remove all uart pin from nrf52840 board, since it is not used.

canaryradio · Mar 25, 2020 · 6b3f70d · 6b3f70d
1 parent 09fdd7d
commit 6b3f70d
Show file tree

Hide file tree

Showing 20 changed files with 80 additions and 185 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"