Merge pull request #31 from ladyada/master

A range of small fixes + Hallowing UF2
adafruit · Oct 3, 2018 · cb6ce4a · cb6ce4a
2 parents 3f4c7c5 + 7d17cf4
commit cb6ce4a
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 11 deletions.
diff --git a/boards/feather_m0/board_config.h b/boards/feather_m0/board_config.h
@@ -4,16 +4,12 @@
 #define VENDOR_NAME "Adafruit Industries"
 #define PRODUCT_NAME "Feather M0"
 #define VOLUME_LABEL "FEATHERBOOT"
-#define INDEX_URL "http://adafru.it/3403"
+#define INDEX_URL "http://adafru.it/"
 #define BOARD_ID "SAMD21G18A-Feather-v0"
 
 #define USB_VID 0x239A
-#define USB_PID 0x001B
+#define USB_PID 0x0015
 
 #define LED_PIN PIN_PA17
 
-#define BOARD_NEOPIXEL_PIN PIN_PA06
-#define BOARD_NEOPIXEL_COUNT 1
-
-
 #endif
diff --git a/boards/feather_m0_express/board.mk b/boards/feather_m0_express/board.mk
@@ -0,0 +1,2 @@
+CHIP_FAMILY = samd21
+CHIP_VARIANT = SAMD21G18A
diff --git a/boards/feather_m0_express/board_config.h b/boards/feather_m0_express/board_config.h
@@ -0,0 +1,19 @@
+#ifndef BOARD_CONFIG_H
+#define BOARD_CONFIG_H
+
+#define VENDOR_NAME "Adafruit Industries"
+#define PRODUCT_NAME "Feather M0 Express"
+#define VOLUME_LABEL "FEATHERBOOT"
+#define INDEX_URL "http://adafru.it/3403"
+#define BOARD_ID "SAMD21G18A-Feather-M0-Express-v0"
+
+#define USB_VID 0x239A
+#define USB_PID 0x001B
+
+#define LED_PIN PIN_PA17
+
+#define BOARD_NEOPIXEL_PIN PIN_PA06
+#define BOARD_NEOPIXEL_COUNT 1
+
+
+#endif
diff --git a/boards/feather_m4/board_config.h b/boards/feather_m4/board_config.h
@@ -2,17 +2,17 @@
 #define BOARD_CONFIG_H
 
 #define VENDOR_NAME "Adafruit Industries"
-#define PRODUCT_NAME "Feather M4"
+#define PRODUCT_NAME "Feather M4 Express"
 #define VOLUME_LABEL "FEATHERBOOT"
-#define INDEX_URL "http://adafru.it/3505"
+#define INDEX_URL "http://adafru.it/3857"
 #define BOARD_ID "SAMD51J19A-FeatherM4-v0"
 
 #define USB_VID 0x239A
 #define USB_PID 0x0022
 
 #define LED_PIN PIN_PA23
 
-#define BOARD_NEOPIXEL_PIN PIN_PB23
+#define BOARD_NEOPIXEL_PIN PIN_PB03
 #define BOARD_NEOPIXEL_COUNT 1
 
 #define BOOT_USART_MODULE                 SERCOM0

diff --git a/boards/hallowing_m0/board.mk b/boards/hallowing_m0/board.mk
@@ -0,0 +1,2 @@
+CHIP_FAMILY = samd21
+CHIP_VARIANT = SAMD21G18A
diff --git a/boards/hallowing_m0/board_config.h b/boards/hallowing_m0/board_config.h
@@ -0,0 +1,19 @@
+#ifndef BOARD_CONFIG_H
+#define BOARD_CONFIG_H
+
+#define VENDOR_NAME "Adafruit Industries"
+#define PRODUCT_NAME "Hallowing M0"
+#define VOLUME_LABEL "HALLOWBOOT"
+#define INDEX_URL "http://adafru.it/3900"
+#define BOARD_ID "SAMD21G18A-Hallowing-v0"
+
+#define USB_VID 0x239A
+#define USB_PID 0xB000
+
+#define LED_PIN PIN_PA23
+
+#define BOARD_NEOPIXEL_PIN PIN_PA12
+#define BOARD_NEOPIXEL_COUNT 1
+
+
+#endif
diff --git a/boards/pirkey/board_config.h b/boards/pirkey/board_config.h
@@ -4,9 +4,9 @@
 #define CRYSTALLESS    1
 
 #define VENDOR_NAME "Adafruit Industries"
-#define PRODUCT_NAME "pIRKey"
+#define PRODUCT_NAME "pIRKey M0"
 #define VOLUME_LABEL "PIRKEYBOOT"
-#define INDEX_URL "http://adafru.it/"
+#define INDEX_URL "http://adafru.it/3364"
 #define BOARD_ID "SAMD21E18A-pIRKey-v0"
 
 #define USB_VID 0x239A
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CHIP_FAMILY = samd21
		CHIP_VARIANT = SAMD21G18A