Skip to content

Commit e3d82bd

Browse files
authored
Merge pull request #192 from th3dstudio/2.0.x
2.90 release
2 parents 04c6b2b + 72d2f38 commit e3d82bd

File tree

4,418 files changed

+1747513
-64169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,418 files changed

+1747513
-64169
lines changed

Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* NO IMPLIED SUPPORT OR WARRANTY IS PROVIDED WITH THIS FIRMWARE AND IS PROVIDED AS-IS
44
*/
55
#pragma once
6-
#define CONFIGURATION_H_VERSION 02010200
6+
#define CONFIGURATION_H_VERSION 02010204
77

8-
#define UNIFIED_VERSION "TH3D UFW 2.87"
9-
#define STRING_DISTRIBUTION_DATE "2024-05-31"
8+
#define UNIFIED_VERSION "TH3D UFW 2.90"
9+
#define STRING_DISTRIBUTION_DATE "2024-09-04"
1010

1111
//#@CONFIGURATION_START_FLAG
1212

@@ -221,13 +221,14 @@
221221
// If you reversed the wiring on your E motor already (like the Bondtech Guide says to do) then you do not need to reverse it in the firmware here.
222222
//
223223
// Example EStep Values For Common Extuders:
224-
// TH3D Aluminum Extruder --- 95 ESteps
225-
// LGX/LGX Lite/NG Extruder - 400 ESteps
226-
// TH3D Tough Extruder V2 --- 407 ESteps
227-
// TH3D Tough Extruder V1 --- 410 ESteps
228-
// Bondtech BMG Extruder ---- 415 ESteps
229-
// Creality Sprite Extruder - 425 ESteps
230-
// LDO Orbiter/Sherpa Mini -- 690 ESteps
224+
// TH3D Aluminum Extruder ------ 95 ESteps
225+
// Micro Swiss DD Extruder ----- 130 ESteps
226+
// LGX/LGX Lite/MS NG Extruder - 400 ESteps
227+
// TH3D Tough Extruder V2 ------ 407 ESteps
228+
// TH3D Tough Extruder V1 ------ 410 ESteps
229+
// Bondtech BMG Extruder ------- 415 ESteps
230+
// Creality Sprite Extruder ---- 425 ESteps
231+
// LDO Orbiter/Sherpa Mini ----- 690 ESteps
231232
//
232233
// If you want to change the Esteps for your printer you can uncomment the below line and set CUSTOM_ESTEPS_VALUE to what you want - USE WHOLE NUMBERS ONLY
233234
// This option sets the esteps from the CUSTOM_ESTEPS_VALUE line below.

Board_Configs/TH3D_EZBoardLite/Firmware/platformio.ini

