diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index 8ecc30d4..5d8b275a 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -21,8 +21,8 @@ jobs: - 'feather_nrf52832' - 'feather_nrf52833_express' - 'feather_nrf52840_express' - - 'feather_nrf52840_tft' - 'feather_nrf52840_sense' + - 'feather_nrf52840_sense_tft' - 'itsybitsy_nrf52840_express' - 'metro_nrf52840_express' - 'ledglasses_nrf52840' diff --git a/src/boards/feather_nrf52840_tft/board.cmake b/src/boards/feather_nrf52840_sense_tft/board.cmake similarity index 100% rename from src/boards/feather_nrf52840_tft/board.cmake rename to src/boards/feather_nrf52840_sense_tft/board.cmake diff --git a/src/boards/feather_nrf52840_tft/board.h b/src/boards/feather_nrf52840_sense_tft/board.h similarity index 84% rename from src/boards/feather_nrf52840_tft/board.h rename to src/boards/feather_nrf52840_sense_tft/board.h index 8e3ad8d4..3dcea991 100644 --- a/src/boards/feather_nrf52840_tft/board.h +++ b/src/boards/feather_nrf52840_sense_tft/board.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef _FEATHER_NRF52840_TFT_H -#define _FEATHER_NRF52840_TFT_H +#ifndef _FEATHER_NRF52840_SENSE_TFT_H +#define _FEATHER_NRF52840_SENSE_TFT_H #define _PINNUM(port, pin) ((port)*32 + (pin)) @@ -44,26 +44,26 @@ *------------------------------------------------------------------*/ #define BUTTONS_NUMBER 2 #define BUTTON_1 _PINNUM(1, 6) -#define BUTTON_2 _PINNUM(1, 4) // not connected +#define BUTTON_2 _PINNUM(1, 10) // DFU pin #define BUTTON_PULL NRF_GPIO_PIN_PULLUP //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Adafruit Industries" -#define BLEDIS_MODEL "Feather nRF52840 TFT" +#define BLEDIS_MODEL "Feather nRF52840 Sense TFT" //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ #define USB_DESC_VID 0x239A -#define USB_DESC_UF2_PID 0x0029 -#define USB_DESC_CDC_ONLY_PID 0x002A +#define USB_DESC_UF2_PID 0x0087 +#define USB_DESC_CDC_ONLY_PID 0x0088 //------------- UF2 -------------// -#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 TFT" -#define UF2_VOLUME_LABEL "FTHR840BOOT" -#define UF2_BOARD_ID "nRF52840-FeatherTFT-revA" +#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Sense TFT" +#define UF2_VOLUME_LABEL "FTHRSNSBOOT" +#define UF2_BOARD_ID "nRF52840-FeatherSenseTFT-revA" #define UF2_INDEX_URL "https://www.adafruit.com/product/" #endif diff --git a/src/boards/feather_nrf52840_tft/board.mk b/src/boards/feather_nrf52840_sense_tft/board.mk similarity index 100% rename from src/boards/feather_nrf52840_tft/board.mk rename to src/boards/feather_nrf52840_sense_tft/board.mk diff --git a/src/boards/feather_nrf52840_tft/pinconfig.c b/src/boards/feather_nrf52840_sense_tft/pinconfig.c similarity index 100% rename from src/boards/feather_nrf52840_tft/pinconfig.c rename to src/boards/feather_nrf52840_sense_tft/pinconfig.c