From ff82b735f25b51aceaa9718bd92e1b903f25308e Mon Sep 17 00:00:00 2001 From: hathach Date: Sun, 5 Jul 2020 22:40:37 +0700 Subject: [PATCH 1/5] remove gcc 7-2017q4 specific --- platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.txt b/platform.txt index 13d2ce5ab..61009d5d9 100644 --- a/platform.txt +++ b/platform.txt @@ -31,7 +31,7 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall -Wno-expansion-to-defined compiler.warning_flags.all=-Wall -Wextra -Wno-expansion-to-defined -compiler.path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/ +compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/ compiler.c.cmd=arm-none-eabi-gcc compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD -D__SKETCH_NAME__="""{build.project_name}""" compiler.c.elf.cmd=arm-none-eabi-g++ From 00a863c100a2d927a0a626ae1f782b8a476fa500 Mon Sep 17 00:00:00 2001 From: hathach Date: Sun, 5 Jul 2020 22:57:02 +0700 Subject: [PATCH 2/5] update tinyusb to 0749077 --- cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore b/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore index 09968245a..07490772a 160000 --- a/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore +++ b/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore @@ -1 +1 @@ -Subproject commit 09968245ad675377f2265717f0e138d5dccb39a3 +Subproject commit 07490772a559b2b0cac8aa187566aff4bec7376a From 246c75a1ae9e6e502c09e4e24eae2e2913c4f52b Mon Sep 17 00:00:00 2001 From: hathach Date: Sun, 5 Jul 2020 22:57:40 +0700 Subject: [PATCH 3/5] bump up version for 1.5.15 --- platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.txt b/platform.txt index 61009d5d9..619156983 100644 --- a/platform.txt +++ b/platform.txt @@ -20,7 +20,7 @@ # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards -version=1.5.14 +version=1.5.15 # Compile variables # ----------------- From 290f3d63088021829b16ca04f9bb250d0b14beaf Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 6 Jul 2020 16:22:30 +0700 Subject: [PATCH 4/5] update cmsis from 4.5.0 to 5.4.0 --- boards.txt | 28 ++++++++++++++-------------- cores/arduino/WInterrupts.h | 2 +- platform.txt | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/boards.txt b/boards.txt index 9c68368b1..5d922d902 100644 --- a/boards.txt +++ b/boards.txt @@ -448,7 +448,7 @@ adafruit_metro_m4.build.vid=0x239A adafruit_metro_m4.build.pid=0x8020 adafruit_metro_m4.bootloader.tool=openocd adafruit_metro_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin -adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_metro_m4.menu.cache.on=Enabled adafruit_metro_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_metro_m4.menu.cache.off=Disabled @@ -514,7 +514,7 @@ adafruit_grandcentral_m4.build.vid=0x239A adafruit_grandcentral_m4.build.pid=0x8031 adafruit_grandcentral_m4.bootloader.tool=openocd adafruit_grandcentral_m4.bootloader.file=grand_central_m4/bootloader-grandcentralM4-v2.0.0-adafruit.5.bin -adafruit_grandcentral_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_grandcentral_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_grandcentral_m4.menu.cache.on=Enabled adafruit_grandcentral_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_grandcentral_m4.menu.cache.off=Disabled @@ -577,7 +577,7 @@ adafruit_itsybitsy_m4.build.vid=0x239A adafruit_itsybitsy_m4.build.pid=0x802B adafruit_itsybitsy_m4.bootloader.tool=openocd adafruit_itsybitsy_m4.bootloader.file=itsybitsyM4/bootloader-itsybitsy_m4-v2.0.0-adafruit.5.bin -adafruit_itsybitsy_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_itsybitsy_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_itsybitsy_m4.menu.cache.on=Enabled adafruit_itsybitsy_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_itsybitsy_m4.menu.cache.off=Disabled @@ -640,7 +640,7 @@ adafruit_feather_m4.build.vid=0x239A adafruit_feather_m4.build.pid=0x8022 adafruit_feather_m4.bootloader.tool=openocd adafruit_feather_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin -adafruit_feather_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_feather_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_feather_m4.menu.cache.on=Enabled adafruit_feather_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_feather_m4.menu.cache.off=Disabled @@ -705,7 +705,7 @@ adafruit_trellis_m4.build.vid=0x239A adafruit_trellis_m4.build.pid=0x802F adafruit_trellis_m4.bootloader.tool=openocd adafruit_trellis_m4.bootloader.file=trellisM4/bootloader-trellis_m4-v2.0.0-adafruit.5.bin -adafruit_trellis_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_trellis_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_trellis_m4.menu.cache.on=Enabled adafruit_trellis_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_trellis_m4.menu.cache.off=Disabled @@ -768,7 +768,7 @@ adafruit_pyportal_m4.build.vid=0x239A adafruit_pyportal_m4.build.pid=0x8035 adafruit_pyportal_m4.bootloader.tool=openocd adafruit_pyportal_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin -adafruit_pyportal_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_pyportal_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_pyportal_m4.menu.cache.on=Enabled adafruit_pyportal_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_pyportal_m4.menu.cache.off=Disabled @@ -831,7 +831,7 @@ adafruit_pyportal_m4_titano.build.vid=0x239A adafruit_pyportal_m4_titano.build.pid=0x8035 adafruit_pyportal_m4_titano.bootloader.tool=openocd adafruit_pyportal_m4_titano.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin -adafruit_pyportal_m4_titano.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_pyportal_m4_titano.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_pyportal_m4_titano.menu.cache.on=Enabled adafruit_pyportal_m4_titano.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_pyportal_m4_titano.menu.cache.off=Disabled @@ -896,7 +896,7 @@ adafruit_pybadge_m4.build.vid=0x239A adafruit_pybadge_m4.build.pid=0x8033 adafruit_pybadge_m4.bootloader.tool=openocd adafruit_pybadge_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin -adafruit_pybadge_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_pybadge_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_pybadge_m4.menu.cache.on=Enabled adafruit_pybadge_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_pybadge_m4.menu.cache.off=Disabled @@ -960,7 +960,7 @@ adafruit_metro_m4_airliftlite.build.vid=0x239A adafruit_metro_m4_airliftlite.build.pid=0x8037 adafruit_metro_m4_airliftlite.bootloader.tool=openocd adafruit_metro_m4_airliftlite.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin -adafruit_metro_m4_airliftlite.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_metro_m4_airliftlite.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_metro_m4_airliftlite.menu.cache.on=Enabled adafruit_metro_m4_airliftlite.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_metro_m4_airliftlite.menu.cache.off=Disabled @@ -1025,7 +1025,7 @@ adafruit_pygamer_m4.build.vid=0x239A adafruit_pygamer_m4.build.pid=0x803D adafruit_pygamer_m4.bootloader.tool=openocd adafruit_pygamer_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin -adafruit_pygamer_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_pygamer_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_pygamer_m4.menu.cache.on=Enabled adafruit_pygamer_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_pygamer_m4.menu.cache.off=Disabled @@ -1089,7 +1089,7 @@ adafruit_pygamer_advance_m4.build.vid=0x239A adafruit_pygamer_advance_m4.build.pid=0x8041 adafruit_pygamer_advance_m4.bootloader.tool=openocd adafruit_pygamer_advance_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin -adafruit_pygamer_advance_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_pygamer_advance_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_pygamer_advance_m4.menu.cache.on=Enabled adafruit_pygamer_advance_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_pygamer_advance_m4.menu.cache.off=Disabled @@ -1155,7 +1155,7 @@ adafruit_pybadge_airlift_m4.build.vid=0x239A adafruit_pybadge_airlift_m4.build.pid=0x8043 adafruit_pybadge_airlift_m4.bootloader.tool=openocd adafruit_pybadge_airlift_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin -adafruit_pybadge_airlift_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_pybadge_airlift_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_pybadge_airlift_m4.menu.cache.on=Enabled adafruit_pybadge_airlift_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_pybadge_airlift_m4.menu.cache.off=Disabled @@ -1221,7 +1221,7 @@ adafruit_monster_m4sk.build.vid=0x239A adafruit_monster_m4sk.build.pid=0x8047 adafruit_monster_m4sk.bootloader.tool=openocd adafruit_monster_m4sk.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin -adafruit_monster_m4sk.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_monster_m4sk.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_monster_m4sk.menu.cache.on=Enabled adafruit_monster_m4sk.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_monster_m4sk.menu.cache.off=Disabled @@ -1287,7 +1287,7 @@ adafruit_hallowing_m4.build.vid=0x239A adafruit_hallowing_m4.build.pid=0x8049 adafruit_hallowing_m4.bootloader.tool=openocd adafruit_hallowing_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin -adafruit_hallowing_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 +adafruit_hallowing_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16 adafruit_hallowing_m4.menu.cache.on=Enabled adafruit_hallowing_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE adafruit_hallowing_m4.menu.cache.off=Disabled diff --git a/cores/arduino/WInterrupts.h b/cores/arduino/WInterrupts.h index 5d2b24a0d..daf02afe5 100644 --- a/cores/arduino/WInterrupts.h +++ b/cores/arduino/WInterrupts.h @@ -31,7 +31,7 @@ extern "C" { #define FALLING 3 #define RISING 4 -#define DEFAULT 1 +//#define DEFAULT 1 #define EXTERNAL 0 typedef void (*voidFuncPtr)(void); diff --git a/platform.txt b/platform.txt index 619156983..b80b93646 100644 --- a/platform.txt +++ b/platform.txt @@ -70,8 +70,8 @@ compiler.S.extra_flags= compiler.ar.extra_flags= compiler.elf2hex.extra_flags= -compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.2.0.path}/CMSIS/Device/ATMEL/" -compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math +compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Core/Include/" "-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/DSP/Include/" "-I{runtime.tools.CMSIS-Atmel-1.2.0.path}/CMSIS/Device/ATMEL/" +compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math compiler.libraries.ldflags= From 53c92d46e9e8be67b69d5f04e2a90c9e5094aba7 Mon Sep 17 00:00:00 2001 From: Ha Thach Date: Tue, 7 Jul 2020 09:37:15 +0700 Subject: [PATCH 5/5] Increase version to 1.6.0 per review --- platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.txt b/platform.txt index b80b93646..5b024a2c8 100644 --- a/platform.txt +++ b/platform.txt @@ -20,7 +20,7 @@ # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards -version=1.5.15 +version=1.6.0 # Compile variables # -----------------