diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85c94677e..a7a02fe7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - name: Checkout submodules + uses: textbook/git-checkout-submodule-action@master - name: Setup Python uses: actions/setup-python@master with: @@ -18,4 +20,4 @@ jobs: python -m pip install --upgrade pip pip install -U platformio - name: Build - run: platformio run -e tbeam -e nrf52dk + run: platformio run -e tbeam -e nrf52840dk diff --git a/docs/software/nrf52-TODO.md b/docs/software/nrf52-TODO.md index d56bfc262..24d9ff960 100644 --- a/docs/software/nrf52-TODO.md +++ b/docs/software/nrf52-TODO.md @@ -10,14 +10,6 @@ nrf52840 256KB RAM, 1MB flash Manual hacks needed to build (for now): -platform.json - - "framework-arduinoadafruitnrf52": { - "type": "framework", - "optional": true, - "version": "https://github.com/meshtastic/Adafruit_nRF52_Arduino.git" - }, - kevinh@kevin-server:~/.platformio/packages/framework-arduinoadafruitnrf52/variants$ ln -s ~/development/meshtastic/meshtastic-esp32/variants/* . ## Initial work items diff --git a/platformio.ini b/platformio.ini index e97a4b8a0..91274a30b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = nrf52dk ; Note: the github actions CI test build can't yet build NRF52 targets +default_envs = nrf52840dk ; Note: the github actions CI test build can't yet build NRF52 targets [common] ; common is not currently used @@ -169,12 +169,12 @@ debug_init_break = ; The NRF52840-dk development board ; Note: By default no lora device is created for this build - it uses a simulated interface -[env:nrf52dk] +[env:nrf52840dk] extends = nrf52_base board = nrf52840_dk ; The NRF52840-dk development board, but @geeksville's board - which has a busted oscilliator -[env:nrf52dk-geeksville] +[env:nrf52840dk-geeksville] extends = nrf52_base board = nrf52840_dk_modified