implement new notification types; change ValueID index type

ekarak · ekarak · commit 9016928b1264 · 2019-06-16T11:40:38.000+03:00
diff --git a/binding.gyp b/binding.gyp
@@ -29,7 +29,9 @@
 					"OPENZWAVE_DOC=<!@(node -p -e \"'<(OZW_DOC)'.length ? '<(OZW_DOC)' : '/usr/local/share/doc/openzwave'\")",
 					"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)",
 					"OPENZWAVE_EXCEPTIONS=<!@(find <(OZW_INC) -name OZWException.h | wc -l)",
-					"OPENZWAVE_BITSET=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)"
+					"OPENZWAVE_16=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
+					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
+					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::ValueID::GetTypeAsString | wc -l)"
 				],
 				"cflags": [ "-Wno-ignored-qualifiers -Wno-write-strings -Wno-unknown-pragmas" ],
 				"link_settings": {
@@ -56,7 +58,7 @@
 					"OPENZWAVE_DOC=<!@(node -p -e \"'<(OZW_DOC)'.length ? '<(OZW_DOC)' : '/usr/local/share/doc/openzwave'\")",
 					"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)",
 					"OPENZWAVE_EXCEPTIONS=<!@(find <(OZW_INC) -name OZWException.h | wc -l)",
-					"OPENZWAVE_BITSET=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
+					"OPENZWAVE_16=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
 					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
 					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::ValueID::GetTypeAsString | wc -l)",
 				],
@@ -90,7 +92,7 @@
 					"OPENZWAVE_DOC=<!@(<(NODE) -p -e \"'<(OZW_DOC)'.length ? '<(OZW_DOC)' : '/usr/local/share/doc/openzwave'\")",
 					"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)",
 					"OPENZWAVE_EXCEPTIONS=<!@(find <(OZW_INC) -name OZWException.h | wc -l)",
-					"OPENZWAVE_BITSET=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
+					"OPENZWAVE_16=<!@(find <(OZW_INC) -name ValueBitSet.h | wc -l)",
 					"OPENZWAVE_VALUETYPE_FROM_ENUM=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::Value::GetTypeNameFromEnum | wc -l)",
 					"OPENZWAVE_VALUETYPE_FROM_VALUEID=<!@(ldconfig -p | grep 'libopenzwave.so ' | awk '{print $4}' | xargs nm -g --demangle |grep OpenZWave::ValueID::GetTypeAsString | wc -l)",
 				],
@@ -125,7 +127,7 @@
 					"OPENZWAVE_ETC=<(OZW_HOME)/config",
 					"OPENZWAVE_SECURITY=1",
 					"OPENZWAVE_EXCEPTIONS=1",
-					"OPENZWAVE_BITSET=1",
+					"OPENZWAVE_16=1",
 					"OPENZWAVE_VALUETYPE_FROM_VALUEID=1"
 				],
 				'msvs_settings': {
diff --git a/src/callbacks.cc b/src/callbacks.cc
@@ -90,10 +90,18 @@ void ozw_watcher_callback(OpenZWave::Notification const *cb, void *ctx)
   case OpenZWave::Notification::Type_ControllerCommand:
     notif->event = cb->GetEvent();
     notif->notification = cb->GetNotification();
+#if OPENZWAVE_16
+    notif->command = cb->GetCommand();
+#endif
+    break;
+#endif
+#if OPENZWAVE_16
+  case OpenZWave::Notification::Type_UserAlerts:
+    notif->notification = cb->GetUserAlertType();
     break;
 #endif
   }
