Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:

- name: Build NRF firmware
run: |
platformio run --environment oeplnrf
platformio run --environment nrf52840custom

- name: Build ESP32 firmware
run: |
platformio run --environment oeplesp32-s3-N16R8
platformio run --environment esp32-s3-N16R8
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ jobs:
- name: Build & Package NRF Firmware
run: |
export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA"
pio run --environment oeplnrf
pio run --environment nrf52840custom
mkdir firmware_output
cp .pio/build/oeplnrf/firmware.hex firmware_output/NRF52840.hex
cp .pio/build/nrf52840custom/firmware.hex firmware_output/NRF52840.hex
TAG_NAME=${{ github.event.release.tag_name }}
adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application firmware_output/NRF52840.hex firmware_output/NRF52840.zip
python uf2conv.py firmware_output/NRF52840.hex --family 0xADA52840 --output firmware_output/NRF52840.uf2

- name: Build & Package esp32-s3-N16R8 Firmware
run: |
export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA"
pioenv=oeplesp32-s3-N16R8
pioenv=esp32-s3-N16R8
pio run --environment ${pioenv}
mkdir ${pioenv}
cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin ${pioenv}/boot_app0.bin
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Build & Package esp32-s3-N8R8 Firmware
run: |
export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA"
pioenv=oeplesp32-s3-N8R8
pioenv=esp32-s3-N8R8
pio run --environment ${pioenv}
mkdir ${pioenv}
cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin ${pioenv}/boot_app0.bin
Expand All @@ -69,7 +69,7 @@ jobs:
- name: Build & Package esp32-s3-N32R8 Firmware
run: |
export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA"
pioenv=oeplesp32-s3-N32R8
pioenv=esp32-s3-N32R8
pio run --environment ${pioenv}
mkdir ${pioenv}
cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin ${pioenv}/boot_app0.bin
Expand Down
2 changes: 1 addition & 1 deletion boards/oeplnrf.json → boards/nrf52840custom.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@
},
"url": "https://os.mbed.com/platforms/Nordic-nRF52840-DK/",
"vendor": "Nordic"
}
}
16 changes: 6 additions & 10 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,19 @@ lib_deps =
https://github.com/bitbank2/bb_epaper.git
https://github.com/pfalcon/uzlib

[env:oeplnrf]
#build_unflags = -DUSE_LFXO
#build_flags = -DNRF52840_XXAA -DUSE_LFRC -DNRF52_S140 -DNRF52 -DNRF52840
[env:nrf52840custom]
build_flags =
-DTARGET_NRF
#lib_compat_mode = soft
platform = https://github.com/maxgerhardt/platform-nordicnrf52
#platform = nordicnrf52
framework = arduino
board_build.variants_dir = variants
board_build.variant = oeplnrf
board_build.variant = nrf52840custom
board = xiaoblesense_adafruit
#board = oeplnrf
monitor_speed = 115200
build_src_filter = +<*> -<main_mbed.cpp>

[env:oeplesp32-s3-N16R8]

[env:esp32-s3-N16R8]
platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
framework = arduino
build_flags =
Expand All @@ -41,7 +37,7 @@ board_upload.maximum_ram_size = 327680
board_upload.flash_size = 16MB
monitor_speed = 115200

[env:oeplesp32-s3-N8R8]
[env:esp32-s3-N8R8]
platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
framework = arduino
build_flags =
Expand All @@ -63,7 +59,7 @@ board_upload.maximum_ram_size = 327680
board_upload.flash_size = 8MB
monitor_speed = 115200

[env:oeplesp32-s3-N32R8]
[env:esp32-s3-N32R8]
platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
framework = arduino
build_flags =
Expand Down
Loading