fix variant multi-define complaints

Author: ladyada

variants/pybadge_m4/variant.h

@@ -16,8 +16,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _VARIANT_FEATHER_M4_
-#define _VARIANT_FEATHER_M4_
+#ifndef _VARIANT_PYBADGE_M4_
+#define _VARIANT_PYBADGE_M4_
 
 // The definitions here needs a SAMD core >=1.6.10
 #define ARDUINO_SAMD_VARIANT_COMPLIANCE 10610

variants/pygamer_m4/variant.cpp

@@ -117,7 +117,6 @@ const PinDescription g_APinDescription[]=
 
   // D52 Speaker enable
   { PORTA, 27, PIO_DIGITAL, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
-
 } ;
 
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TCC3, TCC4, TC0, TC1, TC2, TC3, TC4, TC5 } ;

variants/pygamer_m4/variant.h

@@ -16,8 +16,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _VARIANT_FEATHER_M4_
-#define _VARIANT_FEATHER_M4_
+#ifndef _VARIANT_PYGAMER_M4_
+#define _VARIANT_PYGAMER_M4_
 
 // The definitions here needs a SAMD core >=1.6.10
 #define ARDUINO_SAMD_VARIANT_COMPLIANCE 10610
@@ -201,7 +201,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define PIN_QSPI_IO2    (41u)
 #define PIN_QSPI_IO3    (42u)
 
-#define VARIANT_QSPI_BAUD_DEFAULT 5000000
 #if !defined(VARIANT_QSPI_BAUD_DEFAULT)
   // TODO: meaningful value for this
   #define VARIANT_QSPI_BAUD_DEFAULT 5000000