Merge branch 'master' into platformio_dependabot/WS2812FX/1.4.5

Author: jeremypoulter

docs/mqtt.md

@@ -51,7 +51,7 @@ Limit:
 
 Main settings:
 
-`<base-topic>/divertmode/set [1 | 2]`       : enable (1)/ disable (2) divert mode  
+`<base-topic>/divertmode/set [1 | 2]`       : normal (1)/ eco (2) divert mode  
 `<base-topic>/shaper/set [0 | 1]`           : temporary enable (1)/ disable (0) current shaper ( doesn't survive reboot )  
 `<base-topic>/restart {"device": "gateway|evse"}` : restart the gateway or openevse module
 

docs/user-guide.md

@@ -56,6 +56,27 @@ Most ESP32 boards can be used (see platfromio.ini for full list of supported boa
 * Temp 3 IR sensor (not used)
 * Temp 4 OpenEVSE V1 module 
 
+### Lighting and Indicators
+
+OpenEVSE uses the LCD backlight and/or RGB pixels to indicate status:
+
+* **Off**: Initialising
+* OpenEVSE active
+  * **Green**: No EV Connected
+  * **Yellow**: Connected, but not charging
+  * **Cyan/Teal**: Charging
+  * **Red**: Fault
+* OpenEVSE Sleeping/Disabled
+  * **Cyan/Teal**: EV connected
+  * **Purple/Violet**: EV disconnected
+
+In addition to this the RGB pixels can be used to indicate the WiFi status on the first pixel:
+
+* **Slow Flashing Yellow**: WiFi AP enabled and waiting for connection
+* **Fast Flashing Purple/Violet**: WiFi client connected to AP
+* **Slow Flashing Yellow**: Connecting to WiFi network as a client
+* **Green**: Connected to WiFi network
+
 ## WiFi Setup
 
 At setup OpenEVSE will broadcast a WiFi access point (AP) `OpenEVSE_XXXX`. Connect your browser device to this AP (default password: `openevse`) and the captive portal will forward you to the log-in page. 

gui-v2

@@ -39,7 +39,7 @@ lib_deps =
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
   matth-x/[email protected]
-  matth-x/MicroOcppMongoose@1.1.0
+  matth-x/MicroOcppMongoose@1.2.0
 lib_ignore = WebSockets ; MicroOcpp: don't compile built-in WS library
 extra_scripts =
   pre:scripts/auto_fw_version.py
@@ -124,7 +124,7 @@ build_partitions = min_spiffs.csv
 build_partitions_debug = min_spiffs_debug.csv
 build_partitions_16mb = openevse_16mb.csv
 
-neopixel_lib = adafruit/Adafruit [email protected].3
+neopixel_lib = adafruit/Adafruit [email protected].5
 ws2812fx_lib = kitesurfer1404/[email protected]
 
 gfx_display_libs =
@@ -173,7 +173,7 @@ gfx_display_build_flags =
 #platform = https://github.com/platformio/platform-espressif32.git#feature/stage
 #platform = https://github.com/platformio/platform-espressif32.git#develop
 #platform = [email protected]
-platform = espressif32@6.8.1
+platform = espressif32@6.10.0
 #framework = arduino, espidf
 framework = arduino
 lib_deps = ${common.lib_deps}

platformio.ini

@@ -48,7 +48,7 @@ The WiFi gateway uses an **ESP32** which communicates with the OpenEVSE controll
 
 ### OpenEVSE / EmonEVSE charging station
 
-- Purchase via: [OpenEVSE Store (USA/Canda)](https://store.openevse.com) | [OpenEnergyMonitor (UK / EU)](https://shop.openenergymonitor.com/evse/)
+- Purchase via: [OpenEVSE Store](https://store.openevse.com)
 - OpenEVSE FW [V7.1.3 recommended](https://github.com/OpenEVSE/open_evse/releases)
 - All new OpenEVSE units are shipped with V7.1.3 pre-loaded (April 2021 onwards)
 

readme.md

@@ -520,6 +520,7 @@ bool config_deserialize(DynamicJsonDocument &doc)
       evse.configureCurrentSensorScale(doc["scale"], doc["offset"]);
       config_modified = true;
       DBUGLN("scale changed");
+      evse.getAmmeterSettings();
     }
   }
   #endif

src/app_config.cpp

@@ -430,6 +430,9 @@ class EvseManager : public MicroTasks::Task
     long getCurrentSensorOffset() {
       return _monitor.getCurrentSensorOffset();
     }
+    void getAmmeterSettings() {
+      _monitor.getAmmeterSettings();
+    }
 
     void enableFeature(uint8_t feature, bool enabled, std::function<void(int ret)> callback = NULL) {
       _monitor.enableFeature(feature, enabled, callback);

src/evse_man.h

@@ -235,7 +235,6 @@ void EvseMonitor::evseBoot(const char *firmware)
       DBUGF("scale = %ld, offset = %ld", scale, offset);
       _current_sensor_scale = scale;
       _current_sensor_offset = offset;
-
       _boot_ready.ready(EVSE_MONITOR_CURRENT_SENSOR_BOOT_READY);
     }
   });
@@ -802,3 +801,16 @@ bool EvseMonitor::importTotalEnergy()
     });
   return true;
 }
+
+void EvseMonitor::getAmmeterSettings()
+{
+  _openevse.getAmmeterSettings([this](int ret, long scale, long offset)
+  {
+    if(RAPI_RESPONSE_OK == ret)
+    {
+      DBUGF("scale = %ld, offset = %ld", scale, offset);
+      _current_sensor_scale = scale;
+      _current_sensor_offset = offset;
+    }
+  });
+}

src/evse_monitor.cpp

@@ -276,6 +276,7 @@ class EvseMonitor : public MicroTasks::Task
       return _energyMeter.reset(full, import);
     }
     bool importTotalEnergy();
+    void getAmmeterSettings();
 
     bool publishEnergyMeter() {
       return _energyMeter.publish();