Skip to content

Commit 29173a4

Browse files
hathachhathach
committed
rename BUTTON_FRESET to BUTTON_DFU_OTA
change board.d BUTTON_1/2 directly to BUTTON_DFU and BUTTON_DFU_OTA
1 parent cb30e6f commit 29173a4

File tree

53 files changed

+851
-926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+851
-926
lines changed

‎src/boards/adm_b_nrf52840_1/board.h‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,40 @@
2525
#ifndef ADM_B_NRF52840_1_H
2626
#define ADM_B_NRF52840_1_H
2727

28-
#define _PINNUM(port, pin) ((port)*32 + (pin))
29-
3028
/*------------------------------------------------------------------*/
3129
/* LED
3230
*------------------------------------------------------------------*/
33-
#define LEDS_NUMBER 1
34-
#define LED_PRIMARY_PIN _PINNUM(0, 19) // Red
35-
//#define LED_SECONDARY_PIN 12 // Blue
36-
#define LED_STATE_ON 0
31+
#define LEDS_NUMBER 1
32+
#define LED_PRIMARY_PIN PINNUM(0, 19) // Red
33+
// #define LED_SECONDARY_PIN 12 // Blue
34+
#define LED_STATE_ON 0
3735

3836
/*------------------------------------------------------------------*/
3937
/* BUTTON
4038
*------------------------------------------------------------------*/
4139

42-
#define BUTTON_1 _PINNUM(0, 11)
43-
#define BUTTON_2 _PINNUM(0, 12)
40+
#define BUTTON_DFU PINNUM(0, 11)
41+
#define BUTTON_DFU_OTA PINNUM(0, 12)
4442
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
4543

4644
//--------------------------------------------------------------------+
4745
// BLE OTA
4846
//--------------------------------------------------------------------+
49-
#define BLEDIS_MANUFACTURER "Atelier-Du-Maker"
50-
#define BLEDIS_MODEL "ADM_B_NRF52840_1"
47+
#define BLEDIS_MANUFACTURER "Atelier-Du-Maker"
48+
#define BLEDIS_MODEL "ADM_B_NRF52840_1"
5149

5250
//--------------------------------------------------------------------+
5351
// USB
5452
//--------------------------------------------------------------------+
5553

56-
#define USB_DESC_VID 0x239A
57-
#define USB_DESC_UF2_PID 0x009F
58-
#define USB_DESC_CDC_ONLY_PID 0x009F
54+
#define USB_DESC_VID 0x239A
55+
#define USB_DESC_UF2_PID 0x009F
56+
#define USB_DESC_CDC_ONLY_PID 0x009F
5957

6058
//------------- UF2 -------------//
61-
#define UF2_PRODUCT_NAME "AtelierDuMaker NRF52840 Breakout"
62-
#define UF2_VOLUME_LABEL "ADM840BOOT"
63-
#define UF2_BOARD_ID "ADM_B_NRF52840_1"
64-
#define UF2_INDEX_URL "https://github.com/Atelier-Du-Maker/HolyIoT_NRF52840"
59+
#define UF2_PRODUCT_NAME "AtelierDuMaker NRF52840 Breakout"
60+
#define UF2_VOLUME_LABEL "ADM840BOOT"
61+
#define UF2_BOARD_ID "ADM_B_NRF52840_1"
62+
#define UF2_INDEX_URL "https://github.com/Atelier-Du-Maker/HolyIoT_NRF52840"
6563

6664
#endif // ADM_B_NRF52840_1_H

‎src/boards/ae_bl652_bo/board.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@
2828
/*------------------------------------------------------------------*/
2929
/* LED
3030
*------------------------------------------------------------------*/
31-
#define LEDS_NUMBER 2
32-
#define LED_PRIMARY_PIN 17 // LED1
33-
#define LED_SECONDARY_PIN 19 // LED2
34-
#define LED_STATE_ON 1
31+
#define LEDS_NUMBER 2
32+
#define LED_PRIMARY_PIN 17 // LED1
33+
#define LED_SECONDARY_PIN 19 // LED2
34+
#define LED_STATE_ON 1
3535

