Merge branch 'master' into jeremypoulter/issue29

.github/workflows/build.yaml

@@ -56,6 +56,11 @@ 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
+          - openevse_wifi_tft_v1_dev
         gui:
           - name: gui-v2
             repo: OpenEVSE/openevse-gui-v2
@@ -76,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'
 
@@ -121,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
@@ -134,7 +139,7 @@ jobs:
 
     steps:
     - name: Download the built assets
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: artifacts
 
@@ -160,7 +165,7 @@ jobs:
 
     - name: Upload assets to release
       if: startsWith(github.ref_name, 'v')
-      uses: "softprops/action-gh-release@v1"
+      uses: "softprops/action-gh-release@v2"
       with:
         prerelease: true
         name: "${{ github.ref_name }}"

.github/workflows/dependabot.yml

@@ -0,0 +1,23 @@
+name: PlatformIO Dependabot
+
+on:
+  workflow_dispatch: # option to manually trigger the workflow
+  schedule:
+    # Runs every day at 00:00
+    - cron: '0 0 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    name: run PlatformIO Dependabot
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: run PlatformIO Dependabot
+        uses: peterus/platformio_dependabot@v1
+        with:
+          github_token: ${{ secrets.DEPENDABOT_PAT }}

.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'
 

.gitignore

@@ -101,3 +101,4 @@ divert_sim/epoxyfsdata
 divert_sim/epoxyeepromdata
 
 *.pem
+*.pem

divert_sim/.vscode/launch.json

@@ -99,6 +99,53 @@
       ],
       "preLaunchTask": "build",
       "miDebuggerPath": "/usr/bin/gdb"
+    },
+    {
+      "name": "divert_sim: config-commit",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/divert_sim",
+      "args": [
+        "--config-commit", "--config-check"
+      ],
+      "stopAtEntry": false,
+      "cwd": "${workspaceFolder}",
+      "environment": [],
+      "externalConsole": false,
+      "MIMode": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ],
+      "preLaunchTask": "build",
+      "miDebuggerPath": "/usr/bin/gdb"
+    },
+    {
+      "name": "divert_sim: default state setting",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/divert_sim",
+      "args": [
+        "--config-commit", "--config-check",
+        "--config", "{\"default_state\": false}"
+      ],
+      "stopAtEntry": false,
+      "cwd": "${workspaceFolder}",
+      "environment": [],
+      "externalConsole": false,
+      "MIMode": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ],
+      "preLaunchTask": "build",
+      "miDebuggerPath": "/usr/bin/gdb"
     }
   ]
 }

divert_sim/Makefile

@@ -33,8 +33,9 @@ CPPFLAGS := \
   -D ARDUINOJSON_ENABLE_PROGMEM=0 \
   -D ENABLE_CONFIG_V1_IMPORT=0 \
   -D ENABLE_CONFIG_CHANGE_NOTIFICATION=0
-#  \
+#   \
 #  -D ENABLE_DEBUG \
+#  -D SERIAL_OUTFD=STDERR_FILENO
 #  -D ENABLE_DEBUG_DIVERT \
 #  -D ENABLE_DEBUG_INPUT_FILTER \
 #  -D ENABLE_DEBUG_EVSE_MAN \

divert_sim/divert_sim.cpp

@@ -115,7 +115,10 @@ int main(int argc, char** argv)
     ("c,config", "Config options, either a file name or JSON", cxxopts::value<std::string>(config))
     ("v,voltage", "The Voltage column if < 50, else the fixed voltage", cxxopts::value<int>(voltage_arg), "N")
     ("kw", "values are KW")
-    ("sep", "Field separator", cxxopts::value<std::string>(sep));
+    ("sep", "Field separator", cxxopts::value<std::string>(sep))
+    ("config-check", "Output the config and exit")
+    ("config-load", "Simulate loading config from EEPROM")
+    ("config-commit", "Simulate saving the config to EEPROM");
 
   auto result = options.parse(argc, argv);
 
@@ -126,7 +129,11 @@ int main(int argc, char** argv)
   }
 
   fs::EpoxyFS.begin();
-  config_reset();
+  if(result.count("config-load") > 0) {
+    config_load_settings();
+  } else {
+    config_reset();
+  }
 
   // If config is set and not a JSON string, assume it is a file name
   if(config.length() > 0 && config[0] != '{')
@@ -141,6 +148,18 @@ int main(int argc, char** argv)
     config_deserialize(config.c_str());
   }
 
+  if(result.count("config-commit") > 0) {
+    config_commit();
+  }
+
+  if(result.count("config-check")) 
+  {
+    String config_out;
+    config_serialize(config_out, true, false, false);
+    std::cout << config_out.c_str() << std::endl;
+    return EXIT_SUCCESS;
+  }
+
   kw = result.count("kw") > 0;
 
   divert_type = grid_ie_col >= 0 ? 1 : 0;