update uf2 index url, add UF2_ prefix for volume lable and index url

hathach · hathach · commit 137785f2f08b · 2019-04-24T16:31:08.000+07:00
diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@ This is a CDC/DFU/UF2 bootloader for nRF52 boards.
 - [Adafruit Feather nRF52840 Express](https://www.adafruit.com/product/4062)
 - [Electronut Labs Papyr](https://docs.electronut.in/papyr/)
 - MakerDiary MDK nRF52840 USB Dongle
-- Nordic nRF52840DK PCA10056
-- Nordic nRF52840DK PCA10059 ("Dongle")
+- [Nordic nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
+- [Nordic nRF52840DK PCA10059 ("Dongle")](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle)
 - Particle Argon
 - Particle Boron
 - Particle Xenon
diff --git a/src/boards/electronut_labs_papyr/board.h b/src/boards/electronut_labs_papyr/board.h
@@ -60,8 +60,8 @@
 #define DIS_MANUFACTURER    "Electronut Labs"
 #define DIS_MODEL           "Papyr"
 
-#define UF2_BOARD_ID            "Electronut Labs Papyr"
-#define INDEX_URL           "https://docs.electronut.in/papyr"
+#define UF2_BOARD_ID        "Electronut Labs Papyr"
+#define UF2_INDEX_URL       "https://docs.electronut.in/papyr"
 
 #define USB_DESC_VID        0x239A
 #define USB_DESC_UF2_PID    0x003B
diff --git a/src/boards/feather_nrf52832/board.h b/src/boards/feather_nrf52832/board.h
@@ -55,5 +55,6 @@
 #define DIS_MODEL          "Bluefruit Feather nRF52832"
 
 #define PRODUCT_NAME       "Adafruit Bluefruit Feather nRF52832"
+#define UF2_INDEX_URL      "https://www.adafruit.com/product/3406"
 
 #endif // _FEATHER_NRF52832_H
diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h
@@ -55,11 +55,12 @@
 #define HWFC                  false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER      "Adafruit Industries"
-#define DIS_MODEL             "Bluefruit Feather nRF52840 Express"
+#define DIS_MANUFACTURER   "Adafruit Industries"
+#define DIS_MODEL          "Bluefruit Feather nRF52840 Express"
 
-#define PRODUCT_NAME          "Adafruit Feather nRF52840 Express"
-#define VOLUME_LABEL          "FTHR840BOOT"
-#define UF2_BOARD_ID "nRF52840-Feather-revD"
+#define PRODUCT_NAME       "Adafruit Feather nRF52840 Express"
+#define UF2_VOLUME_LABEL   "FTHR840BOOT"
+#define UF2_BOARD_ID       "nRF52840-Feather-revD"
+#define UF2_INDEX_URL      "https://www.adafruit.com/product/4062"
 
 #endif // _FEATHER_NRF52840_H
diff --git a/src/boards/mdk_nrf52840_dongle/board.h b/src/boards/mdk_nrf52840_dongle/board.h
@@ -49,14 +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 DIS_MANUFACTURER   "MakerDiary"
+#define DIS_MODEL          "nRF52840 Micro Dev Kit USB Dongle"
 
-#define PRODUCT_NAME          "MDK nRF52840 USB Dongle"
-#define VOLUME_LABEL          "MDK840DONGL"
-
-#define UF2_BOARD_ID "MakerDiary-nRF52840-USB-Dongle"
-
-#define INDEX_URL "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
+#define PRODUCT_NAME       "MDK nRF52840 USB Dongle"
+#define UF2_VOLUME_LABEL   "MDK840DONGL"
+#define UF2_BOARD_ID       "MakerDiary-nRF52840-USB-Dongle"
+#define UF2_INDEX_URL      "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
 
 #endif /* _MDK_NRF52840_DONGLE_H_ */
diff --git a/src/boards/metro_nrf52840_express/board.h b/src/boards/metro_nrf52840_express/board.h
@@ -55,12 +55,14 @@
 #define HWFC                  false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER      "Adafruit Industries"
-#define DIS_MODEL             "Bluefruit Metro nRF52840 Express"
+#define DIS_MANUFACTURER   "Adafruit Industries"
+#define DIS_MODEL          "Bluefruit Metro nRF52840 Express"
 
-#define PRODUCT_NAME          "Adafruit Metro nRF52840 Express"
-#define VOLUME_LABEL          "METR840BOOT"
-#define UF2_BOARD_ID "nRF52840-Metro-revA"
+#define PRODUCT_NAME       "Adafruit Metro nRF52840 Express"
+#define UF2_VOLUME_LABEL   "METR840BOOT"
+#define UF2_BOARD_ID       "nRF52840-Metro-revA"
+
+#define UF2_INDEX_URL      "https://www.adafruit.com/"
 
 
 #endif /* _METRO_NRF52840_H_ */
diff --git a/src/boards/particle_argon/board.h b/src/boards/particle_argon/board.h
@@ -57,13 +57,11 @@
 #define HWFC           false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER  "Particle Industries"
-#define DIS_MODEL         "Argon"
+#define DIS_MANUFACTURER   "Particle Industries"
+#define DIS_MODEL          "Argon"
 
-#define VOLUME_LABEL      "ARGONBOOT  "
-
-#define UF2_BOARD_ID "nRF52840-Argon-v1"
-
-#define INDEX_URL "https://www.particle.io/mesh/"
+#define UF2_VOLUME_LABEL   "ARGONBOOT  "
+#define UF2_BOARD_ID       "nRF52840-Argon-v1"
+#define UF2_INDEX_URL      "https://www.particle.io/mesh/"
 
 #endif // _PARTICLE_ARGON_H
diff --git a/src/boards/particle_boron/board.h b/src/boards/particle_boron/board.h
@@ -57,13 +57,11 @@
 #define HWFC           false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER  "Particle Industries"
-#define DIS_MODEL         "Boron"
+#define DIS_MANUFACTURER   "Particle Industries"
+#define DIS_MODEL          "Boron"
 
-#define VOLUME_LABEL      "BORONBOOT  "
-
-#define UF2_BOARD_ID "nRF52840-Boron-v1"
-
-#define INDEX_URL "https://www.particle.io/mesh/"
+#define UF2_VOLUME_LABEL   "BORONBOOT  "
+#define UF2_BOARD_ID       "nRF52840-Boron-v1"
+#define UF2_INDEX_URL      "https://www.particle.io/mesh/"
 
 #endif // _PARTICLE_BORON_H
diff --git a/src/boards/particle_xenon/board.h b/src/boards/particle_xenon/board.h
@@ -57,13 +57,11 @@
 #define HWFC           false
 
 // Used as model string in OTA mode
-#define DIS_MANUFACTURER  "Particle Industries"
-#define DIS_MODEL         "Xenon"
+#define DIS_MANUFACTURER   "Particle Industries"
+#define DIS_MODEL          "Xenon"
 
-#define VOLUME_LABEL      "XENONBOOT  "
-
-#define UF2_BOARD_ID "nRF52840-Xenon-v1"
-
-#define INDEX_URL "https://www.particle.io/mesh/"
+#define UF2_VOLUME_LABEL   "XENONBOOT  "
+#define UF2_BOARD_ID       "nRF52840-Xenon-v1"
+#define UF2_INDEX_URL      "https://www.particle.io/mesh/"
 
 #endif // _PARTICLE_XENON_H
diff --git a/src/boards/pca10056/board.h b/src/boards/pca10056/board.h
@@ -54,6 +54,7 @@
 #define DIS_MANUFACTURER    "Nordic"
 #define DIS_MODEL           "PCA10056"
 
-#define UF2_BOARD_ID           "nRF52840-pca10056-v1"
+#define UF2_BOARD_ID        "nRF52840-pca10056-v1"
+#define UF2_INDEX_URL       "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK"
 
 #endif // PCA10056_H
diff --git a/src/boards/pca10059/board.h b/src/boards/pca10059/board.h
@@ -57,6 +57,7 @@
 #define DIS_MANUFACTURER  "Nordic"
 #define DIS_MODEL         "PCA10059"
 
-#define UF2_BOARD_ID           "nRF52840-pca10059-v1"
+#define UF2_BOARD_ID      "nRF52840-pca10059-v1"
+#define UF2_INDEX_URL     "https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle"
 
 #endif // PCA10059_H
diff --git a/src/usb/uf2/ghostfat.c b/src/usb/uf2/ghostfat.c
@@ -71,7 +71,7 @@ const char indexFile[] = //
     "<html>"
     "<body>"
     "<script>\n"
-    "location.replace(\"" INDEX_URL "\");\n"
+    "location.replace(\"" UF2_INDEX_URL "\");\n"
     "</script>"
     "</body>"
     "</html>\n";
@@ -131,7 +131,7 @@ static FAT_BootBlock const BootBlock = {
 	.PhysicalDriveNum     = 0x80, // to match MediaDescriptor of 0xF8
     .ExtendedBootSig      = 0x29,
     .VolumeSerialNumber   = 0x00420042,
-    .VolumeLabel          = VOLUME_LABEL,
+    .VolumeLabel          = UF2_VOLUME_LABEL,
     .FilesystemIdentifier = "FAT16   ",
 };
 
diff --git a/src/usb/uf2/uf2cfg.h b/src/usb/uf2/uf2cfg.h
@@ -4,16 +4,12 @@
   #define PRODUCT_NAME     DIS_MODEL
 #endif
 
-#ifndef INDEX_URL
-#define INDEX_URL          "https://www.adafruit.com/"
-#endif
-
 #define BOOTLOADER_ID      MK_DIS_FIRMWARE
 
 #define UF2_NUM_BLOCKS     8000   // at least 4,1 MB for FAT16
 
-#ifndef VOLUME_LABEL
-#define VOLUME_LABEL       "NRF52BOOT  "
+#ifndef UF2_VOLUME_LABEL
+#define UF2_VOLUME_LABEL       "NRF52BOOT  "
 #endif
 
 #define FLASH_SIZE         (USER_FLASH_END-USER_FLASH_START) // Max flash size