3636
/*------------------------------------------------------------------*/
3737
/* BUTTON
3838
*------------------------------------------------------------------*/
39-
#define BUTTON_1 11 // BTN1
40-
#define BUTTON_2 15 // BTN2
41-
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
39+
#define BUTTON_DFU 11 // BTN1
40+
#define BUTTON_DFU_OTA 15 // BTN2
41+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
4242

4343
/*------------------------------------------------------------------*/
4444
/* UART (only used by nRF52832)
4545
*------------------------------------------------------------------*/
46-
#define RX_PIN_NUMBER 8
47-
#define TX_PIN_NUMBER 6
48-
#define CTS_PIN_NUMBER 0
49-
#define RTS_PIN_NUMBER 0
50-
#define HWFC false
46+
#define RX_PIN_NUMBER 8
47+
#define TX_PIN_NUMBER 6
48+
#define CTS_PIN_NUMBER 0
49+
#define RTS_PIN_NUMBER 0
50+
#define HWFC false
5151

5252
//--------------------------------------------------------------------+
5353
// BLE OTA

‎src/boards/aramcon2_badge/board.h‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,38 @@
2525
#ifndef _ARAMCON2_BADGE_H
2626
#define _ARAMCON2_BADGE_H
2727

28-
#define _PINNUM(port, pin) ((port)*32 + (pin))
29-
3028
/*------------------------------------------------------------------*/
3129
/* LED
3230
*------------------------------------------------------------------*/
33-
#define LEDS_NUMBER 1
34-
#define LED_PRIMARY_PIN _PINNUM(1, 11) // Red
31+
#define LEDS_NUMBER 1
32+
#define LED_PRIMARY_PIN PINNUM(1, 11) // Red
3533

36-
#define LED_NEOPIXEL _PINNUM(0, 8)
37-
#define NEOPIXELS_NUMBER 2
38-
#define BOARD_RGB_BRIGHTNESS 0x040404
34+
#define LED_NEOPIXEL PINNUM(0, 8)
35+
#define NEOPIXELS_NUMBER 2
36+
#define BOARD_RGB_BRIGHTNESS 0x040404
3937

4038
/*------------------------------------------------------------------*/
4139
/* BUTTON
4240
*------------------------------------------------------------------*/
43-
#define BUTTON_1 _PINNUM(0, 2) // left Button
44-
#define BUTTON_2 _PINNUM(0, 29) // middle button
45-
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
41+
#define BUTTON_DFU PINNUM(0, 2) // left Button
42+
#define BUTTON_DFU_OTA PINNUM(0, 29) // middle button
43+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
4644

4745
// Used as model string in OTA mode
48-
#define BLEDIS_MANUFACTURER "ARAMCON Badge Team"
49-
#define BLEDIS_MODEL "ARAMCON2 Badge"
46+
#define BLEDIS_MANUFACTURER "ARAMCON Badge Team"
47+
#define BLEDIS_MODEL "ARAMCON2 Badge"
5048

5149
//--------------------------------------------------------------------+
5250
// USB
5351
//--------------------------------------------------------------------+
54-
#define USB_DESC_VID 0x239A
55-
#define USB_DESC_UF2_PID 0x007B
56-
#define USB_DESC_CDC_ONLY_PID 0x007B
52+
#define USB_DESC_VID 0x239A
53+
#define USB_DESC_UF2_PID 0x007B
54+
#define USB_DESC_CDC_ONLY_PID 0x007B
5755

5856
//------------- UF2 -------------//
59-
#define UF2_PRODUCT_NAME "ARAMCON2 Badge"
60-
#define UF2_VOLUME_LABEL "ARAMBOOT"
61-
#define UF2_BOARD_ID "nrf52840-ARAMCON2-Badge"
62-
#define UF2_INDEX_URL "https://github.com/aramcon-badge"
57+
#define UF2_PRODUCT_NAME "ARAMCON2 Badge"
58+
#define UF2_VOLUME_LABEL "ARAMBOOT"
59+
#define UF2_BOARD_ID "nrf52840-ARAMCON2-Badge"
60+
#define UF2_INDEX_URL "https://github.com/aramcon-badge"
6361

