Merge pull request #297 from OpenEVSE/jeremypoulter/issue218

Retrieve the serial numbers of the WiFi module and EVSE module

Author: glynhudson

gui

@@ -160,6 +160,7 @@
 
 extern String currentfirmware;
 extern String buildenv;
+extern String serial;
 
 void restart_system();
 

src/emonesp.h

@@ -379,6 +379,9 @@ class EvseManager : public MicroTasks::Task
     const char *getFirmwareVersion() {
       return _monitor.getFirmwareVersion();
     }
+    const char *getSerial() {
+      return _monitor.getSerial();
+    }
     long getMinCurrent() {
       return _monitor.getMinCurrent();
     }

src/evse_man.h

@@ -62,12 +62,14 @@
 #define EVSE_MONITOR_FLAGS_BOOT_READY         (1 << 1)
 #define EVSE_MONITOR_CURRENT_BOOT_READY       (1 << 2)
 #define EVSE_MONITOR_ENERGY_BOOT_READY        (1 << 3)
+#define EVSE_MONITOR_SERIAL_BOOT_READY        (1 << 5)
 
 #define EVSE_MONITOR_BOOT_READY ( \
         EVSE_MONITOR_FAULT_COUNT_BOOT_READY | \
         EVSE_MONITOR_FLAGS_BOOT_READY | \
         EVSE_MONITOR_CURRENT_BOOT_READY | \
-        EVSE_MONITOR_ENERGY_BOOT_READY \
+        EVSE_MONITOR_ENERGY_BOOT_READY | \
+        EVSE_MONITOR_SERIAL_BOOT_READY \
 )
 
 #define EVSE_MONITOR_SESSION_COMPLETE_MASK      OPENEVSE_VFLAG_EV_CONNECTED
@@ -245,6 +247,16 @@ void EvseMonitor::evseBoot(const char *firmware)
     }
   });
 
+  _openevse.getSerial([this](int ret, const char *serial)
+  {
+    if(RAPI_RESPONSE_OK == ret)
+    {
+      DBUGF("serial = %s", serial);
+      snprintf(_serial, sizeof(_serial), "%s", serial);
+      _boot_ready.ready(EVSE_MONITOR_SERIAL_BOOT_READY);
+    }
+  });
+
   _openevse.heartbeatEnable(EVSE_HEATBEAT_INTERVAL, EVSE_HEARTBEAT_CURRENT, [this](int ret, int interval, int current, int triggered) {
     _heartbeat = RAPI_RESPONSE_OK == ret;
   });

src/evse_monitor.cpp

@@ -146,6 +146,7 @@ class EvseMonitor : public MicroTasks::Task
     bool _heartbeat;
 
     char _firmware_version[32];
+    char _serial[16];
 
 #ifdef ENABLE_MCP9808
     Adafruit_MCP9808 _mcp9808;
@@ -294,6 +295,9 @@ class EvseMonitor : public MicroTasks::Task
     const char *getFirmwareVersion() {
       return _firmware_version;
     }
