🔨 INI Updates

Co-Authored-By: Martin Turski <[email protected]>
Infobitas · May 17, 2023 · 51b33cc · 51b33cc
1 parent f452df0
commit 51b33cc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/ini/avr.ini b/ini/avr.ini
@@ -13,8 +13,9 @@
 # AVR (8-bit) Common Environment values
 #
 [common_avr8]
-platform          = atmelavr@~3.4
+platform          = atmelavr@~4.0.1
 build_flags       = ${common.build_flags} -Wl,--relax
+build_src_flags   = -std=gnu++1z
 board_build.f_cpu = 16000000L
 build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
@@ -53,7 +54,7 @@ extends             = common_avr8
 board_build.variant = MARLIN_MEGA_EXTENDED
 extra_scripts       = ${env:mega2560ext.extra_scripts}
 upload_speed        = 57600
-build_flags         = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues
+build_flags         = ${common_avr8.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -mcall-prologues
 
 #
 # MightyBoard ATmega1280
@@ -103,7 +104,7 @@ board_upload.maximum_size = 126976
 #
 
 [tuned_1284p]
-build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues
+build_flags = ${common_avr8.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -mcall-prologues
 
 [env:sanguino1284p_optimized]
 extends     = env:sanguino1284p

diff --git a/ini/features.ini b/ini/features.ini
@@ -204,6 +204,7 @@ HAS_GCODE_M876                         = build_src_filter=+<src/gcode/host/M876.
 HAS_RESUME_CONTINUE                    = build_src_filter=+<src/gcode/lcd/M0_M1.cpp>
 SET_PROGRESS_MANUALLY                  = build_src_filter=+<src/gcode/lcd/M73.cpp>
 HAS_STATUS_MESSAGE                     = build_src_filter=+<src/gcode/lcd/M117.cpp>
+HAS_PREHEAT                            = build_src_filter=+<src/gcode/lcd/M145.cpp>
 HAS_LCD_CONTRAST                       = build_src_filter=+<src/gcode/lcd/M250.cpp>
 HAS_GCODE_M255                         = build_src_filter=+<src/gcode/lcd/M255.cpp>
 HAS_LCD_BRIGHTNESS                     = build_src_filter=+<src/gcode/lcd/M256.cpp>

diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
@@ -61,7 +61,7 @@ monitor_speed = 115200
 [env:STM32F103RC_meeb_maple]
 extends              = env:STM32F103RC_maple
 board                = marlin_maple_MEEB_3DP
-build_flags          = ${STM32F1_maple.build_flags}
+build_flags          = ${env:STM32F103RC_maple.build_flags}
                        -DDEBUG_LEVEL=0
                        -DSS_TIMER=4
                        -DSTM32_FLASH_SIZE=512
@@ -70,10 +70,10 @@ build_flags          = ${STM32F1_maple.build_flags}
                        -DVECT_TAB_OFFSET=0x2000
                        -DGENERIC_BOOTLOADER
 board_build.ldscript = STM32F103RC_MEEB_3DP.ld
-extra_scripts        = ${STM32F1_maple.extra_scripts}
+extra_scripts        = ${env:STM32F103RC_maple.extra_scripts}
                        pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
                            buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
-lib_deps             = ${STM32F1_maple.lib_deps}
+lib_deps             = ${env:STM32F103RC_maple.lib_deps}
                        USBComposite for [email protected]
 custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
 debug_tool           = stlink
@@ -84,9 +84,9 @@ upload_protocol      = dfu
 #
 [env:STM32F103RC_fysetc_maple]
 extends         = env:STM32F103RC_maple
-extra_scripts   = ${STM32F1_maple.extra_scripts}
+extra_scripts   = ${env:STM32F103RC_maple.extra_scripts}
                   buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-build_flags     = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0
+build_flags     = ${env:STM32F103RC_maple.build_flags} -DDEBUG_LEVEL=0
 lib_ldf_mode    = chain
 debug_tool      = stlink
 upload_protocol = serial
@@ -101,7 +101,7 @@ upload_protocol = serial
 extends              = env:STM32F103RC_maple
 board_build.address  = 0x08007000
 board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld
-build_flags          = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
+build_flags          = ${env:STM32F103RC_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
 monitor_speed        = 115200
 
 [env:STM32F103RC_btt_USB_maple]
@@ -115,10 +115,10 @@ lib_deps    = ${env:STM32F103RC_btt_maple.lib_deps}
 #
 [env:STM32F103RE_creality_maple]
 extends              = env:STM32F103RE_maple
-build_flags          = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
+build_flags          = ${env:STM32F103RE_maple.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
 board_build.ldscript = creality.ld
-extra_scripts        = ${STM32F1_maple.extra_scripts}
+extra_scripts        = ${env:STM32F103RE_maple.extra_scripts}
                        pre:buildroot/share/PlatformIO/scripts/random-bin.py
 debug_tool           = jlink
 upload_protocol      = jlink
@@ -128,10 +128,10 @@ upload_protocol      = jlink
 #
 [env:STM32F103RC_creality_maple]
 extends              = env:STM32F103RC_maple
-build_flags          = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
+build_flags          = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
 board_build.ldscript = creality.ld
-extra_scripts        = ${STM32F1_maple.extra_scripts}
+extra_scripts        = ${env:STM32F103RC_maple.extra_scripts}
                        pre:buildroot/share/PlatformIO/scripts/random-bin.py
 debug_tool           = jlink
 upload_protocol      = jlink
@@ -154,14 +154,14 @@ board_build.ldscript = crealityPro.ld
 extends              = env:STM32F103RE_maple
 board_build.address  = 0x08007000
 board_build.ldscript = STM32F103RE_SKR_MINI_512K.ld
-build_flags          = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
+build_flags          = ${env:STM32F103RE_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
 debug_tool           = stlink
 upload_protocol      = stlink
 
 [env:STM32F103RE_btt_USB_maple]
 extends     = env:STM32F103RE_btt_maple
 build_flags = ${env:STM32F103RE_btt_maple.build_flags} -DUSE_USB_COMPOSITE
-lib_deps    = ${STM32F1_maple.lib_deps}
+lib_deps    = ${env:STM32F103RE_btt_maple.lib_deps}
               USBComposite for [email protected]
 
 #
@@ -238,7 +238,6 @@ board_build.ldscript    = mks_robin_pro.ld
 #
 [env:trigorilla_pro_maple]
 extends       = env:mks_robin_maple
-extra_scripts = ${STM32F1_maple.extra_scripts}
 
 #
 # MKS Robin E3D (STM32F103RCT6) and

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
@@ -726,12 +726,10 @@ upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
 # STM32F446ZET6 ARM Cortex-M4
 #
 [env:STM32F446_tronxy]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = marlin_STM32F446ZET_tronxy
 board_build.offset          = 0x10000
 board_build.rename          = fmw_tronxy.bin
-build_src_filter            = ${common_stm32.build_src_filter}
 build_flags                 = ${stm32_variant.build_flags}
                               -DSTM32F4xx
 build_unflags               = ${stm32_variant.build_unflags} -fno-rtti

diff --git a/platformio.ini b/platformio.ini
@@ -223,6 +223,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/t
   -<src/gcode/lcd/M0_M1.cpp>
   -<src/gcode/lcd/M73.cpp>
   -<src/gcode/lcd/M117.cpp>
+  -<src/gcode/lcd/M145.cpp>
   -<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M255.cpp> -<src/gcode/lcd/M256.cpp>
   -<src/gcode/lcd/M300.cpp>
   -<src/gcode/lcd/M414.cpp>
@@ -250,7 +251,6 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/t
   -<src/gcode/units/M82_M83.cpp>
   -<src/gcode/units/M149.cpp>
   -<src/libs/BL24CXX.cpp> -<src/libs/W25Qxx.cpp>
-  -<src/libs/L64XX> -<src/module/stepper/L64xx.cpp> -<src/HAL/shared/HAL_spi_L6470.cpp>
   -<src/libs/MAX31865.cpp>
   -<src/libs/hex_print.cpp>
   -<src/libs/least_squares_fit.cpp>