Skip to content

Commit 4f21ace

Browse files
thinkyheadthinkyhead
committed
🔨 Specify versions in INI
1 parent 7a653f9 commit 4f21ace

8 files changed

+40
-21
lines changed

‎Marlin/src/pins/pins.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@
720720
#elif MB(ARTILLERY_RUBY)
721721
#include "stm32f4/pins_ARTILLERY_RUBY.h" // STM32F4 env:Artillery_Ruby
722722
#elif MB(CREALITY_V24S1_301F4)
723-
#include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
723+
#include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_nobootloader env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
724724
#elif MB(OPULO_LUMEN_REV4)
725725
#include "stm32f4/pins_OPULO_LUMEN_REV4.h" // STM32F4 env:Opulo_Lumen_REV4
726726
#elif MB(FYSETC_SPIDER_KING407)

‎ini/features.ini

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111

1212
[features]
1313
YHCB2004 = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
14-
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
14+
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/a3ebe98bc6.zip
1515
build_src_filter=+<src/lcd/extui/mks_ui>
1616
extra_scripts=download_mks_assets.py
1717
MARLIN_TEST_BUILD = build_src_filter=+<src/tests>
1818
POSTMORTEM_DEBUGGING = build_src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
1919
build_flags=-funwind-tables
20-
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
20+
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/261c5a696a.zip
2121
HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.3
2222
build_src_filter=+<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
2323
HAS_T(RINAMIC_CONFIG|MC_SPI) = build_src_filter=+<src/feature/tmc_util.cpp>
2424
HAS_STEALTHCHOP = build_src_filter=+<src/gcode/feature/trinamic/M569.cpp>
25-
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
25+
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/6f53c19a8a.zip
2626
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
2727
build_src_filter=+<src/feature/digipot>
28-
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
28+
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/a7d7c92a13.zip
2929
build_src_filter=+<src/module/stepper/TMC26X.cpp>
3030
LIB_INTERNAL_MAX31865 = build_src_filter=+<src/libs/MAX31865.cpp>
3131
NEOPIXEL_LED = adafruit/Adafruit NeoPixel@~1.8.0
@@ -43,7 +43,7 @@ HAS_(FSMC|SPI|LTDC)_TFT = build_src_filter=+<src/HAL/STM32/tft> +
4343
HAS_FSMC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
4444
HAS_SPI_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
4545
I2C_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
46-
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
46+
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
4747
SPI_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
4848
HAS_DWIN_E3V2|IS_DWIN_MARLINUI = build_src_filter=+<src/lcd/e3v2/common>
4949
DWIN_CREALITY_LCD = build_src_filter=+<src/lcd/e3v2/creality>
@@ -240,7 +240,7 @@ HAS_SERVOS = build_src_filter=+<src/module/servo.cpp
240240
MORGAN_SCARA = build_src_filter=+<src/gcode/scara>
241241
HAS_MICROSTEPS = build_src_filter=+<src/gcode/control/M350_M351.cpp>
242242
(ESP3D_)?WIFISUPPORT = AsyncTCP, ESP Async WebServer
243-
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
243+
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/dc0f3d96c6.zip
244244
arduinoWebSockets=links2004/WebSockets@2.3.4
245245
luc-github/ESP32SSDP@1.1.1
246246
lib_ignore=ESPAsyncTCP

‎ini/native.ini

+5-4
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
4343
lib_compat_mode = off
4444
build_src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
4545
lib_deps = ${common.lib_deps}
46-
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.1.x.zip
47-
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
48-
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
46+
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/8791f3ff43.zip
47+
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/c6b319f447.zip
48+
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/322fb5fc23.zip
4949
extra_scripts = ${common.extra_scripts}
5050
pre:buildroot/share/PlatformIO/scripts/simulator.py
5151

@@ -71,8 +71,9 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
7171
# sudo port install gcc12 glm libsdl2 libsdl2_net
7272
#
7373
# cd /opt/local/bin
74-
# sudo rm -f gcc g++ cc
74+
# sudo rm gcc g++ cc ld
7575
# sudo ln -s gcc-mp-12 gcc ; sudo ln -s g++-mp-12 g++ ; sudo ln -s g++ cc
76+
# sudo ln -s ld-classic ld
7677
# cd -
7778
# rehash
7879
#

‎ini/stm32-common.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ extra_scripts = ${common_stm32.extra_scripts}
3535
# USB Flash Drive mix-ins for STM32
3636
#
3737
[stm_flash_drive]
38-
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
38+
# Arduino_Core_STM32 uses usb-host-msc-cdc-msc-3 branch
39+
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/39f37d6d6a.zip
3940
build_flags = ${common_stm32.build_flags}
4041
-DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
4142
-DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4

