Merge branch 'master' into jeremypoulter/core_partition

Author: jeremypoulter

.github/workflows/build.yaml

@@ -38,6 +38,7 @@ jobs:
         run: echo "github.ref_name = '${{ github.ref_name }}'"
 
   build:
+    name: Build ${{ matrix.env }} with ${{ matrix.gui.name }}
     runs-on: ubuntu-latest
 
     strategy:
@@ -133,6 +134,7 @@ jobs:
         path: .pio/build/${{ matrix.env }}/firmware.bin
 
   release:
+    name: Upload release assets
     runs-on: ubuntu-latest
     needs: build
     if: github.ref_name == 'master' || startsWith(github.ref_name, 'v')

.github/workflows/divert_sim.yaml

@@ -2,8 +2,13 @@
 
 name: Build OpenEVSE divert simulator
 
+# Allow dependabot to update checks
 permissions:
+  checks: write
+  actions: write
   contents: write
+  issues: read
+  pull-requests: write
 
 on:
   push:
@@ -13,6 +18,7 @@ on:
 
 jobs:
   build:
+    name: Build and test divert_sim
     runs-on: ubuntu-latest
 
     steps:
@@ -73,11 +79,21 @@ jobs:
         with:
           name: divert_sim
           path: OpenEVSE_WiFi/divert_sim/divert_sim
-      
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+          cache: 'pip' # caching pip dependencies
+
+      - name: Install dependencies
+        run: pip install -r OpenEVSE_WiFi/divert_sim/requirements.txt
+
       - name: run tests
         run: |
           cd OpenEVSE_WiFi/divert_sim
-          bash runall.sh
+          mkdir -p output
+          pytest -v --color=yes --code-highlight yes --junit-xml=output/test_results.xml
 
       - name : Upload test results
         uses: actions/upload-artifact@v3
@@ -86,3 +102,10 @@ jobs:
           path: |
             OpenEVSE_WiFi/divert_sim/output
             OpenEVSE_WiFi/divert_sim/view.html
+
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action/composite@v2
+        if: always()
+        with:
+          junit_files: OpenEVSE_WiFi/divert_sim/output/*.xml
+          check_name: Test Results

api.yml

@@ -54,6 +54,7 @@ paths:
                     rapi_connected: 1
                     amp: 0
                     pilot: 32
+                    max_current: 32
                     temp1: 282
                     temp2: -2560
                     temp3: -2560

divert_sim/Makefile

@@ -87,7 +87,8 @@ ARDUINO_OBJ := \
   Stream.o \
   Wire.o \
   WMath.o \
-  WString.o
+  WString.o \
+  Injection.o
 
 EPOXY_FS_OBJ := \
   EpoxyFS.o \
@@ -116,6 +117,8 @@ VPATH 	:= \
   . \
   ../src \
   $(EPOXY_CORE_PATH) \
+  $(EPOXY_CORE_PATH)/epoxy_test/Injection \
+  $(EPOXY_CORE_PATH)/epoxy_test/Script \
   $(ARDUINO_LIB_DIR)/OpenEVSE_Lib/src \
   $(ARDUINO_LIB_DIR)/MicroTasks/src \
   $(ARDUINO_LIB_DIR)/ConfigJson/src \

divert_sim/divert_sim.cpp

@@ -16,6 +16,8 @@
 #include <MicroTasks.h>
 #include <EpoxyFS.h>
 
+#include <epoxy_test/ArduinoTest.h>
+
 using namespace aria::csv;
 
 EventLog eventLog;
@@ -35,6 +37,7 @@ int solar_col = 1;
 int voltage_col = 1;
 
 time_t simulated_time = 0;
+time_t last_time = 0;
 
 bool kw = false;
 
@@ -192,6 +195,15 @@ int main(int argc, char** argv)
         col++;
       }
 
+      if(last_time != 0)
+      {
+        int delta = simulated_time - last_time;
+        if(delta > 0) {
+          EpoxyTest::add_millis(delta * 1000);
+        }
+      }
+      last_time = simulated_time;
+
       divert.update_state();
       MicroTask.update();
 

divert_sim/requirements.txt

@@ -0,0 +1 @@
+pytest