Transmit device type in device ID

Author: lupyuen

.vscode/launch.json

@@ -17,7 +17,7 @@
             //  Arm System View Description, downloaded from https://www.st.com/en/microcontrollers-microprocessors/stm32l476rc.html#
             "svdFile": "scripts/STM32L4x6.svd",
             "configFiles": [ 
-                //  Tell OpenOCD to open the ST Link connection to STM32F1 MCU.
+                //  Tell OpenOCD to open the ST Link connection to STM32 MCU.
                 "interface/stlink-v2.cfg",
                 //  Previously: "target/stm32f1x.cfg",
                 "target/stm32l4x.cfg",

libs/sensor_network/src/sensor_network.c

@@ -371,6 +371,9 @@ const uint8_t *get_hardware_id(void) {
     return hw_id;
 }
 
+//  Device Type e.g. l476
+static const char *DEVICE_TYPE = MYNEWT_VAL(DEVICE_TYPE);
+
 const char *get_device_id(void) {
     //  Get the randomly-generated Device ID that will be sent in every CoAP Server message.  Changes upon restart.
     if (device_id_text[0]) { return device_id_text; }
@@ -385,6 +388,12 @@ const char *get_device_id(void) {
         s += 2;
     }
     device_id_text[DEVICE_ID_TEXT_LENGTH - 1] = 0;
+    //  Overwrite the start of the device ID by the device type followed by ",", e.g. "l476,010203".
+    if (strlen(DEVICE_TYPE) > 0) {
+        assert(strlen(DEVICE_TYPE) < DEVICE_ID_TEXT_LENGTH - 1);  //  DEVICE_TYPE too long
+        strcpy(device_id_text, DEVICE_TYPE);
+        device_id_text[strlen(DEVICE_TYPE)] = ',';
+    }
     console_printf("%srandom device id %s\n", _net, device_id_text);
     return device_id_text;
 }

libs/sensor_network/syscfg.yml

@@ -4,6 +4,10 @@
 #   Strings must be enclosed by '"..."'
 
 syscfg.defs:
+    DEVICE_TYPE:
+        description: 'Device type that will be prepended to the Device ID'
+        value:       '""'
+
     # CoAP Server Connection Settings: Collector Node and Standalone Node will send sensor data to this server
     COAP_HOST:
         description: 'CoAP host e.g. 104.199.85.211 (for coap.thethings.io)'

logs/libapp.json

@@ -37,6 +37,7 @@ syscfg.vals:
     ###########################################################################
     # Network Settings
 
+    DEVICE_TYPE:            '"l476"'  # Device type that will be prepended to the Device ID. thethings.io converts the raw temperature depending on the device type.
     NBIOT_BAND:             8  # Connect to this NB-IoT band
     SENSOR_NETWORK:         1  # Enable Sensor Network library
     SENSOR_COAP:            1  # Send sensor data to CoAP server