Skip to content

Commit b3b9e08

Browse files
hathachhathach
committed
clean up
1 parent 6bbcab7 commit b3b9e08

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

‎lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,8 @@ static void services_init(void)
994994
ble_dis_init_t dis_init;
995995
memset(&dis_init, 0, sizeof(dis_init));
996996

997-
ascii_to_utf8(&dis_init.manufact_name_str, DIS_MANUFACTURER);
998-
ascii_to_utf8(&dis_init.model_num_str, DIS_MODEL);
997+
ascii_to_utf8(&dis_init.manufact_name_str, BLEDIS_MANUFACTURER);
998+
ascii_to_utf8(&dis_init.model_num_str, BLEDIS_MODEL);
999999

10001000
uint32_t const sd_id = SD_ID_GET(MBR_SIZE);
10011001
uint32_t const sd_version = SD_VERSION_GET(MBR_SIZE);

‎src/boards/electronut_labs_papyr/board.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
#define HWFC false
5858

5959
// Used as model string in OTA mode
60-
#define DIS_MANUFACTURER "Electronut Labs"
61-
#define DIS_MODEL "Papyr"
60+
#define BLEDIS_MANUFACTURER "Electronut Labs"
61+
#define BLEDIS_MODEL "Papyr"
6262

63-
#define UF2_PRODUCT_NAME "Electronut Labs Papyr"
63+
#define UF2_PRODUCT_NAME "Electronut Labs Papyr"
6464
#define UF2_BOARD_ID "nRF52840-Papyr-v1"
6565
#define UF2_INDEX_URL "https://docs.electronut.in/papyr"
6666

‎src/boards/feather_nrf52832/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
#define HWFC false
5252

5353
// Used as model string in OTA mode
54-
#define DIS_MANUFACTURER "Adafruit Industries"
55-
#define DIS_MODEL "Bluefruit Feather nRF52832"
54+
#define BLEDIS_MANUFACTURER "Adafruit Industries"
55+
#define BLEDIS_MODEL "Feather nRF52832"
5656

5757
#define UF2_PRODUCT_NAME "Adafruit Feather nRF52832"
5858
#define UF2_INDEX_URL "https://www.adafruit.com/product/3406"

‎src/boards/feather_nrf52840_express/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
#define HWFC false
5656

5757
// Used as model string in OTA mode
58-
#define DIS_MANUFACTURER "Adafruit Industries"
59-
#define DIS_MODEL "Bluefruit Feather nRF52840 Express"
58+
#define BLEDIS_MANUFACTURER "Adafruit Industries"
59+
#define BLEDIS_MODEL "Feather nRF52840 Express"
6060

6161
#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Express"
6262
#define UF2_VOLUME_LABEL "FTHR840BOOT"

‎src/boards/mdk_nrf52840_dongle/board.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
5050

5151
// Used as model string in OTA mode
52-
#define DIS_MANUFACTURER "MakerDiary"
53-
#define DIS_MODEL "nRF52840 Micro Dev Kit USB Dongle"
52+
#define BLEDIS_MANUFACTURER "MakerDiary"
53+
#define BLEDIS_MODEL "nRF52840 Micro Dev Kit USB Dongle"
5454

5555
#define UF2_PRODUCT_NAME "MDK nRF52840 USB Dongle"
5656
#define UF2_VOLUME_LABEL "MDK840DONGL"
57-
#define UF2_BOARD_ID "MakerDiary-nRF52840-USB-Dongle"
57+
#define UF2_BOARD_ID "nRF52840-Dongle-v1"
5858
#define UF2_INDEX_URL "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
5959

6060
#endif /* _MDK_NRF52840_DONGLE_H_ */

‎src/boards/metro_nrf52840_express/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
#define HWFC false
5656

5757
// Used as model string in OTA mode
58-
#define DIS_MANUFACTURER "Adafruit Industries"
59-
#define DIS_MODEL "Bluefruit Metro nRF52840 Express"
58+
#define BLEDIS_MANUFACTURER "Adafruit Industries"
59+
#define BLEDIS_MODEL "Metro nRF52840 Express"
6060

6161
#define UF2_PRODUCT_NAME "Adafruit Metro nRF52840 Express"
6262
#define UF2_VOLUME_LABEL "METR840BOOT"

‎src/boards/particle_argon/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
#define HWFC false
5858

5959
// Used as model string in OTA mode
60-
#define DIS_MANUFACTURER "Particle Industries"
61-
#define DIS_MODEL "Argon"
60+
#define BLEDIS_MANUFACTURER "Particle Industries"
61+
#define BLEDIS_MODEL "Argon"
6262

6363
#define UF2_PRODUCT_NAME "Particle Argon"
6464
#define UF2_VOLUME_LABEL "ARGONBOOT "

‎src/boards/particle_boron/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
#define HWFC false
5858

5959
// Used as model string in OTA mode
60-
#define DIS_MANUFACTURER "Particle Industries"
61-
#define DIS_MODEL "Boron"
60+
#define BLEDIS_MANUFACTURER "Particle Industries"
61+
#define BLEDIS_MODEL "Boron"
6262

6363
#define UF2_PRODUCT_NAME "Particle Boron"
6464
#define UF2_VOLUME_LABEL "BORONBOOT "

‎src/boards/particle_xenon/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
#define HWFC false
5858

5959
// Used as model string in OTA mode
60-
#define DIS_MANUFACTURER "Particle Industries"
61-
#define DIS_MODEL "Xenon"
60+
#define BLEDIS_MANUFACTURER "Particle Industries"
61+
#define BLEDIS_MODEL "Xenon"
6262

6363
#define UF2_PRODUCT_NAME "Particle Xenon"
6464
#define UF2_VOLUME_LABEL "XENONBOOT "

‎src/boards/pca10056/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
#define HWFC false
5252

5353
// Used as model string in OTA mode
54-
#define DIS_MANUFACTURER "Nordic"
55-
#define DIS_MODEL "PCA10056"
54+
#define BLEDIS_MANUFACTURER "Nordic"
55+
#define BLEDIS_MODEL "PCA10056"
5656

5757
#define UF2_PRODUCT_NAME "Nordic nRF52840 DK"
5858
#define UF2_BOARD_ID "nRF52840-pca10056-v1"

0 commit comments

Comments
 (0)