commit 05a979e3ad64a2e6c1986cf5151d032f672b6b2d
author Paul Westbrook <pwestbro@google.com> Fri Dec 04 03:27:22 2015 -0800
committer Alex Vakulenko <avakulenko@google.com> Fri Dec 04 15:29:22 2015 +0000
tree b93d7049e228a37f73645c6aa2623820514a3ce3
parent 44c1dbebd153914ec15bd07d7a0f95cdbd0cc05d

Update light command definitions

Bug: 25824489
Change-Id: Ie4eb04917acd18d5c38348a5f8b20d7593b42ec7
Reviewed-on: https://weave-review.googlesource.com/1768
Reviewed-by: Alex Vakulenko <avakulenko@google.com>

examples/daemon/light/light.cc

diff --git a/examples/daemon/light/light.cc b/examples/daemon/light/light.cc
index 90680d2..7d156ef 100644
--- a/examples/daemon/light/light.cc
+++ b/examples/daemon/light/light.cc
@@ -81,19 +81,23 @@
           }
         }
       },
-      "_colorXY": {
-        "_setConfig": {
+      "colorXY": {
+        "setConfig": {
           "minimalRole": "user",
           "parameters": {
-            "_colorSetting": {
+            "colorSetting": {
               "type": "object",
+              "required": [
+                "colorX",
+                "colorY"
+              ],
               "properties": {
-                "_colorX": {
+                "colorX": {
                   "type": "number",
                   "minimum": 0.0,
                   "maximum": 1.0
                 },
-                "_colorY": {
+                "colorY": {
                   "type": "number",
                   "minimum": 0.0,
                   "maximum": 1.0
@@ -111,7 +115,7 @@
     device->AddCommandHandler("brightness.setConfig",
                               base::Bind(&LightHandler::OnBrightnessSetConfig,
                                          weak_ptr_factory_.GetWeakPtr()));
-    device->AddCommandHandler("_colorXY._setConfig",
+    device->AddCommandHandler("colorXY.setConfig",
                               base::Bind(&LightHandler::OnColorXYSetConfig,
                                          weak_ptr_factory_.GetWeakPtr()));
   }
@@ -174,16 +178,16 @@
     LOG(INFO) << "received command: " << cmd->GetName();
     const auto& params = cmd->GetParameters();
     const base::DictionaryValue* colorXY = nullptr;
-    if (params.GetDictionary("_colorSetting", &colorXY)) {
+    if (params.GetDictionary("colorSetting", &colorXY)) {
       bool updateState = false;
       double X = 0.0;
       double Y = 0.0;
-      if (colorXY->GetDouble("_colorX", &X)) {
+      if (colorXY->GetDouble("colorX", &X)) {
         color_X_ = X;
         updateState = true;
       }
 
-      if (colorXY->GetDouble("_colorY", &Y)) {
+      if (colorXY->GetDouble("colorY", &Y)) {
         color_Y_ = Y;
         updateState = true;
       }