oof bad merge

Author: ladyada

boards.txt

@@ -1321,7 +1321,6 @@ adafruit_hallowing_m4.menu.debug.off=Off
 adafruit_hallowing_m4.menu.debug.on=On
 adafruit_hallowing_m4.menu.debug.on.build.flags.debug=-g
 
-<<<<<<< HEAD
 # Adafruit Matrix Portal M4 (SAMD51)
 # ------------------------------
 adafruit_matrixportal_m4.name=Adafruit Matrix Portal M4 (SAMD51)

variants/blm_badge/variant.cpp

@@ -71,12 +71,6 @@ const PinDescription g_APinDescription[]=
   { PORTA, 30, PIO_TIMER, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
   { PORTA, 31, PIO_TIMER, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
 
-  // GPIO 15 & 16 (SWCLK & SWDIO)
-  // --------------------------
-  { PORTA, 30, PIO_TIMER, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
-  { PORTA, 31, PIO_TIMER, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
-
-
   // 17..19 - USB
   // --------------------
   { PORTA, 28, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB Host enable

variants/blm_badge/variant.h

@@ -16,8 +16,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _VARIANT_ARDUINO_ZERO_
-#define _VARIANT_ARDUINO_ZERO_
+#ifndef _VARIANT_ADAFRUIT_BLMBADGE_
+#define _VARIANT_ADAFRUIT_BLMBADGE_
 
 // The definitions here needs a SAMD core >=1.6.6
 #define ARDUINO_SAMD_VARIANT_COMPLIANCE 10606
@@ -86,8 +86,8 @@ extern "C"
 #define LED_BUILTIN          PIN_LED_13
 
 // Neopixel LED
-#define INTERNAL_NEOPIXEL_PIN   14
-#define INTERNAL_NEOPIXEL_NUM   6
+#define PIN_NEOPIXEL   14
+#define NEOPIXEL_NUM   6
 
 /*
  * Analog pins
@@ -188,5 +188,5 @@ extern Uart Serial1;
 #define SERIAL_PORT_HARDWARE        Serial1
 #define SERIAL_PORT_HARDWARE_OPEN   Serial1
 
-#endif /* _VARIANT_ARDUINO_ZERO_ */
+#endif /* _VARIANT_ADAFRUIT_BLMBADGE_ */