6462
#endif // _ARAMCON2_BADGE_H

‎src/boards/aramcon_badge_2019/board.h‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,40 @@
2626
#ifndef _ARAMCON_BADGE_2019_H
2727
#define _ARAMCON_BADGE_2019_H
2828

29-
#define _PINNUM(port, pin) ((port)*32 + (pin))
30-
3129
/*------------------------------------------------------------------*/
3230
/* LED
3331
*------------------------------------------------------------------*/
34-
#define LEDS_NUMBER 1
35-
#define LED_PRIMARY_PIN _PINNUM(1, 11) // Red
32+
#define LEDS_NUMBER 1
33+
#define LED_PRIMARY_PIN PINNUM(1, 11) // Red
3634

37-
#define LED_NEOPIXEL _PINNUM(0, 8)
38-
#define NEOPIXELS_NUMBER 4
39-
#define BOARD_RGB_BRIGHTNESS 0x040404
35+
#define LED_NEOPIXEL PINNUM(0, 8)
36+
#define NEOPIXELS_NUMBER 4
37+
#define BOARD_RGB_BRIGHTNESS 0x040404
4038

4139
/*------------------------------------------------------------------*/
4240
/* BUTTON
4341
*------------------------------------------------------------------*/
44-
#define BUTTON_1 _PINNUM(0, 2) // left Button
45-
#define BUTTON_2 _PINNUM(0, 29) // middle button
46-
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
42+
#define BUTTON_DFU PINNUM(0, 2) // left Button
43+
#define BUTTON_DFU_OTA PINNUM(0, 29) // middle button
44+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
4745

4846
//--------------------------------------------------------------------+
4947
// BLE OTA
5048
//--------------------------------------------------------------------+
51-
#define BLEDIS_MANUFACTURER "ARAMCON Badge Team"
52-
#define BLEDIS_MODEL "ARAMCON Badge 2019"
49+
#define BLEDIS_MANUFACTURER "ARAMCON Badge Team"
50+
#define BLEDIS_MODEL "ARAMCON Badge 2019"
5351

5452
//--------------------------------------------------------------------+
5553
// USB
5654
//--------------------------------------------------------------------+
57-
#define USB_DESC_VID 0x239A
58-
#define USB_DESC_UF2_PID 0x0079
59-
#define USB_DESC_CDC_ONLY_PID 0x0079
55+
#define USB_DESC_VID 0x239A
56+
#define USB_DESC_UF2_PID 0x0079
57+
#define USB_DESC_CDC_ONLY_PID 0x0079
6058

6159
//------------- UF2 -------------//
62-
#define UF2_PRODUCT_NAME "ARAMCON Badge 2019"
63-
#define UF2_VOLUME_LABEL "ARAMBOOT"
64-
#define UF2_BOARD_ID "nrf52840-ARAMCON-Badge-2019"
65-
#define UF2_INDEX_URL "https://github.com/aramcon-badge"
60+
#define UF2_PRODUCT_NAME "ARAMCON Badge 2019"
61+
#define UF2_VOLUME_LABEL "ARAMBOOT"
62+
#define UF2_BOARD_ID "nrf52840-ARAMCON-Badge-2019"
63+
#define UF2_INDEX_URL "https://github.com/aramcon-badge"
6664

6765
#endif // _ARAMCON_BADGE_2019_H

‎src/boards/arcade_feather_nrf52840_express/board.h‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,45 +25,42 @@
2525
#ifndef _ARCARDE_FEATHER_NRF52840_H
2626
#define _ARCARDE_FEATHER_NRF52840_H
2727

28-
#define _PINNUM(port, pin) ((port)*32 + (pin))
29-
3028
/*------------------------------------------------------------------*/
3129
/* LED
3230
*------------------------------------------------------------------*/
33-
#define LEDS_NUMBER 2
34-
#define LED_PRIMARY_PIN _PINNUM(1, 15)
35-
#define LED_SECONDARY_PIN _PINNUM(1, 10)
36-
#define LED_STATE_ON 1
31+
#define LEDS_NUMBER 2
32+
#define LED_PRIMARY_PIN PINNUM(1, 15)
33+
#define LED_SECONDARY_PIN PINNUM(1, 10)
34+
#define LED_STATE_ON 1
3735

