Skip to content

Commit 914379c

Browse files
committed
followup
1 parent 6778a50 commit 914379c

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed

ini/lpc176x.ini

+9-7
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,20 @@ board = nxp_lpc1768
1919
lib_ldf_mode = off
2020
lib_compat_mode = strict
2121
extra_scripts = ${common.extra_scripts}
22-
Marlin/src/HAL/LPC1768/upload_extra_script.py
22+
Marlin/src/HAL/LPC1768/upload_extra_script.py
2323
build_src_filter = ${common.default_src_filter} +<src/HAL/LPC1768> -<src/HAL/LPC1768/tft> +<src/HAL/shared/backtrace>
2424
lib_deps = ${common.lib_deps}
25-
Servo
26-
custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7
27-
custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
25+
Servo
2826
build_flags = ${common.build_flags} -DU8G_HAL_LINKS -DPLATFORM_M997_SUPPORT
2927
-IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g
30-
# debug options for backtrace
31-
#-funwind-tables
32-
#-mpoke-function-name
28+
# debug options for backtrace
29+
#-funwind-tables
30+
#-mpoke-function-name
3331
build_src_flags = -std=gnu++20 -Wno-volatile
32+
custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7
33+
custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
34+
custom_marlin.HAS_SPI_TFT = +<src/HAL/LPC1768/tft/tft_spi.cpp>
35+
custom_marlin.HAS_TFT_XPT2046 = +<src/HAL/LPC1768/tft/xpt2046.cpp>
3436

3537
#
3638
# NXP LPC176x ARM Cortex-M3

ini/native.ini

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ 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
49-
extra_scripts = ${common.extra_scripts}
50-
pre:buildroot/share/PlatformIO/scripts/simulator.py
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
49+
extra_scripts = ${common.extra_scripts}
50+
pre:buildroot/share/PlatformIO/scripts/simulator.py
5151

5252
[simulator_linux]
5353
extends = simulator_common

ini/stm32-common.ini

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ build_unflags = -std=gnu++11
2020
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> -<src/HAL/STM32/tft> +<src/HAL/shared/backtrace>
2121
extra_scripts = ${common.extra_scripts}
2222
pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
23+
custom_marlin.HAS_SPI_TFT = src_filter=+<src/HAL/STM32/tft/tft_spi.cpp>
24+
custom_marlin.HAS_TFT_XPT2046 = src_filter=+<src/HAL/STM32/tft/xpt2046.cpp>
25+
custom_marlin.TFT_TOUCH_DEVICE_GT911 = src_filter=+<src/HAL/STM32/tft/gt911.cpp>
2326

2427
# For the latest stuff. Latest as in: we test and then bump the version.
2528
# Please test before upgrading.

ini/stm32f1-maple.ini

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@ build_unflags = -std=gnu11 -std=gnu++11
3131
build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1> -<src/HAL/STM32F1/tft>
3232
lib_ignore = SPI, FreeRTOS701, FreeRTOS821
3333
lib_deps = ${common.lib_deps}
34-
SoftwareSerialM
34+
SoftwareSerialM
3535
platform_packages = tool-stm32duino, [email protected]
3636
extra_scripts = ${common.extra_scripts}
3737
pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
3838
pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
3939
buildroot/share/PlatformIO/scripts/custom_board.py
4040
buildroot/share/PlatformIO/scripts/offset_and_rename.py
41+
custom_marlin.HAS_SPI_TFT = +<src/HAL/STM32F1/tft/tft_spi.cpp>
42+
custom_marlin.HAS_TFT_XPT2046 = +<src/HAL/STM32F1/tft/xpt2046.cpp>
4143

4244
#
4345
# Generic STM32F103RC environment

0 commit comments

Comments
 (0)