Skip to content

Commit b4bc89c

Browse files
committed
Merge commit 'd16f2' into HEAD
2 parents 5cf84a4 + 8a3b9cc commit b4bc89c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

boards.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ arduino_zero_edbg.upload.native_usb=false
1010
arduino_zero_edbg.build.mcu=cortex-m0plus
1111
arduino_zero_edbg.build.f_cpu=48000000L
1212
arduino_zero_edbg.build.usb_product="Arduino Zero"
13+
arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
1314
arduino_zero_edbg.build.board=SAMD_ZERO
1415
arduino_zero_edbg.build.core=arduino
1516
arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
@@ -34,6 +35,7 @@ arduino_zero_native.upload.native_usb=true
3435
arduino_zero_native.build.mcu=cortex-m0plus
3536
arduino_zero_native.build.f_cpu=48000000L
3637
arduino_zero_native.build.usb_product="Arduino Zero"
38+
arduino_zero_native.build.usb_manufacturer="Arduino LLC"
3739
arduino_zero_native.build.board=SAMD_ZERO
3840
arduino_zero_native.build.core=arduino
3941
arduino_zero_native.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}

cores/arduino/avr/dtostrf.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1919
*/
2020

21+
#include <stdio.h>
22+
2123
char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {
2224
char fmt[20];
2325
sprintf(fmt, "%%%d.%df", width, prec);

platform.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ version=1.8.0
1111

1212
compiler.path={runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin/
1313
compiler.c.cmd=arm-none-eabi-gcc
14-
compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os -w -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf
15-
#-std=gnu99
14+
compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os -W -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500
1615
compiler.c.elf.cmd=arm-none-eabi-gcc
1716
compiler.c.elf.flags=-Os -Wl,--gc-sections -save-temps
1817
compiler.S.flags=-c -g -x assembler-with-cpp
1918
compiler.cpp.cmd=arm-none-eabi-g++
20-
compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g -Os -w -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf
21-
#-std=gnu++11
19+
compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g -Os -W -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions
2220
compiler.ar.cmd=arm-none-eabi-ar
2321
compiler.ar.flags=rcs
2422
compiler.objcopy.cmd=arm-none-eabi-objcopy

0 commit comments

Comments
 (0)