38-
#define LED_NEOPIXEL _PINNUM(0, 16)
39-
#define NEOPIXELS_NUMBER 1
40-
#define BOARD_RGB_BRIGHTNESS 0x040404
36+
#define LED_NEOPIXEL PINNUM(0, 16)
37+
#define NEOPIXELS_NUMBER 1
38+
#define BOARD_RGB_BRIGHTNESS 0x040404
4139

4240
/*------------------------------------------------------------------*/
4341
/* BUTTON
4442
*------------------------------------------------------------------*/
45-
#define BUTTON_1 _PINNUM(1, 02)
46-
#define BUTTON_2 _PINNUM(0, 10)
47-
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
43+
#define BUTTON_DFU PINNUM(1, 02)
44+
#define BUTTON_DFU_OTA PINNUM(0, 10)
45+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
4846

4947
//--------------------------------------------------------------------+
5048
// BLE OTA
5149
//--------------------------------------------------------------------+
52-
#define BLEDIS_MANUFACTURER "Adafruit Industries"
53-
#define BLEDIS_MODEL "Feather nRF52840 Express"
50+
#define BLEDIS_MANUFACTURER "Adafruit Industries"
51+
#define BLEDIS_MODEL "Feather nRF52840 Express"
5452

5553
//--------------------------------------------------------------------+
5654
// USB
5755
//--------------------------------------------------------------------+
58-
#define USB_DESC_VID 0x239A
59-
#define USB_DESC_UF2_PID 0x0029
60-
#define USB_DESC_CDC_ONLY_PID 0x002A
56+
#define USB_DESC_VID 0x239A
57+
#define USB_DESC_UF2_PID 0x0029
58+
#define USB_DESC_CDC_ONLY_PID 0x002A
6159

6260
//------------- UF2 -------------//
63-
#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Express"
64-
#define UF2_VOLUME_LABEL "ARCADE-N4"
65-
#define UF2_BOARD_ID "nRF52840-Feather-revD"
66-
#define UF2_INDEX_URL "https://www.adafruit.com/product/4062"
61+
#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Express"
62+
#define UF2_VOLUME_LABEL "ARCADE-N4"
63+
#define UF2_BOARD_ID "nRF52840-Feather-revD"
64+
#define UF2_INDEX_URL "https://www.adafruit.com/product/4062"
6765

6866
#endif // _ARCARDE_FEATHER_NRF52840_H
69-

‎src/boards/arduino_nano_33_ble/board.h‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,39 +25,37 @@
2525
#ifndef _ARDUINOBLE33_NRF52840_H
2626
#define _ARDUINOBLE33_NRF52840_H
2727

28-
#define _PINNUM(port, pin) ((port)*32 + (pin))
29-
3028
/*------------------------------------------------------------------*/
3129
/* LED
3230
*------------------------------------------------------------------*/
33-
#define LEDS_NUMBER 1 // red LED
34-
#define LED_PRIMARY_PIN _PINNUM(0, 24)
35-
#define LED_STATE_ON 0
31+
#define LEDS_NUMBER 1 // red LED
32+
#define LED_PRIMARY_PIN PINNUM(0, 24)
33+
#define LED_STATE_ON 0
3634

3735
/*------------------------------------------------------------------*/
3836
/* BUTTON
3937
*------------------------------------------------------------------*/
40-
#define BUTTON_1 _PINNUM(1, 11) // D2 switch
41-
#define BUTTON_2 _PINNUM(1, 12) // D3 switch
42-
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
38+
#define BUTTON_DFU PINNUM(1, 11) // D2 switch
39+
#define BUTTON_DFU_OTA PINNUM(1, 12) // D3 switch
40+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
4341

4442
//--------------------------------------------------------------------+
4543
// BLE OTA
4644
//--------------------------------------------------------------------+
47-
#define BLEDIS_MANUFACTURER "Arduino"
48-
#define BLEDIS_MODEL "Nano 33 BLE"
45+
#define BLEDIS_MANUFACTURER "Arduino"
46+
#define BLEDIS_MODEL "Nano 33 BLE"
4947

