From 2fe17d999674daf3e5cee0ec129d8d0927d9fba3 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 11 Jan 2020 11:45:36 +0700 Subject: [PATCH] clean up --- src/boards/arduino_nano_33_ble/board.h | 2 +- src/boards/circuitplayground_nrf52840/board.h | 2 +- src/boards/clue_nrf52840/board.h | 2 +- src/boards/electronut_labs_papyr/board.h | 2 +- src/boards/feather_nrf52832/board.h | 2 +- src/boards/feather_nrf52840_express/board.h | 6 ++- src/boards/itsybitsy_nrf52840_express/board.h | 2 +- src/boards/metro_nrf52840_express/board.h | 2 +- src/boards/particle_argon/board.h | 2 +- src/boards/particle_boron/board.h | 2 +- src/boards/particle_xenon/board.h | 2 +- src/boards/pca10056/board.h | 2 +- src/boards/pca10059/board.h | 2 +- src/boards/pca10100/board.h | 2 +- src/boards/raytac_mdbt50q_rx/board.h | 50 ++++++++++--------- 15 files changed, 43 insertions(+), 39 deletions(-) diff --git a/src/boards/arduino_nano_33_ble/board.h b/src/boards/arduino_nano_33_ble/board.h index f62b7f3..ad3420e 100644 --- a/src/boards/arduino_nano_33_ble/board.h +++ b/src/boards/arduino_nano_33_ble/board.h @@ -43,7 +43,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER _PINNUM(1, 10) #define TX_PIN_NUMBER _PINNUM(1, 3) diff --git a/src/boards/circuitplayground_nrf52840/board.h b/src/boards/circuitplayground_nrf52840/board.h index a454b0c..8f58e13 100644 --- a/src/boards/circuitplayground_nrf52840/board.h +++ b/src/boards/circuitplayground_nrf52840/board.h @@ -47,7 +47,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLDOWN /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER _PINNUM(0, 30) #define TX_PIN_NUMBER _PINNUM(0, 14) diff --git a/src/boards/clue_nrf52840/board.h b/src/boards/clue_nrf52840/board.h index de52c73..804e178 100644 --- a/src/boards/clue_nrf52840/board.h +++ b/src/boards/clue_nrf52840/board.h @@ -47,7 +47,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER _PINNUM(0, 09) #define TX_PIN_NUMBER _PINNUM(0, 10) diff --git a/src/boards/electronut_labs_papyr/board.h b/src/boards/electronut_labs_papyr/board.h index a0b7ac6..408f62a 100644 --- a/src/boards/electronut_labs_papyr/board.h +++ b/src/boards/electronut_labs_papyr/board.h @@ -48,7 +48,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 7 #define TX_PIN_NUMBER 8 diff --git a/src/boards/feather_nrf52832/board.h b/src/boards/feather_nrf52832/board.h index 7ccda3e..aa35ee3 100644 --- a/src/boards/feather_nrf52832/board.h +++ b/src/boards/feather_nrf52832/board.h @@ -42,7 +42,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h index bfef3d2..ca2527d 100644 --- a/src/boards/feather_nrf52840_express/board.h +++ b/src/boards/feather_nrf52840_express/board.h @@ -48,7 +48,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 @@ -56,7 +56,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 nRF52840 Express" diff --git a/src/boards/itsybitsy_nrf52840_express/board.h b/src/boards/itsybitsy_nrf52840_express/board.h index af3a41b..68ea958 100644 --- a/src/boards/itsybitsy_nrf52840_express/board.h +++ b/src/boards/itsybitsy_nrf52840_express/board.h @@ -47,7 +47,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER _PINNUM(0, 25) #define TX_PIN_NUMBER _PINNUM(0, 24) diff --git a/src/boards/metro_nrf52840_express/board.h b/src/boards/metro_nrf52840_express/board.h index 4a9340f..ef3c8a2 100644 --- a/src/boards/metro_nrf52840_express/board.h +++ b/src/boards/metro_nrf52840_express/board.h @@ -48,7 +48,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 diff --git a/src/boards/particle_argon/board.h b/src/boards/particle_argon/board.h index a644e82..312bfe3 100644 --- a/src/boards/particle_argon/board.h +++ b/src/boards/particle_argon/board.h @@ -48,7 +48,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 diff --git a/src/boards/particle_boron/board.h b/src/boards/particle_boron/board.h index 62c1713..7d1d36d 100644 --- a/src/boards/particle_boron/board.h +++ b/src/boards/particle_boron/board.h @@ -48,7 +48,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 diff --git a/src/boards/particle_xenon/board.h b/src/boards/particle_xenon/board.h index d00b6a4..3f945b0 100644 --- a/src/boards/particle_xenon/board.h +++ b/src/boards/particle_xenon/board.h @@ -48,7 +48,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 diff --git a/src/boards/pca10056/board.h b/src/boards/pca10056/board.h index 089aa2e..fbbdee6 100644 --- a/src/boards/pca10056/board.h +++ b/src/boards/pca10056/board.h @@ -42,7 +42,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 diff --git a/src/boards/pca10059/board.h b/src/boards/pca10059/board.h index 8c7a5c7..336b62f 100644 --- a/src/boards/pca10059/board.h +++ b/src/boards/pca10059/board.h @@ -45,7 +45,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 20 #define TX_PIN_NUMBER 17 diff --git a/src/boards/pca10100/board.h b/src/boards/pca10100/board.h index cd1e9d5..4e7dfbe 100644 --- a/src/boards/pca10100/board.h +++ b/src/boards/pca10100/board.h @@ -42,7 +42,7 @@ #define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) *------------------------------------------------------------------*/ #define RX_PIN_NUMBER 8 #define TX_PIN_NUMBER 6 diff --git a/src/boards/raytac_mdbt50q_rx/board.h b/src/boards/raytac_mdbt50q_rx/board.h index 70db671..d1d2b98 100644 --- a/src/boards/raytac_mdbt50q_rx/board.h +++ b/src/boards/raytac_mdbt50q_rx/board.h @@ -25,48 +25,50 @@ #ifndef RAYTAC_MDBT50Q_RX_H #define RAYTAC_MDBT50Q_RX_H -#define _PINNUM(port, pin) ((port)*32 + (pin)) +#define _PINNUM(port, pin) ((port)*32 + (pin)) /*------------------------------------------------------------------*/ /* LED *------------------------------------------------------------------*/ -#define LEDS_NUMBER 1 -#define LED_PRIMARY_PIN _PINNUM(1, 13) -#define LED_STATE_ON 0 +#define LEDS_NUMBER 1 +#define LED_PRIMARY_PIN _PINNUM(1, 13) +#define LED_STATE_ON 0 /*------------------------------------------------------------------*/ /* BUTTON *------------------------------------------------------------------*/ -#define BUTTONS_NUMBER 2 +#define BUTTONS_NUMBER 2 -#define BUTTON_1 _PINNUM(0, 15) -#define BUTTON_2 _PINNUM(0, 10) -#define BUTTON_PULL NRF_GPIO_PIN_PULLUP +#define BUTTON_1 _PINNUM(0, 15) +#define BUTTON_2 _PINNUM(0, 10) +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP /*------------------------------------------------------------------*/ -/* UART +/* UART (only used by nRF52832) (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 +#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 -#define BLEDIS_MANUFACTURER "Raytac" -#define BLEDIS_MODEL "MDBT50Q-RX" +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "Raytac" +#define BLEDIS_MODEL "MDBT50Q-RX" //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ -#define USB_DESC_VID 0x239A -#define USB_DESC_UF2_PID 0x0029 -#define USB_DESC_CDC_ONLY_PID 0x002A +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0029 +#define USB_DESC_CDC_ONLY_PID 0x002A //------------- UF2 -------------// -#define UF2_PRODUCT_NAME "Raytac MDBT50Q-RX" -#define UF2_VOLUME_LABEL "MDBT50QBOOT" -#define UF2_BOARD_ID "nRF52840-MDBT50Q_RX-verD" -#define UF2_INDEX_URL "https://www.raytac.com/product/ins.php?index_id=89" +#define UF2_PRODUCT_NAME "Raytac MDBT50Q-RX" +#define UF2_VOLUME_LABEL "MDBT50QBOOT" +#define UF2_BOARD_ID "nRF52840-MDBT50Q_RX-verD" +#define UF2_INDEX_URL "https://www.raytac.com/product/ins.php?index_id=89" #endif // RAYTAC_MDBT50Q_RX_H