deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1651 from gebart/pr/lwm2m-json-sv-bv

Browse source 
oma-lwm2m: Use sv for string value, bv for boolean
This commit is contained in:
Nicolas Tsiftes 2016-05-12 17:01:16 +02:00
parent eeff8bf970 cb729b0785
commit 98fcac15cd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/oma-lwm2m/lwm2m-engine.c
View file

@ -639,10 +639,10 @@ write_rd_json_data(const lwm2m_context_t *context,
value = lwm2m_object_get_resource_string(resource, context); value = lwm2m_object_get_resource_string(resource, context);
slen = lwm2m_object_get_resource_strlen(resource, context); slen = lwm2m_object_get_resource_strlen(resource, context);
if(value != NULL) { if(value != NULL) {
PRINTF("%s{\"n\":\"%u\",\"vs\":\"%.*s\"}", s, PRINTF("%s{\"n\":\"%u\",\"sv\":\"%.*s\"}", s,
resource->id, slen, value); resource->id, slen, value);
len = snprintf(&buffer[rdlen], size - rdlen, len = snprintf(&buffer[rdlen], size - rdlen,
"%s{\"n\":\"%u\",\"vs\":\"%.*s\"}", s, "%s{\"n\":\"%u\",\"sv\":\"%.*s\"}", s,
resource->id, slen, value); resource->id, slen, value);
} }
} else if(lwm2m_object_is_resource_int(resource)) { } else if(lwm2m_object_is_resource_int(resource)) {
@ -682,10 +682,10 @@ write_rd_json_data(const lwm2m_context_t *context,
} else if(lwm2m_object_is_resource_boolean(resource)) { } else if(lwm2m_object_is_resource_boolean(resource)) {
int value; int value;
if(lwm2m_object_get_resource_boolean(resource, context, &value)) { if(lwm2m_object_get_resource_boolean(resource, context, &value)) {
PRINTF("%s{\"n\":\"%u\",\"v\":%s}", s, resource->id, PRINTF("%s{\"n\":\"%u\",\"bv\":%s}", s, resource->id,
value ? "true" : "false"); value ? "true" : "false");
len = snprintf(&buffer[rdlen], size - rdlen, len = snprintf(&buffer[rdlen], size - rdlen,
"%s{\"n\":\"%u\",\"v\":%s}", s, resource->id, "%s{\"n\":\"%u\",\"bv\":%s}", s, resource->id,
value ? "true" : "false"); value ? "true" : "false");
} }
} }