Clean up sensor network

lupyuen · May 20, 2019 · 8bf53ef · 8bf53ef
1 parent 7be3067
commit 8bf53ef
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 108 deletions.
diff --git a/libs/remote_sensor/syscfg.yml b/libs/remote_sensor/syscfg.yml
@@ -24,11 +24,11 @@ syscfg.defs:
     value:        AMBIENT_TEMPERATURE_RAW
 
   REMOTE_SENSOR_TYPE_1__INT:
-    description:  'Value Type is int'
+    description:  'Is Sensor Value Type int?'
     value:        1
 
   REMOTE_SENSOR_TYPE_1__DOUBLE:
-    description:  'Value Type is double'
+    description:  'Is Sensor Value Type double?'
     value:        0
 
   ###########################################################################
@@ -51,11 +51,11 @@ syscfg.defs:
     value:        AMBIENT_TEMPERATURE
 
   REMOTE_SENSOR_TYPE_2__INT:
-    description:  'Value Type is int'
+    description:  'Is Sensor Value Type int?'
     value:        0
 
   REMOTE_SENSOR_TYPE_2__DOUBLE:
-    description:  'Value Type is double'
+    description:  'Is Sensor Value Type double?'
     value:        1
 
   ###########################################################################
@@ -78,11 +78,11 @@ syscfg.defs:
     value:        PRESSURE
 
   REMOTE_SENSOR_TYPE_3__INT:
-    description:  'Value Type is int'
+    description:  'Is Sensor Value Type int?'
     value:        0
 
   REMOTE_SENSOR_TYPE_3__DOUBLE:
-    description:  'Value Type is double'
+    description:  'Is Sensor Value Type double?'
     value:        1
 
   ###########################################################################
@@ -105,11 +105,11 @@ syscfg.defs:
     value:        RELATIVE_HUMIDITY
 
   REMOTE_SENSOR_TYPE_4__INT:
-    description:  'Value Type is int'
+    description:  'Is Sensor Value Type int?'
     value:        0
 
   REMOTE_SENSOR_TYPE_4__DOUBLE:
-    description:  'Value Type is double'
+    description:  'Is Sensor Value Type double?'
     value:        1
 
   # When we add Remote Sensor Type 5, remember to replicate the macros in 

diff --git a/libs/sensor_network/include/sensor_network/sensor_network.h b/libs/sensor_network/include/sensor_network/sensor_network.h
@@ -135,7 +135,10 @@ bool should_send_to_collector(struct sensor_value *val, const char *device_name)
 /////////////////////////////////////////////////////////
 //  Sensor Network Addresses
 
-//  Get the randomly-generated device ID.  Changes upon restart.
+//  Return the Hardware ID, which is unique across all microcontrollers.
+const uint8_t *get_hardware_id(void);
+
+//  Get the randomly-generated Device ID that will be sent in every CoAP Server message.  Changes upon restart.
 const char *get_device_id(void);
 
 //  Return the Collector Node address for this Sensor Network.