fix value type and genre mapping to string

Author: ekarak

CHANGELOG.md

@@ -34,8 +34,8 @@ Fix scene values type 'list' (Partially fix #266) #267
 add support for SmartOS #272
 
 # 1.6.0
-Fix broken Node 12 builds (v8 7.4.xxx)
-Initial support for OpenZWave 1.6
+Fix broken Node 12 builds (v8 7.4.xxx) #302
+Initial support for OpenZWave 1.6 #300
   - implement exception macros
   - [deprecate several legacy OpenZWave calls](https://github.com/OpenZWave/open-zwave/wiki/OpenZWave-1.6-Release-Notes#deprecated-featuresmethods)
 Updated Raspbian Readme to fix bug when installing on Raspbian stretch #271

binding.gyp

@@ -56,7 +56,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_BITSET=<!@(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)",
 				],
 				"link_settings": {
 				    "libraries": [
@@ -89,6 +91,8 @@
 					"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_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)",
 				],
 				"link_settings": {
 					"libraries": ["-lopenzwave"]
@@ -121,7 +125,8 @@
 					"OPENZWAVE_ETC=<(OZW_HOME)/config",
 					"OPENZWAVE_SECURITY=1",
 					"OPENZWAVE_EXCEPTIONS=1",
-					"OPENZWAVE_BITSET=1"
+					"OPENZWAVE_BITSET=1",
+					"OPENZWAVE_VALUETYPE_FROM_VALUEID=1"
 				],
 				'msvs_settings': {
 					'VCCLCompilerTool': {

src/utils.cc

@@ -252,8 +252,16 @@ namespace OZW {
 		AddStringProp(nodeobj,  value_id,  buffer.c_str());
 		AddIntegerProp(nodeobj, node_id,   value.GetNodeId());
 		AddIntegerProp(nodeobj, class_id,  value.GetCommandClassId());
+#if OPENZWAVE_VALUETYPE_FROM_VALUEID
+		AddStringProp (nodeobj, type,      value.GetTypeAsString());
+		AddStringProp (nodeobj, genre,     value.GetGenreAsString());
+#elif OPENZWAVE_VALUETYPE_FROM_ENUM
 		AddStringProp (nodeobj, type,      OpenZWave::Value::GetTypeNameFromEnum(value.GetType()));
 		AddStringProp (nodeobj, genre,     OpenZWave::Value::GetGenreNameFromEnum(value.GetGenre()));
+#else
+		AddIntegerProp(nodeobj, type,      value.GetType());
+		AddIntegerProp(nodeobj, genre,     value.GetGenre());
+#endif
 		AddIntegerProp(nodeobj, instance,  value.GetInstance());
 		AddIntegerProp(nodeobj, index,     value.GetIndex());
 		AddStringProp (nodeobj, label,     mgr->GetValueLabel(value).c_str());