Merge pull request #74 from Genaker/use-json-lib-all-boards

Harmonize json log, use ArduinoJSON library for all boards

platformio.ini

@@ -65,6 +65,7 @@ board_build.f_cpu = 240000000
 board_build.filesystem = littlefs
 lib_deps = 
 	ropg/Heltec_ESP32_LoRa_v3@^0.9.1
+	bblanchon/ArduinoJson@^7.2.0
 	RadioLib
 	U8g2
 	XPowersLib
@@ -122,6 +123,7 @@ board_build.f_cpu = 240000000
 board_build.filesystem = littlefs
 lib_deps = 
 	ropg/Heltec_ESP32_LoRa_v3@^0.9.1
+	bblanchon/ArduinoJson@^7.2.0
 	RadioLib
 	U8g2
 	XPowersLib
@@ -148,6 +150,7 @@ monitor_speed = 115200
 board_build.filesystem = littlefs
 lib_deps = 
 	ropg/Heltec_ESP32_LoRa_v3@^0.9.1
+	bblanchon/ArduinoJson@^7.2.0
 	RadioLib
 	U8g2
 	XPowersLib

src/main.cpp

@@ -23,11 +23,9 @@
 
 //  #define HELTEC_NO_DISPLAY
 
-#include <Arduino.h>
-#ifdef HELTEC
-#include <ArduinoJson.h>
-#endif
 #include "FS.h"
+#include <Arduino.h>
+#include <ArduinoJson.h>
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
 #include <File.h>
@@ -598,11 +596,8 @@ void dumpToCommsTask(void *parameter)
 
 void logToSerialTask(void *parameter)
 {
-#ifdef HELTEC
     JsonDocument doc;
     char jsonOutput[200];
-#endif
-
     uint64_t last_epoch = frequency_scan_result.last_epoch;
     frequency_scan_result.rssi = -999;
 
@@ -620,20 +615,12 @@ void logToSerialTask(void *parameter)
                 continue;
             }
 
-#ifdef HELTEC
             doc["low_range_freq"] = frequency_scan_result.begin;
             doc["high_range_freq"] = frequency_scan_result.end;
             doc["value"] = String(highest_value_scanned);
 
             serializeJson(doc, jsonOutput);
             Serial.println(jsonOutput);
-#else
-            Serial.printf("{\"low_range_freq\": %" PRIu64
-                          ", \"high_range_freq\": %" PRIu64 ", "
-                          "\"value\": \"%" PRIi16 "\"}\n",
-                          frequency_scan_result.begin, frequency_scan_result.end,
-                          highest_value_scanned);
-#endif
         }
     }
 }