comment out radio but fix adc support in zero on the extra pins

Author: ladyada

boards.txt

@@ -42,32 +42,32 @@ adafruit_feather_m0.build.pid=0x800B
 adafruit_feather_m0.bootloader.tool=openocd
 adafruit_feather_m0.bootloader.file=feather/samd21_sam_ba.bin
 
-adafruit_radio_m0.name=Adafruit M0 Radio (Native USB Port)
-adafruit_radio_m0.vid.0=0x239A
-adafruit_radio_m0.pid.0=0x8014
-adafruit_radio_m0.vid.1=0x239A
-adafruit_radio_m0.pid.1=0x0014
-adafruit_radio_m0.upload.tool=bossac
-adafruit_radio_m0.upload.protocol=sam-ba
-adafruit_radio_m0.upload.maximum_size=262144
-adafruit_radio_m0.upload.use_1200bps_touch=true
-adafruit_radio_m0.upload.wait_for_upload_port=true
-adafruit_radio_m0.upload.native_usb=true
-adafruit_radio_m0.build.mcu=cortex-m0plus
-adafruit_radio_m0.build.f_cpu=48000000L
-adafruit_radio_m0.build.usb_product="Radio M0"
-adafruit_radio_m0.build.usb_manufacturer="Adafruit"
-adafruit_radio_m0.build.board=SAMD_ZERO
-adafruit_radio_m0.build.core=arduino
-adafruit_radio_m0.build.extra_flags=-D__SAMR21G18A__ {build.usb_flags}
-adafruit_radio_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_radio_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
-adafruit_radio_m0.build.variant=zero_radio
-adafruit_radio_m0.build.variant_system_lib=
-adafruit_radio_m0.build.vid=0x239A
-adafruit_radio_m0.build.pid=0x8014
-adafruit_radio_m0.bootloader.tool=openocd
-adafruit_radio_m0.bootloader.file=feather/samr21_sam_ba.bin
+#adafruit_radio_m0.name=Adafruit M0 Radio (Native USB Port)
+#adafruit_radio_m0.vid.0=0x239A
+#adafruit_radio_m0.pid.0=0x8014
+#adafruit_radio_m0.vid.1=0x239A
+#adafruit_radio_m0.pid.1=0x0014
+#adafruit_radio_m0.upload.tool=bossac
+#adafruit_radio_m0.upload.protocol=sam-ba
+#adafruit_radio_m0.upload.maximum_size=262144
+#adafruit_radio_m0.upload.use_1200bps_touch=true
+#adafruit_radio_m0.upload.wait_for_upload_port=true
+#adafruit_radio_m0.upload.native_usb=true
+#adafruit_radio_m0.build.mcu=cortex-m0plus
+#adafruit_radio_m0.build.f_cpu=48000000L
+#adafruit_radio_m0.build.usb_product="Radio M0"
+#adafruit_radio_m0.build.usb_manufacturer="Adafruit"
+#adafruit_radio_m0.build.board=SAMD_ZERO
+#adafruit_radio_m0.build.core=arduino
+#adafruit_radio_m0.build.extra_flags=-D__SAMR21G18A__ {build.usb_flags}
+#adafruit_radio_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+#adafruit_radio_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+#adafruit_radio_m0.build.variant=zero_radio
+#adafruit_radio_m0.build.variant_system_lib=
+#adafruit_radio_m0.build.vid=0x239A
+#adafruit_radio_m0.build.pid=0x8014
+#adafruit_radio_m0.bootloader.tool=openocd
+#adafruit_radio_m0.bootloader.file=feather/samr21_sam_ba.bin
 
 #adafruit_metro_m0.name=Adafruit Metro M0 (Native USB Port)
 #adafruit_metro_m0.vid.0=0x239A

variants/arduino_zero/variant.cpp

@@ -127,8 +127,8 @@ const PinDescription g_APinDescription[]=
   { PORTA, 21, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
 
   // Digital High
-  { PORTA,  6, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // TCC1/WO[0]
-  { PORTA,  7, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_7 }, // TCC1/WO[1]
+  { PORTA,  6, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel6, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // TCC1/WO[0]
+  { PORTA,  7, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel7, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_7 }, // TCC1/WO[1]
   { PORTA, 18, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH0, TC3_CH0, EXTERNAL_INT_2 }, // TC3/WO[0]
   { PORTA, 16, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_0 }, // TCC2/WO[0]
   { PORTA, 19, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_3 }, // TCC0/WO[3]