[SD] first working offline log to sd

Author: brentru

src/Wippersnapper_V2.cpp

@@ -1200,7 +1200,7 @@ void Wippersnapper_V2::connectV2() {
     // Parse the JSON file
     if (!WsV2._sdCardV2->parseConfigFile())
       haltErrorV2("Failed to parse incoming JSON file");
-    WS_DEBUG_PRINT("[Offline] Attempting to configure hardware...");
+    WS_DEBUG_PRINTLN("[Offline] Attempting to configure hardware...");
     #ifndef OFFLINE_MODE_DEBUG
     // Create a new file to store the json log
     if (!WsV2._sdCardV2->CreateNewLogFile()) {
@@ -1210,7 +1210,7 @@ void Wippersnapper_V2::connectV2() {
     // Call the TL signal decoder to parse the incoming JSON data
     callDecodeB2D();
     WS_DEBUG_PRINTLN(
-        "[Offline] Hardware configured, skipping network setup...");
+        "[Offline] Hardware configured, skipping network setup and running app...");
     return;
   } else {
     WS_DEBUG_PRINTLN("Running in online mode...");

src/components/analogIO/controller.cpp

@@ -197,15 +197,7 @@ bool AnalogIOController::EncodePublishPinEvent(
     }
     WS_DEBUG_PRINTLN("Published AnalogIOEvent message to broker!")
   } else {
-    // Print event data
-    WS_DEBUG_PRINTLN("AnalogIOEvent message:");
-    WS_DEBUG_PRINT("Pin Name: ");
-    WS_DEBUG_PRINTLN(c_pin_name);
-    WS_DEBUG_PRINT("Value: ");
-    WS_DEBUG_PRINTLN(value);
-    WS_DEBUG_PRINT("Read Type: ");
-    WS_DEBUG_PRINTLN(read_type);
-    WS_DEBUG_PRINTLN("[analogio] Offline analogIOEvent message not published!");
+
     // TODO: Log out this data by calling a logging function in sdcard class
   }
 
@@ -225,7 +217,6 @@ bool AnalogIOController::EncodePublishPinEvent(
 /***************************************************************************/
 bool AnalogIOController::EncodePublishPinValue(uint8_t pin, uint16_t value) {
   if (WsV2._sdCardV2->isModeOffline()) {
-    WS_DEBUG_PRINTLN("Logging offline analogio event...");
     return WsV2._sdCardV2->LogGPIOSensorEventToSD(
         pin, value, wippersnapper_sensor_SensorType_SENSOR_TYPE_RAW);
   } else {

src/components/ds18x20/controller.cpp

@@ -97,6 +97,22 @@ bool DS18X20Controller::Handle_Ds18x20Add(pb_istream_t *stream) {
     // If the sensor was successfully initialized, add it to the controller
     if (is_initialized == true)
       _DS18X20_pins.push_back(std::move(new_dsx_driver));
+
+    // Print out the details
+    WS_DEBUG_PRINTLN("[ds18x] New Sensor Added!");
+    WS_DEBUG_PRINT("\tPin: ");
+    WS_DEBUG_PRINTLN(pin_name);
+    WS_DEBUG_PRINT("\tResolution: ");
+    WS_DEBUG_PRINTLN(_DS18X20_model->GetDS18x20AddMsg()->sensor_resolution);
+    WS_DEBUG_PRINT("\tPeriod: ");
+    WS_DEBUG_PRINTLN(_DS18X20_model->GetDS18x20AddMsg()->period);
+    WS_DEBUG_PRINT("\tSI Units: ");
+    for (int i = 0; i < _DS18X20_model->GetDS18x20AddMsg()->sensor_types_count;
+         i++) {
+      WS_DEBUG_PRINT(_DS18X20_model->GetDS18x20AddMsg()->sensor_types[i]);
+      WS_DEBUG_PRINT(", ");
+    }
+    WS_DEBUG_PRINTLN("");
   } else {
     WS_DEBUG_PRINTLN("ERROR | DS18x20: Unable to get sensor ID!");
     is_initialized = false;

src/provisioning/sdcard/ws_sdcard.cpp

@@ -457,13 +457,13 @@ bool ws_sdcard::parseConfigFile() {
   DeserializationError error;
   JsonDocument doc;
 #ifndef OFFLINE_MODE_DEBUG
-  WS_DEBUG_PRINTLN("[SD] Parsing config.txt from SD card...");
-  if (!_sd.exists("config.txt")) {
+  WS_DEBUG_PRINTLN("[SD] Parsing config.json from SD card...");
+  if (!_sd.exists("config.json")) {
     WS_DEBUG_PRINTLN(
-        "[SD] FATAL Error - config.txt file not found on SD Card!");
+        "[SD] FATAL Error - config.json file not found on SD Card!");
     return false;
   }
-  file_config = _sd.open("config.txt", O_RDONLY);
+  file_config = _sd.open("config.json", O_RDONLY);
   error = deserializeJson(doc, file_config);
 #else
   // Test Mode - do not use the SD card, use test data instead!
@@ -744,7 +744,6 @@ void ws_sdcard::BuildJSONDoc(JsonDocument &doc, uint8_t pin, uint16_t value,
   char pin_name[12];
   sprintf(pin_name, "A%d", pin);
   doc["timestamp"] = GetTimestamp();
-  ;
   doc["pin"] = pin_name;
   doc["value"] = value;
   doc["si_unit"] = SensorTypeToString(read_type);
@@ -761,17 +760,23 @@ void ws_sdcard::BuildJSONDoc(JsonDocument &doc, uint8_t pin, bool value,
 }
 
 bool ws_sdcard::LogJSONDoc(JsonDocument &doc) {
-  File32 file;
   size_t szJson;
   // Serialize the JSON document
 #ifndef OFFLINE_MODE_DEBUG
-  if (!_sd.open("log.json", FILE_WRITE))
+  File32 file;
+  file = _sd.open(_log_filename, FILE_WRITE);
+  if (!file) {
+    WS_DEBUG_PRINTLN("[SD] FATAL Error - Unable to open the log file for writing!");
     return false;
+  }
   BufferingPrint bufferedFile(file, 64); // Add buffering to the file
   szJson = serializeJson(
       doc, file);           // Serialize the JSON to the file in 64-byte chunks
   bufferedFile.print("\n"); // JSONL format specifier
   bufferedFile.flush();     // Send the remaining bytes
+  // print the doc to the serial
+  serializeJson(doc, Serial);
+  Serial.print("\n");
 #else
   szJson = serializeJson(doc, Serial); // TODO: Add buffering here, too?
   Serial.print("\n");                  // JSONL format specifier