records restart; loads node id from lsb of Si7021 serialno if not in config

Author: scott2b

SensorGridPM/SensorGridPM.ino

@@ -408,6 +408,7 @@ void setup() {
       txPower(i, DEFAULT_LORA_TX_POWER);
     }
     Watchdog.disable();
+    recordRestart();
 }
 
 void loop() {

SensorGridPM/config.cpp

@@ -67,7 +67,7 @@ bool Config::loadConfig() {
       digitalWrite(default_rfm_cs, LOW);
       digitalWrite(alt_rfm_cs, LOW);
       network_id = (uint32_t)(atoi(getConfig("NETWORK_ID")));
-      node_id = (uint8_t)(atoi(getConfig("NODE_ID")));
+      node_id = (uint8_t)(atoi(getConfig("NODE_ID")), 0);
       collector_id = (uint8_t)(atoi(getConfig("COLLECTOR_ID")));
       rf95_freq = static_cast<float>(atof(getConfig("RF95_FREQ")));
       tx_power = (uint8_t)(atoi(getConfig("TX_POWER")));
@@ -87,12 +87,19 @@ bool Config::loadConfig() {
       logln(F("ERROR: No config file found"));
       return false;
   }
-  WifiConfig::loadConfig();
+  //Serial.print("Loading WiFi config .."); // TODO: collector only?
+  //WifiConfig::loadConfig();
+  //Serial.println(".. done");
+  Serial.print("Loading LoRa config ..");
   RadioConfig::loadConfig();
-  logln(F("Config loaded"));
+  Serial.println(".. done");
   if (!node_id) {
-      logln(F("ERROR: Missing required config parameter NODE_ID"));
-      fail(FAIL_CODE_BAD_CONFIG);
+      Serial.println("Node ID not configured. Using Lower byte of Si7021 serial number A.");
+      Adafruit_Si7021 _sensor = Adafruit_Si7021();
+      _sensor.begin();
+      node_id = (byte)_sensor.sernum_a;
+      Serial.print("NODE ID: ");
+      Serial.println(node_id);
   }
   return true;
 }

SensorGridPM/runtime.cpp

@@ -239,6 +239,16 @@ bool checkBatteryLevel() {
 }
 */
 
+void recordRestart()
+{
+    println("recording restart ...");
+    DataSample *sample = appendData();
+    snprintf(sample->data, DATASAMPLE_DATASIZE, "{\"node\":%d,\"event\":\"restart\",\"ts\":%lu}",
+        nodeId(), rtcz.getEpoch());
+    recordData(sample->data, strlen(sample->data));
+    println("done recording restart ...");
+}
+
 void recordBatteryLevel()
 {
     // float bat = batteryLevel();

SensorGridPM/runtime.h

@@ -19,6 +19,7 @@ extern void recordDataSamples();
 extern void flashHeartbeatOn();
 extern void flashHeartbeatOff();
 extern void recordBatteryLevel();
+extern void recordRestart();
 //extern void recordTempAndHumidity();
 extern void recordUptime();
 // extern void logData(bool clear);

lib/KnightLab_Sensors/src/KL_ADAFRUIT_SI7021.cpp

@@ -23,7 +23,22 @@ ADAFRUIT_SI7021::~ADAFRUIT_SI7021() {}
 bool ADAFRUIT_SI7021::setup() {
     Serial.print(F("Si7021 "));
     if (sensor.begin()) {
-        Serial.println(F("Found"));
+        Serial.println(F("Found Si7021 with serial number: "));
+        Serial.print((byte)(sensor.sernum_a >> 24), HEX);
+        Serial.print(" ");
+        Serial.print((byte)(sensor.sernum_a >> 16), HEX);
+        Serial.print(" ");
+        Serial.print((byte)(sensor.sernum_a >> 8), HEX);
+        Serial.print(" ");
+        Serial.print((byte)sensor.sernum_a, HEX);
+        Serial.print(" :: ");
+        Serial.println((byte)(sensor.sernum_b >> 24), HEX);
+        Serial.print(" ");
+        Serial.print((byte)(sensor.sernum_b >> 16), HEX);
+        Serial.print(" ");
+        Serial.print((byte)(sensor.sernum_b >> 8), HEX);
+        Serial.print(" ");
+        Serial.print((byte)sensor.sernum_b, HEX);
         return true;
     } else {
         Serial.println(F("Not Found"));