From 43551e034ea2928cb6bd43380490b18435cba227 Mon Sep 17 00:00:00 2001 From: Omkar Hegde Date: Wed, 15 Jul 2015 09:25:49 -0700 Subject: [PATCH] Fixing collection samples Wrong property name was being used for resource and values being added incorrectly to the payload after CBOR changes. Change-Id: Id3e4c8c20bae0feee33efb1f5c1479da76f680c9 Signed-off-by: Omkar Hegde Reviewed-on: https://gerrit.iotivity.org/gerrit/1673 Reviewed-by: Erich Keane Tested-by: jenkins-iotivity --- .../stack/samples/linux/SimpleClientServer/ocservercoll.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp index d58b256..86d79b5 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp @@ -153,13 +153,13 @@ OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, OCRepPayload *tempPayload = OCRepPayloadCreate(); OCRepPayloadSetUri(tempPayload, gLightResourceUri); OCRepPayloadSetPropBool(tempPayload, "state", false); - OCRepPayloadSetPropInt(tempPayload, "color", 0); + OCRepPayloadSetPropInt(tempPayload, "power", 0); OCRepPayloadAppend(payload, tempPayload); OCRepPayload *tempPayload2 = OCRepPayloadCreate(); OCRepPayloadSetUri(tempPayload2, gFanResourceUri); - OCRepPayloadSetPropBool(tempPayload, "state", true); - OCRepPayloadSetPropInt(tempPayload, "speed", 10); + OCRepPayloadSetPropBool(tempPayload2, "state", true); + OCRepPayloadSetPropInt(tempPayload2, "speed", 10); OCRepPayloadAppend(payload, tempPayload2); } if (ret == OC_EH_OK) @@ -223,7 +223,7 @@ OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, OCRepPayload *tempPayload = OCRepPayloadCreate(); OCRepPayloadSetUri(tempPayload, gLightResourceUri); OCRepPayloadSetPropBool(tempPayload, "state", true); - OCRepPayloadSetPropInt(tempPayload, "color", 0); + OCRepPayloadSetPropInt(tempPayload, "power", 0); OCRepPayloadAppend(payload, tempPayload); } if(ret != OC_EH_ERROR) @@ -286,13 +286,13 @@ OCEntityHandlerResult OCEntityHandlerLightCb(OCEntityHandlerFlag flag, { OCRepPayloadSetUri(payload, gLightResourceUri); OCRepPayloadSetPropBool(payload, "state", false); - OCRepPayloadSetPropInt(payload, "color", 0); + OCRepPayloadSetPropInt(payload, "power", 0); } else if(OC_REST_PUT == ehRequest->method) { OCRepPayloadSetUri(payload, gLightResourceUri); OCRepPayloadSetPropBool(payload, "state", true); - OCRepPayloadSetPropInt(payload, "color", 0); + OCRepPayloadSetPropInt(payload, "power", 0); } else { -- 2.7.4