Merge branch 'master' of https://github.com/OpenEVSE/ESP32_WiFi_V4.x into fix#411

Author: KipK

docs/developer-guide.md

@@ -39,7 +39,7 @@ PlatformIO can be installed as a command line utility (PlatformIO Core), a stand
 #### 2. Clone this repo
 
 ```bash
-git clone https://github.com/OpenEVSE/ESP32_WiFi_v3.x
+git clone https://github.com/OpenEVSE/ESP32_WiFi_V4.x.git
 ```
 
 #### 3. Compile & upload
@@ -59,6 +59,10 @@ If you are using a different development board, you can specify one of the envs
 pio run -e openevse_huzzah32_idf -t upload
 ```
 
+Build artifacts will be in `.pio/build/your_openevse_env`
+
+To clean an existing build, `pio run -e your_openevse_board -t`
+
 > To enable OTA updates, first upload via serial using the dev environment. This enables OTA enable build flag
 
 ***

docs/wired-ethernet.md

@@ -1,8 +1,7 @@
-# Wired Ethernet using ESP32-Gateway
+# Wired Ethernet
 
-Sometimes getting a WiFi connection to an OpenEVSE / EmonEVSE install location can be troublesome.
+Several boards are available with ethernet hardware, which can be used as drop-in replacements for ESP8266 / ESP32 WiFi modules and are compatible with all models of OpenEVSE / EmonEVSE.
 
-It's now possible to connect the OpenEVSE / EmonEVSE via wired Ethernet using an ESP32-Gateway module. This module is a drop in replacement for ESP8266 / ESP32 WiFi modules and is compatible with all models of OpenEVSE / EmonEVSE.
 
 See [OpenEnergyMonitor web-store to purchase a pre-wired ESP32-Gateway module](https://shop.openenergymonitor.com/openevse-etherent-gateway-esp32/). The Ethernet gateway in our web-store will come with pre-wired power supply, serial connections, and pre-loaded with firmware for drop in replacement.
 
@@ -12,16 +11,19 @@ Network connection can be made with a standard Ethernet cable. For new installat
 
 ## Hardware Connections
 
-See [photos](https://photos.google.com/share/AF1QipNvANgeR_NRmLrq0lhKnA0BR7ieD8DGRoaJFoilMIwQ8c7QpxR4X7hSfGj3XiTTUw) of hardware connectors for new OpenEVSE V5.5 controller.
+Wiring varies depending on the board in use, in particular [this git issue](https://github.com/OpenEVSE/ESP32_WiFi_V3.x/issues/12) discusses a wiring change between revisions of the ESP32-GATEWAY board.
+
 
-> **Note**: The these hardware connections apply to the current Rev.E & Rev.F ESP32-gateway hardware revisions. See section below for older units.
+| Signal     | EVSE wire   | ESP32-GATEWAY E & F | ESP32-GATEWAY pre-E | ESP32-PoE-ISO
+| :--------- | :---------- | :------------------ | :------------------ | :------------
+| 5V         | Red wire    | 20                  | 20                  | N/C (powered over Ethernet)
+| GND        | Black wire  | 19                  | 19                  | GND
+| Tx GPIO 32 | Yellow wire | **13**              | **12**              | 33
+| Rx GPIO 16 | Green wire  | 11                  | 11                  | 35
+
+See [photos](https://photos.google.com/share/AF1QipNvANgeR_NRmLrq0lhKnA0BR7ieD8DGRoaJFoilMIwQ8c7QpxR4X7hSfGj3XiTTUw) of hardware connectors for new OpenEVSE V5.5 controller.
 
-|Signal        | Pin No.   | EVSE connector |
-| :---------- | :---------- | :------------------- |
-5V             | pin 20        | Red wire |
-GND            | pin 19        | Black wire |
-Tx GPIO 32     | pin 13       | Yellow wire |
-Rx GPIO 16     | pin 11       | Green wire |
+> **Note**: The these hardware connections apply to the current Rev.E & Rev.F ESP32-gateway hardware revisions. See table above for other units.
 
 ![esp32-gateway-connections](esp32-gateway-connections.jpg)
 
@@ -44,13 +46,13 @@ ESP32-gateway can be connected by micro USB and firmware can be uploaded using e
 First upload:
 
 ```bash
-esptool esptool.py --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader.bin 0x8000  partitions.bin 0x10000  openevse_esp32-gateway-e.bin
+esptool.py --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 bootloader.bin 0x8000  partitions.bin 0x10000  openevse_esp32-gateway-e.bin
 ```
 
 Subsequent upgrades:
 
 ```bash
-esptool esptool.py --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 0x10000  openevse_esp32-gateway-e.bin
+esptool.py --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 0x10000  openevse_esp32-gateway-e.bin
 ```
 
 ### For rev G
@@ -69,9 +71,14 @@ esptool.py --before default_reset --after hard_reset write_flash 0x10000 openevs
 
 ## Compile and Upload
 
-Firmware can be compiled and upload using PlatformIO with the `openevse_esp32-gateway-e` environment selected. The `e` environment has been tested to work on hardware Rev.E and Rev.F. See note below for older revisions.
+| Board                     | Environment              |
+| :------------------------ | :----------------------- |
+| ESP32-GATEWAY pre-E       | openevse_esp32-gateway   |
+| ESP32-GATEWAY E and later | openevse_esp32-gateway-e |
+| ESP32-PoE-ISO             | openevse_esp32-poe-iso   |
 
-The ESP32-gateway can be connected via micro USB and firmware compiled and uploaded with
+
+Firmware can be compiled using PlatformIO `pio run -e <Environment>`.  The `-t upload` option installs firmware over USB.
 
 ```bash
 pio run -e openevse_esp32-gateway-e -t upload
