[Debian-iot-packaging] [openzwave-controlpanel] 44/81: update to support Color CC
Dara Adib
daradib-guest at moszumanska.debian.org
Thu Dec 22 16:57:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
daradib-guest pushed a commit to branch debian/master
in repository openzwave-controlpanel.
commit 503bf3338b436699d031abc4fa666e34e70a85d4
Author: Justin Hammond <justin at dynam.ac>
Date: Thu May 28 22:14:46 2015 +0800
update to support Color CC
---
cp.js | 2 +-
ozwcp.cpp | 20 ++++++++++----------
webserver.cpp | 26 +++++++++++++++-----------
zwavelib.cpp | 22 ++++++++++++----------
4 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/cp.js b/cp.js
index 2eadc8b..7e07608 100644
--- a/cp.js
+++ b/cp.js
@@ -1587,7 +1587,7 @@ function CreateDivs(genre,divto,ind)
} else if (nodes[ind].values[i].type == 'list') {
divto[ind]=divto[ind]+CreateList(ind,i,vid);
} else if (nodes[ind].values[i].type == 'string') {
- divto[ind]=divto[ind]+CreateLabel(ind,i,vid);
+ divto[ind]=divto[ind]+CreateTextBox(ind,i,vid);
} else if (nodes[ind].values[i].type == 'button') {
divto[ind]=divto[ind]+CreateButton(ind,i,vid);
} else if (nodes[ind].values[i].type == 'raw') {
diff --git a/ozwcp.cpp b/ozwcp.cpp
index f530b24..535dee5 100644
--- a/ozwcp.cpp
+++ b/ozwcp.cpp
@@ -8,29 +8,29 @@
// All rights reserved.
//
// SOFTWARE NOTICE AND LICENSE
-// This work (including software, documents, or other related items) is being
+// This work (including software, documents, or other related items) is being
// provided by the copyright holders under the following license. By obtaining,
// using and/or copying this work, you (the licensee) agree that you have read,
// understood, and will comply with the following terms and conditions:
//
// Permission to use, copy, and distribute this software and its documentation,
-// without modification, for any purpose and without fee or royalty is hereby
+// without modification, for any purpose and without fee or royalty is hereby
// granted, provided that you include the full text of this NOTICE on ALL
// copies of the software and documentation or portions thereof.
//
-// THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+// THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
// MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-// PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+// LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+// PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
// ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
//
-// COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-// CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+// COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+// CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
// DOCUMENTATION.
//
-// The name and trademarks of copyright holders may NOT be used in advertising
-// or publicity pertaining to the software without specific, written prior
-// permission. Title to copyright in this software and any associated
+// The name and trademarks of copyright holders may NOT be used in advertising
+// or publicity pertaining to the software without specific, written prior
+// permission. Title to copyright in this software and any associated
// documentation will at all times remain with copyright holders.
//-----------------------------------------------------------------------------
diff --git a/webserver.cpp b/webserver.cpp
index 60afe3e..0887a49 100644
--- a/webserver.cpp
+++ b/webserver.cpp
@@ -5,29 +5,29 @@
// All rights reserved.
//
// SOFTWARE NOTICE AND LICENSE
-// This work (including software, documents, or other related items) is being
+// This work (including software, documents, or other related items) is being
// provided by the copyright holders under the following license. By obtaining,
// using and/or copying this work, you (the licensee) agree that you have read,
// understood, and will comply with the following terms and conditions:
//
// Permission to use, copy, and distribute this software and its documentation,
-// without modification, for any purpose and without fee or royalty is hereby
+// without modification, for any purpose and without fee or royalty is hereby
// granted, provided that you include the full text of this NOTICE on ALL
// copies of the software and documentation or portions thereof.
//
-// THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+// THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
// MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-// PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+// LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+// PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
// ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
//
-// COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-// CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+// COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+// CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
// DOCUMENTATION.
//
-// The name and trademarks of copyright holders may NOT be used in advertising
-// or publicity pertaining to the software without specific, written prior
-// permission. Title to copyright in this software and any associated
+// The name and trademarks of copyright holders may NOT be used in advertising
+// or publicity pertaining to the software without specific, written prior
+// permission. Title to copyright in this software and any associated
// documentation will at all times remain with copyright holders.
//-----------------------------------------------------------------------------
@@ -749,10 +749,12 @@ int Webserver::SendPollResponse (struct MHD_Connection *conn)
nodeElement->SetAttribute("routing", Manager::Get()->IsNodeRoutingDevice(homeId, i) ? "true" : "false");
nodeElement->SetAttribute("security", Manager::Get()->IsNodeSecurityDevice(homeId, i) ? "true" : "false");
nodeElement->SetAttribute("time", nodes[i]->getTime());
+#if 0
fprintf(stderr, "i=%d failed=%d\n", i, Manager::Get()->IsNodeFailed(homeId, i));
fprintf(stderr, "i=%d awake=%d\n", i, Manager::Get()->IsNodeAwake(homeId, i));
fprintf(stderr, "i=%d state=%s\n", i, Manager::Get()->GetNodeQueryStage(homeId, i).c_str());
fprintf(stderr, "i=%d listening=%d flirs=%d\n", i, listening, flirs);
+#endif
if (Manager::Get()->IsNodeFailed(homeId, i))
nodeElement->SetAttribute("status", "Dead");
else {
@@ -801,7 +803,7 @@ void web_controller_update (Driver::ControllerState cs, Driver::ControllerError
Webserver *cp = (Webserver *)ct;
string s;
bool more = true;
-
+
switch (cs) {
case Driver::ControllerState_Normal:
s = ": no command in progress.";
@@ -1077,6 +1079,8 @@ int Webserver::Handler (struct MHD_Connection *conn, const char *url,
string arg = (char *)cp->conn_arg2;
if (!Manager::Get()->SetValue(val->getId(), arg))
fprintf(stderr, "SetValue string failed type=%s\n", valueTypeStr(val->getId().GetType()));
+ } else {
+ fprintf(stderr, "Can't Find ValueID for %s\n", (char *)cp->conn_arg1 );
}
return MHD_YES;
} else
diff --git a/zwavelib.cpp b/zwavelib.cpp
index b82bdfe..59af67e 100644
--- a/zwavelib.cpp
+++ b/zwavelib.cpp
@@ -8,29 +8,29 @@
// All rights reserved.
//
// SOFTWARE NOTICE AND LICENSE
-// This work (including software, documents, or other related items) is being
+// This work (including software, documents, or other related items) is being
// provided by the copyright holders under the following license. By obtaining,
// using and/or copying this work, you (the licensee) agree that you have read,
// understood, and will comply with the following terms and conditions:
//
// Permission to use, copy, and distribute this software and its documentation,
-// without modification, for any purpose and without fee or royalty is hereby
+// without modification, for any purpose and without fee or royalty is hereby
// granted, provided that you include the full text of this NOTICE on ALL
// copies of the software and documentation or portions thereof.
//
-// THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+// THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
// MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-// PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+// LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+// PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
// ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
//
-// COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-// CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+// COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+// CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
// DOCUMENTATION.
//
-// The name and trademarks of copyright holders may NOT be used in advertising
-// or publicity pertaining to the software without specific, written prior
-// permission. Title to copyright in this software and any associated
+// The name and trademarks of copyright holders may NOT be used in advertising
+// or publicity pertaining to the software without specific, written prior
+// permission. Title to copyright in this software and any associated
// documentation will at all times remain with copyright holders.
//-----------------------------------------------------------------------------
@@ -472,6 +472,8 @@ uint8 cclassNum (char const *str)
return 0xEF;
else if (strcmp(str, "NON INTEROPERABLE") == 0)
return 0xF0;
+ else if (strcmp(str, "COLOR") == 0)
+ return 0x33;
else
return 0xFF;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave-controlpanel.git
More information about the Debian-iot-packaging
mailing list