diff --git a/boards/adafruit_circuitplayground_m0.json b/boards/adafruit_circuitplayground_m0.json index 4a3a432..3e86bfe 100644 --- a/boards/adafruit_circuitplayground_m0.json +++ b/boards/adafruit_circuitplayground_m0.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DADAFRUIT_CIRCUITPLAYGROUND_M0 -DARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS", + "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_SAMD_ZERO -DADAFRUIT_CIRCUITPLAYGROUND_M0 -DARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_crickit_m0.json b/boards/adafruit_crickit_m0.json index b3b338c..31f316f 100644 --- a/boards/adafruit_crickit_m0.json +++ b/boards/adafruit_crickit_m0.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_CRICKIT_M0 -DADAFRUIT_CRICKIT_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__ -DCRYSTALLESS", + "extra_flags": "-DARDUINO_SAMD_CRICKIT_M0 -DADAFRUIT_CRICKIT_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__ -DCRYSTALLESS", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_feather_m0.json b/boards/adafruit_feather_m0.json index 3484959..e3c7a58 100644 --- a/boards/adafruit_feather_m0.json +++ b/boards/adafruit_feather_m0.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_feather_m0_express.json b/boards/adafruit_feather_m0_express.json index 21d9b48..758e235 100644 --- a/boards/adafruit_feather_m0_express.json +++ b/boards/adafruit_feather_m0_express.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_feather_m4.json b/boards/adafruit_feather_m4.json index c270694..7ae4718 100644 --- a/boards/adafruit_feather_m4.json +++ b/boards/adafruit_feather_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_FEATHER_M4", "-DADAFRUIT_FEATHER_M4_EXPRESS", "-D__SAMD51J19A__", diff --git a/boards/adafruit_gemma_m0.json b/boards/adafruit_gemma_m0.json index 4863e60..bb70cc3 100644 --- a/boards/adafruit_gemma_m0.json +++ b/boards/adafruit_gemma_m0.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_GEMMA_M0 -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__", + "extra_flags": "-DARDUINO_GEMMA_M0 -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_grandcentral_m4.json b/boards/adafruit_grandcentral_m4.json index 864a86e..52a8d59 100644 --- a/boards/adafruit_grandcentral_m4.json +++ b/boards/adafruit_grandcentral_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_GRAND_CENTRAL_M4", "-DADAFRUIT_GRAND_CENTRAL_M4", "-D__SAMD51P20A__", diff --git a/boards/adafruit_hallowing.json b/boards/adafruit_hallowing.json index f10e180..c6cdfb1 100644 --- a/boards/adafruit_hallowing.json +++ b/boards/adafruit_hallowing.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DADAFRUIT_SAMD_HALLOWING", + "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_SAMD_ZERO -DADAFRUIT_SAMD_HALLOWING", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_hallowing_m4.json b/boards/adafruit_hallowing_m4.json index cedf324..2311b0a 100644 --- a/boards/adafruit_hallowing_m4.json +++ b/boards/adafruit_hallowing_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_HALLOWING_M4", "-DADAFRUIT_HALLOWING_M4_EXPRESS", "-D__SAMD51J19A__", diff --git a/boards/adafruit_itsybitsy_m0.json b/boards/adafruit_itsybitsy_m0.json index 0970213..d0ffe4b 100644 --- a/boards/adafruit_itsybitsy_m0.json +++ b/boards/adafruit_itsybitsy_m0.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_ITSYBITSY_M0 -DADAFRUIT_ITSYBITSY_M0 -DCRYSTALLESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_ITSYBITSY_M0 -DADAFRUIT_ITSYBITSY_M0 -DCRYSTALLESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_itsybitsy_m4.json b/boards/adafruit_itsybitsy_m4.json index d4f913f..35be03f 100644 --- a/boards/adafruit_itsybitsy_m4.json +++ b/boards/adafruit_itsybitsy_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_ITSYBITSY_M4", "-DADAFRUIT_ITSYBITSY_M4_EXPRESS", "-D__SAMD51G19A__", diff --git a/boards/adafruit_metro_m0.json b/boards/adafruit_metro_m0.json index 10f47df..211dbb8 100644 --- a/boards/adafruit_metro_m0.json +++ b/boards/adafruit_metro_m0.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_metro_m4.json b/boards/adafruit_metro_m4.json index e8482c8..814aad9 100644 --- a/boards/adafruit_metro_m4.json +++ b/boards/adafruit_metro_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_METRO_M4", "-DADAFRUIT_METRO_M4_EXPRESS", "-D__SAMD51J19A__", diff --git a/boards/adafruit_metro_m4_airliftlite.json b/boards/adafruit_metro_m4_airliftlite.json index e5fde2d..9b4a7c2 100644 --- a/boards/adafruit_metro_m4_airliftlite.json +++ b/boards/adafruit_metro_m4_airliftlite.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_METRO_M4_AIRLIFT_LITE", "-DADAFRUIT_METRO_M4_AIRLIFT_LITE", "-D__SAMD51J19A__", diff --git a/boards/adafruit_monster_m4sk.json b/boards/adafruit_monster_m4sk.json index 80bd848..9024821 100644 --- a/boards/adafruit_monster_m4sk.json +++ b/boards/adafruit_monster_m4sk.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_MONSTER_M4SK", "-DADAFRUIT_MONSTER_M4SK_EXPRESS", "-D__SAMD51G19A__", diff --git a/boards/adafruit_pirkey.json b/boards/adafruit_pirkey.json index 0d23dd4..71fa17f 100644 --- a/boards/adafruit_pirkey.json +++ b/boards/adafruit_pirkey.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_PIRKEY -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_PIRKEY -D__SAMD21E18A__", + "extra_flags": "-DARDUINO_PIRKEY -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_PIRKEY -D__SAMD21E18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/adafruit_pybadge_airlift_m4.json b/boards/adafruit_pybadge_airlift_m4.json index 878dbb5..d5b72e3 100644 --- a/boards/adafruit_pybadge_airlift_m4.json +++ b/boards/adafruit_pybadge_airlift_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_PYBADGE_AIRLIFT_M4", "-DADAFRUIT_PYBADGE_AIRLIFT_M4", "-D__SAMD51J20A__", diff --git a/boards/adafruit_pybadge_m4.json b/boards/adafruit_pybadge_m4.json index dc436ae..f17c179 100644 --- a/boards/adafruit_pybadge_m4.json +++ b/boards/adafruit_pybadge_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_PYBADGE_M4", "-DADAFRUIT_PYBADGE_M4_EXPRESS", "-D__SAMD51J19A__", diff --git a/boards/adafruit_pygamer_advance_m4.json b/boards/adafruit_pygamer_advance_m4.json index 76c2be3..0c78506 100644 --- a/boards/adafruit_pygamer_advance_m4.json +++ b/boards/adafruit_pygamer_advance_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_PYGAMER_ADVANCE_M4", "-DADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS", "-D__SAMD51J20A__", diff --git a/boards/adafruit_pygamer_m4.json b/boards/adafruit_pygamer_m4.json index 8d48871..bc9fe52 100644 --- a/boards/adafruit_pygamer_m4.json +++ b/boards/adafruit_pygamer_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_PYGAMER_M4_EXPRESS", "-DADAFRUIT_PYGAMER_M4_EXPRESS", "-D__SAMD51J19A__", diff --git a/boards/adafruit_pyportal_m4.json b/boards/adafruit_pyportal_m4.json index 9dd80f4..622596b 100644 --- a/boards/adafruit_pyportal_m4.json +++ b/boards/adafruit_pyportal_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_PYPORTAL_M4", "-DADAFRUIT_PYPORTAL", "-D__SAMD51J20A__", diff --git a/boards/adafruit_pyportal_m4_titano.json b/boards/adafruit_pyportal_m4_titano.json index 8b19f18..4f504a3 100644 --- a/boards/adafruit_pyportal_m4_titano.json +++ b/boards/adafruit_pyportal_m4_titano.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_PYPORTAL_M4_TITANO", "-DADAFRUIT_PYPORTAL", "-D__SAMD51J20A__", diff --git a/boards/adafruit_trellis_m4.json b/boards/adafruit_trellis_m4.json index 83db15c..d044157 100644 --- a/boards/adafruit_trellis_m4.json +++ b/boards/adafruit_trellis_m4.json @@ -6,7 +6,6 @@ "core": "adafruit", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_TRELLIS_M4", "-DADAFRUIT_TRELLIS_M4_EXPRESS", "-D__SAMD51J19A__", diff --git a/boards/adafruit_trinket_m0.json b/boards/adafruit_trinket_m0.json index aeef6b7..23d4d0c 100644 --- a/boards/adafruit_trinket_m0.json +++ b/boards/adafruit_trinket_m0.json @@ -5,7 +5,7 @@ }, "core": "adafruit", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_TRINKET_M0 -DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -DARM_MATH_CM0PLUS -D__SAMD21E18A__", + "extra_flags": "-DARDUINO_TRINKET_M0 -DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -DARM_MATH_CM0PLUS -D__SAMD21E18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/briki_abc_samd21.json b/boards/briki_abc_samd21.json index c3cc3e0..3d1456e 100644 --- a/boards/briki_abc_samd21.json +++ b/boards/briki_abc_samd21.json @@ -6,7 +6,7 @@ "core": "mbcwb", "cpu": "cortex-m0plus", "board": "briki_abc_samd21", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DBRIKI_ABC -DBRIKI_MBC_WB_SAMD -w", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DBRIKI_ABC -DBRIKI_MBC_WB_SAMD -w", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/briki_mbcwb_samd21.json b/boards/briki_mbcwb_samd21.json index f496516..4b9ac26 100644 --- a/boards/briki_mbcwb_samd21.json +++ b/boards/briki_mbcwb_samd21.json @@ -6,7 +6,7 @@ "core": "mbcwb", "cpu": "cortex-m0plus", "board": "briki_mbcwb_samd21", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DBRIKI_MBC_WB -DBRIKI_MBC_WB_SAMD -w", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DBRIKI_MBC_WB -DBRIKI_MBC_WB_SAMD -w", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/current_ranger.json b/boards/current_ranger.json index 8612389..4eaaa24 100644 --- a/boards/current_ranger.json +++ b/boards/current_ranger.json @@ -5,7 +5,7 @@ }, "core": "moteino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DVERY_LOW_POWER -DCRYSTALLESS", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DVERY_LOW_POWER -DCRYSTALLESS", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/digix.json b/boards/digix.json index 2d7f04e..c7d74a9 100644 --- a/boards/digix.json +++ b/boards/digix.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m3", - "extra_flags": "-w -D__SAM3X8E__ -DARDUINO_SAM_DIGIX -DARDUINO_ARCH_SAM", + "extra_flags": "-w -D__SAM3X8E__ -DARDUINO_SAM_DIGIX", "f_cpu": "84000000L", "hwids": [ [ diff --git a/boards/due.json b/boards/due.json index 0a1a0f5..6aceecd 100644 --- a/boards/due.json +++ b/boards/due.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m3", - "extra_flags": "-D__SAM3X8E__ -DARDUINO_ARCH_SAM -DARDUINO_SAM_DUE", + "extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE", "f_cpu": "84000000L", "hwids": [ [ diff --git a/boards/dueUSB.json b/boards/dueUSB.json index 66cfcae..20e0cb5 100644 --- a/boards/dueUSB.json +++ b/boards/dueUSB.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m3", - "extra_flags": "-D__SAM3X8E__ -DARDUINO_ARCH_SAM -DARDUINO_SAM_DUE", + "extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE", "f_cpu": "84000000L", "hwids": [ [ diff --git a/boards/minitronics20.json b/boards/minitronics20.json index 60dd6cc..7c45417 100644 --- a/boards/minitronics20.json +++ b/boards/minitronics20.json @@ -5,7 +5,7 @@ }, "core": "reprap", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MINITRONICS20 -DARDUINO_ARCH_SAMD -D__SAMD21J18A__ -DUSE_BQ24195L_PMIC", + "extra_flags": "-DARDUINO_SAMD_MINITRONICS20 -D__SAMD21J18A__ -DUSE_BQ24195L_PMIC", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkr1000USB.json b/boards/mkr1000USB.json index c53f0e3..a404561 100644 --- a/boards/mkr1000USB.json +++ b/boards/mkr1000USB.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKR1000 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT", + "extra_flags": "-DARDUINO_SAMD_MKR1000 -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkrfox1200.json b/boards/mkrfox1200.json index 4e5ad51..1a9620e 100644 --- a/boards/mkrfox1200.json +++ b/boards/mkrfox1200.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKRFox1200 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT -DVERY_LOW_POWER", + "extra_flags": "-DARDUINO_SAMD_MKRFox1200 -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT -DVERY_LOW_POWER", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkrgsm1400.json b/boards/mkrgsm1400.json index 3271e78..3a7753c 100644 --- a/boards/mkrgsm1400.json +++ b/boards/mkrgsm1400.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKRGSM1400 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT", + "extra_flags": "-DARDUINO_SAMD_MKRGSM1400 -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkrnb1500.json b/boards/mkrnb1500.json index 0fffa15..c2c5194 100644 --- a/boards/mkrnb1500.json +++ b/boards/mkrnb1500.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKRNB1500 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT", + "extra_flags": "-DARDUINO_SAMD_MKRNB1500 -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkrvidor4000.json b/boards/mkrvidor4000.json index 20a2033..8dbed8a 100644 --- a/boards/mkrvidor4000.json +++ b/boards/mkrvidor4000.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKRVIDOR4000 -DARDUINO_ARCH_SAMD -DUSE_BQ24195L_PMIC -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_MKRVIDOR4000 -DUSE_BQ24195L_PMIC -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkrwan1300.json b/boards/mkrwan1300.json index f9fe452..d71277a 100644 --- a/boards/mkrwan1300.json +++ b/boards/mkrwan1300.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKRWAN1300 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT", + "extra_flags": "-DARDUINO_SAMD_MKRWAN1300 -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkrwan1310.json b/boards/mkrwan1310.json index 9c0c1ed..e2590ea 100644 --- a/boards/mkrwan1310.json +++ b/boards/mkrwan1310.json @@ -7,7 +7,6 @@ "cpu": "cortex-m0plus", "extra_flags": [ "-DARDUINO_SAMD_MKRWAN1310", - "-DARDUINO_ARCH_SAMD", "-D__SAMD21G18A__", "-DUSE_ARDUINO_MKR_PIN_LAYOUT", "-DUSE_BQ24195L_PMIC", diff --git a/boards/mkrwifi1010.json b/boards/mkrwifi1010.json index 48b2ea9..446f96c 100644 --- a/boards/mkrwifi1010.json +++ b/boards/mkrwifi1010.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKRWIFI1010 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT", + "extra_flags": "-DARDUINO_SAMD_MKRWIFI1010 -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mkrzero.json b/boards/mkrzero.json index 193a7af..3a0405b 100644 --- a/boards/mkrzero.json +++ b/boards/mkrzero.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_MKRZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT", + "extra_flags": "-DARDUINO_SAMD_MKRZERO -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/moteino_zero.json b/boards/moteino_zero.json index 28f73cc..bba3c26 100644 --- a/boards/moteino_zero.json +++ b/boards/moteino_zero.json @@ -5,7 +5,7 @@ }, "core": "moteino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DVERY_LOW_POWER", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DVERY_LOW_POWER", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mzeroUSB.json b/boards/mzeroUSB.json index f6fd68e..fecbec0 100644 --- a/boards/mzeroUSB.json +++ b/boards/mzeroUSB.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mzeropro.json b/boards/mzeropro.json index 42c3b6b..7455799 100644 --- a/boards/mzeropro.json +++ b/boards/mzeropro.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/mzeroproUSB.json b/boards/mzeroproUSB.json index 15ba40a..08c0da0 100644 --- a/boards/mzeroproUSB.json +++ b/boards/mzeroproUSB.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/nano_33_iot.json b/boards/nano_33_iot.json index 11c297b..62eeb8c 100644 --- a/boards/nano_33_iot.json +++ b/boards/nano_33_iot.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_NANO_33_IOT -DARDUINO_ARCH_SAMD -DCRYSTALLESS -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_NANO_33_IOT -DCRYSTALLESS -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sainSmartDue.json b/boards/sainSmartDue.json index a037174..d10bc5d 100644 --- a/boards/sainSmartDue.json +++ b/boards/sainSmartDue.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m3", - "extra_flags": "-D__SAM3X8E__ -DARDUINO_ARCH_SAM -DARDUINO_SAM_DUE", + "extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE", "f_cpu": "84000000L", "hwids": [ [ diff --git a/boards/sainSmartDueUSB.json b/boards/sainSmartDueUSB.json index 18f402f..8585eb7 100644 --- a/boards/sainSmartDueUSB.json +++ b/boards/sainSmartDueUSB.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m3", - "extra_flags": "-D__SAM3X8E__ -DARDUINO_ARCH_SAM -DARDUINO_SAM_DUE", + "extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE", "f_cpu": "84000000L", "hwids": [ [ diff --git a/boards/samd21g18a.json b/boards/samd21g18a.json index 5569861..c6d4fd7 100644 --- a/boards/samd21g18a.json +++ b/boards/samd21g18a.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/seeeduino_lorawan.json b/boards/seeeduino_lorawan.json index 984891b..9c5a94b 100644 --- a/boards/seeeduino_lorawan.json +++ b/boards/seeeduino_lorawan.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sodaq_autonomo.json b/boards/sodaq_autonomo.json index f5efac3..b54afce 100644 --- a/boards/sodaq_autonomo.json +++ b/boards/sodaq_autonomo.json @@ -5,7 +5,7 @@ }, "core": "sodaq", "cpu": "cortex-m0plus", - "extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_AUTONOMO", + "extra_flags": "-D__SAMD21J18A__ -DARDUINO_SODAQ_AUTONOMO", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sodaq_explorer.json b/boards/sodaq_explorer.json index 6d111dd..f270287 100644 --- a/boards/sodaq_explorer.json +++ b/boards/sodaq_explorer.json @@ -5,7 +5,7 @@ }, "core": "sodaq", "cpu": "cortex-m0plus", - "extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_EXPLORER", + "extra_flags": "-D__SAMD21J18A__ -DARDUINO_SODAQ_EXPLORER", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sodaq_one.json b/boards/sodaq_one.json index b94d310..6e38355 100644 --- a/boards/sodaq_one.json +++ b/boards/sodaq_one.json @@ -5,7 +5,7 @@ }, "core": "sodaq", "cpu": "cortex-m0plus", - "extra_flags": "-D__SAMD21G18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_ONE", + "extra_flags": "-D__SAMD21G18A__ -DARDUINO_SODAQ_ONE", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sodaq_sara.json b/boards/sodaq_sara.json index 8df0277..4b743c2 100644 --- a/boards/sodaq_sara.json +++ b/boards/sodaq_sara.json @@ -5,7 +5,7 @@ }, "core": "sodaq", "cpu": "cortex-m0plus", - "extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_SARA", + "extra_flags": "-D__SAMD21J18A__ -DARDUINO_SODAQ_SARA", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sodaq_sff.json b/boards/sodaq_sff.json index 821850b..be9b410 100644 --- a/boards/sodaq_sff.json +++ b/boards/sodaq_sff.json @@ -5,7 +5,7 @@ }, "core": "sodaq", "cpu": "cortex-m0plus", - "extra_flags": "-D__SAMD21G18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_SFF", + "extra_flags": "-D__SAMD21G18A__ -DARDUINO_SODAQ_SFF", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sparkfun_qwiic_micro_samd21e.json b/boards/sparkfun_qwiic_micro_samd21e.json index c3abe0a..2a182e2 100644 --- a/boards/sparkfun_qwiic_micro_samd21e.json +++ b/boards/sparkfun_qwiic_micro_samd21e.json @@ -7,7 +7,6 @@ "cpu": "cortex-m0plus", "extra_flags": [ "-DARDUINO_QWIIC_MICRO", - "-DARDUINO_ARCH_SAMD", "-DCRYSTALLESS", "-D__SAMD21E18A__", "-DQWIIC_MICRO_SAMD21E", diff --git a/boards/sparkfun_redboard_turbo.json b/boards/sparkfun_redboard_turbo.json index 3ea18f7..94e6cb0 100644 --- a/boards/sparkfun_redboard_turbo.json +++ b/boards/sparkfun_redboard_turbo.json @@ -5,7 +5,7 @@ }, "core": "sparkfun", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sparkfun_samd21_9dof.json b/boards/sparkfun_samd21_9dof.json index 1873f9f..0bb047c 100644 --- a/boards/sparkfun_samd21_9dof.json +++ b/boards/sparkfun_samd21_9dof.json @@ -5,7 +5,7 @@ }, "core": "sparkfun", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sparkfun_samd21_dev_usb.json b/boards/sparkfun_samd21_dev_usb.json index 50fbccf..5c37a6f 100644 --- a/boards/sparkfun_samd21_dev_usb.json +++ b/boards/sparkfun_samd21_dev_usb.json @@ -5,7 +5,7 @@ }, "core": "sparkfun", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sparkfun_samd21_mini_usb.json b/boards/sparkfun_samd21_mini_usb.json index b5ac323..e69e8d9 100644 --- a/boards/sparkfun_samd21_mini_usb.json +++ b/boards/sparkfun_samd21_mini_usb.json @@ -5,7 +5,7 @@ }, "core": "sparkfun", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sparkfun_samd21_proRF.json b/boards/sparkfun_samd21_proRF.json index 7e3549d..aa10f39 100644 --- a/boards/sparkfun_samd21_proRF.json +++ b/boards/sparkfun_samd21_proRF.json @@ -5,7 +5,7 @@ }, "core": "sparkfun", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/sparkfun_samd51_thing_plus.json b/boards/sparkfun_samd51_thing_plus.json index d71c7ad..818afd6 100644 --- a/boards/sparkfun_samd51_thing_plus.json +++ b/boards/sparkfun_samd51_thing_plus.json @@ -6,7 +6,6 @@ "core": "sparkfun", "cpu": "cortex-m4", "extra_flags": [ - "-DARDUINO_ARCH_SAMD", "-DARDUINO_SAMD51_THING_PLUS", "-D__SAMD51J20A__", "-D__SAMD51__", diff --git a/boards/tian.json b/boards/tian.json index 814ceb1..df502d8 100644 --- a/boards/tian.json +++ b/boards/tian.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/tuinozero96.json b/boards/tuinozero96.json index 1cf2e86..844c467 100644 --- a/boards/tuinozero96.json +++ b/boards/tuinozero96.json @@ -5,7 +5,7 @@ }, "core": "tuino0", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/zero.json b/boards/zero.json index 3f14c71..0c1376f 100644 --- a/boards/zero.json +++ b/boards/zero.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/boards/zeroUSB.json b/boards/zeroUSB.json index 2242408..e188670 100644 --- a/boards/zeroUSB.json +++ b/boards/zeroUSB.json @@ -5,7 +5,7 @@ }, "core": "arduino", "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", + "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__", "f_cpu": "48000000L", "hwids": [ [ diff --git a/builder/frameworks/arduino/arduino-sam.py b/builder/frameworks/arduino/arduino-sam.py index 8cec358..05bf81c 100644 --- a/builder/frameworks/arduino/arduino-sam.py +++ b/builder/frameworks/arduino/arduino-sam.py @@ -43,6 +43,10 @@ env.SConscript("arduino-common.py") env.Append( + CPPDEFINES=[ + "ARDUINO_ARCH_SAM" + ], + CPPPATH=[ os.path.join(FRAMEWORK_DIR, "cores", "arduino"), os.path.join(SYSTEM_DIR, "libsam"), diff --git a/builder/frameworks/arduino/arduino-samd.py b/builder/frameworks/arduino/arduino-samd.py index b306ba1..a334bee 100644 --- a/builder/frameworks/arduino/arduino-samd.py +++ b/builder/frameworks/arduino/arduino-samd.py @@ -48,6 +48,10 @@ BUILD_CORE = "arduino51" env.Append( + CPPDEFINES=[ + "ARDUINO_ARCH_SAMD" + ], + CPPPATH=[ os.path.join(CMSIS_DIR, "CMSIS", "Include"), os.path.join(CMSIS_ATMEL_DIR, "CMSIS", "Device", "ATMEL"), diff --git a/platform.json b/platform.json index c9fd568..aa4dc48 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/platformio/platform-atmelsam.git" }, - "version": "4.4.0", + "version": "4.4.1", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "http://dl.platformio.org/packages/manifest.json",