@@ -93,22 +100,3 @@ The web UI will notify that connection is via Wired Ethernet.
 
 The ESP32-Gateway is a new addition and is currently considered in 'Beta' since the ESP32 firmware is still under active development. However, it has been extensively tested and proven reliable for many months of operation. Please report your experience to the [OpenEnergyMonitor Community Forums](https://community.openenergymonitor.org/).
 ***
-
-## Older Hardware Revisions
-
-This guide focuses on using ESP-gateway hardware rev.E and above. If using a hardware rev older than rev.E the pin connections and firmware is different:
-
-|Signal        | Pin No.   | EVSE connector |
-| :---------- | :---------- | :------------------- |
-5V             | pin 20        | Red wire |
-GND            | pin 19        | Black wire |
-Tx GPIO 17     | pin 12       | Yellow wire |
-Rx GPIO 16     | pin 11       | Green wire |
-
-Firmware for older hardware revisions can be compiled and uploading using:
-
-```bash
-pio run -e openevse_esp32-gateway -t upload
-```
-
-See [this git issue](https://github.com/OpenEVSE/ESP32_WiFi_V3.x/issues/12) for discussion of hardware revision changes.

gui

@@ -266,10 +266,28 @@ build_flags =
   -D RANDOM_SEED_CHANNEL=1
   -D RX2=16
   -D TX2=32
-  -D PHY_PWR=5
+  -D ETH_PHY_POWER=5
+  -D RESET_ETH_PHY_ON_BOOT=1
 board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'E\'"
 upload_speed = 921600
 
+[env:openevse_esp32-poe-iso]
+# Tested against Rev C board
+extends = env:openevse_esp32-gateway
+board = esp32-poe-iso
+build_flags =
+  ${common.build_flags}
+  ${common.version}
+  ${common.src_build_flags}
+  -D WIFI_BUTTON=34
+  -D WIFI_BUTTON_PRESSED_STATE=LOW
+  -D DEBUG_PORT=Serial
+  -D RAPI_PORT=Serial2
+  -D ENABLE_WIRED_ETHERNET
+  -D RANDOM_SEED_CHANNEL=1
+  -D RESET_ETH_PHY_ON_BOOT=1
+upload_speed = 921600
+
 [env:openevse_esp32-gateway-e_dev]
 extends = env:openevse_esp32-gateway-e
 build_flags =

platformio.ini

@@ -88,6 +88,11 @@ bool http_update_start(String source, size_t total)
 
 bool http_update_write(uint8_t *data, size_t len)
 {
+  // Issue #187 "HTTP update fails on ESP32 ethernet gateway" was caused by the
+  // loop watchdog timing out, presumably because updating wasn't bottlenecked
+  // by network and execution stayed in the Mongoose poll() method.
+  feedLoopWDT();
+
   DBUGF("Update Writing %u, %u", update_position, len);
   size_t written = Update.write(data, len);
   DBUGVAR(written);

src/http_update.cpp

@@ -546,7 +546,7 @@ void LcdTask::displayInfoLine(LcdInfoLine line, unsigned long &nextUpdate)
       gettimeofday(&local_time, NULL);
       struct tm timeinfo;
       localtime_r(&local_time.tv_sec, &timeinfo);
-      strftime(temp, sizeof(temp), "%d/%m/%Y", &timeinfo);
+      strftime(temp, sizeof(temp), "%Y-%m-%d", &timeinfo);
       displayNameValue(1, "Date", temp);
       _updateInfoLine = false;
       } break;
@@ -624,10 +624,10 @@ void LcdTask::displayScaledNumberValue(int line, const char *name, double value,
   static const char *mod[] = {
     "",
     "k",
-    "m",
-    "g",
-    "t",
-    "p"
+    "M",
+    "G",
+    "T",
+    "P"
   };
 
   int index = 0;

src/lcd.cpp

@@ -420,15 +420,14 @@ net_setup()
 #ifdef ENABLE_WIRED_ETHERNET
   //ETH.setHostname(esp_hostname.c_str());
 
-#ifdef PHY_PWR
-  pinMode(PHY_PWR, OUTPUT);
-  digitalWrite(PHY_PWR, LOW);
+  pinMode(ETH_PHY_POWER, OUTPUT);
+#ifdef RESET_ETH_PHY_ON_BOOT
+  digitalWrite(ETH_PHY_POWER, LOW);
   delay(1000);
-  digitalWrite(PHY_PWR, HIGH);
-#endif
-
+#endif // #ifdef RESET_ETH_PHY_ON_BOOT
+  digitalWrite(ETH_PHY_POWER, HIGH);
   ETH.begin();
-#endif
+#endif // #ifdef ENABLE_WIRED_ETHERNET
 
   if (MDNS.begin(esp_hostname.c_str()))
   {