add metro nrf52840

Author: hathach

boards.txt

@@ -68,21 +68,21 @@ feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
 #**********************************************
 feather52840.name=Adafruit Bluefruit nRF52840 Feather Express
 
-# DFU Mode with CDC only
+# DFU Mode with CDC + MSC (UF2)
 feather52840.vid.0=0x239A
-feather52840.pid.0=0x002A
+feather52840.pid.0=0x0029
 
-# DFU Mode with CDC + MSC (UF2)
+# DFU Mode with CDC only
 feather52840.vid.1=0x239A
-feather52840.pid.1=0x0029
+feather52840.pid.1=0x002A
 
-# Arduino Application with CDC + MSC
+# Arduino Application
 feather52840.vid.2=0x239A
 feather52840.pid.2=0x8029
 
 # CircuitPython
-feather52840.vid.2=0x239A
-feather52840.pid.2=0x802A
+feather52840.vid.3=0x239A
+feather52840.pid.3=0x802A
 
 feather52840.bootloader.tool=bootburn
 
@@ -125,44 +125,60 @@ feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
 #**********************************************
 # Bluefruit Metro nRF52840 Express Board
 #**********************************************
-#metro52840.name=Adafruit Bluefruit nRF52840 Metro Express
-#metro52840.bootloader.tool=bootburn
+metro52840.name=Adafruit Bluefruit nRF52840 Metro Express
+metro52840.bootloader.tool=bootburn
+
+# DFU Mode with CDC + MSC (UF2)
+metro52840.vid.0=0x239A
+metro52840.pid.0=0x003F
+
+# DFU Mode with CDC only
+metro52840.vid.1=0x239A
+metro52840.pid.1=0x0040
+
+# Arduino Application
+metro52840.vid.2=0x239A
+metro52840.pid.2=0x803F
+
+# CircuitPython
+metro52840.vid.3=0x239A
+metro52840.pid.3=0x8040
 
 # Upload
-#metro52840.upload.tool=nrfutil
-#metro52840.upload.protocol=nrfutil
-#metro52840.upload.use_1200bps_touch=true
-#metro52840.upload.wait_for_upload_port=true
+metro52840.upload.tool=nrfutil
+metro52840.upload.protocol=nrfutil
+metro52840.upload.use_1200bps_touch=true
+metro52840.upload.wait_for_upload_port=true
 
 # Build
-#metro52840.build.mcu=cortex-m4
-#metro52840.build.f_cpu=64000000
-#metro52840.build.board=NRF52840_METRO
-#metro52840.build.core=nRF5
-#metro52840.build.variant=metro_nrf52840_express
-#metro52840.build.extra_flags=-DNRF52840_XXAA
+metro52840.build.mcu=cortex-m4
+metro52840.build.f_cpu=64000000
+metro52840.build.board=NRF52840_METRO
+metro52840.build.core=nRF5
+metro52840.build.variant=metro_nrf52840_express
+metro52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER
 
 # SofDevice Menu
 # Ram & ROM size varies depending on SoftDevice (check linker script)
 
-#metro52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
-#metro52840.menu.softdevice.s140v6.build.sd_flags=-DS140
-#metro52840.menu.softdevice.s140v6.build.sd_name=s140
-#metro52840.menu.softdevice.s140v6.build.sd_version=6.1.1
-#metro52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
-#metro52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
-#metro52840.menu.softdevice.s140v6.upload.maximum_size=815104
-#metro52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
+metro52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
+metro52840.menu.softdevice.s140v6.build.sd_flags=-DS140
+metro52840.menu.softdevice.s140v6.build.sd_name=s140
+metro52840.menu.softdevice.s140v6.build.sd_version=6.1.1
+metro52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
+metro52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
+metro52840.menu.softdevice.s140v6.upload.maximum_size=815104
+metro52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
 
 # Debug Menu
-#metro52840.menu.debug.l0=Level 0 (Release)
-#metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
-#metro52840.menu.debug.l1=Level 1 (Error Message)
-#metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
-#metro52840.menu.debug.l2=Level 2 (Full Debug)
-#metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
-#metro52840.menu.debug.l3=Level 3 (Segger SystemView)
-#metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
+metro52840.menu.debug.l0=Level 0 (Release)
+metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
+metro52840.menu.debug.l1=Level 1 (Error Message)
+metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
+metro52840.menu.debug.l2=Level 2 (Full Debug)
+metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
+metro52840.menu.debug.l3=Level 3 (Segger SystemView)
+metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
 
 #**********************************************
 # Nordic nRF52840DK (PCA10056)

variants/metro_nrf52840_express/variant.h

@@ -139,7 +139,7 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 /* Note: different class combination e.g CDC and (CDC + MSC) should have different
  * PID since Host OS will "remembered" device driver after the first plug */
 #define USB_VID  0x239A
-#define USB_PID  0x8029
+#define USB_PID  0x803F
 
 #ifdef __cplusplus
 }