Lines changed: 62 additions & 200 deletions
Original file line numberDiff line numberDiff line change
@@ -52,217 +52,79 @@ extra_scripts =
5252
pre:buildroot/share/PlatformIO/scripts/preflight-checks.py
5353
post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
5454
lib_deps =
55-
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/tests>
56-
-<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
57-
-<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
58-
-<src/lcd/e3v2/common> -<src/lcd/e3v2/creality> -<src/lcd/e3v2/proui> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
59-
-<src/lcd/menu>
60-
-<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>
61-
-<src/lcd/menu/game/maze.cpp> -<src/lcd/menu/game/snake.cpp>
62-
-<src/lcd/menu/menu_backlash.cpp>
63-
-<src/lcd/menu/menu_bed_corners.cpp>
64-
-<src/lcd/menu/menu_bed_leveling.cpp>
65-
-<src/lcd/menu/menu_cancelobject.cpp>
66-
-<src/lcd/menu/menu_delta_calibrate.cpp>
67-
-<src/lcd/menu/menu_filament.cpp>
68-
-<src/lcd/menu/menu_info.cpp>
69-
-<src/lcd/menu/menu_job_recovery.cpp>
70-
-<src/lcd/menu/menu_language.cpp>
71-
-<src/lcd/menu/menu_led.cpp>
72-
-<src/lcd/menu/menu_media.cpp>
73-
-<src/lcd/menu/menu_mmu2.cpp>
74-
-<src/lcd/menu/menu_password.cpp>
75-
-<src/lcd/menu/menu_power_monitor.cpp>
76-
-<src/lcd/menu/menu_spindle_laser.cpp>
77-
-<src/lcd/menu/menu_temperature.cpp>
78-
-<src/lcd/menu/menu_tmc.cpp>
79-
-<src/lcd/menu/menu_touch_screen.cpp>
80-
-<src/lcd/menu/menu_tramming.cpp>
81-
-<src/lcd/menu/menu_ubl.cpp>
82-
-<src/lcd/menu/menu_x_twist.cpp>
83-
-<src/lcd/extui/anycubic_chiron>
84-
-<src/lcd/extui/anycubic_i3mega>
85-
-<src/lcd/extui/dgus> -<src/lcd/extui/dgus/fysetc> -<src/lcd/extui/dgus/hiprecy> -<src/lcd/extui/dgus/mks> -<src/lcd/extui/dgus/origin>
86-
-<src/lcd/extui/dgus_reloaded>
87-
-<src/lcd/extui/example>
88-
-<src/lcd/extui/ftdi_eve_touch_ui>
89-
-<src/lcd/extui/malyan>
90-
-<src/lcd/extui/mks_ui>
91-
-<src/lcd/extui/nextion>
55+
default_src_filter = +<src/*> -<src/config> -<src/tests>
56+
; LCDs and Controllers
57+
-<src/lcd/HD44780> -<src/lcd/dogm> -<src/lcd/TFTGLCD> -<src/lcd/tft> -<src/lcd/tft_io>
58+
-<src/lcd/e3v2> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
9259
-<src/lcd/lcdprint.cpp>
93-
-<src/lcd/touch/touch_buttons.cpp>
94-
-<src/sd/usb_flashdrive/lib-uhs2> -<src/sd/usb_flashdrive/lib-uhs3>
95-
-<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
96-
-<src/sd/cardreader.cpp> -<src/sd/Sd2Card.cpp> -<src/sd/SdBaseFile.cpp> -<src/sd/SdFatUtil.cpp> -<src/sd/SdFile.cpp> -<src/sd/SdVolume.cpp>
60+
; Marlin HAL
61+
-<src/HAL>
62+
+<src/HAL/shared>
9763
-<src/HAL/shared/backtrace>
9864
-<src/HAL/shared/cpu_exception>
9965
-<src/HAL/shared/eeprom_if_i2c.cpp>
10066
-<src/HAL/shared/eeprom_if_spi.cpp>
101-
-<src/feature/adc> -<src/gcode/feature/adc>
102-
-<src/feature/ammeter.cpp>
103-
-<src/feature/babystep.cpp>
104-
-<src/feature/backlash.cpp>
105-
-<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>
106-
-<src/feature/bedlevel/abl> -<src/gcode/bedlevel/abl>
107-
-<src/feature/bedlevel/bdl> -<src/gcode/probe/M102.cpp>
108-
-<src/feature/bedlevel/mbl> -<src/gcode/bedlevel/mbl>
109-
-<src/feature/bedlevel/ubl> -<src/gcode/bedlevel/ubl>
110-
-<src/feature/bedlevel/hilbert_curve.cpp>
111-
-<src/feature/binary_stream.cpp> -<src/libs/heatshrink>
112-
-<src/feature/bltouch.cpp>
113-
-<src/feature/cancel_object.cpp> -<src/gcode/feature/cancel>
114-
-<src/feature/caselight.cpp> -<src/gcode/feature/caselight>
115-
-<src/feature/closedloop.cpp>
116-
-<src/feature/controllerfan.cpp> -<src/gcode/feature/controllerfan>
117-
-<src/feature/cooler.cpp> -<src/gcode/temp/M143_M193.cpp>
118-
-<src/feature/dac> -<src/feature/digipot>
119-
-<src/feature/direct_stepping.cpp> -<src/gcode/motion/G6.cpp>
120-
-<src/feature/e_parser.cpp>
121-
-<src/feature/easythreed_ui.cpp>
122-
-<src/feature/encoder_i2c.cpp>
123-
-<src/feature/ethernet.cpp> -<src/gcode/feature/network/M552-M554.cpp>
124-
-<src/feature/fancheck.cpp>
125-
-<src/feature/fanmux.cpp>
126-
-<src/feature/filwidth.cpp> -<src/gcode/feature/filwidth>
127-
-<src/feature/fwretract.cpp> -<src/gcode/feature/fwretract>
128-
-<src/feature/host_actions.cpp>
129-
-<src/feature/hotend_idle.cpp>
130-
-<src/feature/joystick.cpp>
131-
-<src/feature/leds/blinkm.cpp>
132-
-<src/feature/leds/leds.cpp>
133-
-<src/feature/leds/neopixel.cpp>
134-
-<src/feature/leds/pca9533.cpp>
135-
-<src/feature/leds/pca9632.cpp>
136-
-<src/feature/leds/printer_event_leds.cpp>
137-
-<src/feature/leds/tempstat.cpp>
138-
-<src/feature/max7219.cpp>
139-
-<src/feature/meatpack.cpp>
140-
-<src/feature/mixing.cpp>
141-
-<src/feature/mmu/mmu.cpp>
142-
-<src/feature/mmu/mmu2.cpp> -<src/gcode/feature/prusa_MMU2>
143-
-<src/feature/password> -<src/gcode/feature/password>
144-
-<src/feature/pause.cpp>
145-
-<src/feature/power.cpp>
146-
-<src/feature/power_monitor.cpp> -<src/gcode/feature/power_monitor>
147-
-<src/feature/powerloss.cpp> -<src/gcode/feature/powerloss>
148-
-<src/feature/probe_temp_comp.cpp>
149-
-<src/feature/repeat.cpp>
150-
-<src/feature/runout.cpp> -<src/gcode/feature/runout>
151-
-<src/feature/snmm.cpp>
152-
-<src/feature/solenoid.cpp> -<src/gcode/control/M380_M381.cpp>
153-
-<src/feature/spindle_laser.cpp> -<src/gcode/control/M3-M5.cpp>
154-
-<src/feature/stepper_driver_safety.cpp>
155-
-<src/feature/tmc_util.cpp> -<src/module/stepper/trinamic.cpp>
156-
-<src/feature/tramming.cpp>
157-
-<src/feature/twibus.cpp>
158-
-<src/feature/x_twist.cpp> -<src/gcode/probe/M423.cpp>
159-
-<src/feature/z_stepper_align.cpp>
160-
-<src/gcode/bedlevel/G26.cpp>
161-
-<src/gcode/bedlevel/G35.cpp>
162-
-<src/gcode/bedlevel/G42.cpp>
163-
-<src/gcode/bedlevel/M420.cpp> -<src/feature/bedlevel/bedlevel.cpp>
164-
-<src/gcode/calibrate/G33.cpp>
165-
-<src/gcode/calibrate/G34.cpp>
166-
-<src/gcode/calibrate/G34_M422.cpp>
167-
-<src/gcode/calibrate/G76_M871.cpp>
168-
-<src/gcode/calibrate/G425.cpp>
169-
-<src/gcode/calibrate/M12.cpp>
170-
-<src/gcode/calibrate/M48.cpp>
171-
-<src/gcode/calibrate/M100.cpp>
172-
-<src/gcode/calibrate/M425.cpp>
173-
-<src/gcode/calibrate/M665.cpp>
174-
-<src/gcode/calibrate/M666.cpp>
175-
-<src/gcode/calibrate/M852.cpp>
176-
-<src/gcode/control/M10-M11.cpp>
177-
-<src/gcode/control/M42.cpp> -<src/gcode/control/M226.cpp>
178-
-<src/gcode/config/M43.cpp>
179-
-<src/gcode/config/M217.cpp>
180-
-<src/gcode/config/M218.cpp>
181-
-<src/gcode/config/M221.cpp>
182-
-<src/gcode/config/M301.cpp>
183-
-<src/gcode/config/M302.cpp>
184-
-<src/gcode/config/M304.cpp>
185-
-<src/gcode/config/M305.cpp>
186-
-<src/gcode/config/M540.cpp>
187-
-<src/gcode/config/M575.cpp>
188-
-<src/gcode/config/M672.cpp>
189-
-<src/gcode/control/M7-M9.cpp>
190-
-<src/gcode/control/M211.cpp>
191-
-<src/gcode/control/M350_M351.cpp>
192-
-<src/gcode/control/M605.cpp>
193-
-<src/gcode/feature/advance>
194-
-<src/gcode/feature/camera>
195-
-<src/gcode/feature/i2c>
196-
-<src/gcode/feature/input_shaping>
197-
-<src/gcode/feature/L6470>
198-
-<src/gcode/feature/leds/M150.cpp>
199-
-<src/gcode/feature/leds/M7219.cpp>
200-
-<src/gcode/feature/macro>
201-
-<src/gcode/feature/mixing/M163-M165.cpp>
202-
-<src/gcode/feature/mixing/M166.cpp>
203-
-<src/gcode/feature/pause/G27.cpp>
204-
-<src/gcode/feature/pause/G60.cpp>
205-
-<src/gcode/feature/pause/G61.cpp>
206-
-<src/gcode/feature/pause/M125.cpp>
207-
-<src/gcode/feature/pause/M600.cpp>
208-
-<src/gcode/feature/pause/M603.cpp>
209-
-<src/gcode/feature/pause/M701_M702.cpp>
210-
-<src/gcode/feature/trinamic/M122.cpp>
211-
-<src/gcode/feature/trinamic/M569.cpp>
212-
-<src/gcode/feature/trinamic/M906.cpp>
213-
-<src/gcode/feature/trinamic/M911-M914.cpp>
214-
-<src/gcode/feature/trinamic/M919.cpp>
215-
-<src/gcode/geometry/G17-G19.cpp>
216-
-<src/gcode/geometry/G53-G59.cpp>
217-
-<src/gcode/geometry/M206_M428.cpp>
218-
-<src/gcode/host/M16.cpp>
219-
-<src/gcode/host/M113.cpp>
220-
-<src/gcode/host/M154.cpp>
221-
-<src/gcode/host/M360.cpp>
222-
-<src/gcode/host/M876.cpp>
223-
-<src/gcode/lcd/M0_M1.cpp>
224-
-<src/gcode/lcd/M73.cpp>
225-
-<src/gcode/lcd/M117.cpp>
226-
-<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M255.cpp> -<src/gcode/lcd/M256.cpp>
227-
-<src/gcode/lcd/M300.cpp>
228-
-<src/gcode/lcd/M414.cpp>
229-
-<src/gcode/lcd/M995.cpp>
230-
-<src/gcode/motion/G2_G3.cpp>
231-
-<src/gcode/motion/G5.cpp>
232-
-<src/gcode/motion/G80.cpp>
233-
-<src/gcode/motion/M290.cpp>
234-
-<src/gcode/probe/G30.cpp>
235-
-<src/gcode/probe/G31_G32.cpp>
236-
-<src/gcode/probe/G38.cpp>
237-
-<src/gcode/probe/M401_M402.cpp>
238-
-<src/gcode/probe/M851.cpp>
239-
-<src/gcode/probe/M951.cpp>
67+
; Features and G-Codes
68+
-<src/feature>
69+
-<src/gcode/bedlevel>
70+
-<src/gcode/calibrate>
71+
-<src/gcode/config>
72+
-<src/gcode/control>
73+
-<src/gcode/feature>
74+
-<src/gcode/geometry>
75+
-<src/gcode/host>
76+
-<src/gcode/lcd>
77+
-<src/gcode/motion>
78+
-<src/gcode/probe>
24079
-<src/gcode/scara>
24180
-<src/gcode/sd>
242-
-<src/gcode/sd/M32.cpp>
243-
-<src/gcode/sd/M808.cpp>
244-
-<src/gcode/temp/M104_M109.cpp>
245-
-<src/gcode/temp/M123.cpp>
246-
-<src/gcode/temp/M155.cpp>
247-
-<src/gcode/temp/M192.cpp>
248-
-<src/gcode/temp/M306.cpp>
249-
-<src/gcode/units/G20_G21.cpp>
250-
-<src/gcode/units/M82_M83.cpp>
251-
-<src/gcode/units/M149.cpp>
81+
-<src/gcode/temp>
82+
-<src/gcode/units>
83+
; Library Code
84+
-<src/libs/heatshrink>
25285
-<src/libs/BL24CXX.cpp> -<src/libs/W25Qxx.cpp>
253-
-<src/libs/L64XX> -<src/module/stepper/L64xx.cpp> -<src/HAL/shared/HAL_spi_L6470.cpp>
25486
-<src/libs/MAX31865.cpp>
25587
-<src/libs/hex_print.cpp>
25688
-<src/libs/least_squares_fit.cpp>
257-
-<src/libs/nozzle.cpp> -<src/gcode/feature/clean>
258-
-<src/module/delta.cpp>
259-
-<src/module/planner_bezier.cpp>
260-
-<src/module/polargraph.cpp>
261-
-<src/module/printcounter.cpp>
262-
-<src/module/probe.cpp>
263-
-<src/module/scara.cpp>
264-
-<src/module/servo.cpp> -<src/gcode/control/M280.cpp> -<src/gcode/config/M281.cpp> -<src/gcode/control/M282.cpp>
265-
-<src/module/stepper/TMC26X.cpp>
89+
-<src/libs/nozzle.cpp>
90+
; Modules
91+
-<src/module>
92+
-<src/module/stepper>
93+
; Media Support
94+
-<src/sd>
95+
;
96+
; Minimal Requirements
97+
;
98+
+<src/gcode/calibrate/G28.cpp>
99+
+<src/gcode/config/M92.cpp>
100+
+<src/gcode/config/M200-M205.cpp>
101+
+<src/gcode/config/M220.cpp>
102+
+<src/gcode/control/M17_M18_M84.cpp>
103+
+<src/gcode/control/M80_M81.cpp>
104+
+<src/gcode/control/M85.cpp>
105+
+<src/gcode/control/M108_*.cpp>
106+
+<src/gcode/control/M111.cpp>
107+
+<src/gcode/control/M120_M121.cpp>
108+
+<src/gcode/control/M999.cpp>
109+
+<src/gcode/control/T.cpp>
110+
+<src/gcode/geometry/G92.cpp>
111+
+<src/gcode/host/M110.cpp>
112+
+<src/gcode/host/M114.cpp>
113+
+<src/gcode/host/M115.cpp>
114+
+<src/gcode/host/M118.cpp>
115+
+<src/gcode/host/M119.cpp>
116+
+<src/gcode/motion/G0_G1.cpp>
117+
+<src/gcode/motion/G4.cpp>
118+
+<src/gcode/motion/M400.cpp>
119+
+<src/gcode/temp/M105.cpp>
120+
+<src/module/endstops.cpp>
121+
+<src/module/motion.cpp>
122+
+<src/module/planner.cpp>
123+
+<src/module/settings.cpp>
124+
+<src/module/stepper.cpp>
125+
+<src/module/temperature.cpp>
126+
+<src/module/tool_change.cpp>
127+
+<src/module/stepper/indirection.cpp>
266128

267129
#
268130
# Default values apply to all 'env:' prefixed environments

Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* THIS FIRMWARE VERSION IS FOR DIY USE ONLY BY ADVANCED USERS AND IS NOT COVERED UNDER INCLUDED TECHNICAL SUPPORT
66
*/
77
#pragma once
8-
#define CONFIGURATION_H_VERSION 02010200
8+
#define CONFIGURATION_H_VERSION 02010204
99

10-
#define UNIFIED_VERSION "TH3D UFW 2.87"
11-
#define STRING_DISTRIBUTION_DATE "2024-05-31"
10+
#define UNIFIED_VERSION "TH3D UFW 2.90"
11+
#define STRING_DISTRIBUTION_DATE "2024-09-04"
1212

1313
//#@CONFIGURATION_START_FLAG
1414

0 commit comments

Comments
 (0)