Merge branch 'master' of github.com:adafruit/ArduinoCore-samd

This commit is contained in:
dean 2018-04-26 14:37:14 -04:00
commit 85431481a4
3 changed files with 4 additions and 4 deletions

View file

@ -286,7 +286,7 @@ adafruit_metro_m4.upload.use_1200bps_touch=true
adafruit_metro_m4.upload.wait_for_upload_port=true
adafruit_metro_m4.upload.native_usb=true
adafruit_metro_m4.build.mcu=cortex-m4
adafruit_metro_m4.build.f_cpu=48000000L
adafruit_metro_m4.build.f_cpu=120000000L
adafruit_metro_m4.build.usb_product="Adafruit Metro M4"
adafruit_metro_m4.build.usb_manufacturer="Adafruit LLC"
adafruit_metro_m4.build.board=METRO_M4
@ -317,7 +317,7 @@ adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{build.variant.path}" -larm_cort
#adafruit_feather_m4.upload.wait_for_upload_port=true
#adafruit_feather_m4.upload.native_usb=true
#adafruit_feather_m4.build.mcu=cortex-m4
#adafruit_feather_m4.build.f_cpu=48000000L
#adafruit_feather_m4.build.f_cpu=120000000L
#adafruit_feather_m4.build.usb_product="Adafruit Feather M4"
#adafruit_feather_m4.build.usb_manufacturer="Adafruit LLC"
#adafruit_feather_m4.build.board=FEATHER_M4

View file

@ -53,8 +53,8 @@ extern "C"
*----------------------------------------------------------------------------*/
// Number of pins defined in PinDescription array
#define PINS_COUNT (26u)
#define NUM_DIGITAL_PINS (20u)
#define PINS_COUNT (42u)
#define NUM_DIGITAL_PINS (42u)
#define NUM_ANALOG_INPUTS (12u)
#define NUM_ANALOG_OUTPUTS (1u)
#define analogInputToDigitalPin(p) ((p < 6u) ? (p) + 14u : -1)