From 6b3f70db470a149db0283af2c90aae7286ba6062 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 25 Mar 2020 18:18:27 +0700 Subject: [PATCH] remove all uart pin from nrf52840 board, since it is not used. --- src/boards/aramcon_badge_2019/board.h | 13 ++------ .../arcade_feather_nrf52840_express/board.h | 9 ------ src/boards/arduino_nano_33_ble/board.h | 13 ++------ src/boards/circuitplayground_nrf52840/board.h | 13 ++------ src/boards/clue_nrf52840/board.h | 13 ++------ src/boards/electronut_labs_papyr/board.h | 16 ++++------ src/boards/feather_nrf52832/board.h | 4 ++- src/boards/feather_nrf52840_sense/board.h | 9 ------ src/boards/itsybitsy_nrf52840_express/board.h | 13 ++------ src/boards/mdk_nrf52840_dongle/board.h | 8 ++++- src/boards/metro_nrf52840_express/board.h | 13 ++------ src/boards/ohs2020_badge/board.h | 13 ++------ src/boards/particle_argon/board.h | 16 ++++------ src/boards/particle_boron/board.h | 16 ++++------ src/boards/particle_xenon/board.h | 30 ++++++++----------- src/boards/pca10056/board.h | 16 ++++------ src/boards/pca10059/board.h | 16 ++++------ src/boards/pca10100/board.h | 16 ++++------ src/boards/raytac_mdbt50q_rx/board.h | 9 ------ src/boards/waveshare_nrf52840_eval/board.h | 9 ------ 20 files changed, 80 insertions(+), 185 deletions(-) diff --git a/src/boards/aramcon_badge_2019/board.h b/src/boards/aramcon_badge_2019/board.h index 9e84b23..3dc666d 100644 --- a/src/boards/aramcon_badge_2019/board.h +++ b/src/boards/aramcon_badge_2019/board.h @@ -46,16 +46,9 @@ #define BUTTON_2 _PINNUM(0, 29) // middle button #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER _PINNUM(0, 28) // SDA -#define TX_PIN_NUMBER _PINNUM(0, 3) // SCL -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "ARAMCON Badge Team" #define BLEDIS_MODEL "ARAMCON Badge 2019" diff --git a/src/boards/arcade_feather_nrf52840_express/board.h b/src/boards/arcade_feather_nrf52840_express/board.h index 738d8a9..aed04ed 100644 --- a/src/boards/arcade_feather_nrf52840_express/board.h +++ b/src/boards/arcade_feather_nrf52840_express/board.h @@ -47,15 +47,6 @@ #define BUTTON_2 _PINNUM(0, 10) #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+ diff --git a/src/boards/arduino_nano_33_ble/board.h b/src/boards/arduino_nano_33_ble/board.h index ad3420e..00fb2ef 100644 --- a/src/boards/arduino_nano_33_ble/board.h +++ b/src/boards/arduino_nano_33_ble/board.h @@ -42,16 +42,9 @@ #define BUTTON_2 _PINNUM(1, 12) // D3 switch #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER _PINNUM(1, 10) -#define TX_PIN_NUMBER _PINNUM(1, 3) -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Arduino" #define BLEDIS_MODEL "Nano 33 BLE" diff --git a/src/boards/circuitplayground_nrf52840/board.h b/src/boards/circuitplayground_nrf52840/board.h index 8f58e13..5544502 100644 --- a/src/boards/circuitplayground_nrf52840/board.h +++ b/src/boards/circuitplayground_nrf52840/board.h @@ -46,16 +46,9 @@ #define BUTTON_2 _PINNUM(1, 15) // right button #define BUTTON_PULL NRF_GPIO_PIN_PULLDOWN -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER _PINNUM(0, 30) -#define TX_PIN_NUMBER _PINNUM(0, 14) -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Adafruit Industries" #define BLEDIS_MODEL "Circuit Playground nRF52840" diff --git a/src/boards/clue_nrf52840/board.h b/src/boards/clue_nrf52840/board.h index f8d32aa..efba060 100644 --- a/src/boards/clue_nrf52840/board.h +++ b/src/boards/clue_nrf52840/board.h @@ -46,16 +46,9 @@ #define BUTTON_2 _PINNUM(1, 10) // right button #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER _PINNUM(0, 09) -#define TX_PIN_NUMBER _PINNUM(0, 10) -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Adafruit Industries" #define BLEDIS_MODEL "CLUE nRF52840" diff --git a/src/boards/electronut_labs_papyr/board.h b/src/boards/electronut_labs_papyr/board.h index 408f62a..738dd50 100644 --- a/src/boards/electronut_labs_papyr/board.h +++ b/src/boards/electronut_labs_papyr/board.h @@ -47,19 +47,15 @@ #define BUTTON_2 1 // P0.1 not exposed anywhere, FRST n/a #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 7 -#define TX_PIN_NUMBER 8 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Electronut Labs" #define BLEDIS_MODEL "Papyr" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Electronut Labs Papyr" #define UF2_BOARD_ID "nRF52840-Papyr-v1" #define UF2_INDEX_URL "https://docs.electronut.in/papyr" diff --git a/src/boards/feather_nrf52832/board.h b/src/boards/feather_nrf52832/board.h index aa35ee3..a31bafa 100644 --- a/src/boards/feather_nrf52832/board.h +++ b/src/boards/feather_nrf52832/board.h @@ -50,7 +50,9 @@ #define RTS_PIN_NUMBER 0 #define HWFC false -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Adafruit Industries" #define BLEDIS_MODEL "Feather nRF52832" diff --git a/src/boards/feather_nrf52840_sense/board.h b/src/boards/feather_nrf52840_sense/board.h index 9d3611b..fbaf9bc 100644 --- a/src/boards/feather_nrf52840_sense/board.h +++ b/src/boards/feather_nrf52840_sense/board.h @@ -47,15 +47,6 @@ #define BUTTON_2 _PINNUM(0, 10) #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+ diff --git a/src/boards/itsybitsy_nrf52840_express/board.h b/src/boards/itsybitsy_nrf52840_express/board.h index 68ea958..2bc82e0 100644 --- a/src/boards/itsybitsy_nrf52840_express/board.h +++ b/src/boards/itsybitsy_nrf52840_express/board.h @@ -46,16 +46,9 @@ #define BUTTON_2 _PINNUM(1, 02) // D2 breakout #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER _PINNUM(0, 25) -#define TX_PIN_NUMBER _PINNUM(0, 24) -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Adafruit Industries" #define BLEDIS_MODEL "ItsyBitsy nRF52840 Express" diff --git a/src/boards/mdk_nrf52840_dongle/board.h b/src/boards/mdk_nrf52840_dongle/board.h index 3f3c6a3..c45213e 100644 --- a/src/boards/mdk_nrf52840_dongle/board.h +++ b/src/boards/mdk_nrf52840_dongle/board.h @@ -39,6 +39,7 @@ //#define LED_RGB_GREEN_PIN _PINNUM(0, 22) //#define LED_RGB_BLUE_PIN _PINNUM(0, 24) #define BOARD_RGB_BRIGHTNESS 0x404040 + /*------------------------------------------------------------------*/ /* BUTTON *------------------------------------------------------------------*/ @@ -48,10 +49,15 @@ #define BUTTON_2 _PINNUM(0, 19) // no connection #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "MakerDiary" #define BLEDIS_MODEL "nRF52840 Micro Dev Kit USB Dongle" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "MDK nRF52840 USB Dongle" #define UF2_VOLUME_LABEL "MDK840DONGL" #define UF2_BOARD_ID "nRF52840-Dongle-v1" diff --git a/src/boards/metro_nrf52840_express/board.h b/src/boards/metro_nrf52840_express/board.h index ef3c8a2..0b47a1c 100644 --- a/src/boards/metro_nrf52840_express/board.h +++ b/src/boards/metro_nrf52840_express/board.h @@ -47,16 +47,9 @@ #define BUTTON_2 _PINNUM(2, 2) #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Adafruit Industries" #define BLEDIS_MODEL "Metro nRF52840 Express" diff --git a/src/boards/ohs2020_badge/board.h b/src/boards/ohs2020_badge/board.h index 4776999..1a62811 100644 --- a/src/boards/ohs2020_badge/board.h +++ b/src/boards/ohs2020_badge/board.h @@ -43,16 +43,9 @@ #define BUTTON_2 _PINNUM(0, 03) // SW1 #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER _PINNUM(0, 09) -#define TX_PIN_NUMBER _PINNUM(0, 10) -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "OSHWA" #define BLEDIS_MODEL "OHS2020 Badge" diff --git a/src/boards/particle_argon/board.h b/src/boards/particle_argon/board.h index 312bfe3..467a7df 100644 --- a/src/boards/particle_argon/board.h +++ b/src/boards/particle_argon/board.h @@ -47,19 +47,15 @@ #define BUTTON_FRESET _PINNUM(0, 03) // A0 #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Particle Industries" #define BLEDIS_MODEL "Argon" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Particle Argon" #define UF2_VOLUME_LABEL "ARGONBOOT " #define UF2_BOARD_ID "nRF52840-Argon-v1" diff --git a/src/boards/particle_boron/board.h b/src/boards/particle_boron/board.h index 7d1d36d..b433cea 100644 --- a/src/boards/particle_boron/board.h +++ b/src/boards/particle_boron/board.h @@ -47,19 +47,15 @@ #define BUTTON_FRESET _PINNUM(0, 03) // A0 #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Particle Industries" #define BLEDIS_MODEL "Boron" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Particle Boron" #define UF2_VOLUME_LABEL "BORONBOOT " #define UF2_BOARD_ID "nRF52840-Boron-v1" diff --git a/src/boards/particle_xenon/board.h b/src/boards/particle_xenon/board.h index 3f945b0..5fe2474 100644 --- a/src/boards/particle_xenon/board.h +++ b/src/boards/particle_xenon/board.h @@ -30,14 +30,14 @@ /*------------------------------------------------------------------*/ /* LED *------------------------------------------------------------------*/ - #define LEDS_NUMBER 1 - #define LED_PRIMARY_PIN _PINNUM(1, 12) - #define LED_STATE_ON 1 +#define LEDS_NUMBER 1 +#define LED_PRIMARY_PIN _PINNUM(1, 12) +#define LED_STATE_ON 1 - #define LED_RGB_RED_PIN _PINNUM(0, 13) - #define LED_RGB_GREEN_PIN _PINNUM(0, 14) - #define LED_RGB_BLUE_PIN _PINNUM(0, 15) - #define BOARD_RGB_BRIGHTNESS 0x202020 +#define LED_RGB_RED_PIN _PINNUM(0, 13) +#define LED_RGB_GREEN_PIN _PINNUM(0, 14) +#define LED_RGB_BLUE_PIN _PINNUM(0, 15) +#define BOARD_RGB_BRIGHTNESS 0x202020 /*------------------------------------------------------------------*/ /* BUTTON @@ -47,19 +47,15 @@ #define BUTTON_FRESET _PINNUM(0, 03) // A0 #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Particle Industries" #define BLEDIS_MODEL "Xenon" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Particle Xenon" #define UF2_VOLUME_LABEL "XENONBOOT " #define UF2_BOARD_ID "nRF52840-Xenon-v1" diff --git a/src/boards/pca10056/board.h b/src/boards/pca10056/board.h index fbbdee6..a17d597 100644 --- a/src/boards/pca10056/board.h +++ b/src/boards/pca10056/board.h @@ -41,19 +41,15 @@ #define BUTTON_2 12 #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Nordic" #define BLEDIS_MODEL "PCA10056" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Nordic nRF52840 DK" #define UF2_BOARD_ID "nRF52840-pca10056-v1" #define UF2_INDEX_URL "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK" diff --git a/src/boards/pca10059/board.h b/src/boards/pca10059/board.h index 336b62f..6654b87 100644 --- a/src/boards/pca10059/board.h +++ b/src/boards/pca10059/board.h @@ -44,19 +44,15 @@ #define BUTTON_2 _PINNUM(1, 10) #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 20 -#define TX_PIN_NUMBER 17 -#define CTS_PIN_NUMBER 15 -#define RTS_PIN_NUMBER 13 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Nordic" #define BLEDIS_MODEL "PCA10059" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Nordic nRF52840 Dongle" #define UF2_BOARD_ID "nRF52840-pca10059-v1" #define UF2_INDEX_URL "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle" diff --git a/src/boards/pca10100/board.h b/src/boards/pca10100/board.h index 4e7dfbe..d82e2d1 100644 --- a/src/boards/pca10100/board.h +++ b/src/boards/pca10100/board.h @@ -41,19 +41,15 @@ #define BUTTON_2 12 #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - -// Used as model string in OTA mode +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ #define BLEDIS_MANUFACTURER "Nordic" #define BLEDIS_MODEL "PCA10100" +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Nordic nRF52833 DK" #define UF2_BOARD_ID "nRF52833-pca10100-v1" #define UF2_INDEX_URL "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52833-DK" diff --git a/src/boards/raytac_mdbt50q_rx/board.h b/src/boards/raytac_mdbt50q_rx/board.h index fb4bdef..18b7c90 100644 --- a/src/boards/raytac_mdbt50q_rx/board.h +++ b/src/boards/raytac_mdbt50q_rx/board.h @@ -43,15 +43,6 @@ #define BUTTON_2 _PINNUM(0, 10) #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+ diff --git a/src/boards/waveshare_nrf52840_eval/board.h b/src/boards/waveshare_nrf52840_eval/board.h index d4f0efc..27991df 100644 --- a/src/boards/waveshare_nrf52840_eval/board.h +++ b/src/boards/waveshare_nrf52840_eval/board.h @@ -50,15 +50,6 @@ #define BUTTON_2 _PINNUM(0, 29) #define BUTTON_PULL NRF_GPIO_PIN_PULLUP -/*------------------------------------------------------------------*/ -/* UART (only used by nRF52832) - *------------------------------------------------------------------*/ -#define RX_PIN_NUMBER 8 -#define TX_PIN_NUMBER 6 -#define CTS_PIN_NUMBER 0 -#define RTS_PIN_NUMBER 0 -#define HWFC false - //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+