-
+  // push the notification to the queue
   {
     mutex::scoped_lock sl(zqueue_mutex);
     zqueue.push(notif);
@@ -146,6 +154,7 @@ void handleControllerCommand(NotifInfo *notif)
 // ##### END OF LEGACY MODE ###### //
 #endif
 
+ 
 /*
  * handle normal OpenZWave notifications
  */
@@ -252,10 +261,7 @@ void handleNotification(NotifInfo *notif)
   //                            #################
   case OpenZWave::Notification::Type_NodeRemoved: {
     //                            #################
-    {
-      mutex::scoped_lock sl(znodes_mutex);
-      znodes.erase(notif->nodeid);
-    }
+    delete_node(notif->nodeid);
     emitinfo[0] = Nan::New<String>("node removed").ToLocalChecked();
     emitinfo[1] = Nan::New<Integer>(notif->nodeid);
     emit_cb->Call(Nan::New(ctx_obj),  2, emitinfo, resource);
@@ -420,38 +426,74 @@ void handleNotification(NotifInfo *notif)
     emit_cb->Call(Nan::New(ctx_obj),  4, emitinfo, resource);
     break;
   }
-  case OpenZWave::Notification::Type_DriverRemoved:
-  case OpenZWave::Notification::Type_Group:
+  //                              ##################
+  case OpenZWave::Notification::Type_DriverRemoved: {
+    //                            ##################
+    emitinfo[0] = Nan::New<String>("driver removed").ToLocalChecked();
+    emit_cb->Call(Nan::New(ctx_obj),  1, emitinfo, resource);
+    break;
+  }
+  //                            ###########
+  case OpenZWave::Notification::Type_Group: {
+  //                            ###########
     /* The associations for the node have changed. The
      * application should rebuild any group information it
      * holds about the node.
      */
-    // todo
+    emitinfo[0] = Nan::New<String>("group").ToLocalChecked();
+    emit_cb->Call(Nan::New(ctx_obj),  1, emitinfo, resource);
     break;
-#if OPENZWAVE_SECURITY == 1
-  case OpenZWave::Notification::Type_ControllerCommand:
+  }
+#if OPENZWAVE_16
+  //                            ##############
+  case OpenZWave::Notification::Type_NodeReset: {
+  //                            ##############
+    delete_node(notif->nodeid);
+    emitinfo[0] = Nan::New<String>("node reset").ToLocalChecked();
+    emitinfo[1] = Nan::New<Integer>(notif->nodeid);
+    emit_cb->Call(Nan::New(ctx_obj),  2, emitinfo, resource);
+    break;
+  }
+  //                            ##############
+  case OpenZWave::Notification::Type_UserAlerts: {
+  //                            ##############
+    emitinfo[0] = Nan::New<String>("user alert").ToLocalChecked();
+    emitinfo[1] = Nan::New<Integer>(notif->notification); 
+    emitinfo[2] = Nan::New<String>(notif->help.c_str()).ToLocalChecked();
+    emit_cb->Call(Nan::New(ctx_obj),  3, emitinfo, resource);
+    break;
+  }
+  //                            ################################
+  case OpenZWave::Notification::Type_ManufacturerSpecificDBReady: {
+  //                            ################################
+    emitinfo[0] = Nan::New<String>("manufacturer specific DB ready").ToLocalChecked();
+    emit_cb->Call(Nan::New(ctx_obj),  1, emitinfo, resource);
+    break;    
+  }
+#endif
+
+#if OPENZWAVE_SECURITY
+  case OpenZWave::Notification::Type_ControllerCommand: {
     emitinfo[0] = Nan::New<String>("controller command").ToLocalChecked();
     emitinfo[1] = Nan::New<Integer>(notif->nodeid);
     emitinfo[2] = Nan::New<Integer>(notif->event); // Driver::ControllerCommand
     emitinfo[3] =
         Nan::New<Integer>(notif->notification); // Driver::ControllerState
     emitinfo[4] = Nan::New<String>(notif->help.c_str()).ToLocalChecked();
+#if OPENZWAVE_16
+    emitinfo[5] = Nan::New<Integer>(notif->command);
+    emit_cb->Call(Nan::New(ctx_obj),  6, emitinfo, resource);
+#else
     emit_cb->Call(Nan::New(ctx_obj),  5, emitinfo, resource);
+#endif
     break;
-  case OpenZWave::Notification::Type_NodeReset:
-    emitinfo[0] = Nan::New<String>("node reset").ToLocalChecked();
-    emitinfo[1] = Nan::New<Integer>(notif->nodeid);
-    emitinfo[2] = Nan::New<Integer>(notif->event); // Driver::ControllerCommand
-    emitinfo[3] =
-        Nan::New<Integer>(notif->notification); // Driver::ControllerState
-    emit_cb->Call(Nan::New(ctx_obj),  4, emitinfo, resource);
-    break;
+  }
 #endif
   default:
     fprintf(stderr, "Unhandled OpenZWave notification: %d\n", notif->type);
-    break;
-  } // end switch
-}
+    break;  
+} // end switch
+} // end handleNotification
 
 /*
 * Async handler, triggered by the OpenZWave callback.
diff --git a/src/callbacks.hpp b/src/callbacks.hpp
@@ -31,6 +31,9 @@ namespace OZW {
     uint8 notification;
     ::std::list<OpenZWave::ValueID> values;
     ::std::string help;
+#if OPENZWAVE_16
+    uint8 command;
+#endif
   } NotifInfo;
 
   typedef struct {
diff --git a/src/openzwave-values.cc b/src/openzwave-values.cc
@@ -90,9 +90,11 @@ namespace OZW {
 					OZWManager( SetValue, *vit, val, len);
 					break;
 				}
-#if OPENZWAVE_BITSET
+#if OPENZWAVE_16
 				case OpenZWave::ValueID::ValueType_BitSet: {
-					// TODO
+					uint8 pos = Nan::To<Number>(info[validx]).ToLocalChecked()->Value();
+					bool val = Nan::To<Boolean>(info[validx+1]).ToLocalChecked()->Value();
+					OZWManager( SetValue, *vit, pos, val);
 				}
 #endif
 			}
@@ -276,7 +278,7 @@ namespace OZW {
 		}
 	}
 
-#if OPENZWAVE_BITSET
+#if OPENZWAVE_16
 	// =================================================================
 	NAN_METHOD(OZW::GetValueAsBitSet)
 	// =================================================================
diff --git a/src/openzwave.hpp b/src/openzwave.hpp
@@ -157,7 +157,7 @@ namespace OZW {
 		static NAN_METHOD(ClearSwitchPoints);
 		static NAN_METHOD(SetSwitchPoint);
 		static NAN_METHOD(RemoveSwitchPoint);
-#if OPENZWAVE_BITSET
+#if OPENZWAVE_16
 		static NAN_METHOD(GetValueAsBitSet);
 		static NAN_METHOD(SetBitMask);
 		static NAN_METHOD(GetBitMask);
diff --git a/src/utils.cc b/src/utils.cc
@@ -43,6 +43,16 @@ namespace OZW {
 		return NULL;
 	}
 
+	/*
+	* Delete NodeInfo after a NodeReset or NodeRemoved notification
+	*/
+	void delete_node(uint8 nodeid) {
+		mutex::scoped_lock sl(znodes_mutex);
+		if (znodes.erase(nodeid)) {
+			// TODO: extra cleanup??
+		}
+	}
+
 	SceneInfo *get_scene_info(uint8 sceneid) {
 		::std::list<SceneInfo *>::iterator it;
 
@@ -122,9 +132,18 @@ namespace OZW {
 				AddStringProp(valobj, value, val.c_str())
 				break;
 			}
-#if OPENZWAVE_BITSET
+#if OPENZWAVE_16
+#define SET(val,offset)   val |=  (1 << offset)
+#define CLEAR(val,offset) val &= ~(1 << offset)
+			// just return the whole bitset, mask your bit in JS land
 			case OpenZWave::ValueID::ValueType_BitSet: {
-				// TODO
+				uint8 val = 0;
+				bool bit;
+				for (uint8 pos = 0; pos < 8; pos++) {
+					OZWManager( GetValueAsBitSet, value, pos, &bit);
+					bit ? SET(val, pos) : CLEAR(val, pos);
+				}
+				AddIntegerProp(valobj, value, val);
 			}
 #endif
 			/*
@@ -313,7 +332,8 @@ namespace OZW {
 		index: the index of the command (usually 0)
 */
 	OpenZWave::ValueID* populateValueId(const Nan::FunctionCallbackInfo<v8::Value> &info, uint8 offset) {
-		uint8 nodeid, comclass, instance, index;
+		uint8 nodeid, comclass, instance;
+		OZWValueIdIndex index;
 		if ( (info.Length() >= offset) && info[offset]->IsObject() ) {
 			Local<Object> o = Nan::To<Object>(info[offset]).ToLocalChecked();
 			if (isOzwValue(o)) {
@@ -461,7 +481,13 @@ const ::std::string getNotifHelpMsg(Notification const *n) {
 				str.append(getControllerStateAsStr((OpenZWave::Driver::ControllerState) n->GetByte()));
 				break;
 			case Notification::Type_DriverRemoved:
-				str = "DriverRemoved";				break;
+				str = "DriverRemoved";	break;
+			case Notification::Type_NodeReset:
+				str = "NodeReset"; break;
+			case Notification::Type_UserAlerts:
+				str = "UserAlerts"; break;
+			case Notification::Type_ManufacturerSpecificDBRead:
+				str = "ManuacturerSpecificDBRead"; break;
 		}
 		return str;
 #endif
diff --git a/src/utils.hpp b/src/utils.hpp
@@ -46,6 +46,13 @@
 #define OZWManagerAssign(VALUE,METHOD,...) VALUE = OpenZWave::Manager::Get()->METHOD(__VA_ARGS__)
 #endif
 
+typedef 
+#if OPENZWAVE_16 
+	uint16_t
+#else
+	uint8_t
+#endif
+OZWValueIdIndex;
 
 #define AddIntegerProp(OBJ,PROPNAME,PROPVALUE) \
 	Nan::Set(OBJ,                                \
@@ -124,6 +131,7 @@ namespace OZW {
 
 	v8::Local<v8::Object> zwaveValue2v8Value(OpenZWave::ValueID value);
 	NodeInfo  *get_node_info(uint8 nodeid);
+	void       delete_node(uint8 nodeid);
 
 #ifdef OPENZWAVE_DEPRECATED16
 	v8::Local<v8::Object> zwaveSceneValue2v8Value(uint8 sceneId, OpenZWave::ValueID value);

Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,11 @@ namespace OZW {`
`90`	`90`	`OZWManager( SetValue, *vit, val, len);`
`91`	`91`	`break;`
`92`	`92`	`}`
`93`		`-#if OPENZWAVE_BITSET`
	`93`	`+#if OPENZWAVE_16`
`94`	`94`	`case OpenZWave::ValueID::ValueType_BitSet: {`
`95`		`- // TODO`
	`95`	`+ uint8 pos = Nan::To<Number>(info[validx]).ToLocalChecked()->Value();`
	`96`	`+ bool val = Nan::To<Boolean>(info[validx+1]).ToLocalChecked()->Value();`
	`97`	`+ OZWManager( SetValue, *vit, pos, val);`
`96`	`98`	`}`
`97`	`99`	`#endif`
`98`	`100`	`}`
`@@ -276,7 +278,7 @@ namespace OZW {`
`276`	`278`	`}`
`277`	`279`	`}`
`278`	`280`
`279`		`-#if OPENZWAVE_BITSET`
	`281`	`+#if OPENZWAVE_16`
`280`	`282`	`// =================================================================`
`281`	`283`	`NAN_METHOD(OZW::GetValueAsBitSet)`
`282`	`284`	`// =================================================================`