Linco work

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
+      - linco-work
   pull_request:
 
 jobs:
@@ -18,18 +18,13 @@ jobs:
 
   build_platform_io:
     name: Build using PlatformIO
-    uses: OpenEVSE/open_evse/.github/workflows/build_platformio.yml@master
-
-  build_arduino:
-    name: Build using Arduino
-    uses: OpenEVSE/open_evse/.github/workflows/build_arduino.yml@master
+    uses: OpenEVSE/open_evse/.github/workflows/build_platformio.yml@linco-work
 
   release:
     name: Create pre-release
 
     needs:
       - build_platform_io
-      - build_arduino
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/linco-work'
 
-    uses: OpenEVSE/open_evse/.github/workflows/release.yml@master
+    uses: OpenEVSE/open_evse/.github/workflows/release.yml@linco-work

.github/workflows/build_arduino.yml

@@ -27,14 +27,14 @@ jobs:
 
     steps:
       - name: Cache Arduino
-        uses: actions/cache@v2
+        uses: actions/cache@v5
         with:
           path: ~/.arduino15
           key: ${{ runner.os }}-${{ matrix.name }}-arduino-15-${{ hashFiles('**/packages.txt') }}
           restore-keys: |
             ${{ runner.os }}-${{ matrix.name }}-arduino-15-
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       - name: Setup Arduino CLI
         uses: arduino/setup-arduino-cli@v1
@@ -70,7 +70,7 @@ jobs:
           source ci/info_common.sh info.json
 
       - name: Upload output to GitHub
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}
           path: |

.github/workflows/build_platformio.yml

@@ -12,44 +12,41 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - env: openevse_1-8-3
+          - env: m328p_autodetect
             python: 3.x
-            platformio: 6.1.5 
-          - env: openevse_latest
+            platformio: 6.1.5
+            arch: avr
+            artifact: firmware.hex
+          - env: m328p_RTC_BTN_LCD
             python: 3.x
-            platformio: 6.1.5 
-          - env: openevse
+            platformio: 6.1.5
+            arch: avr
+            artifact: firmware.hex
+          - env: samd
             python: 3.x
-            platformio: 6.1.5 
-          - env: openevse_eu
-            python: 3.x
-            platformio: 6.1.5 
-          - env: openevse_v6
-            python: 3.x
-            platformio: 6.1.5 
-          - env: emonevse
-            python: 3.x
-            platformio: 6.1.5 
+            platformio: 6.1.5
+            arch: samd
+            artifact: firmware.bin
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
 
     - name: Cache pip
-      uses: actions/cache@v2
+      uses: actions/cache@v5
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-${{ matrix.env }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-${{ matrix.env }}-pip-
 
     - name: Cache PlatformIO
-      uses: actions/cache@v2
+      uses: actions/cache@v5
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ matrix.env }}-${{ hashFiles('**/lockfiles') }}
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v6
       with:
         python-version: '${{ matrix.python }}'
 
@@ -61,7 +58,8 @@ jobs:
     - name: Run PlatformIO
       run: pio run -e ${{ matrix.env }}
 
-    - name: Get compiler and output info
+    - name: Get compiler and output info (AVR)
+      if: matrix.arch == 'avr'
       run: |
         NAME=${{ matrix.env }}
         BUILT_TOOL="Platform IO"
@@ -72,10 +70,23 @@ jobs:
 
         source ci/info_common.sh info.json
 
+    - name: Get build info (SAMD)
+      if: matrix.arch == 'samd'
+      run: |
+        BIN_SIZE=$(ls -l .pio/build/${{ matrix.env }}/firmware.bin | awk '{ print $5 }')
+        cat <<EOF >info.json
+        {
+          "name": "${{ matrix.env }}",
+          "built_tool": "Platform IO",
+          "arch": "samd",
+          "bin_size": $BIN_SIZE
+        }
+        EOF
+
     - name: Upload output to GitHub
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ matrix.env }}
         path: |
-          .pio/build/${{ matrix.env }}/firmware.hex
+          .pio/build/${{ matrix.env }}/${{ matrix.artifact }}
           info.json

.github/workflows/release.yml

@@ -13,17 +13,19 @@ jobs:
         sudo apt-get install jq -y
 
     - name: Download the built assets
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v7
       with:
         path: artifacts
 
     - name: Rename images to something more sensible
       run: |