5048
//--------------------------------------------------------------------+
5149
// USB
5250
//--------------------------------------------------------------------+
53-
#define USB_DESC_VID 0x239A
54-
#define USB_DESC_UF2_PID 0x0063
55-
#define USB_DESC_CDC_ONLY_PID 0x0064
51+
#define USB_DESC_VID 0x239A
52+
#define USB_DESC_UF2_PID 0x0063
53+
#define USB_DESC_CDC_ONLY_PID 0x0064
5654

5755
//------------- UF2 -------------//
58-
#define UF2_PRODUCT_NAME "Arduino Nano 33 BLE"
59-
#define UF2_VOLUME_LABEL "NANO33BOOT"
60-
#define UF2_BOARD_ID "nRF52840-Nano-33"
61-
#define UF2_INDEX_URL "https://www.arduino.cc/"
56+
#define UF2_PRODUCT_NAME "Arduino Nano 33 BLE"
57+
#define UF2_VOLUME_LABEL "NANO33BOOT"
58+
#define UF2_BOARD_ID "nRF52840-Nano-33"
59+
#define UF2_INDEX_URL "https://www.arduino.cc/"
6260

6361
#endif // _ITSY_NRF52840_H

‎src/boards/bast_ble/board.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,39 +25,39 @@
2525
#ifndef _BASTBLE_NRF52840_H
2626
#define _BASTBLE_NRF52840_H
2727

28-
#define _PINNUM(port, pin) ((port)*32 + (pin))
28+
#define PINNUM(port, pin) ((port) * 32 + (pin))
2929
/*------------------------------------------------------------------*/
3030
/* LED
3131
*------------------------------------------------------------------*/
32-
#define LEDS_NUMBER 1 // red LED
33-
#define LED_PRIMARY_PIN _PINNUM(0, 24)
34-
#define LED_STATE_ON 0
32+
#define LEDS_NUMBER 1 // red LED
33+
#define LED_PRIMARY_PIN PINNUM(0, 24)
34+
#define LED_STATE_ON 0
3535

3636
/*------------------------------------------------------------------*/
3737
/* BUTTON
3838
*------------------------------------------------------------------*/
39-
#define BUTTON_1 _PINNUM(0, 05)
40-
#define BUTTON_2 _PINNUM(0, 10)
41-
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
39+
#define BUTTON_DFU PINNUM(0, 05)
40+
#define BUTTON_DFU_OTA PINNUM(0, 10)
41+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
4242

4343
//--------------------------------------------------------------------+
4444
// BLE OTA
4545
//--------------------------------------------------------------------+
46-
#define BLEDIS_MANUFACTURER "ElectronicCats"
47-
#define BLEDIS_MODEL "BastBLE"
46+
#define BLEDIS_MANUFACTURER "ElectronicCats"
47+
#define BLEDIS_MODEL "BastBLE"
4848

4949
//--------------------------------------------------------------------+
5050
// USB
5151
//--------------------------------------------------------------------+
5252

5353
// Shared VID/PID with Feather nRF52840, will be disabled for building in the future
54-
#define USB_DESC_VID 0x1209
55-
#define USB_DESC_UF2_PID 0x805A
56-
#define USB_DESC_CDC_ONLY_PID 0x805A
57-
58-
#define UF2_PRODUCT_NAME "Bast BLE"
59-
#define UF2_VOLUME_LABEL "BASTBLE"
60-
#define UF2_BOARD_ID "Bast-ble-v1"
61-
#define UF2_INDEX_URL "https://www.electroniccats.com"
54+
#define USB_DESC_VID 0x1209
55+
#define USB_DESC_UF2_PID 0x805A
56+
#define USB_DESC_CDC_ONLY_PID 0x805A
57+
58+
#define UF2_PRODUCT_NAME "Bast BLE"
59+
#define UF2_VOLUME_LABEL "BASTBLE"
60+
#define UF2_BOARD_ID "Bast-ble-v1"
61+
#define UF2_INDEX_URL "https://www.electroniccats.com"
6262

6363
#endif // _BASTBLE_NRF52840_H

0 commit comments

Comments
 (0)