diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index 68b4f7f..2cec1cd 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -2,7 +2,6 @@ name: Build on: pull_request: - push: repository_dispatch: release: types: @@ -21,7 +20,8 @@ jobs: id: set-matrix working-directory: src/boards run: | - MATRIX_JSON=$(ls -d */ | sed 's/\/$//' | jq -R -s -c 'split("\n")[:-1]') + #MATRIX_JSON=$(ls -d */ | sed 's/\/$//' | jq -R -s -c 'split("\n")[:-1]') + MATRIX_JSON=$(ls -d promicro_nrf52840 | sed 's/\/$//' | jq -R -s -c 'split("\n")[:-1]') echo "matrix=$MATRIX_JSON" echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT @@ -50,8 +50,10 @@ jobs: - name: Build run: | - make BOARD=${{ matrix.board }} all - make BOARD=${{ matrix.board }} copy-artifact + make BOARD=promicro_nrf52840 all + make BOARD=promicro_nrf52840 copy-artifact +# make BOARD=${{ matrix.board }} all +# make BOARD=${{ matrix.board }} copy-artifact - uses: actions/upload-artifact@v4 with: @@ -60,9 +62,8 @@ jobs: - name: Upload Release Asset uses: softprops/action-gh-release@v1 - if: ${{ github.event_name == 'release' }} with: files: | - _bin/${{ matrix.board }}/${{ matrix.board }}_bootloader-*.zip - _bin/${{ matrix.board }}/${{ matrix.board }}_bootloader-*.hex - _bin/${{ matrix.board }}/update-${{ matrix.board }}_bootloader-*.uf2 + _bin/promicro_nrf52840/promicro_nrf52840_bootloader-*.zip + _bin/promicro_nrf52840/promicro_nrf52840_bootloader-*.hex + _bin/promicro_nrf52840/update-promicro_nrf52840_bootloader-*.uf2 diff --git a/src/boards/promicro_nrf52840/board.h b/src/boards/promicro_nrf52840/board.h new file mode 100644 index 0000000..dca466f --- /dev/null +++ b/src/boards/promicro_nrf52840/board.h @@ -0,0 +1,65 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2020 Nick Winans + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef _PROMICRO_NRF52840_H +#define _PROMICRO_NRF52840_H + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +#define UICR_REGOUT0_VALUE UICR_REGOUT0_VOUT_3V3 + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 1 +#define LED_PRIMARY_PIN _PINNUM(0, 15) // Blue +#define LED_STATE_ON 1 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 // none connected at all +#define BUTTON_1 _PINNUM(0, 18) // unusable: RESET +#define BUTTON_2 _PINNUM(0, 19) // no connection +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "Nologo" +#define BLEDIS_MODEL "ProMicro NRF52840" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x00B3 +#define USB_DESC_CDC_ONLY_PID 0x00B3 + +#define UF2_PRODUCT_NAME "ProMicro NRF52840" +#define UF2_VOLUME_LABEL "PROMICRO" +#define UF2_BOARD_ID "nRF52840-promicro" +#define UF2_INDEX_URL "https://www.nologo.tech/product/otherboard/NRF52840.html" + +#endif // _PROMICRO_NRF52840_H diff --git a/src/boards/promicro_nrf52840/board.mk b/src/boards/promicro_nrf52840/board.mk new file mode 100644 index 0000000..9d29ac6 --- /dev/null +++ b/src/boards/promicro_nrf52840/board.mk @@ -0,0 +1 @@ +MCU_SUB_VARIANT = nrf52840 diff --git a/src/boards/promicro_nrf52840/pinconfig.c b/src/boards/promicro_nrf52840/pinconfig.c new file mode 100644 index 0000000..a983e4a --- /dev/null +++ b/src/boards/promicro_nrf52840/pinconfig.c @@ -0,0 +1,19 @@ +#include "boards.h" +#include "uf2/configkeys.h" + +__attribute__((used, section(".bootloaderConfig"))) +const uint32_t bootloaderConfig[] = +{ + /* CF2 START */ + CFG_MAGIC0, CFG_MAGIC1, // magic + 5, 100, // used entries, total entries + + 204, 0x100000, // FLASH_BYTES = 0x100000 + 205, 0x40000, // RAM_BYTES = 0x40000 + 208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2 + 209, 0xada52840, // UF2_FAMILY = 0xada52840 + 210, 0x20, // PINS_PORT_SIZE = PA_32 + + 0, 0, 0, 0, 0, 0, 0, 0 + /* CF2 END */ +};