Skip to content

Commit 2c2eb81

Browse files
committed
DM: fixed m0 boards compilation error with math additions
1 parent bbff6c1 commit 2c2eb81

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

boards.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ adafruit_feather_m0.build.usb_product="Feather M0"
3232
adafruit_feather_m0.build.usb_manufacturer="Adafruit"
3333
adafruit_feather_m0.build.board=SAMD_ZERO
3434
adafruit_feather_m0.build.core=arduino
35-
adafruit_feather_m0.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
35+
adafruit_feather_m0.build.extra_flags=-DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS -D__SAMD21G18A__ {build.usb_flags}
3636
adafruit_feather_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
3737
adafruit_feather_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
3838
adafruit_feather_m0.build.variant=feather_m0
@@ -60,7 +60,7 @@ adafruit_feather_m0_express.build.usb_product="Feather M0 Express"
6060
adafruit_feather_m0_express.build.usb_manufacturer="Adafruit"
6161
adafruit_feather_m0_express.build.board=SAMD_FEATHER_M0_EXPRESS
6262
adafruit_feather_m0_express.build.core=arduino
63-
adafruit_feather_m0_express.build.extra_flags=-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DADAFRUIT_FEATHER_M0_EXPRESS -D__SAMD21G18A__ {build.usb_flags}
63+
adafruit_feather_m0_express.build.extra_flags=-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARM_MATH_CM0PLUS -DADAFRUIT_FEATHER_M0_EXPRESS -D__SAMD21G18A__ {build.usb_flags}
6464
adafruit_feather_m0_express.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
6565
adafruit_feather_m0_express.build.openocdscript=openocd_scripts/arduino_zero.cfg
6666
adafruit_feather_m0_express.build.variant=feather_m0_express
@@ -88,7 +88,7 @@ adafruit_feather_m0_express.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4
8888
#adafruit_radio_m0.build.usb_manufacturer="Adafruit"
8989
#adafruit_radio_m0.build.board=SAMD_ZERO
9090
#adafruit_radio_m0.build.core=arduino
91-
#adafruit_radio_m0.build.extra_flags=-D__SAMR21G18A__ {build.usb_flags}
91+
#adafruit_radio_m0.build.extra_flags=-D__SAMR21G18A__ -DARM_MATH_CM0PLUS {build.usb_flags}
9292
#adafruit_radio_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
9393
#adafruit_radio_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
9494
#adafruit_radio_m0.build.variant=zero_radio
@@ -115,7 +115,7 @@ adafruit_metro_m0.build.usb_product="Metro M0 Express"
115115
adafruit_metro_m0.build.usb_manufacturer="Adafruit"
116116
adafruit_metro_m0.build.board=SAMD_ZERO
117117
adafruit_metro_m0.build.core=arduino
118-
adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__ -DARDUINO_SAMD_ZERO -DADAFRUIT_METRO_M0_EXPRESS {build.usb_flags}
118+
adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__ -DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS -DADAFRUIT_METRO_M0_EXPRESS {build.usb_flags}
119119
adafruit_metro_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
120120
adafruit_metro_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
121121
adafruit_metro_m0.build.variant=metro_m0
@@ -146,7 +146,7 @@ adafruit_circuitplayground_m0.build.usb_product="Circuit Playground Express"
146146
adafruit_circuitplayground_m0.build.usb_manufacturer="Adafruit"
147147
adafruit_circuitplayground_m0.build.board=SAMD_CIRCUITPLAYGROUND_EXPRESS
148148
adafruit_circuitplayground_m0.build.core=arduino
149-
adafruit_circuitplayground_m0.build.extra_flags=-DCRYSTALLESS -DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DADAFRUIT_CIRCUITPLAYGROUND_M0 {build.usb_flags}
149+
adafruit_circuitplayground_m0.build.extra_flags=-DCRYSTALLESS -DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DARM_MATH_CM0PLUS -DADAFRUIT_CIRCUITPLAYGROUND_M0 {build.usb_flags}
150150
adafruit_circuitplayground_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
151151
adafruit_circuitplayground_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
152152
adafruit_circuitplayground_m0.build.variant=circuitplay

cores/arduino/math_helper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ void arm_apply_guard_bits (float32_t * pIn, uint32_t numSamples, uint32_t guard_
6060
uint32_t arm_compare_fixed_q15(q15_t *pIn, q15_t * pOut, uint32_t numSamples);
6161
uint32_t arm_compare_fixed_q31(q31_t *pIn, q31_t *pOut, uint32_t numSamples);
6262
uint32_t arm_calc_2pow(uint32_t guard_bits);
63-
#endif
63+
#endif

0 commit comments

Comments
 (0)