mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-22 23:56:13 +01:00
Compare commits
4 Commits
cb4acf4404
...
adb0878b77
Author | SHA1 | Date | |
---|---|---|---|
|
adb0878b77 | ||
|
4e491a1e56 | ||
|
430161ef60 | ||
|
53f598192c |
85
.github/workflows/main.yml
vendored
85
.github/workflows/main.yml
vendored
|
@ -1,19 +1,82 @@
|
||||||
name: CI
|
name: PlatformIO CI
|
||||||
|
|
||||||
on: [push]
|
on: [push]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- name: Install Python Wheel
|
- uses: actions/cache@v3
|
||||||
run: pip install wheel
|
with:
|
||||||
- name: Install PlatformIO Core
|
path: |
|
||||||
run: pip install -U platformio
|
~/.cache/pip
|
||||||
- name: Copy generic config over
|
~/.platformio/.cache
|
||||||
run: cp config.example.h config.h
|
key: ${{ runner.os }}-pio
|
||||||
- name: Compile Command Station (AVR)
|
- uses: actions/setup-python@v4
|
||||||
run: python -m platformio run
|
with:
|
||||||
|
python-version: '3.9'
|
||||||
|
- name: Install PlatformIO Core
|
||||||
|
run: pip install --upgrade platformio
|
||||||
|
|
||||||
|
- name: Use sample "config.example.h" for compilations
|
||||||
|
run: mv $GITHUB_WORKSPACE/config.example.h $GITHUB_WORKSPACE/config.h
|
||||||
|
|
||||||
|
- name: Build PlatformIO Project
|
||||||
|
run: pio run
|
||||||
|
|
||||||
|
- name: Copy all firmwares for for packaging
|
||||||
|
run: |
|
||||||
|
mkdir downloads
|
||||||
|
cd .pio/build
|
||||||
|
find . -name '*.bin' | cpio -pdm ../../downloads
|
||||||
|
find . -name '*.hex' | cpio -pdm ../../downloads
|
||||||
|
find . -name '*.uf2' | cpio -pdm ../../downloads
|
||||||
|
cd ../..
|
||||||
|
|
||||||
|
- name: Package and upload all firmwares for download
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: all-firmwares-for-download
|
||||||
|
path: downloads
|
||||||
|
|
||||||
|
- name: Test on Arduino MEGA with Wokwi
|
||||||
|
uses: wokwi/wokwi-ci-action@v1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.WOKWI_CLI_TOKEN }}
|
||||||
|
path: /wokwi/mega # directory with wokwi.toml, relative to repo's root
|
||||||
|
timeout: 10000
|
||||||
|
expect_text: '<* LCD3:Free RAM='
|
||||||
|
fail_text: 'Error'
|
||||||
|
# scenario: 'test-hello-world.yaml' # optional
|
||||||
|
|
||||||
|
- name: Test on Arduino UNO with Wokwi
|
||||||
|
uses: wokwi/wokwi-ci-action@v1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.WOKWI_CLI_TOKEN }}
|
||||||
|
path: /wokwi/uno # directory with wokwi.toml, relative to repo's root
|
||||||
|
timeout: 10000
|
||||||
|
expect_text: '<* LCD3:Free RAM='
|
||||||
|
fail_text: 'Error'
|
||||||
|
# scenario: 'test-hello-world.yaml' # optional
|
||||||
|
|
||||||
|
- name: Test on Arduino NANO with Wokwi
|
||||||
|
uses: wokwi/wokwi-ci-action@v1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.WOKWI_CLI_TOKEN }}
|
||||||
|
path: /wokwi/nano # directory with wokwi.toml, relative to repo's root
|
||||||
|
timeout: 10000
|
||||||
|
expect_text: '<* LCD3:Free RAM='
|
||||||
|
fail_text: 'Error'
|
||||||
|
# scenario: 'test-hello-world.yaml' # optional
|
||||||
|
|
||||||
|
- name: Test on ESP32 with Wokwi
|
||||||
|
uses: wokwi/wokwi-ci-action@v1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.WOKWI_CLI_TOKEN }}
|
||||||
|
path: /wokwi/esp32 # directory with wokwi.toml, relative to repo's root
|
||||||
|
timeout: 10000
|
||||||
|
expect_text: 'ESP32 / STANDARD_MOTOR_SHIELD'
|
||||||
|
fail_text: 'Error'
|
||||||
|
# scenario: 'test-hello-world.yaml' # optional
|
||||||
|
|
|
@ -76,8 +76,13 @@ int DCCTimer::freeMemory() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef ARDUINO_ARCH_ESP32
|
#ifdef ARDUINO_ARCH_ESP32
|
||||||
|
|
||||||
|
#include "esp_idf_version.h"
|
||||||
|
#if ESP_IDF_VERSION_MAJOR > 4
|
||||||
|
#error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains IDF version 4. Arduino ESP32 library 3.0.0 is too new. Use 2.0.9 to 2.0.17"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <driver/adc.h>
|
#include <driver/adc.h>
|
||||||
#include <soc/sens_reg.h>
|
#include <soc/sens_reg.h>
|
||||||
#include <soc/sens_struct.h>
|
#include <soc/sens_struct.h>
|
||||||
|
|
8
wokwi/esp32/diagram.json
Normal file
8
wokwi/esp32/diagram.json
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"author": "Olivier Chatelain",
|
||||||
|
"editor": "wokwi",
|
||||||
|
"parts": [ { "type": "board-esp32-devkit-c-v4", "id": "esp", "top": 0, "left": 0, "attrs": {} } ],
|
||||||
|
"connections": [ [ "esp:TX", "$serialMonitor:RX", "", [] ], [ "esp:RX", "$serialMonitor:TX", "", [] ] ],
|
||||||
|
"dependencies": {}
|
||||||
|
}
|
4
wokwi/esp32/wokwi.toml
Normal file
4
wokwi/esp32/wokwi.toml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[wokwi]
|
||||||
|
version = 1
|
||||||
|
firmware = '../../.pio/build/ESP32/firmware.bin'
|
||||||
|
elf = '../../.pio/build/ESP32/firmware.elf'
|
47
wokwi/mega/diagram.json
Normal file
47
wokwi/mega/diagram.json
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"author": "Olivier Chatelain",
|
||||||
|
"editor": "wokwi",
|
||||||
|
"parts": [
|
||||||
|
{ "type": "wokwi-arduino-mega", "id": "mega", "top": -249, "left": -147.6, "attrs": {} },
|
||||||
|
{ "type": "wokwi-logic-analyzer", "id": "logic1", "top": -374.05, "left": 355.2, "attrs": {} },
|
||||||
|
{
|
||||||
|
"type": "board-ssd1306",
|
||||||
|
"id": "oled1",
|
||||||
|
"top": -409.66,
|
||||||
|
"left": 57.83,
|
||||||
|
"attrs": { "i2cAddress": "0x3c" }
|
||||||
|
},
|
||||||
|
{ "type": "wokwi-gnd", "id": "gnd1", "top": -268.8, "left": 335.4, "attrs": {} },
|
||||||
|
{ "type": "wokwi-gnd", "id": "gnd2", "top": -57.6, "left": 239.4, "attrs": {} },
|
||||||
|
{
|
||||||
|
"type": "wokwi-resistor",
|
||||||
|
"id": "r1",
|
||||||
|
"top": -476.6,
|
||||||
|
"left": 152.75,
|
||||||
|
"rotate": 270,
|
||||||
|
"attrs": { "value": "1000" }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "wokwi-resistor",
|
||||||
|
"id": "r2",
|
||||||
|
"top": -476.6,
|
||||||
|
"left": 75.95,
|
||||||
|
"rotate": 270,
|
||||||
|
"attrs": { "value": "1000" }
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"connections": [
|
||||||
|
[ "mega:GND.1", "oled1:GND", "black", [ "v0" ] ],
|
||||||
|
[ "mega:5V", "oled1:VCC", "red", [ "v-348.3", "h88.55" ] ],
|
||||||
|
[ "gnd1:GND", "logic1:GND", "black", [ "v0" ] ],
|
||||||
|
[ "mega:GND.5", "gnd2:GND", "black", [ "v0" ] ],
|
||||||
|
[ "oled1:SCL", "r2:1", "green", [ "v0" ] ],
|
||||||
|
[ "oled1:SDA", "r1:1", "green", [ "v0" ] ],
|
||||||
|
[ "r2:2", "oled1:VCC", "green", [ "h38.4", "v87.6", "h-38.4" ] ],
|
||||||
|
[ "r2:2", "r1:2", "green", [ "h0" ] ],
|
||||||
|
[ "mega:SCL", "oled1:SCL", "green", [ "v-144", "h172.5" ] ],
|
||||||
|
[ "mega:SDA", "oled1:SDA", "green", [ "v-134.4", "h162.8" ] ]
|
||||||
|
],
|
||||||
|
"dependencies": {}
|
||||||
|
}
|
4
wokwi/mega/wokwi.toml
Normal file
4
wokwi/mega/wokwi.toml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[wokwi]
|
||||||
|
version = 1
|
||||||
|
firmware = '../../.pio/build/mega2560/firmware.hex'
|
||||||
|
elf = '../../.pio/build/mega2560/firmware.elf'
|
8
wokwi/nano/diagram.json
Normal file
8
wokwi/nano/diagram.json
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"author": "Olivier Chatelain",
|
||||||
|
"editor": "wokwi",
|
||||||
|
"parts": [ { "type": "wokwi-arduino-nano", "id": "nano", "top": 0, "left": 0, "attrs": {} } ],
|
||||||
|
"connections": [],
|
||||||
|
"dependencies": {}
|
||||||
|
}
|
4
wokwi/nano/wokwi.toml
Normal file
4
wokwi/nano/wokwi.toml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[wokwi]
|
||||||
|
version = 1
|
||||||
|
firmware = '../../.pio/build/nano/firmware.hex'
|
||||||
|
elf = '../../.pio/build/nano/firmware.elf'
|
8
wokwi/uno/diagram.json
Normal file
8
wokwi/uno/diagram.json
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"author": "Olivier Chatelain",
|
||||||
|
"editor": "wokwi",
|
||||||
|
"parts": [ { "type": "wokwi-arduino-uno", "id": "uno", "top": 0, "left": 0, "attrs": {} } ],
|
||||||
|
"connections": [],
|
||||||
|
"dependencies": {}
|
||||||
|
}
|
4
wokwi/uno/wokwi.toml
Normal file
4
wokwi/uno/wokwi.toml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[wokwi]
|
||||||
|
version = 1
|
||||||
|
firmware = '../../.pio/build/uno/firmware.hex'
|
||||||
|
elf = '../../.pio/build/uno/firmware.elf'
|
Loading…
Reference in New Issue
Block a user