+    const char *getSerial() {
+      return _serial;
+    }
 
     // Register for events
     void onStateChange(MicroTasks::EventListener *listner) {

src/evse_monitor.h

@@ -78,6 +78,7 @@ static uint32_t last_mem = 0;
 #define ESCAPEQUOTE(A) TEXTIFY(A)
 String currentfirmware = ESCAPEQUOTE(BUILD_TAG);
 String buildenv = ESCAPEQUOTE(BUILD_ENV_NAME);
+String serial;
 
 ArduinoOcppTask ocpp = ArduinoOcppTask();
 
@@ -98,6 +99,9 @@ void setup()
   DEBUG.printf("IDF version: %s\n", ESP.getSdkVersion());
   DEBUG.printf("Free: %d\n", ESPAL.getFreeHeap());
 
+  serial = ESPAL.getLongId();
+  serial.toUpperCase();
+
   if(!LittleFS.begin(FORMAT_LITTLEFS_IF_FAILED)){
     DEBUG.println("LittleFS Mount Failed");
     return;

src/main.cpp

@@ -29,6 +29,8 @@ handleConfigGet(MongooseHttpServerRequest *request, MongooseHttpServerResponseSt
   doc["espinfo"] = ESPAL.getChipInfo();
   doc["buildenv"] = buildenv;
   doc["version"] = currentfirmware;
+  doc["evse_serial"] = evse.getSerial();
+  doc["wifi_serial"] = serial;
   doc["diodet"] = evse.isDiodeCheckDisabled() ? 1 : 0;
   doc["gfcit"] = evse.isGfiTestDisabled() ? 1 : 0;
   doc["groundt"] = evse.isGroundCheckDisabled() ? 1 : 0;

src/web_server_config.cpp

@@ -25,7 +25,7 @@ static const char CONTENT_ZONES_JSON[] PROGMEM =
   "\"Africa/Gaborone\":\"CAT-2\",\n"
   "\"Africa/Harare\":\"CAT-2\",\n"
   "\"Africa/Johannesburg\":\"SAST-2\",\n"
-  "\"Africa/Juba\":\"EAT-3\",\n"
+  "\"Africa/Juba\":\"CAT-2\",\n"
   "\"Africa/Kampala\":\"EAT-3\",\n"
   "\"Africa/Khartoum\":\"CAT-2\",\n"
   "\"Africa/Kigali\":\"CAT-2\",\n"
@@ -215,7 +215,7 @@ static const char CONTENT_ZONES_JSON[] PROGMEM =
   "\"Arctic/Longyearbyen\":\"CET-1CEST,M3.5.0,M10.5.0/3\",\n"
   "\"Asia/Aden\":\"<+03>-3\",\n"
   "\"Asia/Almaty\":\"<+06>-6\",\n"
-  "\"Asia/Amman\":\"EET-2EEST,M3.5.4/24,M10.5.5/1\",\n"
+  "\"Asia/Amman\":\"EET-2EEST,M2.5.4/24,M10.5.5/1\",\n"
   "\"Asia/Anadyr\":\"<+12>-12\",\n"
   "\"Asia/Aqtau\":\"<+05>-5\",\n"
   "\"Asia/Aqtobe\":\"<+05>-5\",\n"
@@ -238,8 +238,8 @@ static const char CONTENT_ZONES_JSON[] PROGMEM =
   "\"Asia/Dubai\":\"<+04>-4\",\n"
   "\"Asia/Dushanbe\":\"<+05>-5\",\n"
   "\"Asia/Famagusta\":\"EET-2EEST,M3.5.0/3,M10.5.0/4\",\n"
-  "\"Asia/Gaza\":\"EET-2EEST,M3.4.4/48,M10.4.4/49\",\n"
-  "\"Asia/Hebron\":\"EET-2EEST,M3.4.4/48,M10.4.4/49\",\n"
+  "\"Asia/Gaza\":\"EET-2EEST,M3.4.4/48,M10.5.5/1\",\n"
+  "\"Asia/Hebron\":\"EET-2EEST,M3.4.4/48,M10.5.5/1\",\n"
   "\"Asia/Ho_Chi_Minh\":\"<+07>-7\",\n"
   "\"Asia/Hong_Kong\":\"HKT-8\",\n"
   "\"Asia/Hovd\":\"<+07>-7\",\n"
@@ -423,7 +423,7 @@ static const char CONTENT_ZONES_JSON[] PROGMEM =
   "\"Indian/Mauritius\":\"<+04>-4\",\n"
   "\"Indian/Mayotte\":\"EAT-3\",\n"
   "\"Indian/Reunion\":\"<+04>-4\",\n"
-  "\"Pacific/Apia\":\"<+13>-13<+14>,M9.5.0/3,M4.1.0/4\",\n"
+  "\"Pacific/Apia\":\"<+13>-13\",\n"
   "\"Pacific/Auckland\":\"NZST-12NZDT,M9.5.0,M4.1.0/3\",\n"
   "\"Pacific/Bougainville\":\"<+11>-11\",\n"
   "\"Pacific/Chatham\":\"<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45\",\n"
@@ -462,4 +462,4 @@ static const char CONTENT_ZONES_JSON[] PROGMEM =
   "\"Pacific/Wake\":\"<+12>-12\",\n"
   "\"Pacific/Wallis\":\"<+12>-12\"\n"
   "}\n";
-static const char CONTENT_ZONES_JSON_ETAG[] PROGMEM = "7641cf7331c8ae6124b008c962061938c20f26ae538e30e0484afc06adb88af9";
+static const char CONTENT_ZONES_JSON_ETAG[] PROGMEM = "d11c22c036ed3ee40406009e0f69f2a96903bd4261eb4e16b07bea3f3cf4a65e";