‎ini/stm32f1-maple.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ build_flags = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
401401
board_build.address = 0x08007000
402402
board_build.ldscript = sovol.ld
403403
extra_scripts = ${STM32F1_maple.extra_scripts}
404-
pre:buildroot/share/PlatformIO/scripts/random-bin.py
405-
buildroot/share/PlatformIO/scripts/custom_board.py
404+
pre:buildroot/share/PlatformIO/scripts/random-bin.py
405+
buildroot/share/PlatformIO/scripts/custom_board.py
406406
debug_tool = jlink
407407
upload_protocol = jlink

‎ini/stm32f4.ini

+15-2
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ extra_scripts = ${common_stm32.extra_scripts}
677677
#
678678
# Ender-3 S1 STM32F401RC_creality
679679
#
680-
[env:STM32F401RC_creality]
680+
[STM32F401RC_creality_base]
681681
extends = stm32_variant
682682
board = genericSTM32F401RC
683683
board_build.variant = MARLIN_CREALITY_STM32F401RC
@@ -691,6 +691,18 @@ extra_scripts = ${stm32_variant.extra_scripts}
691691
pre:buildroot/share/PlatformIO/scripts/random-bin.py
692692
monitor_speed = 115200
693693

694+
[env:STM32F401RC_creality]
695+
extends = STM32F401RC_creality_base
696+
board_build.offset = 0x10000
697+
board_upload.offset_address = 0x08010000
698+
699+
[env:STM32F401RC_creality_nobootloader]
700+
extends = STM32F401RC_creality_base
701+
board_build.offset = 0x0000
702+
board_upload.offset_address = 0x08000000
703+
debug_tool = stlink
704+
upload_protocol = stlink
705+
694706
[env:STM32F401RC_creality_jlink]
695707
extends = env:STM32F401RC_creality
696708
debug_tool = jlink
@@ -707,7 +719,8 @@ upload_protocol = stlink
707719
[env:STM32F401RC_btt]
708720
extends = stm32_variant
709721
platform = ststm32@~14.1.0
710-
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
722+
platform_packages = framework-arduinoststm32@~4.20600.231001
723+
toolchain-gccarmnoneeabi@1.100301.220327
711724
board = marlin_STM32F401RC
712725
board_build.offset = 0x4000
713726
board_upload.offset_address = 0x08004000

‎ini/stm32g0.ini

+6-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ build_flags = -DPIN_WIRE_SCL=PB3 -DPIN_WIRE_SDA=PB4
3232
[env:BTT_EBB42_V1_1_filament_extruder]
3333
extends = stm32_variant
3434
platform = ststm32@~14.1.0
35-
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
35+
platform_packages = framework-arduinoststm32@~4.20600.231001
36+
toolchain-gccarmnoneeabi@1.100301.220327
3637
board = marlin_BTT_EBB42_V1_1
3738
board_build.offset = 0x0000
3839
board_upload.offset_address = 0x08000000
@@ -46,7 +47,8 @@ debug_tool = stlink
4647
[env:STM32G0B1RE_btt]
4748
extends = stm32_variant
4849
platform = ststm32@~14.1.0
49-
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
50+
platform_packages = framework-arduinoststm32@~4.20600.231001
51+
toolchain-gccarmnoneeabi@1.100301.220327
5052
board = marlin_STM32G0B1RE
5153
board_build.offset = 0x2000
5254
board_upload.offset_address = 0x08002000
@@ -100,7 +102,8 @@ upload_protocol = custom
100102
[env:STM32G0B1VE_btt]
101103
extends = stm32_variant
102104
platform = ststm32@~14.1.0
103-
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
105+
platform_packages = framework-arduinoststm32@~4.20600.231001
106+
toolchain-gccarmnoneeabi@1.100301.220327
104107
board = marlin_STM32G0B1VE
105108
board_build.offset = 0x2000
106109
board_upload.offset_address = 0x08002000

‎ini/stm32h7.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
#
2525
[env:BTT_SKR_SE_BX]
2626
extends = stm32_variant
27-
platform_packages = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/biqu-bx-workaround.zip
27+
# framework-arduinoststm32 uses biqu-bx-workaround branch
28+
platform_packages = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/8b3522051a.zip
2829
board = marlin_BTT_SKR_SE_BX
2930
board_build.offset = 0x20000
3031
build_flags = ${stm32_variant.build_flags} ${stm_flash_drive.build_flags}
@@ -88,7 +89,7 @@ upload_protocol = cmsis-dap
8889
debug_tool = cmsis-dap
8990

9091
#
91-
# BigTreeTech Octopus Pro V1.0 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
92+
# BigTreeTech Octopus Pro V1.0.1/1.1 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
9293
#
9394
[env:STM32H723Zx_btt]
9495
extends = stm32_variant

0 commit comments

Comments
 (0)