diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index d8dc9a3843..a8467ac606 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -40,6 +40,9 @@ #error "Marlin requires C++11 support (gcc >= 4.7, Arduino IDE >= 1.6.8). Please upgrade your toolchain." #endif +// Emit the GCC version +//static_assert(false, "GCC version: " STRINGIFY(__GNUC__) "." STRINGIFY(__GNUC_MINOR__) "." STRINGIFY(__GNUC_PATCHLEVEL__)); + // Strings for sanity check messages #define _NUM_AXES_STR NUM_AXIS_GANG("X ", "Y ", "Z ", "I ", "J ", "K ", "U ", "V ", "W ") #define _LOGICAL_AXES_STR LOGICAL_AXIS_GANG("E ", "X ", "Y ", "Z ", "I ", "J ", "K ", "U ", "V ", "W ") diff --git a/ini/due.ini b/ini/due.ini index 7e4017e257..12a0005ffc 100644 --- a/ini/due.ini +++ b/ini/due.ini @@ -16,10 +16,11 @@ # - RADDS # [env:DUE] -platform = atmelsam -board = due -build_src_filter = ${common.default_src_filter} + + -build_flags = -DWATCHDOG_PIO_RESET +platform = atmelsam +#platform_packages = toolchain-gccarmnoneeabi@1.120301.0 # Otherwise it's GCC 7.2.1 +board = due +build_src_filter = ${common.default_src_filter} + + +build_flags = -DWATCHDOG_PIO_RESET [env:DUE_USB] extends = env:DUE diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini index 12c07ef824..2ba6baed1b 100644 --- a/ini/stm32-common.ini +++ b/ini/stm32-common.ini @@ -10,14 +10,15 @@ #################################### [common_stm32] -platform = ststm32@~12.1 -board_build.core = stm32 -build_flags = ${common.build_flags} -std=gnu++14 +platform = ststm32@~12.1 +#platform_packages = toolchain-gccarmnoneeabi@1.100301.220327 # Otherwise it's GCC 9.2.1 +board_build.core = stm32 +build_flags = ${common.build_flags} -std=gnu++14 -DHAL_STM32 -DPLATFORM_M997_SUPPORT -DUSBCON -DUSBD_USE_CDC -DTIM_IRQ_PRIO=13 -DADC_RESOLUTION=12 -build_unflags = -std=gnu++11 -build_src_filter = ${common.default_src_filter} + - + -extra_scripts = ${common.extra_scripts} +build_unflags = -std=gnu++11 +build_src_filter = ${common.default_src_filter} + - + +extra_scripts = ${common.extra_scripts} pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py custom_marlin.HAS_LTDC_TFT = build_src_filter=+ custom_marlin.HAS_FSMC_TFT = build_src_filter=+ diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini index dd72b8980c..304102351d 100644 --- a/ini/stm32f1-maple.ini +++ b/ini/stm32f1-maple.ini @@ -33,7 +33,7 @@ lib_ignore = SPI, FreeRTOS701, FreeRTOS821 lib_deps = ${common.lib_deps} SoftwareSerialM platform_packages = tool-stm32duino - toolchain-gccarmnoneeabi@1.100301.220327 + toolchain-gccarmnoneeabi@1.120301.0 # Otherwise it's GCC 7.2.1 extra_scripts = ${common.extra_scripts} pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py @@ -65,7 +65,8 @@ monitor_speed = 115200 [env:STM32F103RC_meeb_maple] extends = env:STM32F103RC_maple board = marlin_maple_MEEB_3DP -platform_packages = platformio/tool-dfuutil@~1.11.0 +platform_packages = ${env:STM32F103RC_maple.platform_packages} + platformio/tool-dfuutil@~1.11.0 build_flags = ${env:STM32F103RC_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4 @@ -93,7 +94,6 @@ extends = env:STM32F103RC_maple extra_scripts = ${env:STM32F103RC_maple.extra_scripts} buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py build_flags = ${env:STM32F103RC_maple.build_flags} -DDEBUG_LEVEL=0 -platform_packages = toolchain-gccarmnoneeabi@1.90301.200702 lib_ldf_mode = chain debug_tool = stlink upload_protocol = serial @@ -109,7 +109,6 @@ extends = env:STM32F103RC_maple board_build.address = 0x08007000 board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld build_flags = ${env:STM32F103RC_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4 -platform_packages = toolchain-gccarmnoneeabi@1.90301.200702 monitor_speed = 115200 [env:STM32F103RC_btt_USB_maple] @@ -136,7 +135,6 @@ upload_protocol = jlink [env:STM32F103RC_creality_maple] extends = env:STM32F103RC_maple build_flags = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4 -platform_packages = toolchain-gccarmnoneeabi@1.90301.200702 board_build.address = 0x08007000 board_build.ldscript = creality256k.ld board_build.rename = firmware-{date}-{time}.bin @@ -160,7 +158,6 @@ board_build.ldscript = crealityPro.ld [env:GD32F103RC_voxelab_maple] extends = env:STM32F103RC_maple build_flags = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4 -platform_packages = toolchain-gccarmnoneeabi@1.90301.200702 board_build.address = 0x08007000 board_build.ldscript = creality256k.ld debug_tool = jlink @@ -170,7 +167,6 @@ upload_protocol = jlink extends = env:STM32F103RE_maple build_flags = ${env:STM32F103RE_maple.build_flags} -DTEMP_TIMER_CHAN=4 -DVOXELAB_N32 -DSDCARD_FLASH_LIMIT_256K -platform_packages = toolchain-gccarmnoneeabi@1.90301.200702 board_build.address = 0x08007000 board_build.ldscript = creality.ld debug_tool = jlink @@ -393,13 +389,11 @@ lib_ignore = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED [env:STM32F103RC_ZM3E2_USB_maple] extends = ZONESTAR_ZM3E_maple -platform_packages = toolchain-gccarmnoneeabi@1.90301.200702 board = genericSTM32F103RC board_build.ldscript = ZONESTAR_ZM3E_256K.ld [env:STM32F103VC_ZM3E4_USB_maple] extends = ZONESTAR_ZM3E_maple -platform_packages = toolchain-gccarmnoneeabi@1.90301.200702 board = genericSTM32F103VC board_build.ldscript = ZONESTAR_ZM3E_256K.ld build_flags = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2