Compare commits

...

485 Commits

Author SHA1 Message Date
Sven Soost
d60a566cd2 Merge branch '2.1---sv' of https://git.soost.dev/sv/Marlin into 2.1---sv 2024-01-02 11:30:58 +01:00
Sven Soost
07df92fb03 help 2024-01-02 11:26:43 +01:00
Sven Soost
32d88bb983 upped fw version
corrected board type
2024-01-02 11:26:43 +01:00
Scott Lahteine
969a7bcd29 🔨 Specify versions in INI 2024-01-02 11:26:42 +01:00
Scott Lahteine
ef7b2a00f8 🔖 Marlin 2.1.0.1 2024-01-02 11:26:32 +01:00
Scott Lahteine
6fde6ce9c4 🔨 PlatformIO 6 compatibility 2024-01-02 11:24:09 +01:00
efflicto
eee1018122 tweaks 2024-01-02 11:23:53 +01:00
efflicto
c7e0f6e129 tweaks 2024-01-02 11:23:53 +01:00
efflicto
1ea8481194 tweaks 2024-01-02 11:23:53 +01:00
efflicto
1b742e6e01 Tweaks 2024-01-02 11:23:53 +01:00
efflicto
e6c84f6245 fix 2024-01-02 11:23:53 +01:00
efflicto
db5500815e fixes 2024-01-02 11:23:53 +01:00
efflicto
9c82457bef pid tunning 2024-01-02 11:23:53 +01:00
efflicto
7707c21bd1 tweaks 2024-01-02 11:23:53 +01:00
efflicto
33f614aaf5 Fixes and changes for BL and other stuff 2024-01-02 11:23:53 +01:00
76d6f47b05 fixed extruder 2024-01-02 11:23:53 +01:00
sv
ac4b0f41dc Added homing parameters 2024-01-02 11:23:53 +01:00
9a9bb290dc Remeasured extruder steps after extruder metal replacement 2024-01-02 11:23:53 +01:00
efflicto
735b54d32e chagnes and tweaks, enabled BL 2024-01-02 11:23:53 +01:00
efflicto
75a32fdc69 revert MULTI_VOLUME 2024-01-02 11:23:53 +01:00
efflicto
f610f4449a tweaks 2024-01-02 11:23:53 +01:00
efflicto
cea093c0a1 tweaks 2024-01-02 11:23:53 +01:00
efflicto
20a2f46e10 fixes for fans 2024-01-02 11:23:53 +01:00
efflicto
e63a15ce07 Bootscreen added
Adjusted bed PID
2024-01-02 11:22:24 +01:00
efflicto
1f922c98f8 disabled HYBRID_THRESHOLD 2024-01-02 11:22:24 +01:00
efflicto
e249879310 Added host communication
Corrected feeding rate
2024-01-02 11:22:24 +01:00
efflicto
3b5a2f33e8 Fixed fan related stuff 2024-01-02 11:22:24 +01:00
efflicto
331fc693f3 enabled lcd_bed_leveling 2024-01-02 11:22:24 +01:00
efflicto
91f27a5591 switched back to en 2024-01-02 11:22:23 +01:00
efflicto
91dfaec623 fixes for lin_advance & version 2024-01-02 11:22:23 +01:00
efflicto
0112b260fa Initial Setup 2024-01-02 11:22:23 +01:00
sv
0762338343 Initial commit 2024-01-02 11:22:23 +01:00
Scott Lahteine
d5813db0b9 🩹 Fix G33 output
See #26299
2024-01-02 11:22:23 +01:00
Scott Lahteine
5161465a2d 🔖 Version 2.1.2.1 2024-01-02 11:22:23 +01:00
Giuliano Zaro
7e24de9180 🐛 Fix G2/G3 limiting_speed (#25988) 2024-01-02 11:22:23 +01:00
Scott Lahteine
7aeea3f322 🩹 Prevent Z drop with G28 X/Y 2024-01-02 11:22:23 +01:00
Scott Lahteine
ecf5dcbc9d 🩹 Fix TFT LVGL compile error (#25865)
Fixes regression from #24302
2024-01-02 11:22:23 +01:00
Scott Lahteine
2db055d004 🚸 Improve EEPROM validation (#25860) 2024-01-02 11:22:23 +01:00
Scott Lahteine
85f486e037 🩹 Fix null pwm_details 2024-01-02 11:22:22 +01:00
Scott Lahteine
de1ccb20e8 🩹 Improve edit menu rounding 2024-01-02 11:22:22 +01:00
Scott Lahteine
e728cc69ae 🧑‍💻 ftdi_language 2024-01-02 11:22:22 +01:00
Scott Lahteine
50f9493afe 📌 TH3D EZBoard SD_DETECT_PIN 27 2024-01-02 11:22:22 +01:00
Chris Bagwell
1d8be142c8 🔧 Fix SHAPING_MIN_FREQ check (#25358) 2024-01-02 11:22:22 +01:00
Scott Lahteine
c6e4e7fa82 🧑‍💻 M43 updates 2024-01-02 11:22:22 +01:00
Giuliano Zaro
8784b581bb 🔧 Move SOFT_PWM_SCALE fallback to cpp (#25800)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:22 +01:00
Scott Lahteine
e1d59948a9 🚸 Faster default Marlin feedrate 2024-01-02 11:22:22 +01:00
ellensp
03baefab85 🔨 MKS Robin2 PIO Env (#25792) 2024-01-02 11:22:22 +01:00
Scott Lahteine
c3f24d61ac 🎨 Move G28O inside ProUI 2024-01-02 11:22:21 +01:00
Scott Mikutsky
d3c9bcd7a2 🐛 Fix STM32 USB disconnect behavior (#25762) 2024-01-02 11:22:21 +01:00
Scott Lahteine
2bf73b415c 🔧 Fix X2/Y2 axis pins check 2024-01-02 11:22:21 +01:00
Scott Lahteine
69dc14d494 🔧 Move MMU section 2024-01-02 11:22:21 +01:00
Scott Lahteine
b31296b7d8 🩹 Fix TFT sanity error 2024-01-02 11:22:21 +01:00
Scott Lahteine
c7e6e65ffb 🧑‍💻 Use NUM_AXIS_ARRAY 2024-01-02 11:22:21 +01:00
Scott Lahteine
ef949a54f9 🔨 Servo Timer 1 with STM32F103RC_fysetc (#25741) 2024-01-02 11:22:21 +01:00
Scott Lahteine
472b14678d 🔧 Update config.ini script 2024-01-02 11:22:21 +01:00
Scott Lahteine
0fe8cd2b7a 🧑‍💻 Change HAL_PATH macro for easier HAL relocation (#25743) 2024-01-02 11:22:21 +01:00
Scott Lahteine
84ad4c9f61 🔧 Extra axis endstop defaults 2024-01-02 11:22:20 +01:00
Anson Liu
bd1db04ccd 🔨 Prevent SlowSoftWire + Wire name conflict (#25707) 2024-01-02 11:22:20 +01:00
Scott Lahteine
b1c1cefef3 📝 Developer note in boards.h 2024-01-02 11:22:20 +01:00
Scott Lahteine
0b0a38c7f9 🚸 Improve PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED (#25681) 2024-01-02 11:22:20 +01:00
Scott Lahteine
cee8622475 🩹 Fix UBL safe measure move with extra axes
Followup to 7e79fc5b
2024-01-02 11:22:20 +01:00
Alexey D. Filimonov
800fd1e2ee 🎨 Clean up TFT Color UI display items (#25712)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:20 +01:00
Keith Bennett
7ad2bd1f86 🚸 Permit G38 with Core (#25713) 2024-01-02 11:22:20 +01:00
Jay Robson
6ada8b091c 🐛 Fix G38 with Z, support 9 axes (#25691)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:20 +01:00
Keith Bennett
2f5e70f03f 🔧 Check renamed LIN_ADVANCE_K (#25710) 2024-01-02 11:22:20 +01:00
ellensp
2f3f002c27 🩹 Correctly add JSON to mc.zip (#25706) 2024-01-02 11:22:20 +01:00
Scott Lahteine
d35ceb0aa2 🧑‍💻 Minor SpindleLaser::set_enabled tweak 2024-01-02 11:22:19 +01:00
Alexey D. Filimonov
ddb3033268 🩹 Fix Spindle/Laser ENA pin test (#25622) 2024-01-02 11:22:19 +01:00
Bob Kuhn
6d67142f7b 🩹 Fix laser with no PWM compile (#25290) 2024-01-02 11:22:19 +01:00
Dennis Lawler
1407f43f32 🚸 Echo G30 out-of-bounds (#25671) 2024-01-02 11:22:19 +01:00
Giuliano Zaro
a6f8679eda 🩹 Bail on 'mc.zip' write error (#25695)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:19 +01:00
ellensp
a2a566337d 🔨 Fix, clean up STM32F1 envs (#25697)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:19 +01:00
Giuliano Zaro
faf3a25f20 🐛 Fix Configuration Embedding (#25688) 2024-01-02 11:22:19 +01:00
ellensp
4620d00adb 🩹 Status / Host Prompt followup (#25720)
Followup to #25679

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:19 +01:00
Scott Lahteine
84dde2e9f8 🧑‍💻 HostUI::continue_prompt method 2024-01-02 11:22:19 +01:00
Scott Lahteine
1e61e7e19c 🧑‍💻 Status Message cleanup 2024-01-02 11:22:19 +01:00
Scott Lahteine
6ceeca432d 🧑‍💻 JyersUI code cleanup 2024-01-02 11:22:18 +01:00
Scott Lahteine
2854dd98d0 🧑‍💻 Apply simplified ?: 2024-01-02 11:22:18 +01:00
Scott Lahteine
9c00146e43 🔧 Trigorilla / Chiron updates
Followup to c3f34e4e
2024-01-02 11:22:18 +01:00
Scott Lahteine
be0cf33e4d 🔨 Improve runout script check 2024-01-02 11:22:18 +01:00
Scott Lahteine
109960a386 🩹 Fix AUTOFAN_CASE
Followup to #25554
2024-01-02 11:22:18 +01:00
Scott Lahteine
5df4e1ab13 🔧 Move FIL_RUNOUT_PIN for Chiron + GLCD 2024-01-02 11:22:18 +01:00
Scott Lahteine
6ceedafab0 🧑‍💻 Clarify G28 R / R0 2024-01-02 11:22:18 +01:00
Scott Lahteine
c49013becf 🚸 Minor M43 improvements 2024-01-02 11:22:18 +01:00
David Fries
bb61af4fe5 ️ Skip a redundant BLTouch::command (#25656) 2024-01-02 11:22:18 +01:00
Scott Lahteine
c6298ae610 🔧 Move TFT sanity checks 2024-01-02 11:22:18 +01:00
Scott Lahteine
a88627394b 🎨 Detab some build files 2024-01-02 11:22:17 +01:00
Scott Lahteine
1fb57947b9 🎨 Apply const (#25643) 2024-01-02 11:22:17 +01:00
ellensp
e9ec79e12e 🚸 Support CoreXY without Z (#25630) 2024-01-02 11:22:17 +01:00
Scott Lahteine
815d65e262 📝 Update Ender # labels 2024-01-02 11:22:17 +01:00
Scott Lahteine
ef646f2114 🧑‍💻 Update pinsformat.js 2024-01-02 11:22:17 +01:00
Scott Lahteine
1e3a5b0ac3 🐛 Ensure root for 'M503 C' 2024-01-02 11:22:17 +01:00
Giuliano Zaro
563a5da9e7 🌐 Update Italian language (#25587) 2024-01-02 11:22:17 +01:00
Scott Lahteine
3924c398c2 🩹 Fix displayed mix percentages 2024-01-02 11:22:17 +01:00
Scott Lahteine
a05af1b8be 🩹 Fix Ender-3 V2 with no fan 2024-01-02 11:22:16 +01:00
Chris Pepper
775d03bcdf 🔨 MarlinSimUI updates (#25589) 2024-01-02 11:22:16 +01:00
John Unland
be8cc5c4fe 🔨 Improve Docker local tests support (#25583) 2024-01-02 11:22:16 +01:00
Andrew
90474c2553 🎨 Remove unused ProUI : UBLValidMesh (#25591) 2024-01-02 11:22:11 +01:00
Scott Lahteine
f19ea05601 🔧 Fix up WiFi options (#25586) 2024-01-02 11:22:11 +01:00
Scott Lahteine
6bc106c48b 🔨 INI Updates
Co-Authored-By: Martin Turski <turningtides@outlook.de>
2024-01-02 11:22:11 +01:00
Eduard Sukharev
b9e05fd6bd 🐛 Fix M23 long filename support (#25540) 2024-01-02 11:22:11 +01:00
Scott Lahteine
bfd678bd62 🧑‍💻 Auto Fan / Cooler Fan updates (#25554) 2024-01-02 11:22:11 +01:00
Keith Bennett
1298acac83 🩹 Fix Touch Calibration first point (#25298) 2024-01-02 11:22:11 +01:00
Scott Lahteine
21f6f41a6d 🎨 Timer tweaks 2024-01-02 11:22:11 +01:00
ellensp
2569f74ade 🩹 Fix Chitu3D V6 default probe pin (#25552) 2024-01-02 11:22:11 +01:00
Scott Lahteine
90af917a29 🩹 Update TRONXY_V10 SPI_FLASH pins 2024-01-02 11:22:10 +01:00
Scott Lahteine
375c61aaa3 🎨 LPC_SOFTWARE_SPI => SOFTWARE_SPI
Co-Authored-By: Martin Turski <turningtides@outlook.de>
2024-01-02 11:22:10 +01:00
Scott Lahteine
df743d755a 🎨 Pins header comments
Co-Authored-By: Martin Turski <turningtides@outlook.de>
2024-01-02 11:22:10 +01:00
Martin Turski
78f854613c 🩹 Reset touch screen calibration on failure (#25334)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:09 +01:00
Scott Lahteine
3c6f086f2d 🎨 calibration_stage => stage 2024-01-02 11:22:09 +01:00
Scott Lahteine
81d279906b 🩹 Fix a serial_ternary 2024-01-02 11:22:09 +01:00
ellensp
707797f5d0 🩹 Fix Ender 2 stock LCD (#25538) 2024-01-02 11:22:09 +01:00
George Fu
66e5a906fb 🐛 Fix FYSETC Cheetah v2.0 Servo/Probe pins (#24635)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:22:09 +01:00
Scott Lahteine
4a3e84c5b9 ️ Misc. optimizations 2024-01-02 11:22:09 +01:00
Davide Rombolà
aa460bd936 🎨 Suppress warning (#25529) 2024-01-02 11:22:09 +01:00
Scott Lahteine
dbf7ea8796 🧑‍💻 More IntelliSense-friendly declares 2024-01-02 11:22:09 +01:00
Michael Hill
8583551557 Sovol v1.3.1 (Sovol SV06) (#25267) 2024-01-02 11:22:09 +01:00
dwzg
e469b04f9a 🩹 Fix DWIN MarlinUI Fan/E/XY (#25502) 2024-01-02 11:22:09 +01:00
Scott Lahteine
9f65ab96e4 🩹 Fan Menu / Status fixes
Followup to #21888
2024-01-02 11:22:08 +01:00
Abdullah YILMAZ
22ce4e5b22 🌐 Update Turkish language (#25447) 2024-01-02 11:22:08 +01:00
Giuliano Zaro
97e9f63286 🌐 Update Italian language (#25454) 2024-01-02 11:22:08 +01:00
Scott Lahteine
b7a3afe85d 📝 Fix a comment 2024-01-02 11:22:08 +01:00
jamespearson04
dc36389ea7 🐛 Fix UBL 'G29 J' mesh tilt (#25453)
Fix regression from #24214
2024-01-02 11:22:08 +01:00
Marcio T
ed992427e7 🚸 Improve CocoaPress Touch UI (#25446) 2024-01-02 11:22:08 +01:00
ellensp
7aa0454712 📝 Link to archived RA Control Panel page (#25424) 2024-01-02 11:22:08 +01:00
Giuliano Zaro
18aa56fa63 🌐 Update Italian language (#25309) 2024-01-02 11:22:08 +01:00
Roman Moravčík
9c4de0056a 🌐 Update Slovak language (#25305) 2024-01-02 11:22:08 +01:00
ellensp
47c00a59bd 🧑‍💻 Add IA_CREALITY CI test (#25434) 2024-01-02 11:22:07 +01:00
Scott Lahteine
e77686cfd9 🔨 Use 'build_src_filter' 2024-01-02 11:22:07 +01:00
Scott Lahteine
18a55a58f5 🔨 Fix thread-unsafe deque iteration 2024-01-02 11:22:03 +01:00
ellensp
3d4c6e5ca3 🐛 Fix MKS Robin Nano 1.3 F4 pin collision (#25838) 2024-01-02 11:21:55 +01:00
ellensp
94b4bd5c1e 🔧 Update thermocouple 2 pin sanity check (#25627) 2024-01-02 11:21:55 +01:00
ellensp
effeb5a4f2 🩹 Fix MARLIN_F446Zx_TRONXY variant (#25659)
Followup to 9be1554f
2024-01-02 11:21:55 +01:00
Chris Pepper
0935cdf7eb 🩹 Fix SD partitionTable packing (#25648) 2024-01-02 11:21:55 +01:00
Jason Smith
7f53cb3ce6 🎨 Suppress M122 sign warning (#25613) 2024-01-02 11:21:54 +01:00
Eduard Sukharev
4287eb83d2 🐛 Fix long filename read/report (#25509) 2024-01-02 11:21:54 +01:00
John Robertson
49ea4714fe 🔧 Sanity-check PRINTCOUNTER_SAVE_INTERVAL + ESP32 I2S Exp (#25527)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:21:54 +01:00
Keith Bennett
979313597a 🐛 Fix Anet ET4 SD_SS_PIN (#25492) 2024-01-02 11:21:54 +01:00
Scott Lahteine
25f3acab4c ️ Exit from ISR on AVR already does sei
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
2024-01-02 11:21:54 +01:00
Keith Bennett
aec1322585 BTT Octopus Max EZ 1.0, SKR 3.0 / 3.0 EZ (#25387, #25495, #25535) 2024-01-02 11:21:54 +01:00
Sion Williams
d57586b6a5 🔨 VSCode + Devcontainer support (#22420) 2024-01-02 11:21:53 +01:00
alextrical
094c9c38e4 🐛 Fix Flash EEPROM for STM32G0B1CB (#25469) 2024-01-02 11:21:53 +01:00
Hans-Christian Ebke
9b7acf8f40 🐛 Fix apply_power for SPINDLE_SERVO (#25465) 2024-01-02 11:21:53 +01:00
tombrazier
d8e232b120 🐛 Fix LA retract/feedrate edge case (#25445)
Followup to #25442
2024-01-02 11:21:53 +01:00
Scott Lahteine
fe7a60dc91 🔨 Improve config.ini example fetch 2024-01-02 11:21:53 +01:00
Scott Lahteine
29b392fa01 🌐 Regenerate language data 2024-01-02 11:21:53 +01:00
Scott Lahteine
bc915a2bb8 🧑‍💻 Script to make non-accented languages 2024-01-02 11:21:53 +01:00
Scott Lahteine
5a50118884 🔨 Update font scripts 2024-01-02 11:21:53 +01:00
ellensp
e55d4c9bfc 🔧 Fix Sensorless Probe sanity-check err (#25417) 2024-01-02 11:21:53 +01:00
tombrazier
27edbb21d3 🐛 Fix Linear Advance E position tracking (#25442)
Fix regression from #24951
2024-01-02 11:21:53 +01:00
tombrazier
32e0662783 🐛 Fix ISR_SHAPING_LOOP_CYCLES (#25335) 2024-01-02 11:21:52 +01:00
ellensp
bbf3083af6 🔨 Fix 'step' type in createTemperatureLookupMarlin.py (#25455) 2024-01-02 11:21:52 +01:00
Keith Bennett
1d6da05b6b 🔨 Fix env STM32G0B1RE_btt, add …_manta_btt (#25431) 2024-01-02 11:21:52 +01:00
Scott Lahteine
32ebc98f66 🎨 Use LIMIT macro 2024-01-02 11:21:52 +01:00
Guðni Már Gilbert
37287b234d ️ Reduce edit_screen code size (#25420) 2024-01-02 11:21:52 +01:00
Scott Lahteine
65443c3b15 🔧 Fix Einsy Rambo TMC driver check 2024-01-02 11:21:52 +01:00
tombrazier
0bd007abe6 🐛 Fix AVR maths used by Stepper (#25338) 2024-01-02 11:21:41 +01:00
ellensp
1de5d24780 🔨 Encrypt some MKS Robin (#25349) 2024-01-02 11:21:41 +01:00
Scott Lahteine
da0307daba 🧑‍💻 Fix preheat tests (nested macro limit ~256)
Followup to #25407
2024-01-02 11:21:41 +01:00
ellensp
cb6135f8f0 🔧 Sanity-check hotend max / preheat temps (#25407)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:21:41 +01:00
ellensp
fd20299a5d 📺 Update Re-ARM VIKI2 SPI pins (#25411) 2024-01-02 11:21:41 +01:00
Scott Lahteine
19ebcac9e3 🚸 Interruptible PLR (#25395) 2024-01-02 11:21:41 +01:00
ellensp
0325a0335c 🐛 Fix FastPWM calculations (#25343)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:21:41 +01:00
Trevin Small
42b7aa50ef ✏️ Fix README typo (#25388) 2024-01-02 11:21:41 +01:00
Scott Lahteine
ea122a1ce1 🎨 Tweak VALIDATE_MESH_TILT 2024-01-02 11:21:41 +01:00
Frederik Kemner
ea198b2cf3 🚸 SPI endstops for X/Y Dual and Core (#25371) 2024-01-02 11:21:41 +01:00
Radek
68621d7cb9 📝 Fix BTT_MINI_12864_V1 comment (#25366) 2024-01-02 11:21:40 +01:00
Scott Lahteine
ef96d439c8 🔨 Suppress native build warnings 2024-01-02 11:21:40 +01:00
EvilGremlin
b8913b19af 🔨 Adjust INI comments (#25183) 2024-01-02 11:21:40 +01:00
Scott Lahteine
f58ebcbbc1 🩹 Extra axis min home with Delta Sensorless Probe 2024-01-02 11:21:40 +01:00
Scott Lahteine
c023781f41 🩹 Extra axes for Tool Change 2024-01-02 11:21:40 +01:00
Scott Lahteine
002b48a52a 🩹 Various simple fixes 2024-01-02 11:21:40 +01:00
Scott Lahteine
f7f50a267a 🩹 Safe Bed Leveling updates 2024-01-02 11:21:40 +01:00
Scott Lahteine
7429633b29 🩹 Misc. extra axis updates 2024-01-02 11:21:40 +01:00
Scott Lahteine
6034a3e502 🩹 Use 'M205 D' when 'B' is an axis 2024-01-02 11:21:40 +01:00
Scott Lahteine
a581ba7107 🔧 Add a test for extra axes 2024-01-02 11:21:39 +01:00
Keith Bennett
6768759d96 BigTreeTech Manta M4P, M5P, M8P V1.0 / 1.1, E3 EZ (#25001) 2024-01-02 11:21:39 +01:00
Victor Oliveira
d58daf80f5 🧑‍💻 General 'MediaFile' type alias (#24424) 2024-01-02 11:21:39 +01:00
vyacheslav-shubin
2e019225d4 🧑‍💻 Add SD Card 'hide' method for dev usage (#22425) 2024-01-02 11:21:39 +01:00
Keith Bennett
63bca6fdd0 📝 Fix Z*_ENDSTOP_ADJUSTMENT comments (#25295) 2024-01-02 11:21:39 +01:00
kg333
670a37640b 📺 Melzi v4 with BTT SKR Mini E3 (#25321) 2024-01-02 11:21:38 +01:00
Martin Turski
32236c84d4 🔨 Fix test build path with spaces (#25329) 2024-01-02 11:21:38 +01:00
Bob Kuhn
79b3bcd3b1 🔧 Fix SD sorting sanity checks (#25318) 2024-01-02 11:21:38 +01:00
Scott Lahteine
ccc0d88a0e 🔧 Fix build with no Y axis (#25311) 2024-01-02 11:21:38 +01:00
Bob Kuhn
c45a880382 🩹 Fix G61 axis parameters with no offset (#25312) 2024-01-02 11:21:38 +01:00
Darren Garnier
44de068229 🔨 Fix config.ini URL fetch (#25313) 2024-01-02 11:21:38 +01:00
avionix-g
7154eea1fe 🐛 Fix MKS board Ultipanel support (#25278) 2024-01-02 11:21:38 +01:00
xBiohazardx
2fc5e21a18 ✏️ Fix probe invert flag (#25282) 2024-01-02 11:21:38 +01:00
Scott Lahteine
2c872dd096 🔧 Refine Input Shaping check (#25280) 2024-01-02 11:21:37 +01:00
Scott Lahteine
d1ebbcfbbe SDIO retry, hsd clock, etc. 2024-01-02 11:21:37 +01:00
Scott Lahteine
05a3ecb438 🔧 Overridable Stepper EN init 2024-01-02 11:21:37 +01:00
Bob Kuhn
fb860e69a8 🐛 Fix Ender-2 Stock Display with Melzi (#25258) 2024-01-02 11:21:37 +01:00
MarkMan0
f49f5ebd02 🐛 Fix, Refactor PID scaling (#25096) 2024-01-02 11:21:37 +01:00
John Robertson
c62005f750 🐛 Fix potential I2S buffer overwrite (#25113) 2024-01-02 11:21:37 +01:00
Scott Lahteine
ec57fcc4d1 🎨 Heading cleanup 2024-01-02 11:21:37 +01:00
Scott Lahteine
7a1d662fc2 🎨 Language / menu cleanup 2024-01-02 11:21:36 +01:00
Scott Lahteine
0df6ae413e ✏️ ProUI followup 2024-01-02 11:21:36 +01:00
Scott Lahteine
68b6ca53cf 🔧 Added MOTHERBOARD error text 2024-01-02 11:21:36 +01:00
Scott Lahteine
78375bbbd4 🎨 Misc. formatting 2024-01-02 11:21:36 +01:00
Scott Lahteine
2087a56624 🧑‍💻 Fix D5 warning 2024-01-02 11:21:36 +01:00
Scott Lahteine
f0b1090e6a 🐛 Fix homing_needed_error 2024-01-02 11:21:36 +01:00
Scott Lahteine
f1895947a8 🔧 Input Shaping sanity checks 2024-01-02 11:21:36 +01:00
Scott Lahteine
1378e3fb2b 🩹 Fix Sim with USE_WATCHDOG disabled 2024-01-02 11:21:35 +01:00
Scott Lahteine
38a954e9fa 🔨 Improve config.ini parser 2024-01-02 11:21:35 +01:00
Alex Z
98bf7cbfeb 🐛 Fix Chitu V6 Z_STOP_PIN (#25227) 2024-01-02 11:21:35 +01:00
Miguel Risco-Castillo
55e4de0144 🚸 ProUI updates (#25176) 2024-01-02 11:21:35 +01:00
Sebastien BLAISOT
e3a64464ee 🐛 Fix Neopixel 1 startup (#25203) 2024-01-02 11:21:35 +01:00
Vlad Popescu
9f7f6ab10f 🩹 Fix E3V2 MarlinUI XYZ frame (#25206) 2024-01-02 11:21:35 +01:00
Richard Layton
dd6791bb45 📝 Linux Sim apt-get line (#25208) 2024-01-02 11:21:35 +01:00
Richard Layton
91fe29319f 📝 More native.ini docs (#25201) 2024-01-02 11:21:34 +01:00
ellensp
f7a9a73f91 🩹 Update MKS_GEN_13 MOSFET pins (#25126) 2024-01-02 11:21:34 +01:00
ellensp
b6267b7ffa 🩹 Replace pow() with _BV() (#25186) 2024-01-02 11:21:34 +01:00
Mike Bignell
8debbc213c 🩹 Fix missing IS_MELZI (#25190) 2024-01-02 11:21:34 +01:00
Ashley 'DrToxic' Devine
9435483b74 🎨 Misc. cleanup (#25194)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:21:34 +01:00
Vovodroid
6d1df38a5b 🚸 Attach USB media (#25120) 2024-01-02 11:21:34 +01:00
Scott Lahteine
e3b2324c13 🧑‍💻 Add Temperature::is_above_target 2024-01-02 11:21:34 +01:00
Scott Lahteine
7ac6609d7d 🎨 Rename *_temp_error to *temp_error 2024-01-02 11:21:34 +01:00
Timothy Hoogland
30c1d06300 🩹 Remove extraneous EZBoard V1 autofans (#25182) 2024-01-02 11:21:34 +01:00
Scott Lahteine
6dfe711846 🎨 Misc. IS cleanup 2024-01-02 11:21:34 +01:00
Giuliano Zaro
4147b41e58 🚸 MarlinUI edit steps/mm to 2 decimal places (#25144) 2024-01-02 11:21:33 +01:00
ellensp
6f5648ae41 🧑‍💻 Fix type warning (#25149) 2024-01-02 11:21:33 +01:00
ellensp
105569c93b 🔨 FILAMENT_RUNOUT_SCRIPT sanity check (#25150) 2024-01-02 11:21:33 +01:00
Lukas Erlacher
222079c7aa 🔧 Add H8 to Creality 4.2.2 stepper warning (#25154) 2024-01-02 11:21:33 +01:00
Lukas Erlacher
84b8d64cda 🚸 Z Servo Probe is HAS_STOWABLE_PROBE (#25158) 2024-01-02 11:21:33 +01:00
Timothy Hoogland
f421096af2 🩹 Remove extraneous EZBoard V2 autofans (#25166) 2024-01-02 11:21:33 +01:00
Scott Lahteine
3efe91aa95 🚸 Hide IS menu while busy 2024-01-02 11:21:33 +01:00
Vlad Popescu
12e066b41f 🐛 Avoid lambda for menu items (#25169) 2024-01-02 11:21:33 +01:00
Stefan Kalscheuer
d37c967754 🐛 Fix Mesh Bed Leveling Z correction (#25122) 2024-01-02 11:21:33 +01:00
Keith Bennett
cc79ceb830 📝 Fix Configs URL (#25167) 2024-01-02 11:21:32 +01:00
Scott Lahteine
a62911210b 🧑‍💻 Fix ONBOARD_FLASH_SIZE 2024-01-02 11:21:27 +01:00
Scott Lahteine
e92d8ed620 🔖 Version 2.1.2 2024-01-02 11:21:27 +01:00
Scott Lahteine
9e4623344c 📝 Update 2.1.x README 2024-01-02 11:21:04 +01:00
Scott Lahteine
60e7acb96b 🧑‍💻 M593 F "min" freq 2024-01-02 11:21:04 +01:00
Scott Lahteine
02171faf35 🐛 Fix Melzi encoder 2024-01-02 11:21:04 +01:00
Scott Lahteine
c74da8b595 🩹 Fix LCD_FOR_MELZI with Tronxy Melzi 2024-01-02 11:21:04 +01:00
EvilGremlin
fef48d3c26 🐛 Fix DOGM time overflow, alignment (#25103) 2024-01-02 11:21:03 +01:00
ellensp
ec409acc7d 🎨 Suppress warning (#25101) 2024-01-02 11:21:03 +01:00
ellensp
a8394ad94a BTT Octopus with STM32-F407 (#25031) 2024-01-02 11:21:03 +01:00
alextrical
6288fb639f BigTreeTech EBB42 v1.1 (#24964) 2024-01-02 11:21:03 +01:00
ils15
e254a806cf 🔧 Use multi-XYZ 'STOP' pins for MIN/MAX (#24855)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:21:03 +01:00
Scott Lahteine
d1e0dffff3 Robin Nano v1 CDC (USB mod)
Followup to #24619
2024-01-02 11:21:03 +01:00
Dipl.-Ing. Raoul Rubien, BSc
46777d86d0 🩹 Fix M115_GEOMETRY_REPORT (#25092) 2024-01-02 11:21:02 +01:00
ellensp
bb34b41608 🩹 Inverted probe pin flag (K8400) (#25085) 2024-01-02 11:21:02 +01:00
Scott Lahteine
e48537fe50 🩹 Fix M502 init of default motion
Fix regression from #25035
2024-01-02 11:21:02 +01:00
alextrical
6dd559184f 🩹 Use custom I2C pins for OLED (#24970) 2024-01-02 11:21:02 +01:00
Bart Meijer
4b52aed9a8 SAMD21 HAL / Minitronics v2.0 (#24976) 2024-01-02 11:21:02 +01:00
Alexander Gavrilenko
ed3ae09e66 TFT_COLOR_UI async DMA SPI (#24980) 2024-01-02 11:21:01 +01:00
Scott Lahteine
903f9b2ac0 📝 Replace Twitter with Fosstodon 2024-01-02 11:21:01 +01:00
Simon Pilepich
4dd5b0e7e3 🔧 Anycubic alternate Z1/Z2 wiring (#25071) 2024-01-02 11:21:01 +01:00
Krzysztof Błażewicz
e2e50a05eb JyersUI TMC Settings (#25048) 2024-01-02 11:21:01 +01:00
Keith Bennett
a20ef4ca63 🔧 Custom Menu Sanity Check (#25079) 2024-01-02 11:21:01 +01:00
Scott Lahteine
b5e0ff331c 🔨 Updated 'mfconfig init' 2024-01-02 11:21:01 +01:00
ellensp
5de18e548a 🔨 No env:mega1280 for MIGHTYBOARD_REVE (#25080) 2024-01-02 11:21:00 +01:00
tombrazier
4e9ed5990b ️ Better IS buffer size calc (#25035) 2024-01-02 11:21:00 +01:00
Vovodroid
c62f686ecc Two controller fans (#24995) 2024-01-02 11:21:00 +01:00
ellensp
6a4a6d8c07 📌 Pins updates for Longer LK5, etc. (#25012)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:21:00 +01:00
EvilGremlin
065eb12f51 🚸 Progress display followup (#24879) 2024-01-02 11:21:00 +01:00
Sebastien BLAISOT
9a07f768bf M150 S default index (#23066)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:21:00 +01:00
Scott Lahteine
1911ed13de 🔨 Return error on mftest exit 2024-01-02 11:20:59 +01:00
Scott Lahteine
751316598e 📝 Update config comments 2024-01-02 11:20:59 +01:00
ellensp
acb2e452bb 🐛 Fix Fast PWM on AVR (#25030)
Followup to #25005
2024-01-02 11:20:59 +01:00
kisslorand
8e2c013c57 ✏️ Fix missing ) (#25055) 2024-01-02 11:20:59 +01:00
Scott Lahteine
855b6de9e7 🔨 Fix CI Test clean step (2) 2024-01-02 11:20:59 +01:00
Scott Lahteine
b8b65e7bcb 🎨 Misc. cleanup 2024-01-02 11:20:59 +01:00
Scott Lahteine
6f119178f2 🔨 Fix CI Test clean step 2024-01-02 11:20:59 +01:00
tombrazier
ac3d422a46 🐛 Fix TMC5160 + Input Shaping overcurrent (#25050) 2024-01-02 11:20:59 +01:00
Taylor Talkington
d1ad6d7481 🩹 Ender 3v2 DWIN MarlinUI Fixup (#24984) 2024-01-02 11:20:58 +01:00
Scott Lahteine
c7e3054b67 🎨 Trailing whitespace 2024-01-02 11:20:58 +01:00
ellensp
258b812eef 🔨 Update renamed.ini (#25042) 2024-01-02 11:20:58 +01:00
ellensp
fb4c69407f 🩹 Fix MSG_MOVE_N_MM substitution (#25043) 2024-01-02 11:20:58 +01:00
kisslorand
94a4101f22 🚸 G30 move to logical XY (#24953) 2024-01-02 11:20:58 +01:00
Scott Lahteine
6b3533a946 🎨 Misc. cleanup 2024-01-02 11:20:58 +01:00
Scott Lahteine
ee4bf53e3b 🧑‍💻 Use spaces indent for Python 2024-01-02 11:20:58 +01:00
トトも
5efd79b282 📝 Formatted Team Overview (#25029) 2024-01-02 11:20:57 +01:00
Scott Lahteine
acfa61728c 🐛 Fix G-code resend race condition
As pointed out in #24972 by @silycr, but simplified.
2024-01-02 11:20:57 +01:00
Taylor Talkington
47263b0411 Ender-3 V2 DWIN for BTT Octopus V1.1 (#24983) 2024-01-02 11:20:57 +01:00
Chris Bagwell
04fb7b322a ️ More SCURVE cycles on unoptimized cortex-m0 (#24955) 2024-01-02 11:20:57 +01:00
tombrazier
a1439ca445 ️ Input Shaping improvements (#24951) 2024-01-02 11:20:57 +01:00
Trivalik
3f46baa323 🐛 Fix missing va_end in UnwPrintf (#25027) 2024-01-02 11:20:56 +01:00
studiodyne
118eb82993 🐛 Fix MILLISECONDS_PREHEAT_TIME / mintemp (#24967) 2024-01-02 11:20:56 +01:00
Marcio T
7d44a3ab46 🩹 Fix ADVANCE_K + DISTINCT_E_FACTORS sanity check (#25007) 2024-01-02 11:20:56 +01:00
Manuel McLure
b340de5e9d 🔧 Merge TMC26X with TMC config (#24373) 2024-01-02 11:20:56 +01:00
Radek
eefaa70893 🐛 Fix SKR mini E2 V2 + BTT_MINI_12864_V1 (#24827)
See https://github.com/bigtreetech/BIGTREETECH-SKR-mini-E3/issues/686#issuecomment-1296545443
2024-01-02 11:20:56 +01:00
Vasily Evseenko
868258fca9 🍻 Fix Z increase on toolchange without UBL (#22942) 2024-01-02 11:20:56 +01:00
ellensp
2b79b66f66 🩹 Fix UBL menu compile (#25020) 2024-01-02 11:20:56 +01:00
mikemerryguy
5c31f99178 🚸 Add 50mm manual move (#24884) 2024-01-02 11:20:55 +01:00
Thomas Buck
bc7aaa6120 🚸 Optional Cutter/Laser status for HD44780 (#25003) 2024-01-02 11:20:55 +01:00
Tanguy Pruvot
ec7af0ca4c 🚸 COLOR_UI sleep timeout / setting (#24994) 2024-01-02 11:20:55 +01:00
ellensp
fe962b1e4c 🔧 Fix TPARA (…SCARA, DELTA) settings (#25016) 2024-01-02 11:20:55 +01:00
Tanguy Pruvot
a7b982ed67 ✏️ Fix Robin nano env typo (#24993) 2024-01-02 11:20:55 +01:00
ellensp
dab181c464 📺 FYSETC_MINI_12864_2_1 with BTT_SKR_E3_DIP (#24986) 2024-01-02 11:20:55 +01:00
ellensp
81f47a9d28 🩹 Fix planner typo (#24977) 2024-01-02 11:20:55 +01:00
ellensp
0bdbc656d6 🐛 MKS_MINI_12864 on SKR 1.3 needs FORCE_SOFT_SPI (#24850) 2024-01-02 11:20:54 +01:00
EvilGremlin
a8a16eaf6b 🔧 Check Delta homing direction (#24865) 2024-01-02 11:20:54 +01:00
phigjm
4eeb38a1e8 🩹 Fix SERVICE_INTERVAL reset (#24888) 2024-01-02 11:20:54 +01:00
Marcio T
4998bee1b8 Fix FAST_PWM_FAN / TouchUI with NO_MOTION_BEFORE_HOMING (#25005)
Fix regressions from #20323, #23463
2024-01-02 11:20:54 +01:00
ellensp
b743c6c1de 🩹 Fix 2 thermocouples (#24982)
Followup to #24898
2024-01-02 11:20:54 +01:00
Scott Lahteine
f930d870c3 🐛 Fix M808 starting count
Reported by adcurtin on Discord
2024-01-02 11:20:54 +01:00
Justin Hartmann
af2dbae015 🩹 Fix Overlord compile (#24947) 2024-01-02 11:20:54 +01:00
Pascal de Bruijn
8c9354c897 🚸 M306: Indicate MPC Autotune (#24949) 2024-01-02 11:20:54 +01:00
ellensp
53691bbecb 🩹 Allow max endstops MKS Monster 8 V2 (#24944) 2024-01-02 11:20:54 +01:00
Scott Lahteine
2c4a35e042 🐛 Fix Anycubic / Trigorilla pins, etc. (#24971) 2024-01-02 11:20:54 +01:00
Scott Lahteine
05fbc97759 🎨 Prefer axis element over index 2024-01-02 11:20:53 +01:00
Scott Lahteine
28544fe5f6 🩹 Fix EEPROM write for !LIN_ADVANCE
Fixes #24963
Followup to #24821
2024-01-02 11:20:53 +01:00
Scott Lahteine
af62eef5d5 🩹 MAX Thermocouple followup
Followup to #24898
2024-01-02 11:20:53 +01:00
Scott Lahteine
55c6d815a1 🩹 leds.update needed for reset_timeout
Followup to #23590
2024-01-02 11:20:53 +01:00
Scott Lahteine
e6cfaeef2c 🧑‍💻 More direct encoder spin 2024-01-02 11:20:53 +01:00
Scott Lahteine
9f29c582d0 🎨 Update SAMD51 headers 2024-01-02 11:20:53 +01:00
Scott Lahteine
6c17e643c4 🎨 Format some lib-uhs3 code 2024-01-02 11:20:53 +01:00
ellensp
ba7cda7a3d 📌 ZRIB V52-V53 Servo Pins (#24880) 2024-01-02 11:20:53 +01:00
InsanityAutomation
343d1da462 Tenlog MB1V23 IDEX board (#24896) 2024-01-02 11:20:52 +01:00
Giuliano Zaro
20bbb1f56b 🌐 Update Italian language (#24915) 2024-01-02 11:20:52 +01:00
ellensp
aedd655cef 📌 Remove unused RX/TX pins (#24932) 2024-01-02 11:20:52 +01:00
Keith Bennett
e01912fb96 🔧 Update Display Sleep LCD Check (#24934) 2024-01-02 11:20:52 +01:00
Justin Hartmann
5f9aae26c4 🩹 Buttons Followup (#24935)
Followup to #24878
2024-01-02 11:20:52 +01:00
Scott Lahteine
6f25c2b1c7 🩹 Allow for last non-servo extruder 2024-01-02 11:20:52 +01:00
ellensp
000fa4b199 🐛 Fix move_extruder_servo (#24908) 2024-01-02 11:20:52 +01:00
InsanityAutomation
4b591c6c3f 🐛 Fix FTDUI Status Screen Timeout (#24899) 2024-01-02 11:20:52 +01:00
Manuel McLure
15c9a6dffa 🩹 Fix spurious "bad command" (#24923) 2024-01-02 11:20:52 +01:00
Scott Lahteine
aefcffa413 🩹 Fix M593 report 2024-01-02 11:20:51 +01:00
kurtis-potier-geofabrica
d33ef1f094 🚸 Up to 3 MAX Thermocouples (#24898) 2024-01-02 11:20:51 +01:00
Scott Lahteine
11b910d4d6 🔧 Clean up unused ESP_WIFI pins 2024-01-02 11:20:51 +01:00
tombrazier
7c88f2ea86 🚀 ZV Input Shaping (#24797) 2024-01-02 11:20:51 +01:00
Scott Lahteine
4cac625bb0 🔨 gcc-12 for macOS native 2024-01-02 11:20:51 +01:00
InsanityAutomation
a932657403 Controllerfan PWM scaling, kickstart (#24873) 2024-01-02 11:20:45 +01:00
silycr
8bbe7481a1 🚸 Probe pins for Chitu V5 (#24910) 2024-01-02 11:20:45 +01:00
ellensp
a73a88917b 🔧 Some STM32 UART Sanity Checks (#24795) 2024-01-02 11:20:45 +01:00
Scott Lahteine
ca407c7934 🎨 Misc. variant cleanup, translation
Followup to #24787
2024-01-02 11:20:45 +01:00
InsanityAutomation
60eb1ef736 🐛 Fix Print Timer stop with MarlinUI abort (#24902) 2024-01-02 11:20:45 +01:00
ellensp
4e4d5aa021 🔧 No Native USB on AVR (#24906) 2024-01-02 11:20:44 +01:00
Scott Lahteine
2d02703af8 🧑‍💻 Pins and debug list cleanup (#24878) 2024-01-02 11:20:44 +01:00
Scott Lahteine
e352cf20c2 🎨 CONF_SERIAL_IS => SERIAL_IN_USE 2024-01-02 11:20:44 +01:00
ellensp
cb0a760200 Tronxy v10 (#24787) 2024-01-02 11:20:44 +01:00
Keith Bennett
8cbb620180 🔧 No Sleep for CR-10 Stock Display (#24875) 2024-01-02 11:20:44 +01:00
karliss
29f0cbcbd6 🐛 Fix compile without Y/Z (#24858)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:20:44 +01:00
Keith Bennett
10e96c64ac 🔧 Check Sensorless Homing on all axes (#24872) 2024-01-02 11:20:44 +01:00
InsanityAutomation
44fdd877fd 🐛 Fix bed/chamber PID P edit (#24861) 2024-01-02 11:20:44 +01:00
Scott Lahteine
62cbe127f1 🎨 HAS_SPI_FLASH => SPI_FLASH 2024-01-02 11:20:43 +01:00
Dan Royer
b12267148e 🐛 Fix and improve Polargraph (#24847)
Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:20:43 +01:00
ellensp
c1d9bea3e0 🐛 Fix operators for V axis (#24866)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:20:43 +01:00
mjbogusz
73d4db77d7 🩹 Fix TFT LCD in Simulation (#24871) 2024-01-02 11:20:43 +01:00
Scott Lahteine
a59cfecc16 🎨 MMU2 cleanup 2024-01-02 11:20:43 +01:00
Scott Lahteine
4aaf2d2b82 🐛 Fix M876 without emergency parser
Fix regression from 1fb2fffdbf
2024-01-02 11:20:43 +01:00
adam3654
e0aad89105 DOGM Display Sleep (#24829) 2024-01-02 11:20:43 +01:00
EvilGremlin
48622d27f0 🩹 Fix temperature include (#24834) 2024-01-02 11:20:43 +01:00
Scott Lahteine
cde06bba6a 🎨 Misc. variant cleanup 2024-01-02 11:20:42 +01:00
Scott Lahteine
14d9774f93 🧑‍💻 Min and max for base types 2024-01-02 11:20:42 +01:00
EvilGremlin
eae02513d7 MKS SKIPR board (#24791) 2024-01-02 11:20:42 +01:00
Scott Lahteine
d1ae2e5a8b 🔨 Update mfinfo for 2.1.x 2024-01-02 11:20:42 +01:00
Scott Lahteine
594be2c248 🧑‍💻 Min and max for base types 2024-01-02 11:20:42 +01:00
Giuliano Zaro
4eaea9cd29 ADVANCE_K per-extruder (#24821)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:20:42 +01:00
EvilGremlin
41ffff26a4 ♻️ Set Progress without LCD (#24767)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:20:42 +01:00
EvilGremlin
1c4b9de530 🩹 Fix Color UI touchscreen sleep (#24826) 2024-01-02 11:20:41 +01:00
Adam
6b54b8c409 🩹 Fix Switching Toolhead compile (#24814) 2024-01-02 11:20:41 +01:00
ellensp
986a5c9b80 🧑‍💻 Einsy Rambo EXP headers (#24825) 2024-01-02 11:20:41 +01:00
ellensp
b5f7b7919d 🔨 Detect feature parsing error (#24824) 2024-01-02 11:20:41 +01:00
ellensp
0d88b8b461 Creality v5.2.1 board (#24815)
Followup to #24760
2024-01-02 11:20:41 +01:00
Keith Bennett
009fbc85d2 🔧 Thermistor (66) sanity-check (#24803) 2024-01-02 11:20:41 +01:00
Eduardo José Tagle
316d8e9181 🐛 Fix DUE compile and errors (#24809) 2024-01-02 11:20:41 +01:00
Scott Lahteine
adf3d4cd73 🩹 Fix some vector_3 cast operators 2024-01-02 11:20:41 +01:00
Keith Bennett
726c04b70e 🔧 Update Creality 4.2.2 Driver Warning (#24806) 2024-01-02 11:20:41 +01:00
ellensp
6e7ce5e3aa 🩹 Disable DEBUG_DGUSLCD (#24798) 2024-01-02 11:20:40 +01:00
Yuri D'Elia
eeb286d2a9 🎨 Remove non-const compare operators (#24810) 2024-01-02 11:20:40 +01:00
Plynix / Ben Hartiwch
ec9338474f Creality v5.2.1 board (#24760) 2024-01-02 11:20:40 +01:00
discip
d2594ff9c8 Pt1000 with 2k2 pullup (SKR 3 / EZ) (#24790) 2024-01-02 11:20:40 +01:00
ellensp
abe9431029 ✏️ Followup for M524 (#24775)
Followup to #24761
2024-01-02 11:20:40 +01:00
Stuart Pittaway
3f8a8666f6 🚸 UUID fallback to STM32 device SN (#24759)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:20:40 +01:00
Keith Bennett
bc4a252819 📌 Specify MarlinFirmware/U8glib (#24792) 2024-01-02 11:20:40 +01:00
Renaud11232
4eadd76d47 🔨 Fix LPC1768 autodetect path on Linux (#24773) 2024-01-02 11:20:31 +01:00
Stefan Kalscheuer
623f70fd3b Anycubic i3 Mega LCD file menu fix (#24752) 2024-01-02 11:20:30 +01:00
studiodyne
02694dcd58 M217 G wipe retract length 2024-01-02 11:20:30 +01:00
studiodyne
1bd3f4e7cd XY_COUNTERPART_BACKOFF_MM 2024-01-02 11:20:30 +01:00
studiodyne
d7ecc271a4 RGB_STARTUP_TEST 2024-01-02 11:20:30 +01:00
tombrazier
9bf7f28d15 Permit Linear Advance with I2S Streaming (#24684) 2024-01-02 11:20:30 +01:00
Scott Lahteine
3d90aac76a Robin Nano v1 CDC (USB mod)
Followup to #24619
2024-01-02 11:20:30 +01:00
Scott Lahteine
c71bc95700 🐛 Fix recalculate_max_e_jerk 2024-01-02 11:20:30 +01:00
ellensp
0453fdfb94 🐛 Fix VW axis fields in types.h (#24780) 2024-01-02 11:20:30 +01:00
Giuliano Zaro
9194c9f2dc 🚸 Strict index 2 for M913 / M914 XY (#24680) 2024-01-02 11:20:30 +01:00
Arkadiusz Miśkiewicz
8ce2cd7617 🚸 Emergency Parse M524 (#24761) 2024-01-02 11:20:29 +01:00
Giuliano Zaro
59b99da36f 🐛 Fix / refactor shared PID (#24673)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:20:29 +01:00
Chris Bagwell
a43175aada 🧑‍💻 STM32G0B1RE Pins Debugging (#24748) 2024-01-02 11:20:29 +01:00
Eduard Sukharev
3b98fece67 🩹 Fix MKS TinyBee + MKS MINI 12864 SD blank on write (#24670) 2024-01-02 11:20:29 +01:00
Eduard Sukharev
e6c9776c21 🚸 Sanity check Integrated Babystepping + I2S stream + ESP32 (#24691) 2024-01-02 11:20:29 +01:00
George Fu
7c31b6e518 FYSETC SPIDER KING407 (#24696) 2024-01-02 11:20:29 +01:00
ellensp
08aeec931c BTT SKR Mini E3 V3.0.1 (#24722) 2024-01-02 11:20:29 +01:00
XDA-Bam
17e9faa4b8 ️ Minor planner optimization (#24737) 2024-01-02 11:20:28 +01:00
Arkadiusz Miśkiewicz
c467ab751d 🚸 On pause report "SD printing byte X/Y" (#24709) 2024-01-02 11:20:28 +01:00
Arkadiusz Miśkiewicz
1159cbe0d9 🩹 Report M22 / M23 success / fail (#24706) 2024-01-02 11:20:28 +01:00
Gurmeet Athwal
2a6cc9f343 🚸 M115 spindle/laser (#24681, #24747) 2024-01-02 11:20:28 +01:00
ellensp
b8c3e9df4f 📺 FYSETC Mini 12864 2.1 pins for Creality V4 (#24624) 2024-01-02 11:20:28 +01:00
FBN
2a938002eb 🚸 More automatic MMU2 load (#24750, #24770) 2024-01-02 11:20:28 +01:00
Yuri D'Elia
cc17fbcae4 👷 Array macros to …26 elements (#24789) 2024-01-02 11:20:28 +01:00
Scott Lahteine
a9dad3b2c0 🌐 Some short menu strings 2024-01-02 11:20:28 +01:00
Keith Bennett
b8300aed8a ️ Only Sync Emulated EEPROM Print Counter (#24731) 2024-01-02 11:20:28 +01:00
Giuliano Zaro
668b725cca 🐛 Fix heater timeout PID output (#24682) 2024-01-02 11:20:28 +01:00
Scott Lahteine
33ea1647b1 🧑‍💻 Microsteps to stepper.cpp 2024-01-02 11:20:28 +01:00
hartmannathan
582a5c6dfe 📝 Fix example comment (#24744) 2024-01-02 11:20:28 +01:00
Scott Lahteine
e51a0b4fd0 📝 Fix comment 2024-01-02 11:20:27 +01:00
JoaquinBerrios
24874d7f89 ️ BTT SKR V3.0 / EZ = 480MHz (#24721) 2024-01-02 11:20:27 +01:00
Scott Lahteine
2be53bbc15 🔨 Fix config-labels.py 2024-01-02 11:20:27 +01:00
Scott Lahteine
b36f688851 🔨 Outdent py string 2024-01-02 11:20:27 +01:00
dmitrygribenchuk
e015483d93 🔨 Clean up Python imports (#24736) 2024-01-02 11:20:27 +01:00
ButchMonkey
4732105dd9 🔨 Fix config.ini custom items, and 'all' (#24720) 2024-01-02 11:20:27 +01:00
ButchMonkey
cbc48f165f 🔨 Fix configuration.py with encoding UTF-8 (#24719)
- Opening files with Windows-1252 encoding.
2024-01-02 11:20:27 +01:00
Stephen Hawes
dcf6c735ae Opulo LumenPnP REV04 (#24718) 2024-01-02 11:20:26 +01:00
Keith Bennett
f51ed2fb12 🔨 Update SKR 3 env (#24711) 2024-01-02 11:20:12 +01:00
Scott Lahteine
37aaae242b 📝 Format some comments 2024-01-02 11:20:01 +01:00
EvilGremlin
17eae12bad 🔨 Native USB modified env followup (#24669)
Followup to #24619
2024-01-02 11:20:00 +01:00
Bob Kuhn
2e81c8079a 🐛 Fix UBL regression (#24622)
Fix regression from #24188
2024-01-02 11:20:00 +01:00
Ruedi Steinmann
7f22e95477 🩹 Fix a BUZZ (#24740) 2024-01-02 11:20:00 +01:00
Scott Lahteine
bd175092b6 🔖 Config version 02010200 2024-01-02 11:20:00 +01:00
EvilGremlin
7dfb0046da 🐛 Fix back button (#24694) 2024-01-02 11:20:00 +01:00
Scott Lahteine
d33d47a6ce ✏️ Fix http:// links 2024-01-02 11:20:00 +01:00
Lefteris Garyfalakis
8dabaf86ff ✏️ Fix LCD sleep conditional (#24685) 2024-01-02 11:20:00 +01:00
Miguel Risco-Castillo
c352db3f1e 🩹 Constrain UBL within mesh bounds (#24631)
Fixes #24630
2024-01-02 11:20:00 +01:00
Keith Bennett
1f2b80591c 🚸 Up to 10 Preheat Constants (#24636) 2024-01-02 11:20:00 +01:00
ellensp
f86b79fc9d 🔧 Fix Auto-Fan / Controller-Fan pin conflict check (#24648) 2024-01-02 11:19:59 +01:00
ellensp
afc38a7c6f 🩹 Fix PID debug output (#24647) 2024-01-02 11:19:59 +01:00
Mark
3f17d3cdd5 🐛 Fix Bed Distance Sensor reading (#24649) 2024-01-02 11:19:59 +01:00
Arkadiusz Miśkiewicz
df1eb30d29 M20_TIMESTAMP_SUPPORT (#24679)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:19:59 +01:00
EvilGremlin
1aea7d4a2c ♻️ Display sleep minutes, encoder disable option (#24618)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:19:59 +01:00
DejitaruJin
372916c8cd 🩹 Fix SainSmart LCD (#24672) 2024-01-02 11:19:59 +01:00
Keith Bennett
90bc3d65f3 🩹 Fix Freeze Feature (#24664) 2024-01-02 11:19:59 +01:00
Lefteris Garyfalakis
e49e3880ee 🔨 Suppressible Creality 4.2.2 warning (#24683) 2024-01-02 11:19:59 +01:00
EvilGremlin
3f40d0a59f Robin Nano v1 CDC (USB mod) (#24619) 2024-01-02 11:19:59 +01:00
Alexey Galakhov
5381f53214 🐛 Fix JyersUI (#24652) 2024-01-02 11:19:58 +01:00
Keith Bennett
878b629f91 🔧 Fix Skew Correction defaults (#24601) 2024-01-02 11:19:58 +01:00
Scott Lahteine
8ac992327c 🎨 Some automated cleanup 2024-01-02 11:19:58 +01:00
Keith Bennett
92bc63822f 📺 Add to MKS UI About Screen (#24610) 2024-01-02 11:19:58 +01:00
Keith Bennett
0f7d7fccd7 🔧 Remove STM32F4 Print Counter Sanity Check (#24605) 2024-01-02 11:19:58 +01:00
Protomosh
e0b1bc8403 🐛 Fix DGUS Reloaded + STM32 (#24600) 2024-01-02 11:19:58 +01:00
Scott Lahteine
f54cafdc76 🧑‍💻 Use spaces indent for Python 2024-01-02 11:19:57 +01:00
Scott Lahteine
37918e1c77 🔨 Misc. schema updates 2024-01-02 11:19:42 +01:00
Graham Reed
c607c12e3a 🔨 Fix LPC1768 automatic upload port (#24599) 2024-01-02 11:19:42 +01:00
Scott Lahteine
003dfec67d 🩹 Fix strtof interpreting a hex value
Bug introduced in #21532
2024-01-02 11:19:42 +01:00
Scott Lahteine
2042df1df4 🔨 Add args to schema.py 2024-01-02 11:19:42 +01:00
Scott Lahteine
8d1f734819 🎨 Fix '…if_chain' Uncrustify option 2024-01-02 11:19:42 +01:00
Scott Lahteine
7a3d3d1a14 🔨 Misc. config py updates 2024-01-02 11:19:42 +01:00
Scott Lahteine
61c63d5b4c 🧑‍💻 Add operator== for C++20 2024-01-02 11:19:41 +01:00
Keith Bennett
4dc731f434 🧑‍💻 Fix UBL Build Mesh preheat items (#24598)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2024-01-02 11:19:41 +01:00
Ivan Kravets
8fec539881 🔨 Fix a PlatformIO debug issue (#24569) 2024-01-02 11:19:41 +01:00
Scott Lahteine
860e466a13 🔨 Update schema export 2024-01-02 11:19:41 +01:00
Sven Soost
6fcdefe31f help 2024-01-02 11:19:11 +01:00
Sven Soost
075d91e518 upped fw version
corrected board type
2024-01-02 10:33:45 +01:00
Sven Soost
7da3d3f4b2 Merge remote-tracking branch 'default/lts-2.1.0' into 2.1---sv 2024-01-02 10:29:39 +01:00
efflicto
31411b121a tweaks 2024-01-02 10:04:54 +01:00
efflicto
a22d2f7bb1 tweaks 2023-12-28 18:48:43 +01:00
Scott Lahteine
591b856796 👔 Update .gitignore 2023-12-27 15:31:33 -06:00
Scott Lahteine
ed46f6c675 👔 Update .gitignore 2023-12-27 15:30:31 -06:00
efflicto
c197c1c9a0 tweaks 2023-12-26 22:59:12 +01:00
efflicto
6bcbcb17da Tweaks 2023-12-26 17:11:15 +01:00
Scott Lahteine
815c9163ce 🩹 Fix LONG_FILENAME_WRITE_SUPPORT typo 2023-12-11 15:42:30 -06:00
Scott Lahteine
68dbe13f85 🔨 Specify versions in INI 2023-12-11 15:42:30 -06:00
Scott Lahteine
4caa32b6dd 🔖 Version 2.1.1.1 2023-12-11 15:42:26 -06:00
Scott Lahteine
e829fbad70 🔨 Specify versions in INI 2023-12-08 21:42:44 -06:00
efflicto
b062149058 fix 2023-12-01 02:36:26 +01:00
efflicto
33fbcc9d1b fixes 2023-12-01 01:46:56 +01:00
efflicto
7c8411beb9 pid tunning 2023-12-01 01:28:34 +01:00
efflicto
6708be8912 tweaks 2023-11-30 20:24:50 +01:00
efflicto
64a3a22b29 Fixes and changes for BL and other stuff 2023-11-30 14:01:59 +01:00
efflicto
db80c683fa Merge remote-tracking branch 'main/2.1---sv' into 2.1---sv 2023-11-30 13:35:08 +01:00
efflicto
e730f6ba46 chagnes and tweaks, enabled BL 2023-11-30 13:00:41 +01:00
3a70ee72e5 fixed extruder 2023-11-23 14:01:51 +01:00
sv
38c89b749a Added homing parameters 2023-11-17 10:16:28 +01:00
c5db863a4e Remeasured extruder steps after extruder metal replacement 2023-11-16 19:53:06 +00:00
efflicto
f42fe57a86 revert MULTI_VOLUME 2023-11-12 14:02:40 +01:00
efflicto
4498338a2e tweaks 2023-11-12 13:55:15 +01:00
efflicto
64d7ebc11d tweaks 2023-11-12 13:44:38 +01:00
efflicto
d0cf0f2d75 fixes for fans 2023-11-11 02:51:41 +01:00
efflicto
7ea91c9f65 fix 2023-11-11 01:35:33 +01:00
efflicto
2768abf7da Merge branch '2.1---sv' of https://git.soost.dev/me/Marlin into 2.1---sv 2023-11-11 01:35:01 +01:00
efflicto
d9184ee9f5 Bootscreen added
Adjusted bed PID
2023-11-11 01:34:17 +01:00
efflicto
fa28fff246 Changed PID after tuning 2023-11-11 00:27:03 +01:00
efflicto
a8fa1b807b disabled HYBRID_THRESHOLD 2023-11-10 23:56:28 +01:00
efflicto
ca845e11a5 Added host communication
Corrected feeding rate
2023-11-10 23:34:57 +01:00
efflicto
0abe6975e7 Fixed fan related stuff 2023-11-10 22:38:05 +01:00
efflicto
d2173a58a5 enabled lcd_bed_leveling 2023-11-10 21:13:59 +01:00
efflicto
549ed9e5e5 switched back to en 2023-11-10 20:51:54 +01:00
efflicto
6ba8846429 fixes for lin_advance & version 2023-11-10 20:38:24 +01:00
efflicto
1c96d85991 Initial Setup 2023-11-10 20:26:08 +01:00
sv
200f20b5e7 Initial commit 2023-11-09 01:59:30 +01:00
Scott Lahteine
60cd1ecb69 🩹 Fix G33 output
See #26299
2023-10-07 01:08:40 -05:00
Scott Lahteine
dfa748cb96 🔨 PlatformIO 6 compatibility 2023-07-20 13:44:06 -05:00
Scott Lahteine
b412a1a03e 🔖 Marlin 2.1.0.1 2023-07-20 13:43:19 -05:00
Scott Lahteine
8fd6f9a2b0 🔨 PlatformIO 6 compatibility 2023-07-20 13:43:19 -05:00
21 changed files with 10698 additions and 653 deletions

25
.gitignore vendored
View File

@@ -1,6 +1,6 @@
#
# Marlin 3D Printer Firmware
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
# Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,8 +23,13 @@
_Version.h
bdf2u8g.exe
genpages.exe
bdf2u8g.exe
genpages.exe
marlin_config.json
mczip.h
language*.csv
out-csv/
out-language/
*.gen
*.sublime-workspace
@@ -32,6 +37,7 @@ mczip.h
applet/
.DS_Store
# Compiled C++ Object files
# Compiled C++ Object files
*.slo
*.lo
@@ -63,6 +69,7 @@ applet/
*.out
*.app
# Compiled C Object files
# Compiled C Object files
*.o
*.ko
@@ -123,14 +130,17 @@ vc-fileutils.settings
.vscode/*
!.vscode/extensions.json
# Simulation files
# Simulation files
imgui.ini
eeprom.dat
spi_flash.bin
fs.img
fs.img
# CMake
CMakeLists.txt
!buildroot/share/cmake/CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
build/
@@ -163,3 +173,16 @@ __pycache__
tags
*.logs
*.bak
# Misc.
*~
*.orig
*.rej
*.bak
*.idea
*.i
*.ii
*.swp
tags
*.logs
*.bak

View File

@@ -35,7 +35,7 @@
*
* Advanced settings can be found in Configuration_adv.h
*/
#define CONFIGURATION_H_VERSION 02010201
#define CONFIGURATION_H_VERSION 02010100
//===========================================================================
//============================= Getting Started =============================
@@ -60,8 +60,8 @@
// @section info
// Author info of this build printed to the host during boot and M115
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
#define STRING_CONFIG_H_AUTHOR "(Sven Soost, 0.0.1)" // Who made the changes.
#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
/**
* *** VENDORS PLEASE READ ***
@@ -78,7 +78,7 @@
#define SHOW_BOOTSCREEN
// Show the bitmap in Marlin/_Bootscreen.h on startup.
//#define SHOW_CUSTOM_BOOTSCREEN
#define SHOW_CUSTOM_BOOTSCREEN
// Show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
@@ -87,7 +87,7 @@
// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_RAMPS_14_EFB
#define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V3_0
#endif
/**
@@ -98,7 +98,7 @@
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
#define SERIAL_PORT 0
#define SERIAL_PORT 2
/**
* Serial Port Baud Rate
@@ -111,7 +111,7 @@
*
* :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
*/
#define BAUDRATE 250000
#define BAUDRATE 115200
//#define BAUD_RATE_GCODE // Enable G-code M575 to set the baud rate
@@ -120,8 +120,8 @@
* Currently Ethernet (-2) is only supported on Teensy 4.1 boards.
* :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
//#define SERIAL_PORT_2 -1
//#define BAUDRATE_2 250000 // :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] Enable to override BAUDRATE
#define SERIAL_PORT_2 -1
//#define BAUDRATE_2 115200 // :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] Enable to override BAUDRATE
/**
* Select a third serial port on the board to use for communication with the host.
@@ -135,11 +135,11 @@
//#define BLUETOOTH
// Name displayed in the LCD "Ready" message and Info menu
//#define CUSTOM_MACHINE_NAME "3D Printer"
#define CUSTOM_MACHINE_NAME "sv3dprt01"
// Printer's unique ID, used by some programs to differentiate between machines.
// Choose your own or use a service like https://www.uuidgenerator.net/version4
//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
#define MACHINE_UUID "29546829-8cef-4c73-bfb3-7ff034a6861a"
// @section stepper drivers
@@ -158,9 +158,9 @@
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
*/
#define X_DRIVER_TYPE A4988
#define Y_DRIVER_TYPE A4988
#define Z_DRIVER_TYPE A4988
#define X_DRIVER_TYPE TMC2209
#define Y_DRIVER_TYPE TMC2209
#define Z_DRIVER_TYPE TMC2209
//#define X2_DRIVER_TYPE A4988
//#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988
@@ -172,7 +172,7 @@
//#define U_DRIVER_TYPE A4988
//#define V_DRIVER_TYPE A4988
//#define W_DRIVER_TYPE A4988
#define E0_DRIVER_TYPE A4988
#define E0_DRIVER_TYPE TMC2209
//#define E1_DRIVER_TYPE A4988
//#define E2_DRIVER_TYPE A4988
//#define E3_DRIVER_TYPE A4988
@@ -408,7 +408,7 @@
//#define MKS_PWC // Using the MKS PWC add-on
//#define PS_OFF_CONFIRM // Confirm dialog when power off
//#define PS_OFF_SOUND // Beep 1s when power off
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
#define PSU_ACTIVE_STATE HIGH // Set 'LOW' for ATX, 'HIGH' for X-Box
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
@@ -536,7 +536,7 @@
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
*
*/
#define TEMP_SENSOR_0 1
#define TEMP_SENSOR_0 5
#define TEMP_SENSOR_1 0
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_3 0
@@ -544,7 +544,7 @@
#define TEMP_SENSOR_5 0
#define TEMP_SENSOR_6 0
#define TEMP_SENSOR_7 0
#define TEMP_SENSOR_BED 0
#define TEMP_SENSOR_BED 1
#define TEMP_SENSOR_PROBE 0
#define TEMP_SENSOR_CHAMBER 0
#define TEMP_SENSOR_COOLER 0
@@ -619,7 +619,7 @@
// Above this temperature the heater will be switched off.
// This can protect components from overheating, but NOT from shorts and failures.
// (Use MINTEMP for thermistor short/failure protection.)
#define HEATER_0_MAXTEMP 275
#define HEATER_0_MAXTEMP 300
#define HEATER_1_MAXTEMP 275
#define HEATER_2_MAXTEMP 275
#define HEATER_3_MAXTEMP 275
@@ -627,7 +627,7 @@
#define HEATER_5_MAXTEMP 275
#define HEATER_6_MAXTEMP 275
#define HEATER_7_MAXTEMP 275
#define BED_MAXTEMP 150
#define BED_MAXTEMP 100
#define CHAMBER_MAXTEMP 60
/**
@@ -667,9 +667,9 @@
#define DEFAULT_Ki_LIST { 1.08, 1.08 }
#define DEFAULT_Kd_LIST { 114.00, 114.00 }
#else
#define DEFAULT_Kp 22.20
#define DEFAULT_Ki 1.08
#define DEFAULT_Kd 114.00
#define DEFAULT_Kp 21.98
#define DEFAULT_Ki 2.59
#define DEFAULT_Kd 46.62
#endif
#endif
@@ -734,7 +734,7 @@
* the issues involved, don't use bed PID until someone else verifies that your hardware works.
* @section bed temp
*/
//#define PIDTEMPBED
#define PIDTEMPBED
//#define BED_LIMIT_SWITCHING
@@ -752,9 +752,9 @@
// 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
// from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
#define DEFAULT_bedKi .023
#define DEFAULT_bedKd 305.4
#define DEFAULT_bedKp 68.68
#define DEFAULT_bedKi 13.40
#define DEFAULT_bedKd 234.69
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED
@@ -831,7 +831,7 @@
* Note: For Bowden Extruders make this large enough to allow load/unload.
*/
#define PREVENT_LENGTHY_EXTRUDE
#define EXTRUDE_MAXLENGTH 200
#define EXTRUDE_MAXLENGTH 450
//===========================================================================
//======================== Thermal Runaway Protection =======================
@@ -1168,14 +1168,14 @@
* Override with M92
* X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
*/
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 500 }
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 100.671 }
/**
* Default Max Feed Rate (linear=mm/s, rotational=°/s)
* Override with M203
* X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
*/
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
#define DEFAULT_MAX_FEEDRATE { 500, 500, 20, 25 }
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
#if ENABLED(LIMITED_MAX_FR_EDITING)
@@ -1188,7 +1188,7 @@
* Override with M201
* X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
*/
#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
#define DEFAULT_MAX_ACCELERATION { 5000, 5000, 150, 10000 }
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
@@ -1203,9 +1203,9 @@
* M204 R Retract Acceleration
* M204 T Travel Acceleration
*/
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
#define DEFAULT_ACCELERATION 1500 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Default Jerk limits (mm/s)
@@ -1245,7 +1245,7 @@
* https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
#define JUNCTION_DEVIATION_MM 0.054 // (mm) Distance from real junction edge
#define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle
// for small segments (< 1mm) with large junction angles (> 135°).
#endif
@@ -1258,7 +1258,7 @@
*
* See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
*/
//#define S_CURVE_ACCELERATION
#define S_CURVE_ACCELERATION
//===========================================================================
//============================= Z Probe Options =============================
@@ -1274,10 +1274,10 @@
* The probe replaces the Z-MIN endstop and is used for Z homing.
* (Automatically enables USE_PROBE_FOR_Z_HOMING.)
*/
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
// Force the use of the probe for Z-axis homing
//#define USE_PROBE_FOR_Z_HOMING
#define USE_PROBE_FOR_Z_HOMING
/**
* Z_MIN_PROBE_PIN
@@ -1294,7 +1294,7 @@
* - normally-closed switches to GND and D32.
* - normally-open switches to 5V and D32.
*/
//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default
#define Z_MIN_PROBE_PIN PC14 // Pin 32 is the RAMPS default
/**
* Probe Type
@@ -1331,7 +1331,7 @@
/**
* The BLTouch probe uses a Hall effect sensor and emulates a servo.
*/
//#define BLTOUCH
#define BLTOUCH
/**
* MagLev V4 probe by MDD
@@ -1381,8 +1381,8 @@
*/
//#define MAG_MOUNTED_PROBE
#if ENABLED(MAG_MOUNTED_PROBE)
#define PROBE_DEPLOY_FEEDRATE (133*60) // (mm/min) Probe deploy speed
#define PROBE_STOW_FEEDRATE (133*60) // (mm/min) Probe stow speed
#define PROBE_DEPLOY_FEEDRATE (100*60) // (mm/min) Probe deploy speed
#define PROBE_STOW_FEEDRATE (100*60) // (mm/min) Probe stow speed
#define MAG_MOUNTED_DEPLOY_1 { PROBE_DEPLOY_FEEDRATE, { 245, 114, 30 } } // Move to side Dock & Attach probe
#define MAG_MOUNTED_DEPLOY_2 { PROBE_DEPLOY_FEEDRATE, { 210, 114, 30 } } // Move probe off dock
@@ -1483,17 +1483,17 @@
* | [-] |
* O-- FRONT --+
*/
#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define NOZZLE_TO_PROBE_OFFSET { -40.40, -9.00, -2.45 }
// Most probes should stay away from the edges of the bed, but
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
#define PROBING_MARGIN 10
#define PROBING_MARGIN 15
// X and Y axis travel speed (mm/min) between probes
#define XY_PROBE_FEEDRATE (133*60)
#define XY_PROBE_FEEDRATE (150*60)
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
#define Z_PROBE_FEEDRATE_FAST (4*60)
#define Z_PROBE_FEEDRATE_FAST (10*60)
// Feedrate (mm/min) for the "accurate" probe of each point
#define Z_PROBE_FEEDRATE_SLOW (Z_PROBE_FEEDRATE_FAST / 2)
@@ -1561,7 +1561,7 @@
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
*/
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
#define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
//#define Z_AFTER_PROBING 5 // Z position after probing is done
@@ -1595,12 +1595,12 @@
//#define PROBING_FANS_OFF // Turn fans off when probing
//#define PROBING_ESTEPPERS_OFF // Turn all extruder steppers off when probing
//#define PROBING_STEPPERS_OFF // Turn all steppers off (unless needed to hold position) when probing (including extruders)
//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
#define DELAY_BEFORE_PROBING 350 // (ms) To prevent vibrations from triggering piezo sensors
// Require minimum nozzle and/or bed temperature for probing
//#define PREHEAT_BEFORE_PROBING
#if ENABLED(PREHEAT_BEFORE_PROBING)
#define PROBING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time
#define PROBING_NOZZLE_TEMP 180 // (°C) Only applies to E0 at this time
#define PROBING_BED_TEMP 50
#endif
@@ -1640,7 +1640,7 @@
// @section motion
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
#define INVERT_X_DIR false
#define INVERT_X_DIR true
#define INVERT_Y_DIR true
#define INVERT_Z_DIR false
//#define INVERT_I_DIR false
@@ -1653,7 +1653,7 @@
// @section extruder
// For direct drive extruder v9 set to true, for geared extruder set to false.
#define INVERT_E0_DIR false
#define INVERT_E0_DIR true
#define INVERT_E1_DIR false
#define INVERT_E2_DIR false
#define INVERT_E3_DIR false
@@ -1694,8 +1694,8 @@
// @section geometry
// The size of the printable area
#define X_BED_SIZE 200
#define Y_BED_SIZE 200
#define X_BED_SIZE 230
#define Y_BED_SIZE 230
// Travel limits (linear=mm, rotational=°) after homing, corresponding to endstop positions.
#define X_MIN_POS 0
@@ -1703,7 +1703,7 @@
#define Z_MIN_POS 0
#define X_MAX_POS X_BED_SIZE
#define Y_MAX_POS Y_BED_SIZE
#define Z_MAX_POS 200
#define Z_MAX_POS 250
//#define I_MIN_POS 0
//#define I_MAX_POS 50
//#define J_MIN_POS 0
@@ -1771,9 +1771,9 @@
* RAMPS-based boards use SERVO3_PIN for the first runout sensor.
* For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
*/
//#define FILAMENT_RUNOUT_SENSOR
#define FILAMENT_RUNOUT_SENSOR
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
#define FIL_RUNOUT_ENABLED_DEFAULT false // Enable the sensor on startup. Override with M412 followed by M500.
#define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
@@ -1873,7 +1873,7 @@
*/
//#define AUTO_BED_LEVELING_3POINT
//#define AUTO_BED_LEVELING_LINEAR
//#define AUTO_BED_LEVELING_BILINEAR
#define AUTO_BED_LEVELING_BILINEAR
//#define AUTO_BED_LEVELING_UBL
//#define MESH_BED_LEVELING
@@ -1882,13 +1882,13 @@
* these options to restore the prior leveling state or to always enable
* leveling immediately after G28.
*/
//#define RESTORE_LEVELING_AFTER_G28
#define RESTORE_LEVELING_AFTER_G28
//#define ENABLE_LEVELING_AFTER_G28
/**
* Auto-leveling needs preheating
*/
//#define PREHEAT_BEFORE_LEVELING
#define PREHEAT_BEFORE_LEVELING
#if ENABLED(PREHEAT_BEFORE_LEVELING)
#define LEVELING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time
#define LEVELING_BED_TEMP 50
@@ -1923,7 +1923,7 @@
*/
#define ENABLE_LEVELING_FADE_HEIGHT
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
#define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height.
#define DEFAULT_LEVELING_FADE_HEIGHT 0.0 // (mm) Default fade height.
#endif
/**
@@ -1937,7 +1937,7 @@
/**
* Enable the G26 Mesh Validation Pattern tool.
*/
//#define G26_MESH_VALIDATION
#define G26_MESH_VALIDATION
#if ENABLED(G26_MESH_VALIDATION)
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for G26.
@@ -1963,7 +1963,7 @@
// Beyond the probed grid, continue the implied tilt?
// Default is to maintain the height of the nearest edge.
//#define EXTRAPOLATE_BEYOND_GRID
#define EXTRAPOLATE_BEYOND_GRID
//
// Experimental Subdivision of the grid by Catmull-Rom method.
@@ -1983,10 +1983,10 @@
//========================= Unified Bed Leveling ============================
//===========================================================================
//#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh
#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh
#define MESH_INSET 1 // Set Mesh bounds as an inset region of the bed
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define MESH_INSET 35 // Set Mesh bounds as an inset region of the bed
#define GRID_MAX_POINTS_X 3 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
//#define UBL_HILBERT_CURVE // Use Hilbert distribution for less travel when probing multiple points
@@ -1997,7 +1997,7 @@
//#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
// as the Z-Height correction value.
//#define UBL_MESH_WIZARD // Run several commands in a row to get a complete mesh
#define UBL_MESH_WIZARD // Run several commands in a row to get a complete mesh
#elif ENABLED(MESH_BED_LEVELING)
@@ -2017,7 +2017,7 @@
* Add a bed leveling sub-menu for ABL or MBL.
* Include a guided procedure if manual probing is enabled.
*/
//#define LCD_BED_LEVELING
#define LCD_BED_LEVELING
#if ENABLED(LCD_BED_LEVELING)
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
@@ -2090,7 +2090,7 @@
* - Allows Z homing only when XY positions are known and trusted.
* - If stepper drivers sleep, XY homing may be required again before Z homing.
*/
//#define Z_SAFE_HOMING
#define Z_SAFE_HOMING
#if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing
@@ -2098,7 +2098,7 @@
#endif
// Homing speeds (linear=mm/min, rotational=°/min)
#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) }
#define HOMING_FEEDRATE_MM_M { (100*60), (100*60), (10*60) }
// Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS
@@ -2142,7 +2142,7 @@
#define XY_SIDE_AD 200
// Or, set the XY skew factor directly:
//#define XY_SKEW_FACTOR 0.0
#define XY_SKEW_FACTOR 0.0
//#define SKEW_CORRECTION_FOR_Z
#if ENABLED(SKEW_CORRECTION_FOR_Z)
@@ -2153,8 +2153,8 @@
#define YZ_SIDE_AD 200
// Or, set the Z skew factors directly:
//#define XZ_SKEW_FACTOR 0.0
//#define YZ_SKEW_FACTOR 0.0
#define XZ_SKEW_FACTOR 0.0
#define YZ_SKEW_FACTOR 0.0
#endif
// Enable this option for M852 to set skew at runtime
@@ -2176,12 +2176,12 @@
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
*/
//#define EEPROM_SETTINGS // Persistent storage with M500 and M501
#define EEPROM_SETTINGS // Persistent storage with M500 and M501
//#define DISABLE_M503 // Saves ~2700 bytes of flash. Disable for release!
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load
#if ENABLED(EEPROM_SETTINGS)
//#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors.
#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors.
//#define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build.
#endif
@@ -2214,17 +2214,17 @@
//
// Preheat Constants - Up to 10 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180
#define PREHEAT_1_TEMP_BED 70
#define PREHEAT_1_TEMP_CHAMBER 35
#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 185
#define PREHEAT_1_TEMP_BED 45
#define PREHEAT_1_TEMP_CHAMBER 35
#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
#define PREHEAT_2_LABEL "ABS"
#define PREHEAT_2_TEMP_HOTEND 240
#define PREHEAT_2_TEMP_BED 110
#define PREHEAT_2_TEMP_CHAMBER 35
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
#define PREHEAT_2_LABEL "ABS"
#define PREHEAT_2_TEMP_HOTEND 240
#define PREHEAT_2_TEMP_BED 70
#define PREHEAT_2_TEMP_CHAMBER 35
#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
// @section motion
@@ -2239,7 +2239,7 @@
* P1 Raise the nozzle always to Z-park height.
* P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
*/
//#define NOZZLE_PARK_FEATURE
#define NOZZLE_PARK_FEATURE
#if ENABLED(NOZZLE_PARK_FEATURE)
// Specify a park position as { X, Y, Z_raise }
@@ -2461,7 +2461,7 @@
* SD Card support is disabled by default. If your controller has an SD slot,
* you must uncomment the following option or it won't work.
*/
//#define SDSUPPORT
#define SDSUPPORT
/**
* SD CARD: ENABLE CRC
@@ -2550,7 +2550,7 @@
// If you have a speaker that can produce tones, enable it here.
// By default Marlin assumes you have a buzzer with a fixed frequency.
//
//#define SPEAKER
#define SPEAKER
//
// The duration and frequency for the UI feedback sound.
@@ -2559,8 +2559,8 @@
// Note: Test audio output with the G-Code:
// M300 S<frequency Hz> P<duration ms>
//
//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
//#define LCD_FEEDBACK_FREQUENCY_HZ 5000
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 0
#define LCD_FEEDBACK_FREQUENCY_HZ 5000
//=============================================================================
//======================== LCD / Controller Selection =========================
@@ -2839,7 +2839,7 @@
// This is RAMPS-compatible using a single 10-pin connector.
// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
//
//#define CR10_STOCKDISPLAY
#define CR10_STOCKDISPLAY
//
// Ender-2 OEM display, a variant of the MKS_MINI_12864
@@ -3216,7 +3216,7 @@
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
// is too low, you should also increment SOFT_PWM_SCALE.
//#define FAN_SOFT_PWM
#define FAN_SOFT_PWM
// Incrementing this by 1 will double the software PWM frequency,
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.

View File

@@ -30,7 +30,7 @@
*
* Basic settings can be found in Configuration.h
*/
#define CONFIGURATION_ADV_H_VERSION 02010201
#define CONFIGURATION_ADV_H_VERSION 02010100
// @section develop
@@ -535,9 +535,9 @@
* The fan turns on automatically whenever any driver is enabled and turns
* off (or reduces to idle speed) shortly after drivers are turned off.
*/
//#define USE_CONTROLLER_FAN
#define USE_CONTROLLER_FAN
#if ENABLED(USE_CONTROLLER_FAN)
//#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan
#define CONTROLLER_FAN_PIN PB15 // Set a custom pin for the controller fan
//#define CONTROLLER_FAN2_PIN -1 // Set a custom pin for second controller fan
//#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered
//#define CONTROLLER_FAN_IGNORE_Z // Ignore Z stepper. Useful when stepper timeout is disabled.
@@ -549,7 +549,7 @@
// Use TEMP_SENSOR_BOARD as a trigger for enabling the controller fan
//#define CONTROLLER_FAN_MIN_BOARD_TEMP 40 // (°C) Turn on the fan if the board reaches this temperature
//#define CONTROLLER_FAN_EDITABLE // Enable M710 configurable settings
#define CONTROLLER_FAN_EDITABLE // Enable M710 configurable settings
#if ENABLED(CONTROLLER_FAN_EDITABLE)
#define CONTROLLER_FAN_MENU // Enable the Controller Fan submenu
#endif
@@ -561,8 +561,8 @@
* gets it spinning reliably for a short time before setting the requested speed.
* (Does not work on Sanguinololu with FAN_SOFT_PWM.)
*/
//#define FAN_KICKSTART_TIME 100 // (ms)
//#define FAN_KICKSTART_POWER 180 // 64-255
#define FAN_KICKSTART_TIME 3000 // (ms)
#define FAN_KICKSTART_POWER 255 // 64-255
// Some coolers may require a non-zero "off" state.
//#define FAN_OFF_PWM 1
@@ -579,8 +579,8 @@
*
* Define one or both of these to override the default 0-255 range.
*/
//#define FAN_MIN_PWM 50
//#define FAN_MAX_PWM 128
#define FAN_MIN_PWM 64
#define FAN_MAX_PWM 255
/**
* Fan Fast PWM
@@ -639,7 +639,7 @@
* Multiple extruders can be assigned to the same pin in which case
* the fan will turn on when any selected extruder is above the threshold.
*/
#define E0_AUTO_FAN_PIN -1
#define E0_AUTO_FAN_PIN PC7
#define E1_AUTO_FAN_PIN -1
#define E2_AUTO_FAN_PIN -1
#define E3_AUTO_FAN_PIN -1
@@ -908,7 +908,7 @@
// Safety: The probe needs time to recognize the command.
// Minimum command delay (ms). Enable and increase if needed.
//#define BLTOUCH_DELAY 500
#define BLTOUCH_DELAY 300
/**
* Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
@@ -1373,17 +1373,17 @@
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
#if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
#if ENABLED(PROBE_OFFSET_WIZARD)
/**
* Enable to init the Probe Z-Offset when starting the Wizard.
* Use a height slightly above the estimated nozzle-to-probe Z offset.
* For example, with an offset of -5, consider a starting height of -4.
*/
//#define PROBE_OFFSET_WIZARD_START_Z -4.0
#define PROBE_OFFSET_WIZARD_START_Z -4.0
// Set a convenient position to do the calibration (probing point and nozzle/bed-distance)
//#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER }
#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER }
#endif
#endif
@@ -1409,7 +1409,7 @@
#endif
// Include a page of printer information in the LCD Main Menu
//#define LCD_INFO_MENU
#define LCD_INFO_MENU
#if ENABLED(LCD_INFO_MENU)
//#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
#endif
@@ -1439,7 +1439,7 @@
#endif
// Scroll a longer status message into view
//#define STATUS_MESSAGE_SCROLLING
#define STATUS_MESSAGE_SCROLLING
// Apply a timeout to low-priority status messages
//#define STATUS_MESSAGE_TIMEOUT_SEC 30 // (seconds)
@@ -1565,9 +1565,9 @@
* an option on the LCD screen to continue the print from the last-known
* point in the file.
*/
//#define POWER_LOSS_RECOVERY
#define POWER_LOSS_RECOVERY
#if ENABLED(POWER_LOSS_RECOVERY)
#define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
#define PLR_ENABLED_DEFAULT true // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
//#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
//#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)
//#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
@@ -1630,11 +1630,11 @@
// LCD's font must contain the characters. Check your selected LCD language.
//#define UTF_FILENAME_SUPPORT
//#define LONG_FILENAME_HOST_SUPPORT // Get the long filename of a file/folder with 'M33 <dosname>' and list long filenames with 'M20 L'
#define LONG_FILENAME_HOST_SUPPORT // Get the long filename of a file/folder with 'M33 <dosname>' and list long filenames with 'M20 L'
//#define LONG_FILENAME_WRITE_SUPPORT // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol
//#define M20_TIMESTAMP_SUPPORT // Include timestamps by adding the 'T' flag to M20 commands
//#define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu
#define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu
//#define SD_ABORT_NO_COOLDOWN // Leave the heaters on after Stop Print (not recommended!)
@@ -1650,7 +1650,7 @@
//#define SD_REPRINT_LAST_SELECTED_FILE // On print completion open the LCD Menu and select the same file
//#define AUTO_REPORT_SD_STATUS // Auto-report media status with 'M27 S<seconds>'
#define AUTO_REPORT_SD_STATUS // Auto-report media status with 'M27 S<seconds>'
/**
* Support for USB thumb drives using an Arduino USB Host Shield or
@@ -1719,11 +1719,11 @@
//#define CONFIGURATION_EMBEDDING
// Add an optimized binary file transfer mode, initiated with 'M28 B1'
//#define BINARY_FILE_TRANSFER
#define BINARY_FILE_TRANSFER
#if ENABLED(BINARY_FILE_TRANSFER)
// Include extra facilities (e.g., 'M20 F') supporting firmware upload via BINARY_FILE_TRANSFER
//#define CUSTOM_FIRMWARE_UPLOAD
#define CUSTOM_FIRMWARE_UPLOAD
#endif
/**
@@ -1735,7 +1735,7 @@
*
* :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
*/
//#define SDCARD_CONNECTION LCD
#define SDCARD_CONNECTION ONBOARD
// Enable if SD detect is rendered useless (e.g., by using an SD extender)
//#define NO_SD_DETECT
@@ -1744,7 +1744,7 @@
* Multiple volume support - EXPERIMENTAL.
* Adds 'M21 Pm' / 'M21 S' / 'M21 U' to mount SD Card / USB Drive.
*/
//#define MULTI_VOLUME
//define MULTI_VOLUME
#if ENABLED(MULTI_VOLUME)
#define VOLUME_SD_ONBOARD
#define VOLUME_USB_FLASH_DRIVE
@@ -2058,18 +2058,18 @@
*
* Warning: Does not respect endstops!
*/
//#define BABYSTEPPING
#define BABYSTEPPING
#if ENABLED(BABYSTEPPING)
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
//#define BABYSTEP_WITHOUT_HOMING
//#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
#define BABYSTEP_WITHOUT_HOMING
#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
//#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps
#define BABYSTEP_MULTIPLICATOR_Z 1 // (steps or mm) Steps or millimeter distance for each Z babystep
#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps
#define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep
#define BABYSTEP_MULTIPLICATOR_XY 1 // (steps or mm) Steps or millimeter distance for each XY babystep
//#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
// Note: Extra time may be added to mitigate controller latency.
@@ -2079,12 +2079,12 @@
#endif
#endif
//#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
//#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
#endif
#endif
@@ -2108,9 +2108,9 @@
//#define LIN_ADVANCE
#if ENABLED(LIN_ADVANCE)
#if ENABLED(DISTINCT_E_FACTORS)
#define ADVANCE_K { 0.22 } // (mm) Compression length per 1mm/s extruder speed, per extruder
#define ADVANCE_K { 0.00 } // (mm) Compression length per 1mm/s extruder speed, per extruder
#else
#define ADVANCE_K 0.22 // (mm) Compression length applying to all extruders
#define ADVANCE_K 0.00 // (mm) Compression length applying to all extruders
#endif
//#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L.
//#define LA_DEBUG // Print debug information to serial during operation. Disable for production use.
@@ -2191,9 +2191,9 @@
* Repeatedly attempt G29 leveling until it succeeds.
* Stop after G29_MAX_RETRIES attempts.
*/
//#define G29_RETRY_AND_RECOVER
#define G29_RETRY_AND_RECOVER
#if ENABLED(G29_RETRY_AND_RECOVER)
#define G29_MAX_RETRIES 3
#define G29_MAX_RETRIES 1
#define G29_HALT_ON_FAILURE
/**
* Specify the GCODE commands that will be executed when leveling succeeds,
@@ -2382,11 +2382,11 @@
// The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8
#define BLOCK_BUFFER_SIZE 32
#elif ENABLED(SDSUPPORT)
#define BLOCK_BUFFER_SIZE 16
#define BLOCK_BUFFER_SIZE 64
#else
#define BLOCK_BUFFER_SIZE 16
#define BLOCK_BUFFER_SIZE 64
#endif
// @section serial
@@ -2402,7 +2402,7 @@
// For debug-echo: 128 bytes for the optimal speed.
// Other output doesn't need to be that speedy.
// :[0, 2, 4, 8, 16, 32, 64, 128, 256]
#define TX_BUFFER_SIZE 0
#define TX_BUFFER_SIZE 128
// Host Receive Buffer Size
// Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
@@ -2440,7 +2440,7 @@
* Currently handles M108, M112, M410, M876
* NOTE: Not yet implemented for all platforms.
*/
//#define EMERGENCY_PARSER
#define EMERGENCY_PARSER
/**
* Realtime Reporting (requires EMERGENCY_PARSER)
@@ -2633,7 +2633,7 @@
*
* Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park.
*/
//#define ADVANCED_PAUSE_FEATURE
#define ADVANCED_PAUSE_FEATURE
#if ENABLED(ADVANCED_PAUSE_FEATURE)
#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
@@ -2673,10 +2673,10 @@
//#define FILAMENT_CHANGE_RESUME_ON_INSERT // Automatically continue / load filament when runout sensor is triggered again.
//#define PAUSE_REHEAT_FAST_RESUME // Reduce number of waits by not prompting again post-timeout before continuing.
//#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
//#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change
#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change
//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
#endif
@@ -2717,7 +2717,7 @@
#define INTERPOLATE true
#if AXIS_IS_TMC_CONFIG(X)
#define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current.
#define X_CURRENT 650 // (mA) RMS current. Multiply by 1.414 for peak current.
#define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing
#define X_MICROSTEPS 16 // 0..256
#define X_RSENSE 0.11 // Multiplied x1000 for TMC26X
@@ -2727,7 +2727,7 @@
#endif
#if AXIS_IS_TMC_CONFIG(X2)
#define X2_CURRENT 800
#define X2_CURRENT 650
#define X2_CURRENT_HOME X2_CURRENT
#define X2_MICROSTEPS X_MICROSTEPS
#define X2_RSENSE 0.11
@@ -2737,7 +2737,7 @@
#endif
#if AXIS_IS_TMC_CONFIG(Y)
#define Y_CURRENT 800
#define Y_CURRENT 650
#define Y_CURRENT_HOME Y_CURRENT
#define Y_MICROSTEPS 16
#define Y_RSENSE 0.11
@@ -2747,7 +2747,7 @@
#endif
#if AXIS_IS_TMC_CONFIG(Y2)
#define Y2_CURRENT 800
#define Y2_CURRENT 650
#define Y2_CURRENT_HOME Y2_CURRENT
#define Y2_MICROSTEPS Y_MICROSTEPS
#define Y2_RSENSE 0.11
@@ -2757,7 +2757,7 @@
#endif
#if AXIS_IS_TMC_CONFIG(Z)
#define Z_CURRENT 800
#define Z_CURRENT 650
#define Z_CURRENT_HOME Z_CURRENT
#define Z_MICROSTEPS 16
#define Z_RSENSE 0.11
@@ -2767,7 +2767,7 @@
#endif
#if AXIS_IS_TMC_CONFIG(Z2)
#define Z2_CURRENT 800
#define Z2_CURRENT 650
#define Z2_CURRENT_HOME Z2_CURRENT
#define Z2_MICROSTEPS Z_MICROSTEPS
#define Z2_RSENSE 0.11
@@ -2777,7 +2777,7 @@
#endif
#if AXIS_IS_TMC_CONFIG(Z3)
#define Z3_CURRENT 800
#define Z3_CURRENT 650
#define Z3_CURRENT_HOME Z3_CURRENT
#define Z3_MICROSTEPS Z_MICROSTEPS
#define Z3_RSENSE 0.11
@@ -2787,7 +2787,7 @@
#endif
#if AXIS_IS_TMC_CONFIG(Z4)
#define Z4_CURRENT 800
#define Z4_CURRENT 650
#define Z4_CURRENT_HOME Z4_CURRENT
#define Z4_MICROSTEPS Z_MICROSTEPS
#define Z4_RSENSE 0.11
@@ -3030,7 +3030,7 @@
#define STEALTHCHOP_U
#define STEALTHCHOP_V
#define STEALTHCHOP_W
#define STEALTHCHOP_E
//#define STEALTHCHOP_E
#endif
/**
@@ -3048,7 +3048,7 @@
* Define your own with:
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
*/
#define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below)
#define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below)
//#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below)
//#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
//#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below)
@@ -3085,7 +3085,7 @@
* M912 - Clear stepper driver overtemperature pre-warn condition flag.
* M122 - Report driver parameters (Requires TMC_DEBUG)
*/
//#define MONITOR_DRIVER_STATUS
#define MONITOR_DRIVER_STATUS
#if ENABLED(MONITOR_DRIVER_STATUS)
#define CURRENT_STEP_DOWN 50 // [mA]
@@ -3108,7 +3108,7 @@
#define X2_HYBRID_THRESHOLD 100
#define Y_HYBRID_THRESHOLD 100
#define Y2_HYBRID_THRESHOLD 100
#define Z_HYBRID_THRESHOLD 3
#define Z_HYBRID_THRESHOLD 20
#define Z2_HYBRID_THRESHOLD 3
#define Z3_HYBRID_THRESHOLD 3
#define Z4_HYBRID_THRESHOLD 3
@@ -3157,11 +3157,11 @@
#if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
// TMC2209: 0...255. TMC2130: -64...63
#define X_STALL_SENSITIVITY 8
#define X_STALL_SENSITIVITY 72
#define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
#define Y_STALL_SENSITIVITY 8
#define Y_STALL_SENSITIVITY 70
#define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY
//#define Z_STALL_SENSITIVITY 8
#define Z_STALL_SENSITIVITY 10
//#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY
//#define Z3_STALL_SENSITIVITY Z_STALL_SENSITIVITY
//#define Z4_STALL_SENSITIVITY Z_STALL_SENSITIVITY
@@ -3172,7 +3172,7 @@
//#define V_STALL_SENSITIVITY 8
//#define W_STALL_SENSITIVITY 8
//#define SPI_ENDSTOPS // TMC2130 only
//#define IMPROVE_HOMING_RELIABILITY
#define IMPROVE_HOMING_RELIABILITY
#endif
// @section tmc/config
@@ -3199,7 +3199,7 @@
* Enable M122 debugging command for TMC stepper drivers.
* M122 S0/1 will enable continuous reporting.
*/
//#define TMC_DEBUG
#define TMC_DEBUG
/**
* You can set your own advanced settings by filling in predefined functions.
@@ -3605,7 +3605,7 @@
/**
* Auto-report position with M154 S<seconds>
*/
//#define AUTO_REPORT_POSITION
#define AUTO_REPORT_POSITION
/**
* Include capabilities in M115 output
@@ -3657,11 +3657,11 @@
// @section reporting
// Extra options for the M114 "Current Position" report
//#define M114_DETAIL // Use 'M114` for details to check planner calculations
#define M114_DETAIL // Use 'M114` for details to check planner calculations
//#define M114_REALTIME // Real current position based on forward kinematics
//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed.
//#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others)
#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others)
// @section gcode
@@ -3735,9 +3735,9 @@
// @section custom main menu
// Custom Menu: Main Menu
//#define CUSTOM_MENU_MAIN
#define CUSTOM_MENU_MAIN
#if ENABLED(CUSTOM_MENU_MAIN)
//#define CUSTOM_MENU_MAIN_TITLE "Custom Commands"
#define CUSTOM_MENU_MAIN_TITLE "Custom Commands"
#define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 User Script Done"
#define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK
//#define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script
@@ -3745,11 +3745,11 @@
#define MAIN_MENU_ITEM_1_DESC "Home & UBL Info"
#define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W"
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL
#define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
//#define MAIN_MENU_ITEM_2_CONFIRM
#define MAIN_MENU_ITEM_2_DESC "Extruder 200°C"
#define MAIN_MENU_ITEM_2_GCODE "M104 S200"
#define MAIN_MENU_ITEM_2_CONFIRM
//#define MAIN_MENU_ITEM_3_DESC "Preheat for " PREHEAT_2_LABEL
//#define MAIN_MENU_ITEM_3_GCODE "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
@@ -3845,10 +3845,10 @@
* Host Prompt Support enables Marlin to use the host for user prompts so
* filament runout and other processes can be managed from the host side.
*/
//#define HOST_ACTION_COMMANDS
#define HOST_ACTION_COMMANDS
#if ENABLED(HOST_ACTION_COMMANDS)
//#define HOST_PAUSE_M76 // Tell the host to pause in response to M76
//#define HOST_PROMPT_SUPPORT // Initiate host prompts to get user feedback
#define HOST_PAUSE_M76 // Tell the host to pause in response to M76
#define HOST_PROMPT_SUPPORT // Initiate host prompts to get user feedback
#if ENABLED(HOST_PROMPT_SUPPORT)
//#define HOST_STATUS_NOTIFICATIONS // Send some status messages to the host as notifications
#endif
@@ -4218,7 +4218,7 @@
//
// M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
//
//#define PINS_DEBUGGING
#define PINS_DEBUGGING
// Enable Tests that will run at startup and produce a report
//#define MARLIN_TEST_BUILD

View File

@@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "2.1.2.1"
//#define SHORT_BUILD_VERSION "2.1.0.2"
/**
* Verbose version identifier which should contain a reference to the location
@@ -41,12 +41,13 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2023-05-16"
//#define STRING_DISTRIBUTION_DATE "2023-12-08"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
*/
//#define MACHINE_NAME "3D Printer"
#define MACHINE_NAME "sv3dprt01.sv.loc"
#define MACHINE_NAME "sv3dprt01.sv.loc"
/**
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
@@ -54,7 +55,8 @@
* has a distinct Github fork— the Source Code URL should just be the main
* Marlin repository.
*/
//#define SOURCE_CODE_URL "github.com/MarlinFirmware/Marlin"
#define SOURCE_CODE_URL "https://git.soost.dev/me/Marlin"
#define SOURCE_CODE_URL "https://git.soost.dev/me/Marlin"
/**
* Default generic printer UUID.
@@ -65,7 +67,8 @@
* The WEBSITE_URL is the location where users can get more information such as
* documentation about a specific Marlin release.
*/
//#define WEBSITE_URL "marlinfw.org"
//define WEBSITE_URL "https://soo.st"
//define WEBSITE_URL "https://soo.st"
/**
* Set the vendor info the serial USB interface, if changable

50
Marlin/_Bootscreen.h Normal file
View File

@@ -0,0 +1,50 @@
/**
* Made with Marlin Bitmap Converter
* https://marlinfw.org/tools/u8glib/converter.html
*
* This bitmap from the file 'd2.png'
*/
#pragma once
#define CUSTOM_BOOTSCREEN_BMPWIDTH 128
const unsigned char custom_start_bmp[] PROGMEM = {
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,0x0F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x01,0xFF,0xFF,0xFF,0xFF,0xF3,0xFF,0xFF,0xFF,
0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x00,0x00,0x7F,0xFF,0xFF,0xFF,0x00,0x7C,0x00,0x00,
0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x00,0x00,0x3F,0xFF,0xFF,0xFC,0x00,0x1C,0x00,0x00,
0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0x00,0x00,0x1F,0xFF,0xFF,0xF8,0x00,0x0C,0x00,0x00,
0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x00,0x00,0x07,0xFF,0xFF,0xF8,0x00,0x1C,0x00,0x00,
0xFF,0xFF,0xFF,0xFF,0xFF,0xC0,0x0F,0xC0,0x07,0xFF,0xFF,0xF0,0x00,0x3C,0x00,0x00,
0xFF,0xFF,0xFF,0xFF,0xFF,0x80,0x3F,0xF8,0x03,0xFF,0xFF,0xF0,0x3E,0x7F,0xF0,0x3F,
0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0xFF,0xFC,0x01,0xFF,0xFF,0xF0,0x1F,0xFF,0xF0,0x3F,
0xFF,0xFF,0xFF,0xFF,0xFE,0x01,0xFF,0xFF,0x00,0xFF,0xFF,0xF0,0x07,0xFF,0xF0,0x3F,
0xFF,0xFF,0xFF,0xFF,0xFE,0x03,0xFF,0xFF,0x80,0xFF,0xFF,0xF8,0x01,0xFF,0xF0,0x3F,
0xFF,0xFF,0x01,0xFF,0xFC,0x03,0xE0,0x3F,0x80,0x7F,0xFF,0xF8,0x00,0x7F,0xF0,0x3F,
0xFF,0xFC,0x00,0xFF,0xF8,0x07,0xC0,0x0F,0xC0,0x7F,0xFF,0xFC,0x00,0x1F,0xF0,0x3F,
0xFF,0xF8,0x00,0x7F,0xF8,0x0F,0x80,0x07,0xE0,0x7F,0xFF,0xFE,0x00,0x0F,0xF0,0x3F,
0xFF,0xF0,0x00,0x3F,0xF0,0x1F,0x00,0x03,0xE0,0x3F,0xFF,0xFF,0x80,0x0F,0xF0,0x3F,
0xFF,0xF0,0x00,0x1F,0xE0,0x1E,0x00,0x03,0xE0,0x3F,0xC1,0xFF,0xF0,0x0F,0xF0,0x3F,
0x03,0xE0,0x00,0x1F,0xE0,0x3E,0x00,0x01,0xF0,0x3F,0x80,0xFF,0xFC,0x0F,0xF0,0x3F,
0x03,0xE0,0x00,0x1F,0xC0,0x3C,0x00,0x01,0xF0,0x3F,0x00,0xFC,0x7C,0x0F,0xF0,0x3F,
0x03,0xE0,0x00,0x1F,0x80,0x7C,0x00,0x01,0xF0,0x3F,0x00,0x78,0x00,0x0F,0xF0,0x3F,
0x03,0xE0,0x00,0x1F,0x80,0xFC,0x00,0x01,0xF0,0x3F,0x00,0x70,0x00,0x0F,0xF0,0x3F,
0x03,0xE0,0x00,0x1F,0x00,0xFC,0x00,0x01,0xF0,0x3F,0x00,0xE0,0x00,0x1F,0xF0,0x3F,
0x03,0xE0,0x00,0x1F,0x01,0xFE,0x00,0x01,0xF0,0x3F,0x80,0xF8,0x00,0x3F,0xF0,0x3F,
0x03,0xE0,0x00,0x1E,0x03,0xFE,0x00,0x03,0xFF,0xFF,0xC1,0xFC,0x00,0x7F,0xF0,0x3F,
0x01,0xF0,0x00,0x3C,0x03,0xFF,0x00,0x03,0xFF,0xFF,0xFF,0xFF,0xE7,0xFF,0xFF,0xFF,
0x81,0xF8,0x00,0x7C,0x07,0xFF,0x00,0x07,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0x80,0xFC,0x00,0xF8,0x07,0xFF,0x80,0x0F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0x80,0xFE,0x01,0xF0,0x0F,0xFF,0xE0,0x3F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xC0,0x7F,0xFF,0xE0,0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xC0,0x3F,0xFF,0xC0,0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xE0,0x1F,0xFF,0x80,0x3F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xF0,0x07,0xFF,0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xF0,0x01,0xFC,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xF8,0x00,0x00,0x01,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFC,0x00,0x00,0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0x00,0x00,0x07,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0x80,0x00,0x0F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0xE0,0x00,0x3F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0xFC,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
};

View File

@@ -464,8 +464,8 @@ void GcodeSuite::G33() {
SERIAL_ECHOLNPGM("G33 Auto Calibrate");
// Report settings
PGM_P const checkingac = PSTR("Checking... AC");
SERIAL_ECHOPGM_P(checkingac);
FSTR_P const checkingac = F("Checking... AC");
SERIAL_ECHOF(checkingac);
SERIAL_ECHOPGM(" at radius:", dcr);
if (verbose_level == 0) SERIAL_ECHOPGM(" (DRY-RUN)");
SERIAL_EOL();

View File

@@ -25,7 +25,7 @@
* Release version. Leave the Marlin version or apply a custom scheme.
*/
#ifndef SHORT_BUILD_VERSION
#define SHORT_BUILD_VERSION "2.1.2.1"
#define SHORT_BUILD_VERSION "2.1.0.2"
#endif
/**
@@ -42,7 +42,8 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2023-05-16"
#define STRING_DISTRIBUTION_DATE "2023-12-08"
#define STRING_DISTRIBUTION_DATE "2023-12-08"
#endif
/**

View File

@@ -195,8 +195,6 @@
#include "ramps/pins_ORTUR_4.h" // ATmega2560 env:mega2560
#elif MB(TENLOG_D3_HERO)
#include "ramps/pins_TENLOG_D3_HERO.h" // ATmega2560 env:mega2560
#elif MB(TENLOG_MB1_V23)
#include "ramps/pins_TENLOG_MB1_V23.h" // ATmega2560 env:mega2560
#elif MB(MKS_GEN_L_V21)
#include "ramps/pins_MKS_GEN_L_V21.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_S_12_EEFB, RAMPS_S_12_EEEB, RAMPS_S_12_EFFB)
@@ -234,7 +232,7 @@
#elif MB(CNCONTROLS_15)
#include "mega/pins_CNCONTROLS_15.h" // ATmega2560, ATmega1280 env:mega2560 env:mega1280
#elif MB(MIGHTYBOARD_REVE)
#include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega2560, ATmega1280 env:mega2560ext env:MightyBoard1280 env:MightyBoard2560
#include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega2560, ATmega1280 env:mega2560ext env:mega1280 env:MightyBoard1280 env:MightyBoard2560
#elif MB(CHEAPTRONIC)
#include "mega/pins_CHEAPTRONIC.h" // ATmega2560 env:mega2560
#elif MB(CHEAPTRONIC_V2)
@@ -404,8 +402,6 @@
#include "lpc1768/pins_BTT_SKR_V1_3.h" // LPC1768 env:LPC1768
#elif MB(BTT_SKR_V1_4)
#include "lpc1768/pins_BTT_SKR_V1_4.h" // LPC1768 env:LPC1768
#elif MB(EMOTRONIC)
#include "lpc1768/pins_EMOTRONIC.h" // LPC1768 env:LPC1768
//
// LPC1769 ARM Cortex M3
@@ -514,9 +510,9 @@
#elif MB(MKS_ROBIN_MINI)
#include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini env:mks_robin_mini_maple
#elif MB(MKS_ROBIN_NANO)
#include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1v2_usbmod
#include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
#elif MB(MKS_ROBIN_NANO_V2)
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
#elif MB(MKS_ROBIN_LITE)
#include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite env:mks_robin_lite_maple
#elif MB(MKS_ROBIN_LITE3)
@@ -533,8 +529,6 @@
#include "stm32f1/pins_MKS_ROBIN_E3D_V1_1.h" // STM32F1 env:mks_robin_e3
#elif MB(MKS_ROBIN_E3P)
#include "stm32f1/pins_MKS_ROBIN_E3P.h" // STM32F1 env:mks_robin_e3p env:mks_robin_e3p_maple
#elif MB(BTT_EBB42_V1_1)
#include "stm32g0/pins_BTT_EBB42_V1_1.h" // STM32G0 env:BTT_EBB42_V1_1_filament_extruder
#elif MB(BTT_SKR_MINI_V1_1)
#include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
#elif MB(BTT_SKR_MINI_E3_V1_0)
@@ -545,18 +539,6 @@
#include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
#elif MB(BTT_SKR_MINI_E3_V3_0)
#include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
#elif MB(BTT_MANTA_M4P_V1_0)
#include "stm32g0/pins_BTT_MANTA_M4P_V1_0.h" // STM32G0 env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
#elif MB(BTT_MANTA_M5P_V1_0)
#include "stm32g0/pins_BTT_MANTA_M5P_V1_0.h" // STM32G0 env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
#elif MB(BTT_MANTA_E3_EZ_V1_0)
#include "stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h" // STM32G0 env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
#elif MB(BTT_MANTA_M8P_V1_0)
#include "stm32g0/pins_BTT_MANTA_M8P_V1_0.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer
#elif MB(BTT_MANTA_M8P_V1_1)
#include "stm32g0/pins_BTT_MANTA_M8P_V1_1.h" // STM32G0 env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer
#elif MB(BTT_SKR_MINI_E3_V3_0_1)
#include "stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h"// STM32F4 env:STM32F401RC_btt
#elif MB(BTT_SKR_MINI_MZ_V1_0)
#include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
#elif MB(BTT_SKR_E3_DIP)
@@ -585,8 +567,6 @@
#include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V4210)
#include "stm32f1/pins_CREALITY_V4210.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V425)
#include "stm32f1/pins_CREALITY_V425.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V422)
#include "stm32f1/pins_CREALITY_V422.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V423)
@@ -605,10 +585,8 @@
#include "stm32f1/pins_CREALITY_V24S1_301.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V25S1)
#include "stm32f1/pins_CREALITY_V25S1.h" // STM32F1 env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
#elif MB(CREALITY_V521)
#include "stm32f1/pins_CREALITY_V521.h" // STM32F103VE env:STM32F103VE_creality
#elif MB(TRIGORILLA_PRO)
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro env:trigorilla_pro_maple env:trigorilla_pro_disk
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro env:trigorilla_pro_maple
#elif MB(FLY_MINI)
#include "stm32f1/pins_FLY_MINI.h" // STM32F1 env:FLY_MINI env:FLY_MINI_maple
#elif MB(FLSUN_HISPEED)
@@ -627,8 +605,6 @@
#include "stm32f1/pins_ERYONE_ERY32_MINI.h" // STM32F103VET6 env:ERYONE_ERY32_MINI_maple
#elif MB(PANDA_PI_V29)
#include "stm32f1/pins_PANDA_PI_V29.h" // STM32F103RCT6 env:PANDA_PI_V29
#elif MB(SOVOL_V131)
#include "stm32f1/pins_SOVOL_V131.h" // GD32F1 env:GD32F103RET6_sovol_maple
//
// ARM Cortex-M4F
@@ -653,6 +629,8 @@
#include "stm32f4/pins_RUMBA32_BTT.h" // STM32F4 env:rumba32
#elif MB(BLACK_STM32F407VE)
#include "stm32f4/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black
#elif MB(STEVAL_3DP001V1)
#include "stm32f4/pins_STEVAL_3DP001V1.h" // STM32F4 env:STM32F401VE_STEVAL
#elif MB(BTT_SKR_PRO_V1_1)
#include "stm32f4/pins_BTT_SKR_PRO_V1_1.h" // STM32F4 env:BIGTREE_SKR_PRO env:BIGTREE_SKR_PRO_usb_flash_drive
#elif MB(BTT_SKR_PRO_V1_2)
@@ -668,11 +646,11 @@
#elif MB(BTT_SKR_V2_0_REV_B)
#include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h" // STM32F4 env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug env:BIGTREE_SKR_2_F429 env:BIGTREE_SKR_2_F429_USB env:BIGTREE_SKR_2_F429_USB_debug
#elif MB(BTT_OCTOPUS_V1_0)
#include "stm32f4/pins_BTT_OCTOPUS_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB
#include "stm32f4/pins_BTT_OCTOPUS_V1_0.h" // STM32F4 env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
#elif MB(BTT_OCTOPUS_V1_1)
#include "stm32f4/pins_BTT_OCTOPUS_V1_1.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32F407ZE_btt env:STM32F407ZE_btt_USB
#include "stm32f4/pins_BTT_OCTOPUS_V1_1.h" // STM32F4 env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
#elif MB(BTT_OCTOPUS_PRO_V1_0)
#include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4 env:STM32F446ZE_btt env:STM32F446ZE_btt_USB env:STM32F429ZG_btt env:STM32F429ZG_btt_USB env:STM32H723Zx_btt
#include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4 env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB env:BIGTREE_OCTOPUS_PRO_V1_F429 env:BIGTREE_OCTOPUS_PRO_V1_F429_USB
#elif MB(LERDGE_K)
#include "stm32f4/pins_LERDGE_K.h" // STM32F4 env:LERDGEK env:LERDGEK_usb_flash_drive
#elif MB(LERDGE_S)
@@ -692,7 +670,7 @@
#elif MB(FLYF407ZG)
#include "stm32f4/pins_FLYF407ZG.h" // STM32F4 env:FLYF407ZG
#elif MB(MKS_ROBIN2)
#include "stm32f4/pins_MKS_ROBIN2.h" // STM32F4 env:mks_robin2
#include "stm32f4/pins_MKS_ROBIN2.h" // STM32F4 env:MKS_ROBIN2
#elif MB(MKS_ROBIN_PRO_V2)
#include "stm32f4/pins_MKS_ROBIN_PRO_V2.h" // STM32F4 env:mks_robin_pro2
#elif MB(MKS_ROBIN_NANO_V3)
@@ -700,35 +678,25 @@
#elif MB(MKS_ROBIN_NANO_V3_1)
#include "stm32f4/pins_MKS_ROBIN_NANO_V3.h" // STM32F4 env:mks_robin_nano_v3_1 env:mks_robin_nano_v3_1_usb_flash_drive env:mks_robin_nano_v3_1_usb_flash_drive_msc
#elif MB(ANET_ET4)
#include "stm32f4/pins_ANET_ET4.h" // STM32F4 env:Anet_ET4_no_bootloader env:Anet_ET4_OpenBLT
#include "stm32f4/pins_ANET_ET4.h" // STM32F4 env:Anet_ET4_OpenBLT
#elif MB(ANET_ET4P)
#include "stm32f4/pins_ANET_ET4P.h" // STM32F4 env:Anet_ET4_no_bootloader env:Anet_ET4_OpenBLT
#include "stm32f4/pins_ANET_ET4P.h" // STM32F4 env:Anet_ET4_OpenBLT
#elif MB(FYSETC_CHEETAH_V20)
#include "stm32f4/pins_FYSETC_CHEETAH_V20.h" // STM32F4 env:FYSETC_CHEETAH_V20
#elif MB(MKS_MONSTER8_V1)
#include "stm32f4/pins_MKS_MONSTER8_V1.h" // STM32F4 env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
#elif MB(MKS_MONSTER8_V2)
#include "stm32f4/pins_MKS_MONSTER8_V2.h" // STM32F4 env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
#elif MB(MKS_MONSTER8)
#include "stm32f4/pins_MKS_MONSTER8.h" // STM32F4 env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
#elif MB(TH3D_EZBOARD_V2)
#include "stm32f4/pins_TH3D_EZBOARD_V2.h" // STM32F4 env:TH3D_EZBoard_V2_no_bootloader env:TH3D_EZBoard_V2_OpenBLT
#elif MB(OPULO_LUMEN_REV3)
#include "stm32f4/pins_OPULO_LUMEN_REV3.h" // STM32F4 env:Opulo_Lumen_REV3
#include "stm32f4/pins_TH3D_EZBOARD_V2.h" // STM32F4 env:TH3D_EZBoard_V2
#elif MB(INDEX_REV03)
#include "stm32f4/pins_INDEX_REV03.h" // STM32F4 env:Index_Mobo_Rev03
#elif MB(MKS_ROBIN_NANO_V1_3_F4)
#include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4 env:mks_robin_nano_v1_3_f4 env:mks_robin_nano_v1_3_f4_usbmod
#include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4 env:mks_robin_nano_v1_3_f4
#elif MB(MKS_EAGLE)
#include "stm32f4/pins_MKS_EAGLE.h" // STM32F4 env:mks_eagle
#elif MB(ARTILLERY_RUBY)
#include "stm32f4/pins_ARTILLERY_RUBY.h" // STM32F4 env:Artillery_Ruby
#elif MB(CREALITY_V24S1_301F4)
#include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
#elif MB(OPULO_LUMEN_REV4)
#include "stm32f4/pins_OPULO_LUMEN_REV4.h" // STM32F4 env:Opulo_Lumen_REV4
#elif MB(FYSETC_SPIDER_KING407)
#include "stm32f4/pins_FYSETC_SPIDER_KING407.h" // STM32F4 env:FYSETC_SPIDER_KING407
#elif MB(MKS_SKIPR_V1)
#include "stm32f4/pins_MKS_SKIPR_V1_0.h" // STM32F4 env:mks_skipr_v1 env:mks_skipr_v1_nobootloader
#elif MB(TRONXY_V10)
#include "stm32f4/pins_TRONXY_V10.h" // STM32F4 env:STM32F446_tronxy
#include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_nobootloader env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
//
// ARM Cortex M7
@@ -738,16 +706,12 @@
#include "stm32f7/pins_REMRAM_V1.h" // STM32F7 env:REMRAM_V1
#elif MB(NUCLEO_F767ZI)
#include "stm32f7/pins_NUCLEO_F767ZI.h" // STM32F7 env:NUCLEO_F767ZI
#elif MB(BTT_SKR_SE_BX_V2)
#include "stm32h7/pins_BTT_SKR_SE_BX_V2.h" // STM32H7 env:BTT_SKR_SE_BX
#elif MB(BTT_SKR_SE_BX_V3)
#include "stm32h7/pins_BTT_SKR_SE_BX_V3.h" // STM32H7 env:BTT_SKR_SE_BX
#elif MB(BTT_SKR_SE_BX)
#include "stm32h7/pins_BTT_SKR_SE_BX.h" // STM32H7 env:BTT_SKR_SE_BX
#elif MB(BTT_SKR_V3_0)
#include "stm32h7/pins_BTT_SKR_V3_0.h" // STM32H7 env:STM32H723Vx_btt env:STM32H743Vx_btt
#include "stm32h7/pins_BTT_SKR_V3_0.h" // STM32H7 env:STM32H743Vx_btt
#elif MB(BTT_SKR_V3_0_EZ)
#include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H723Vx_btt env:STM32H743Vx_btt
#elif MB(BTT_OCTOPUS_MAX_EZ_V1_0)
#include "stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h" // STM32H7 env:STM32H723Vx_btt env:STM32H723Zx_btt
#include "stm32h7/pins_BTT_SKR_V3_0_EZ.h" // STM32H7 env:STM32H743Vx_btt
#elif MB(TEENSY41)
#include "teensy4/pins_TEENSY41.h" // Teensy-4.x env:teensy41
#elif MB(T41U5XBB)
@@ -789,13 +753,6 @@
#elif MB(BRICOLEMON_LITE_V1_0)
#include "samd/pins_BRICOLEMON_LITE_V1_0.h" // SAMD51 env:SAMD51_grandcentral_m4
//
// ReprapWorld Minitronics (SAMD21)
//
#elif MB(MINITRONICS20)
#include "samd/pins_MINITRONICS20.h" // SAMD21 env:SAMD21_minitronics20
//
// Custom board (with custom PIO env)
//
@@ -807,7 +764,7 @@
// Linux Native Debug board
//
#elif MB(SIMULATED)
#elif MB(LINUX_RAMPS)
#include "linux/pins_RAMPS_LINUX.h" // Native or Simulation lin:linux_native mac:simulator_macos_debug mac:simulator_macos_release win:simulator_windows lin:simulator_linux_debug lin:simulator_linux_release
#else
@@ -825,7 +782,6 @@
#define BOARD_STM32F103R 99906
#define BOARD_ESP32 99907
#define BOARD_STEVAL 99908
#define BOARD_STEVAL_3DP001V1 99908
#define BOARD_BIGTREE_SKR_V1_1 99909
#define BOARD_BIGTREE_SKR_V1_3 99910
#define BOARD_BIGTREE_SKR_V1_4 99911
@@ -841,9 +797,6 @@
#define BOARD_RAMPS_LONGER3D_LK4PRO 99921
#define BOARD_BTT_SKR_V2_0 99922
#define BOARD_TH3D_EZBOARD_LITE_V2 99923
#define BOARD_BTT_SKR_SE_BX 99924
#define BOARD_MKS_MONSTER8 99925
#define BOARD_LINUX_RAMPS 99926
#if MB(MKS_13)
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -882,7 +835,7 @@
#elif MOTHERBOARD == BOARD_ESP32
#error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
#elif MB(STEVAL)
#error "BOARD_STEVAL_3DP001V1 (BOARD_STEVAL) is no longer supported in Marlin."
#error "BOARD_STEVAL has been renamed BOARD_STEVAL_3DP001V1. Please update your configuration."
#elif MB(RUMBA32)
#error "BOARD_RUMBA32 is now BOARD_RUMBA32_MKS or BOARD_RUMBA32_V1_0. Please update your configuration."
#elif MB(RUMBA32_AUS3D)
@@ -895,12 +848,6 @@
#error "BOARD_BTT_SKR_V2_0 is now BOARD_BTT_SKR_V2_0_REV_A or BOARD_BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
#elif MB(TH3D_EZBOARD_LITE_V2)
#error "BOARD_TH3D_EZBOARD_LITE_V2 is now BOARD_TH3D_EZBOARD_V2. Please update your configuration."
#elif MB(BTT_SKR_SE_BX)
#error "BOARD_BTT_SKR_SE_BX is now BOARD_BTT_SKR_SE_BX_V2 or BOARD_BTT_SKR_SE_BX_V3. Please update your configuration."
#elif MB(MKS_MONSTER8)
#error "BOARD_MKS_MONSTER8 is now BOARD_MKS_MONSTER8_V1 or BOARD_MKS_MONSTER8_V2. Please update your configuration."
#elif MB(LINUX_RAMPS)
#error "BOARD_LINUX_RAMPS is now BOARD_SIMULATED. Please update your configuration."
#elif defined(MOTHERBOARD)
#error "Unknown MOTHERBOARD value set in Configuration.h."
#else
@@ -916,7 +863,7 @@
#undef BOARD_STM32F103R
#undef BOARD_ESP32
#undef BOARD_STEVAL
#undef BOARD_STEVAL_3DP001V1
#undef BOARD_BIGTREE_SKR_MINI_E3
#undef BOARD_BIGTREE_SKR_V1_1
#undef BOARD_BIGTREE_SKR_V1_3
#undef BOARD_BIGTREE_SKR_V1_4
@@ -924,7 +871,6 @@
#undef BOARD_BIGTREE_BTT002_V1_0
#undef BOARD_BIGTREE_SKR_PRO_V1_1
#undef BOARD_BIGTREE_SKR_MINI_V1_1
#undef BOARD_BIGTREE_SKR_MINI_E3
#undef BOARD_BIGTREE_SKR_E3_DIP
#undef BOARD_RUMBA32
#undef BOARD_RUMBA32_AUS3D
@@ -932,9 +878,6 @@
#undef BOARD_RAMPS_LONGER3D_LK4PRO
#undef BOARD_BTT_SKR_V2_0
#undef BOARD_TH3D_EZBOARD_LITE_V2
#undef BOARD_BTT_SKR_SE_BX
#undef BOARD_MKS_MONSTER8
#undef BOARD_LINUX_RAMPS
#endif

View File

@@ -708,7 +708,7 @@ bool SdBaseFile::open(SdBaseFile * const dirFile, const uint8_t dname[11]
}
// Get LFN sequence number
lfnSequenceNumber = pvFat->sequenceNumber & 0x1F;
if WITHIN(lfnSequenceNumber, 1, reqEntriesNum) {
if (WITHIN(lfnSequenceNumber, 1, reqEntriesNum)) {
// Check checksum for all other entries with the starting checksum fetched before
if (lfnChecksum == pvFat->checksum) {
// Set chunk of LFN from VFAT entry into lfnName

View File

@@ -5,248 +5,249 @@
import pioutil
if pioutil.is_pio_build():
import subprocess,os,re
Import("env")
import subprocess,os,re
Import("env")
from platformio.package.meta import PackageSpec
from platformio.project.config import ProjectConfig
from platformio.package.meta import PackageSpec
from platformio.project.config import ProjectConfig
verbose = 0
FEATURE_CONFIG = {}
verbose = 0
FEATURE_CONFIG = {}
def validate_pio():
PIO_VERSION_MIN = (6, 0, 1)
try:
from platformio import VERSION as PIO_VERSION
weights = (1000, 100, 1)
version_min = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION_MIN)])
version_cur = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION)])
if version_cur < version_min:
print()
print("**************************************************")
print("****** An update to PlatformIO is ******")
print("****** required to build Marlin Firmware. ******")
print("****** ******")
print("****** Minimum version: ", PIO_VERSION_MIN, " ******")
print("****** Current Version: ", PIO_VERSION, " ******")
print("****** ******")
print("****** Update PlatformIO and try again. ******")
print("**************************************************")
print()
exit(1)
except SystemExit:
exit(1)
except:
print("Can't detect PlatformIO Version")
def validate_pio():
PIO_VERSION_MIN = (6, 0, 1)
try:
from platformio import VERSION as PIO_VERSION
weights = (1000, 100, 1)
version_min = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION_MIN)])
version_cur = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION)])
if version_cur < version_min:
print()
print("**************************************************")
print("****** An update to PlatformIO is ******")
print("****** required to build Marlin Firmware. ******")
print("****** ******")
print("****** Minimum version: ", PIO_VERSION_MIN, " ******")
print("****** Current Version: ", PIO_VERSION, " ******")
print("****** ******")
print("****** Update PlatformIO and try again. ******")
print("**************************************************")
print()
exit(1)
except SystemExit:
exit(1)
except:
print("Can't detect PlatformIO Version")
def blab(str,level=1):
if verbose >= level:
print("[deps] %s" % str)
def blab(str,level=1):
if verbose >= level:
print("[deps] %s" % str)
def add_to_feat_cnf(feature, flines):
def add_to_feat_cnf(feature, flines):
try:
feat = FEATURE_CONFIG[feature]
except:
FEATURE_CONFIG[feature] = {}
try:
feat = FEATURE_CONFIG[feature]
except:
FEATURE_CONFIG[feature] = {}
# Get a reference to the FEATURE_CONFIG under construction
feat = FEATURE_CONFIG[feature]
# Get a reference to the FEATURE_CONFIG under construction
feat = FEATURE_CONFIG[feature]
# Split up passed lines on commas or newlines and iterate
# Add common options to the features config under construction
# For lib_deps replace a previous instance of the same library
atoms = re.sub(r',\s*', '\n', flines).strip().split('\n')
for line in atoms:
parts = line.split('=')
name = parts.pop(0)
if name in ['build_flags', 'extra_scripts', 'build_src_filter', 'lib_ignore']:
feat[name] = '='.join(parts)
blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
else:
for dep in re.split(r',\s*', line):
lib_name = re.sub(r'@([~^]|[<>]=?)?[\d.]+', '', dep.strip()).split('=').pop(0)
lib_re = re.compile('(?!^' + lib_name + '\\b)')
if not 'lib_deps' in feat: feat['lib_deps'] = {}
feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
blab("[%s] lib_deps = %s" % (feature, dep), 3)
# Split up passed lines on commas or newlines and iterate
# Add common options to the features config under construction
# For lib_deps replace a previous instance of the same library
atoms = re.sub(r',\\s*', '\n', flines).strip().split('\n')
for line in atoms:
parts = line.split('=')
name = parts.pop(0)
if name in ['build_flags', 'extra_scripts', 'build_src_filter', 'lib_ignore']:
feat[name] = '='.join(parts)
blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
else:
for dep in re.split(r",\s*", line):
lib_name = re.sub(r'@([~^]|[<>]=?)?[\d.]+', '', dep.strip()).split('=').pop(0)
lib_re = re.compile('(?!^' + lib_name + '\\b)')
feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
blab("[%s] lib_deps = %s" % (feature, dep), 3)
def load_features():
blab("========== Gather [features] entries...")
for key in ProjectConfig().items('features'):
feature = key[0].upper()
if not feature in FEATURE_CONFIG:
FEATURE_CONFIG[feature] = { 'lib_deps': [] }
add_to_feat_cnf(feature, key[1])
def load_config():
blab("========== Gather [features] entries...")
items = ProjectConfig().items('features')
for key in items:
feature = key[0].upper()
if not feature in FEATURE_CONFIG:
FEATURE_CONFIG[feature] = { 'lib_deps': [] }
add_to_feat_cnf(feature, key[1])
# Add options matching custom_marlin.MY_OPTION to the pile
blab("========== Gather custom_marlin entries...")
for n in env.GetProjectOptions():
key = n[0]
mat = re.match(r'custom_marlin\.(.+)', key)
if mat:
try:
val = env.GetProjectOption(key)
except:
val = None
if val:
opt = mat[1].upper()
blab("%s.custom_marlin.%s = '%s'" % ( env['PIOENV'], opt, val ))
add_to_feat_cnf(opt, val)
# Add options matching custom_marlin.MY_OPTION to the pile
blab("========== Gather custom_marlin entries...")
all_opts = env.GetProjectOptions()
for n in all_opts:
key = n[0]
mat = re.match(r'custom_marlin\.(.+)', key)
if mat:
try:
val = env.GetProjectOption(key)
except:
val = None
if val:
opt = mat.group(1).upper()
blab("%s.custom_marlin.%s = '%s'" % ( env['PIOENV'], opt, val ))
add_to_feat_cnf(opt, val)
def get_all_known_libs():
known_libs = []
for feature in FEATURE_CONFIG:
feat = FEATURE_CONFIG[feature]
if not 'lib_deps' in feat:
continue
for dep in feat['lib_deps']:
known_libs.append(PackageSpec(dep).name)
return known_libs
def get_all_known_libs():
known_libs = []
for feature in FEATURE_CONFIG:
feat = FEATURE_CONFIG[feature]
if not 'lib_deps' in feat:
continue
for dep in feat['lib_deps']:
known_libs.append(PackageSpec(dep).name)
return known_libs
def get_all_env_libs():
env_libs = []
lib_deps = env.GetProjectOption('lib_deps')
for dep in lib_deps:
env_libs.append(PackageSpec(dep).name)
return env_libs
def get_all_env_libs():
env_libs = []
lib_deps = env.GetProjectOption('lib_deps')
for dep in lib_deps:
env_libs.append(PackageSpec(dep).name)
return env_libs
def set_env_field(field, value):
proj = env.GetProjectConfig()
proj.set("env:" + env['PIOENV'], field, value)
def set_env_field(field, value):
proj = env.GetProjectConfig()
proj.set("env:" + env['PIOENV'], field, value)
# All unused libs should be ignored so that if a library
# exists in .pio/lib_deps it will not break compilation.
def force_ignore_unused_libs():
env_libs = get_all_env_libs()
known_libs = get_all_known_libs()
diff = (list(set(known_libs) - set(env_libs)))
lib_ignore = env.GetProjectOption('lib_ignore') + diff
blab("Ignore libraries: %s" % lib_ignore)
set_env_field('lib_ignore', lib_ignore)
# All unused libs should be ignored so that if a library
# exists in .pio/lib_deps it will not break compilation.
def force_ignore_unused_libs():
env_libs = get_all_env_libs()
known_libs = get_all_known_libs()
diff = (list(set(known_libs) - set(env_libs)))
lib_ignore = env.GetProjectOption('lib_ignore') + diff
blab("Ignore libraries: %s" % lib_ignore)
set_env_field('lib_ignore', lib_ignore)
def apply_features_config():
load_features()
blab("========== Apply enabled features...")
for feature in FEATURE_CONFIG:
if not env.MarlinHas(feature):
continue
def apply_features_config():
load_config()
blab("========== Apply enabled features...")
for feature in FEATURE_CONFIG:
if not env.MarlinFeatureIsEnabled(feature):
continue
feat = FEATURE_CONFIG[feature]
feat = FEATURE_CONFIG[feature]
if 'lib_deps' in feat and len(feat['lib_deps']):
blab("========== Adding lib_deps for %s... " % feature, 2)
if 'lib_deps' in feat and len(feat['lib_deps']):
blab("========== Adding lib_deps for %s... " % feature, 2)
# feat to add
deps_to_add = {}
for dep in feat['lib_deps']:
deps_to_add[PackageSpec(dep).name] = dep
blab("==================== %s... " % dep, 2)
# feat to add
deps_to_add = {}
for dep in feat['lib_deps']:
deps_to_add[PackageSpec(dep).name] = dep
blab("==================== %s... " % dep, 2)
# Does the env already have the dependency?
deps = env.GetProjectOption('lib_deps')
for dep in deps:
name = PackageSpec(dep).name
if name in deps_to_add:
del deps_to_add[name]
# Does the env already have the dependency?
deps = env.GetProjectOption('lib_deps')
for dep in deps:
name = PackageSpec(dep).name
if name in deps_to_add:
del deps_to_add[name]
# Are there any libraries that should be ignored?
lib_ignore = env.GetProjectOption('lib_ignore')
for dep in deps:
name = PackageSpec(dep).name
if name in deps_to_add:
del deps_to_add[name]
# Are there any libraries that should be ignored?
lib_ignore = env.GetProjectOption('lib_ignore')
for dep in deps:
name = PackageSpec(dep).name
if name in deps_to_add:
del deps_to_add[name]
# Is there anything left?
if len(deps_to_add) > 0:
# Only add the missing dependencies
set_env_field('lib_deps', deps + list(deps_to_add.values()))
# Is there anything left?
if len(deps_to_add) > 0:
# Only add the missing dependencies
set_env_field('lib_deps', deps + list(deps_to_add.values()))
if 'build_flags' in feat:
f = feat['build_flags']
blab("========== Adding build_flags for %s: %s" % (feature, f), 2)
new_flags = env.GetProjectOption('build_flags') + [ f ]
env.Replace(BUILD_FLAGS=new_flags)
if 'build_flags' in feat:
f = feat['build_flags']
blab("========== Adding build_flags for %s: %s" % (feature, f), 2)
new_flags = env.GetProjectOption('build_flags') + [ f ]
env.Replace(BUILD_FLAGS=new_flags)
if 'extra_scripts' in feat:
blab("Running extra_scripts for %s... " % feature, 2)
env.SConscript(feat['extra_scripts'], exports="env")
if 'extra_scripts' in feat:
blab("Running extra_scripts for %s... " % feature, 2)
env.SConscript(feat['extra_scripts'], exports="env")
if 'build_src_filter' in feat:
blab("========== Adding build_src_filter for %s... " % feature, 2)
build_src_filter = ' '.join(env.GetProjectOption('build_src_filter'))
# first we need to remove the references to the same folder
my_srcs = re.findall(r'[+-](<.*?>)', feat['build_src_filter'])
cur_srcs = re.findall(r'[+-](<.*?>)', build_src_filter)
for d in my_srcs:
if d in cur_srcs:
build_src_filter = re.sub(r'[+-]' + d, '', build_src_filter)
if 'build_src_filter' in feat:
blab("========== Adding build_src_filter for %s... " % feature, 2)
build_src_filter = ' '.join(env.GetProjectOption('build_src_filter'))
# first we need to remove the references to the same folder
my_srcs = re.findall(r'[+-](<.*?>)', feat['build_src_filter'])
cur_srcs = re.findall(r'[+-](<.*?>)', build_src_filter)
for d in my_srcs:
if d in cur_srcs:
build_src_filter = re.sub(r'[+-]' + d, '', build_src_filter)
build_src_filter = feat['build_src_filter'] + ' ' + build_src_filter
set_env_field('build_src_filter', [build_src_filter])
env.Replace(SRC_FILTER=build_src_filter)
build_src_filter = feat['build_src_filter'] + ' ' + build_src_filter
set_env_field('build_src_filter', [build_src_filter])
env.Replace(SRC_FILTER=build_src_filter)
if 'lib_ignore' in feat:
blab("========== Adding lib_ignore for %s... " % feature, 2)
lib_ignore = env.GetProjectOption('lib_ignore') + [feat['lib_ignore']]
set_env_field('lib_ignore', lib_ignore)
if 'lib_ignore' in feat:
blab("========== Adding lib_ignore for %s... " % feature, 2)
lib_ignore = env.GetProjectOption('lib_ignore') + [feat['lib_ignore']]
set_env_field('lib_ignore', lib_ignore)
#
# Use the compiler to get a list of all enabled features
#
def load_marlin_features():
if 'MARLIN_FEATURES' in env:
return
#
# Use the compiler to get a list of all enabled features
#
def load_marlin_features():
if 'MARLIN_FEATURES' in env:
return
# Process defines
from preprocessor import run_preprocessor
define_list = run_preprocessor(env)
marlin_features = {}
for define in define_list:
feature = define[8:].strip().decode().split(' ')
feature, definition = feature[0], ' '.join(feature[1:])
marlin_features[feature] = definition
env['MARLIN_FEATURES'] = marlin_features
# Process defines
from preprocessor import run_preprocessor
define_list = run_preprocessor(env)
marlin_features = {}
for define in define_list:
feature = define[8:].strip().decode().split(' ')
feature, definition = feature[0], ' '.join(feature[1:])
marlin_features[feature] = definition
env['MARLIN_FEATURES'] = marlin_features
#
# Return True if a matching feature is enabled
#
def MarlinHas(env, feature):
load_marlin_features()
r = re.compile('^' + feature + '$')
found = list(filter(r.match, env['MARLIN_FEATURES']))
#
# Return True if a matching feature is enabled
#
def MarlinFeatureIsEnabled(env, feature):
load_marlin_features()
r = re.compile('^' + feature + '$')
found = list(filter(r.match, env['MARLIN_FEATURES']))
# Defines could still be 'false' or '0', so check
some_on = False
if len(found):
for f in found:
val = env['MARLIN_FEATURES'][f]
if val in [ '', '1', 'true' ]:
some_on = True
elif val in env['MARLIN_FEATURES']:
some_on = env.MarlinHas(val)
# Defines could still be 'false' or '0', so check
some_on = False
if len(found):
for f in found:
val = env['MARLIN_FEATURES'][f]
if val in [ '', '1', 'true' ]:
some_on = True
elif val in env['MARLIN_FEATURES']:
some_on = env.MarlinFeatureIsEnabled(val)
return some_on
return some_on
validate_pio()
validate_pio()
try:
verbose = int(env.GetProjectOption('custom_verbose'))
except:
pass
try:
verbose = int(env.GetProjectOption('custom_verbose'))
except:
pass
#
# Add a method for other PIO scripts to query enabled features
#
env.AddMethod(MarlinHas)
#
# Add a method for other PIO scripts to query enabled features
#
env.AddMethod(MarlinFeatureIsEnabled)
#
# Add dependencies for enabled Marlin features
#
apply_features_config()
force_ignore_unused_libs()
#
# Add dependencies for enabled Marlin features
#
apply_features_config()
force_ignore_unused_libs()
#print(env.Dump())
#print(env.Dump())
from signature import compute_build_signature
compute_build_signature(env)
from signature import compute_build_signature
compute_build_signature(env)

View File

@@ -2,72 +2,75 @@
# marlin.py
# Helper module with some commonly-used functions
#
import shutil
from pathlib import Path
import os,shutil
from SCons.Script import DefaultEnvironment
env = DefaultEnvironment()
from os.path import join
def copytree(src, dst, symlinks=False, ignore=None):
for item in src.iterdir():
if item.is_dir():
shutil.copytree(item, dst / item.name, symlinks, ignore)
else:
shutil.copy2(item, dst / item.name)
for item in os.listdir(src):
s = join(src, item)
d = join(dst, item)
if os.path.isdir(s):
shutil.copytree(s, d, symlinks, ignore)
else:
shutil.copy2(s, d)
def replace_define(field, value):
envdefs = env['CPPDEFINES'].copy()
for define in envdefs:
if define[0] == field:
env['CPPDEFINES'].remove(define)
env['CPPDEFINES'].append((field, value))
envdefs = env['CPPDEFINES'].copy()
for define in envdefs:
if define[0] == field:
env['CPPDEFINES'].remove(define)
env['CPPDEFINES'].append((field, value))
# Relocate the firmware to a new address, such as "0x08005000"
def relocate_firmware(address):
replace_define("VECT_TAB_ADDR", address)
replace_define("VECT_TAB_ADDR", address)
# Relocate the vector table with a new offset
def relocate_vtab(address):
replace_define("VECT_TAB_OFFSET", address)
replace_define("VECT_TAB_OFFSET", address)
# Replace the existing -Wl,-T with the given ldscript path
def custom_ld_script(ldname):
apath = str(Path("buildroot/share/PlatformIO/ldscripts", ldname).resolve())
for i, flag in enumerate(env["LINKFLAGS"]):
if "-Wl,-T" in flag:
env["LINKFLAGS"][i] = "-Wl,-T" + apath
elif flag == "-T":
env["LINKFLAGS"][i + 1] = apath
apath = os.path.abspath("buildroot/share/PlatformIO/ldscripts/" + ldname)
for i, flag in enumerate(env["LINKFLAGS"]):
if "-Wl,-T" in flag:
env["LINKFLAGS"][i] = "-Wl,-T" + apath
elif flag == "-T":
env["LINKFLAGS"][i + 1] = apath
# Encrypt ${PROGNAME}.bin and save it with a new name. This applies (mostly) to MKS boards
# This PostAction is set up by offset_and_rename.py for envs with 'build.encrypt_mks'.
# Encrypt ${PROGNAME}.bin and save it with a new name
# Called by specific encrypt() functions, mostly for MKS boards
def encrypt_mks(source, target, env, new_name):
import sys
import sys
key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
# If FIRMWARE_BIN is defined by config, override all
mf = env["MARLIN_FEATURES"]
if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
# If FIRMWARE_BIN is defined by config, override all
mf = env["MARLIN_FEATURES"]
if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
fwpath = Path(target[0].path)
fwfile = fwpath.open("rb")
enfile = Path(target[0].dir.path, new_name).open("wb")
length = fwpath.stat().st_size
position = 0
try:
while position < length:
byte = fwfile.read(1)
if 320 <= position < 31040:
byte = chr(ord(byte) ^ key[position & 31])
if sys.version_info[0] > 2:
byte = bytes(byte, 'latin1')
enfile.write(byte)
position += 1
finally:
fwfile.close()
enfile.close()
fwpath.unlink()
fwpath = target[0].path
fwfile = open(fwpath, "rb")
enfile = open(target[0].dir.path + "/" + new_name, "wb")
length = os.path.getsize(fwpath)
position = 0
try:
while position < length:
byte = fwfile.read(1)
if position >= 320 and position < 31040:
byte = chr(ord(byte) ^ key[position & 31])
if sys.version_info[0] > 2:
byte = bytes(byte, 'latin1')
enfile.write(byte)
position += 1
finally:
fwfile.close()
enfile.close()
os.remove(fwpath)
def add_post_action(action):
env.AddPostAction(str(Path("$BUILD_DIR", "${PROGNAME}.bin")), action);
env.AddPostAction(join("$BUILD_DIR", "${PROGNAME}.bin"), action);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -11,22 +11,23 @@
[features]
YHCB2004 = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/a3ebe98bc6.zip
build_src_filter=+<src/lcd/extui/mks_ui>
extra_scripts=download_mks_assets.py
MARLIN_TEST_BUILD = build_src_filter=+<src/tests>
POSTMORTEM_DEBUGGING = build_src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
build_flags=-funwind-tables
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/261c5a696a.zip
HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.3
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>
HAS_T(RINAMIC_CONFIG|MC_SPI) = build_src_filter=+<src/feature/tmc_util.cpp>
HAS_STEALTHCHOP = build_src_filter=+<src/gcode/feature/trinamic/M569.cpp>
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/6f53c19a8a.zip
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
build_src_filter=+<src/feature/digipot>
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/a7d7c92a13.zip
build_src_filter=+<src/module/stepper/TMC26X.cpp>
HAS_L64XX = Arduino-L6470@0.8.0
build_src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
LIB_INTERNAL_MAX31865 = build_src_filter=+<src/libs/MAX31865.cpp>
NEOPIXEL_LED = adafruit/Adafruit NeoPixel@~1.8.0
build_src_filter=+<src/feature/leds/neopixel.cpp>
@@ -37,13 +38,13 @@ USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7
HAS_LCDPRINT = build_src_filter=+<src/lcd/lcdprint.cpp>
HAS_MARLINUI_HD44780 = build_src_filter=+<src/lcd/HD44780>
HAS_MARLINUI_U8GLIB = marlinfirmware/U8glib-HAL@~0.5.2
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.5.2
build_src_filter=+<src/lcd/dogm>
HAS_(FSMC|SPI|LTDC)_TFT = build_src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
HAS_FSMC_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
HAS_SPI_TFT = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
I2C_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
SOFT_I2C_EEPROM = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
SPI_EEPROM = build_src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
HAS_DWIN_E3V2|IS_DWIN_MARLINUI = build_src_filter=+<src/lcd/e3v2/common>
DWIN_CREALITY_LCD = build_src_filter=+<src/lcd/e3v2/creality>
@@ -99,8 +100,6 @@ HAS_MCP3426_ADC = build_src_filter=+<src/feature/adc> +<s
AUTO_BED_LEVELING_BILINEAR = build_src_filter=+<src/feature/bedlevel/abl>
AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = build_src_filter=+<src/gcode/bedlevel/abl>
X_AXIS_TWIST_COMPENSATION = build_src_filter=+<src/feature/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp> +<src/gcode/probe/M423.cpp>
BD_SENSOR = markyue/Panda_SoftMasterI2C
build_src_filter=+<src/feature/bedlevel/bdl> +<src/gcode/probe/M102.cpp>
MESH_BED_LEVELING = build_src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
AUTO_BED_LEVELING_UBL = build_src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
UBL_HILBERT_CURVE = build_src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
@@ -119,7 +118,7 @@ EMERGENCY_PARSER = build_src_filter=+<src/feature/e_parser
EASYTHREED_UI = build_src_filter=+<src/feature/easythreed_ui.cpp>
I2C_POSITION_ENCODERS = build_src_filter=+<src/feature/encoder_i2c.cpp>
IIC_BL24CXX_EEPROM = build_src_filter=+<src/libs/BL24CXX.cpp>
SPI_FLASH = build_src_filter=+<src/libs/W25Qxx.cpp>
HAS_SPI_FLASH = build_src_filter=+<src/libs/W25Qxx.cpp>
HAS_ETHERNET = build_src_filter=+<src/feature/ethernet.cpp> +<src/gcode/feature/network/M552-M554.cpp>
HAS_FANCHECK = build_src_filter=+<src/feature/fancheck.cpp> +<src/gcode/temp/M123.cpp>
HAS_FANMUX = build_src_filter=+<src/feature/fanmux.cpp>
@@ -187,7 +186,6 @@ HAS_DUPLICATION_MODE = build_src_filter=+<src/gcode/control/M6
LIN_ADVANCE = build_src_filter=+<src/gcode/feature/advance>
PHOTO_GCODE = build_src_filter=+<src/gcode/feature/camera>
CONTROLLER_FAN_EDITABLE = build_src_filter=+<src/gcode/feature/controllerfan>
HAS_SHAPING = build_src_filter=+<src/gcode/feature/input_shaping>
GCODE_MACROS = build_src_filter=+<src/gcode/feature/macro>
GRADIENT_MIX = build_src_filter=+<src/gcode/feature/mixing/M166.cpp>
HAS_SAVED_POSITIONS = build_src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
@@ -202,13 +200,12 @@ AUTO_REPORT_POSITION = build_src_filter=+<src/gcode/host/M154.
REPETIER_GCODE_M360 = build_src_filter=+<src/gcode/host/M360.cpp>
HAS_GCODE_M876 = build_src_filter=+<src/gcode/host/M876.cpp>
HAS_RESUME_CONTINUE = build_src_filter=+<src/gcode/lcd/M0_M1.cpp>
SET_PROGRESS_MANUALLY = build_src_filter=+<src/gcode/lcd/M73.cpp>
LCD_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>
HAS_SOUND = build_src_filter=+<src/gcode/lcd/M300.cpp>
HAS_BUZZER = build_src_filter=+<src/gcode/lcd/M300.cpp>
TOUCH_SCREEN_CALIBRATION = build_src_filter=+<src/gcode/lcd/M995.cpp>
ARC_SUPPORT = build_src_filter=+<src/gcode/motion/G2_G3.cpp>
GCODE_MOTION_MODES = build_src_filter=+<src/gcode/motion/G80.cpp>
@@ -240,8 +237,7 @@ HAS_SERVOS = build_src_filter=+<src/module/servo.cpp
MORGAN_SCARA = build_src_filter=+<src/gcode/scara>
HAS_MICROSTEPS = build_src_filter=+<src/gcode/control/M350_M351.cpp>
(ESP3D_)?WIFISUPPORT = AsyncTCP, ESP Async WebServer
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/dc0f3d96c6.zip
arduinoWebSockets=links2004/WebSockets@2.3.4
luc-github/ESP32SSDP@1.1.1
luc-github/ESP32SSDP@^1.1.1
lib_ignore=ESPAsyncTCP
build_flags=-DSRCHOME=${platformio.src_dir}/src -DHALHOME=SRCHOME

View File

@@ -26,8 +26,6 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
# Native Simulation
# Builds with a small subset of available features
# Required system libraries: SDL2, SDL2-net, OpenGL, GLM
# sudo apt-get install python3-venv build-essential libsdl2-dev libsdl2-net-dev libglm-dev
# See https://docs.platformio.org/en/latest/platforms/native.html for more information
#
# Tested with Linux (Mint 20) : gcc [9.3.0, 10.2.0]: libsdl2-dev[2.0.10], libsdl2-net-dev[2.0.1], libglm-dev[0.9.9.7, 0.9.9.8]
#
@@ -37,15 +35,15 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
platform = native
framework =
build_flags = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
build_src_flags = -Wall -Wno-expansion-to-defined -Wno-deprecated-declarations -Wcast-align
build_src_flags = -Wall -Wno-expansion-to-defined -Wcast-align
release_flags = -g0 -O3 -flto
debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
lib_compat_mode = off
build_src_filter = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
lib_deps = ${common.lib_deps}
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.1.x.zip
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/8791f3ff43.zip
Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/c6b319f447.zip
LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/322fb5fc23.zip
extra_scripts = ${common.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/simulator.py
@@ -65,38 +63,21 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
#
# Simulator for macOS (MacPorts)
#
#
# MacPorts:
# sudo port install gcc12 glm libsdl2 libsdl2_net
# sudo port install gcc11 gdb glm libsdl2 libsdl2_net freetype
# sudo port install ld64 @3_3 +ld64_xcode
#
# cd /opt/local/bin
# sudo rm -f gcc g++ cc
# sudo rm gcc g++ cc ld
# sudo ln -s gcc-mp-12 gcc ; sudo ln -s g++-mp-12 g++ ; sudo ln -s g++ cc
# sudo ln -s ld-classic ld
# cd -
# rehash
#
# Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
# If Xcode is installed be sure to run `xcode-select --install` first.
#
#==================================================================================
#
# Homebrew:
# /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
#
# brew install gcc@12 glm sdl2 sdl2_net
#
# cd /opt/homebrew/bin
# sudo rm -f gcc g++ cc
# sudo ln -s gcc-12 gcc ; sudo ln -s g++-12 g++ ; sudo ln -s g++ cc
# cd -
#
# Use 'brew install mesa' to get a <GL/gl.h> if no Xcode is installed.
# If Xcode is installed be sure to run `xcode-select --install` first.
#
[simulator_macos]
build_unflags = -lGL -fstack-protector-strong
build_unflags = -lGL
build_flags =
-I/opt/local/include
-I/opt/local/include/freetype2
@@ -105,7 +86,6 @@ build_flags =
-Wl,-framework,OpenGl
-Wl,-framework,CoreFoundation
-lSDL2
-fno-stack-protector
[env:simulator_macos_debug]
extends = env:simulator_linux_debug
@@ -125,14 +105,10 @@ custom_gcc = g++
# Simulator for Windows 10
#
# MSYS2 mingw-w64-x86_64 with these packages:
# pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
# pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
#
# Ensure the following paths have been added to the PATH system environment variable:
# C:\msys64\mingw64\bin, C:\msys64\ucrt64\bin, C:\msys64\usr\bin
#
[env:simulator_windows]
extends = simulator_common
extends = simulator_common
build_src_flags = ${simulator_common.build_src_flags} -fpermissive
build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
build_type = debug
build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
build_type = debug

View File

@@ -35,7 +35,8 @@ extra_scripts = ${common_stm32.extra_scripts}
# USB Flash Drive mix-ins for STM32
#
[stm_flash_drive]
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
# Arduino_Core_STM32 uses usb-host-msc-cdc-msc-3 branch
platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/39f37d6d6a.zip
build_flags = ${common_stm32.build_flags}
-DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
-DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4

View File

@@ -677,7 +677,7 @@ extra_scripts = ${common_stm32.extra_scripts}
#
# Ender-3 S1 STM32F401RC_creality
#
[env:STM32F401RC_creality]
[STM32F401RC_creality_base]
extends = stm32_variant
board = genericSTM32F401RC
board_build.variant = MARLIN_CREALITY_STM32F401RC
@@ -691,6 +691,18 @@ extra_scripts = ${stm32_variant.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py
monitor_speed = 115200
[env:STM32F401RC_creality]
extends = STM32F401RC_creality_base
board_build.offset = 0x10000
board_upload.offset_address = 0x08010000
[env:STM32F401RC_creality_nobootloader]
extends = STM32F401RC_creality_base
board_build.offset = 0x0000
board_upload.offset_address = 0x08000000
debug_tool = stlink
upload_protocol = stlink
[env:STM32F401RC_creality_jlink]
extends = env:STM32F401RC_creality
debug_tool = jlink

View File

@@ -46,7 +46,8 @@ debug_tool = stlink
[env:STM32G0B1RE_btt]
extends = stm32_variant
platform = ststm32@~14.1.0
platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
platform_packages = framework-arduinoststm32@~4.20600.231001
toolchain-gccarmnoneeabi@1.100301.220327
board = marlin_STM32G0B1RE
board_build.offset = 0x2000
board_upload.offset_address = 0x08002000

View File

@@ -20,22 +20,23 @@
#################################
#
# BigTreeTech SKR SE BX V2.0 / V3.0 (STM32H743IIT6 ARM Cortex-M7)
# BigTreeTech SKR SE BX (STM32H743IIT6 ARM Cortex-M7)
#
[env:BTT_SKR_SE_BX]
extends = stm32_variant
platform_packages = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/biqu-bx-workaround.zip
# framework-arduinoststm32 uses biqu-bx-workaround branch
platform_packages = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/8b3522051a.zip
board = marlin_BTT_SKR_SE_BX
board_build.offset = 0x20000
build_flags = ${stm32_variant.build_flags} ${stm_flash_drive.build_flags}
-DUSE_USBHOST_HS
-DUSE_USB_HS_IN_FS
-DHAL_DMA2D_MODULE_ENABLED
-DHAL_LTDC_MODULE_ENABLED
-DHAL_SDRAM_MODULE_ENABLED
-DHAL_QSPI_MODULE_ENABLED
-DHAL_MDMA_MODULE_ENABLED
-DHAL_SD_MODULE_ENABLED
-DUSE_USBHOST_HS
-DUSE_USB_HS_IN_FS
-DHAL_DMA2D_MODULE_ENABLED
-DHAL_LTDC_MODULE_ENABLED
-DHAL_SDRAM_MODULE_ENABLED
-DHAL_QSPI_MODULE_ENABLED
-DHAL_MDMA_MODULE_ENABLED
-DHAL_SD_MODULE_ENABLED
upload_protocol = cmsis-dap
debug_tool = cmsis-dap
@@ -44,8 +45,8 @@ debug_tool = cmsis-dap
#
[env:STM32H743Vx_btt]
extends = stm32_variant
platform = ststm32@15.4.1
platform_packages = framework-arduinoststm32@~4.20200.220530
platform = ststm32@~14.1.0
platform_packages = framework-arduinoststm32@~4.20600.231001
board = marlin_STM32H743Vx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
@@ -59,56 +60,3 @@ build_flags = ${stm32_variant.build_flags}
-DD_CACHE_DISABLED
upload_protocol = cmsis-dap
debug_tool = cmsis-dap
#
# BigTreeTech SKR V3.0 / SKR V3.0 EZ (STM32H723VGT6 ARM Cortex-M7)
# BigTreeTech Octopus Max EZ V1.0 (STM32H723VET6 ARM Cortex-M7)
#
[env:STM32H723Vx_btt]
extends = stm32_variant
platform = ststm32@15.4.1
platform_packages = framework-arduinoststm32@~4.20200.220530
board = marlin_STM32H723Vx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
build_flags = ${stm32_variant.build_flags}
-DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-DPIN_SERIAL2_RX=PD_6 -DPIN_SERIAL2_TX=PD_5
-DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-DPIN_SERIAL7_RX=PE_7 -DPIN_SERIAL7_TX=PE_8
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
-DSTEP_TIMER_IRQ_PRIO=0
-DRCC_PERIPHCLK_I2C35=RCC_PERIPHCLK_I2C5
-DUSE_USB_HS -DUSE_USB_HS_IN_FS
-DD_CACHE_DISABLED
-UI2C5_BASE
upload_protocol = cmsis-dap
debug_tool = cmsis-dap
#
# BigTreeTech Octopus Pro V1.0 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
#
[env:STM32H723Zx_btt]
extends = stm32_variant
platform = ststm32@15.4.1
platform_packages = framework-arduinoststm32@~4.20200.220530
board = marlin_STM32H723Zx
board_build.offset = 0x20000
board_upload.offset_address = 0x08020000
build_flags = ${stm32_variant.build_flags}
-DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-DPIN_SERIAL2_RX=PD_6 -DPIN_SERIAL2_TX=PD_5
-DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-DPIN_SERIAL7_RX=PE_7 -DPIN_SERIAL7_TX=PE_8
-DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
-DSTEP_TIMER_IRQ_PRIO=0
-DRCC_PERIPHCLK_I2C35=RCC_PERIPHCLK_I2C5
-DUSE_USB_HS -DUSE_USB_HS_IN_FS
-DD_CACHE_DISABLED
-UI2C5_BASE
upload_protocol = cmsis-dap
debug_tool = cmsis-dap

View File

@@ -13,17 +13,15 @@
[platformio]
src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards
default_envs = mega2560
default_envs = STM32G0B1RE_btt
include_dir = Marlin
extra_configs =
Marlin/config.ini
ini/avr.ini
ini/due.ini
ini/esp32.ini
ini/features.ini
ini/lpc176x.ini
ini/native.ini
ini/samd21.ini
ini/samd51.ini
ini/stm32-common.ini
ini/stm32f0.ini
@@ -46,13 +44,12 @@ extra_configs =
build_flags = -g3 -D__MARLIN_FIRMWARE__ -DNDEBUG
-fmax-errors=5
extra_scripts =
pre:buildroot/share/PlatformIO/scripts/configuration.py
pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
pre:buildroot/share/PlatformIO/scripts/preflight-checks.py
post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
lib_deps =
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/tests>
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
-<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
-<src/lcd/e3v2/common> -<src/lcd/e3v2/creality> -<src/lcd/e3v2/proui> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
@@ -104,7 +101,6 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/t
-<src/feature/backlash.cpp>
-<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>
-<src/feature/bedlevel/abl> -<src/gcode/bedlevel/abl>
-<src/feature/bedlevel/bdl> -<src/gcode/probe/M102.cpp>
-<src/feature/bedlevel/mbl> -<src/gcode/bedlevel/mbl>
-<src/feature/bedlevel/ubl> -<src/gcode/bedlevel/ubl>
-<src/feature/bedlevel/hilbert_curve.cpp>
@@ -193,7 +189,6 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/t
-<src/gcode/feature/advance>
-<src/gcode/feature/camera>
-<src/gcode/feature/i2c>
-<src/gcode/feature/input_shaping>
-<src/gcode/feature/L6470>
-<src/gcode/feature/leds/M150.cpp>
-<src/gcode/feature/leds/M7219.cpp>
@@ -223,7 +218,6 @@ 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>
@@ -251,6 +245,7 @@ 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>
@@ -268,14 +263,14 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/t
# Default values apply to all 'env:' prefixed environments
#
[env]
framework = arduino
extra_scripts = ${common.extra_scripts}
build_flags = ${common.build_flags}
lib_deps = ${common.lib_deps}
monitor_speed = 250000
monitor_eol = LF
monitor_echo = yes
monitor_filters = colorize, time, send_on_enter
framework = arduino
extra_scripts = ${common.extra_scripts}
build_flags = ${common.build_flags}
lib_deps = ${common.lib_deps}
monitor_speed = 250000
monitor_eol = LF
monitor_echo = yes
monitor_filters = colorize, time, send_on_enter
#
# Just print the dependency tree