-        find artifacts -name '*.hex' | while read -r image; do
-          dir=$(dirname "${image}")
-          board=$(basename "${dir}")
-          echo mv "$image" "$board.hex"
-          mv "$image" "$board.hex"
+        for ext in hex bin; do
+          find artifacts -name "*.$ext" | while read -r image; do
+            dir=$(dirname "${image}")
+            board=$(basename "${dir}")
+            echo mv "$image" "$board.$ext"
+            mv "$image" "$board.$ext"
+          done
         done
         jq -s . $(find -name info.json) > build_info.json
         jq -r '(map(keys) | add | unique) as $cols | map(. as $row | $cols | map($row[.])) as $rows | $cols, $rows[] | @csv' build_info.json > build_info.csv
@@ -37,5 +39,6 @@ jobs:
         title: "Development Build"
         files: |
           *.hex
+          *.bin
           build_info.json
           build_info.csv

.github/workflows/release_validation.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       ### Check the version number in the code matches the tag number
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       - name: Retrieve the version number(s)
         run: |

.gitignore

@@ -1,3 +1,5 @@
+.pio/**
+kicad/**
 download/**
 archive/**
 genrapi/**

README.md

@@ -1,42 +1,20 @@
 # OpenEVSE
 
-Firmware for OpenEVSE controller used in OpenEVSE Charging Stations sold in the USA, and OpenEnergyMonitor EmonEVSE units sold in (UK/EU).
+Firmware for OpenEVSE controller used in OpenEVSE Charging Stations.
 
 - OpenEVSE: <https://store.openevse.com/collections/all-products>
-- EmonEVSE: <https://shop.openenergymonitor.com/evse/>
 
-Based on OpenEVSE: Open Source Hardware J1772 Electric Vehicle Supply Equipment
-
-## USA
-
-TODO: add notes about USA OpenEVSE
-
-## UK/EU
-
-- Disable `AUTOSVCLEVEL` (autodetection is designed for split-phase)
-- Charging level default to `L2`
-- Set `MAX_CURRENT_CAPACITY_L2 32` (limit for single-phase charging in UK/EU)
-- Add '.EU' to version number
-- Enable LCD Redraw every couple of min (required for EMC/CE)
 
-### EmonEVSE
-
-EmonEVSE (non-tethered type-2 EVSE unit)
+Based on OpenEVSE: Open Source Hardware J1772 Electric Vehicle Supply Equipment
 
-- `PP_AUTO_AMPACITY` enabled to set max current based on non-tethered cable connected
-- Three-phase option with `THREEPHASE` enabled to calculate three-phase energy ( Unneeded with ESP32_WiFi firmware >= 4.2
 
 ## API Documentation
 
 - WIFI API: <http://github.com/openevse/ESP32_WiFi_V4.x/>
-- RAPI API: <https://github.com/openenergymonitor/open_evse/blob/master/firmware/open_evse/rapi_proc.h>
 
-## Resources
 
-- [OpenEnergyMonitor OpenEVSE Setup Guide](https://guide.openenergymonitor.org/integrations/openevse)
-- [OpenEnergyMonitor OpenEVSE Shop](https://shop.openenergymonitor.com/ev-charging/)
+## Resources
 
-- [OpenEVSE Controller Datasheet](https://github.com/OpenEVSE/OpenEVSE_PLUS/blob/master/OpenEVSE_PLUS_v5/OpenEVSE_Plus_v5.pdf)
 - [OpenEVSE Controller Hardware Repo](https://github.com/OpenEVSE/OpenEVSE_PLUS)
 - [OpenEVSE Project Homepage](https://openevse.com)
 
@@ -53,7 +31,7 @@ NOTES:
 
 `$ avrdude -p atmega328p -B6 -c usbasp -P usb -e -U flash:w:firmware.hex`
 
-ISP programmer required e.g [USBASP](https://www.amazon.co.uk/Hobby-Components-USBASP-Programmer-Adapter/dp/B06XYV162N)
+ISP programmer required
 
 ### Set AVR fuses
 
@@ -65,7 +43,7 @@ If writing eFuse fails ISBasp may need a [firmware update](https://www.vishnumai
 
 ***
 
-Tip Jar: I developed/maintain this firmware on a volunteer basis. Any donation, no matter how small, is greatly appreciated.
+Tip Jar: Lincomatic developed/maintain this firmware on a volunteer basis. Any donation, no matter how small, is greatly appreciated.
 
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/lincomatic)