clean up
This commit is contained in:
		@@ -994,8 +994,8 @@ static void services_init(void)
 | 
			
		||||
    ble_dis_init_t dis_init;
 | 
			
		||||
    memset(&dis_init, 0, sizeof(dis_init));
 | 
			
		||||
 | 
			
		||||
    ascii_to_utf8(&dis_init.manufact_name_str, DIS_MANUFACTURER);
 | 
			
		||||
    ascii_to_utf8(&dis_init.model_num_str, DIS_MODEL);
 | 
			
		||||
    ascii_to_utf8(&dis_init.manufact_name_str, BLEDIS_MANUFACTURER);
 | 
			
		||||
    ascii_to_utf8(&dis_init.model_num_str, BLEDIS_MODEL);
 | 
			
		||||
 | 
			
		||||
    uint32_t const sd_id      = SD_ID_GET(MBR_SIZE);
 | 
			
		||||
    uint32_t const sd_version = SD_VERSION_GET(MBR_SIZE);
 | 
			
		||||
 
 | 
			
		||||
@@ -57,10 +57,10 @@
 | 
			
		||||
#define HWFC                false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER    "Electronut Labs"
 | 
			
		||||
#define DIS_MODEL           "Papyr"
 | 
			
		||||
#define BLEDIS_MANUFACTURER    "Electronut Labs"
 | 
			
		||||
#define BLEDIS_MODEL           "Papyr"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME    "Electronut Labs  Papyr"
 | 
			
		||||
#define UF2_PRODUCT_NAME    "Electronut Labs Papyr"
 | 
			
		||||
#define UF2_BOARD_ID        "nRF52840-Papyr-v1"
 | 
			
		||||
#define UF2_INDEX_URL       "https://docs.electronut.in/papyr"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -51,8 +51,8 @@
 | 
			
		||||
#define HWFC               false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER   "Adafruit Industries"
 | 
			
		||||
#define DIS_MODEL          "Bluefruit Feather nRF52832"
 | 
			
		||||
#define BLEDIS_MANUFACTURER   "Adafruit Industries"
 | 
			
		||||
#define BLEDIS_MODEL          "Feather nRF52832"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME   "Adafruit Feather nRF52832"
 | 
			
		||||
#define UF2_INDEX_URL      "https://www.adafruit.com/product/3406"
 | 
			
		||||
 
 | 
			
		||||
@@ -55,8 +55,8 @@
 | 
			
		||||
#define HWFC                  false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER   "Adafruit Industries"
 | 
			
		||||
#define DIS_MODEL          "Bluefruit Feather nRF52840 Express"
 | 
			
		||||
#define BLEDIS_MANUFACTURER   "Adafruit Industries"
 | 
			
		||||
#define BLEDIS_MODEL          "Feather nRF52840 Express"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME   "Adafruit Feather nRF52840 Express"
 | 
			
		||||
#define UF2_VOLUME_LABEL   "FTHR840BOOT"
 | 
			
		||||
 
 | 
			
		||||
@@ -49,12 +49,12 @@
 | 
			
		||||
#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER   "MakerDiary"
 | 
			
		||||
#define DIS_MODEL          "nRF52840 Micro Dev Kit USB Dongle"
 | 
			
		||||
#define BLEDIS_MANUFACTURER   "MakerDiary"
 | 
			
		||||
#define BLEDIS_MODEL          "nRF52840 Micro Dev Kit USB Dongle"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME   "MDK nRF52840 USB Dongle"
 | 
			
		||||
#define UF2_VOLUME_LABEL   "MDK840DONGL"
 | 
			
		||||
#define UF2_BOARD_ID       "MakerDiary-nRF52840-USB-Dongle"
 | 
			
		||||
#define UF2_BOARD_ID       "nRF52840-Dongle-v1"
 | 
			
		||||
#define UF2_INDEX_URL      "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
 | 
			
		||||
 | 
			
		||||
#endif /* _MDK_NRF52840_DONGLE_H_ */
 | 
			
		||||
 
 | 
			
		||||
@@ -55,8 +55,8 @@
 | 
			
		||||
#define HWFC                  false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER   "Adafruit Industries"
 | 
			
		||||
#define DIS_MODEL          "Bluefruit Metro nRF52840 Express"
 | 
			
		||||
#define BLEDIS_MANUFACTURER   "Adafruit Industries"
 | 
			
		||||
#define BLEDIS_MODEL          "Metro nRF52840 Express"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME   "Adafruit Metro nRF52840 Express"
 | 
			
		||||
#define UF2_VOLUME_LABEL   "METR840BOOT"
 | 
			
		||||
 
 | 
			
		||||
@@ -57,8 +57,8 @@
 | 
			
		||||
#define HWFC           false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER   "Particle Industries"
 | 
			
		||||
#define DIS_MODEL          "Argon"
 | 
			
		||||
#define BLEDIS_MANUFACTURER   "Particle Industries"
 | 
			
		||||
#define BLEDIS_MODEL          "Argon"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME   "Particle Argon"
 | 
			
		||||
#define UF2_VOLUME_LABEL   "ARGONBOOT  "
 | 
			
		||||
 
 | 
			
		||||
@@ -57,8 +57,8 @@
 | 
			
		||||
#define HWFC           false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER   "Particle Industries"
 | 
			
		||||
#define DIS_MODEL          "Boron"
 | 
			
		||||
#define BLEDIS_MANUFACTURER   "Particle Industries"
 | 
			
		||||
#define BLEDIS_MODEL          "Boron"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME   "Particle Boron"
 | 
			
		||||
#define UF2_VOLUME_LABEL   "BORONBOOT  "
 | 
			
		||||
 
 | 
			
		||||
@@ -57,8 +57,8 @@
 | 
			
		||||
#define HWFC           false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER   "Particle Industries"
 | 
			
		||||
#define DIS_MODEL          "Xenon"
 | 
			
		||||
#define BLEDIS_MANUFACTURER   "Particle Industries"
 | 
			
		||||
#define BLEDIS_MODEL          "Xenon"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME   "Particle Xenon"
 | 
			
		||||
#define UF2_VOLUME_LABEL   "XENONBOOT  "
 | 
			
		||||
 
 | 
			
		||||
@@ -51,8 +51,8 @@
 | 
			
		||||
#define HWFC                false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER    "Nordic"
 | 
			
		||||
#define DIS_MODEL           "PCA10056"
 | 
			
		||||
#define BLEDIS_MANUFACTURER    "Nordic"
 | 
			
		||||
#define BLEDIS_MODEL           "PCA10056"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME    "Nordic nRF52840 DK"
 | 
			
		||||
#define UF2_BOARD_ID        "nRF52840-pca10056-v1"
 | 
			
		||||
 
 | 
			
		||||
@@ -54,8 +54,8 @@
 | 
			
		||||
#define HWFC           false
 | 
			
		||||
 | 
			
		||||
// Used as model string in OTA mode
 | 
			
		||||
#define DIS_MANUFACTURER  "Nordic"
 | 
			
		||||
#define DIS_MODEL         "PCA10059"
 | 
			
		||||
#define BLEDIS_MANUFACTURER  "Nordic"
 | 
			
		||||
#define BLEDIS_MODEL         "PCA10059"
 | 
			
		||||
 | 
			
		||||
#define UF2_PRODUCT_NAME  "Nordic nRF52840 Dongle"
 | 
			
		||||
#define UF2_BOARD_ID      "nRF52840-pca10059-v1"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user