Merge branch 'master' into elecrow_esp32_hmi

.github/workflows/build.yaml

@@ -56,6 +56,7 @@ jobs:
           - olimex_esp32-poe-iso
           - heltec_esp32-wifi-lora-v2
           - wt32-eth01
+          - esp32-c3-devkitc-02
           - elecrow_esp32_hmi
           - elecrow_esp32_hmi_dev
           - openevse_wifi_tft_v1
@@ -80,21 +81,21 @@ jobs:
         submodules: recursive
 
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
 
     - name: Cache PlatformIO
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
 
@@ -125,7 +126,7 @@ jobs:
         PLATFORMIO_BUILD_FLAGS: ${{ matrix.gui.build_flags }}
 
     - name: Upload output to GitHub
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.env }}.bin
         path: .pio/build/${{ matrix.env }}/firmware.bin
@@ -138,7 +139,7 @@ jobs:
 
     steps:
     - name: Download the built assets
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: artifacts
 

.github/workflows/divert_sim.yaml

@@ -75,13 +75,13 @@ jobs:
           make -j
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: divert_sim
           path: OpenEVSE_WiFi/divert_sim/divert_sim
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
           cache: 'pip' # caching pip dependencies
@@ -96,7 +96,7 @@ jobs:
           pytest -v --color=yes --code-highlight yes --junit-xml=output/test_results.xml
 
       - name : Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test_results
           path: |

.github/workflows/release_validation.yaml

@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

docs/developer-guide.md

@@ -6,11 +6,11 @@ It is necessary to download and build the static web assets for the GUI before c
 
 ### Building the GUI static assets
 
-The GUI static web assets are minified and compiled into the firmware using a combination of Webpack and a [custom python build script](scripts/extra_script.py).
+The GUI static web assets are minified and compiled into the firmware using a combination of Webpack and a [custom python build script](../scripts/extra_script.py).
 
 You will need Node.js and npm installed: <https://nodejs.org/en/download/>
 
-In addition, the GUI is now maintained in a [separate repository](https://nodejs.org/en/download/package-manager/) and is included as a Git submodule.
+In addition, the GUI is now maintained in a [separate repository](https://github.com/OpenEVSE/openevse-gui-v2/) and is included as a Git submodule.
 
 If the `gui` directory is empty, use the following to retrieve the GUI source and fetch the dependencies:
 
@@ -65,7 +65,7 @@ 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
 
-***
+---
 
 ## Troubleshooting
 

platformio.ini

@@ -150,7 +150,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.0.1
+platform = espressif32@6.4.0
 #framework = arduino, espidf
 framework = arduino
 lib_deps = ${common.lib_deps}
@@ -382,6 +382,22 @@ build_flags =
   -D ETH_CLK_MODE=ETH_CLOCK_GPIO0_IN
   -D ETH_PHY_POWER=16
 
+[env:esp32-c3-devkitc-02]
+board = esp32-c3-devkitc-02
+lib_deps =
+  ${common.lib_deps}
+  ${common.neopixel_lib}
+build_flags =
+  ${common.build_flags}
+  ${common.src_build_flags}
+  ${common.debug_flags}
+  -D RAPI_PORT=Serial1
+  -D TX1=6
+  -D RX1=7
+  -D NEO_PIXEL_PIN=8
+  -D NEO_PIXEL_LENGTH=1
+  -D WIFI_PIXEL_NUMBER=1
+
 [env:elecrow_esp32_hmi]
 board = denky32
 build_flags =

src/current_shaper.cpp

@@ -174,9 +174,9 @@ void CurrentShaperTask::shapeCurrent() {
 			max_pwr += solar;
 		}
 	}
-	if (livepwr > max_pwr) {
-		livepwr = max_pwr;
-	}
+//	if (livepwr > max_pwr) {
+//		livepwr = max_pwr;
+//	}
 	if(!config_threephase_enabled()) {
 		_max_cur = ((max_pwr - livepwr) / evse.getVoltage()) + evse.getAmps();
 	 }