Skip to content

Commit

Permalink
Adding latest commits (#6)
Browse files Browse the repository at this point in the history
* ✏️ Fix MKS enum

* ✅ FYSETC TFT81050 CI Test (MarlinFirmware#23604)

* ✨ BOARD_CREALITY_V24S1_301 (MarlinFirmware#23620)

Co-Authored-By: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>

* 🚸 Better "Bed Tramming Done" dialog (MarlinFirmware#23616)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* 📝 Update Creality 4.2.2 driver warning

* 🐛 Fix SPI DMA and default mode (MarlinFirmware#23627)

Followup to MarlinFirmware#23464

* 🧑‍💻 Simplify Fast PWM timer macros

* 🐛 Fix AVR 644/1284 Timer / PWM conflicts (MarlinFirmware#23629)

* 🐛 Fix FYSETC S6, S6 V2 Serial RX pins (MarlinFirmware#23642)

* 🔧 Board temp sensor check

* 🔨 Workspace file with recommendation

* 🐛 Creality v4 cleanup, pin correction (MarlinFirmware#23666)

* 🔧 Sanity-check AVR D9 Fan PWM / SPEAKER Timer2 (MarlinFirmware#23672)

* 💡 Comment variant timers

* 🍻 STM32 set_pwm_duty "on/off" for digital pins (MarlinFirmware#23665)

* 🐛 Fix RUMBA + MKS Mini12864 Neopixel pin (MarlinFirmware#23646)

* 🧑‍💻 Relocate a variant

* ✨ Add ZRIB v53, patch G35 Z drop, related issues (MarlinFirmware#23636)

* 📌 Distinct BOARD_CREALITY_V422 (MarlinFirmware#23674)

* ✨ SAMD51 Bricolemon / Bricolemon Lite boards (MarlinFirmware#23658)

* 🐛 Fix Index Mobo Rev03 upload (MarlinFirmware#23676)

* 🩹 Init brightness/contrast later (MarlinFirmware#23645)

* 🚨 Deprecate Maple build (MarlinFirmware#23661)

Update Warnings.cpp

* 🩹 Prevent Z error with UBL + Park unscaled E move (MarlinFirmware#23568)

* 🐛 Fix dual MAX31865 initialization issues (MarlinFirmware#23496)

* 🔨 Clean up upload.py (MarlinFirmware#23679)

* 🐛 Fix missing u8g_esp32_spi (MarlinFirmware#23562)

* 🐛 Fix init of delta safe height (for G29, G33, etc.) (MarlinFirmware#23622)

* 🧑‍💻 Generic Maple STM32F103RC envs for devs (MarlinFirmware#23686)

* 🚨 Cleaner errors for renamed envs (MarlinFirmware#23690)

* 🩹 Fix Maple HAL compile errors (MarlinFirmware#23685)

* PLR accessors for Ext UI (MarlinFirmware#23687)

* 🔧 Update MIXING_EXTRUDER sanity checks

Fixing MarlinFirmware#23693

* ✨ Optional HOST_STATUS_NOTIFICATIONS (MarlinFirmware#22833)

* 🧑‍💻 Drop hostui.flag

* 🚸 Restore active tool after ABL G29 (MarlinFirmware#23692)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 Fix, Improve Power-Loss Recovery (MarlinFirmware#22828)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* 🩹 Simplify quick homing feedrate (MarlinFirmware#23714)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* 🧑‍💻 Wrap MMU1 pins

* ✨ Pxmalion Core i3 (MarlinFirmware#23711)

* 🎨 Misc. DGUS cleanup

* 💥 Change 'M42 M' to 'M42 T'

* 🚸 Align MKS UI heated bed status with HAS_MULTI_HOTEND (MarlinFirmware#23718)

* ✏️ Fix E3V2 display with BTT SKR Mini E3 v3 (MarlinFirmware#23719)

* 🔧 HAS_LCDPRINT conditional

* 📝 Update conditionals descriptions

* ♻️ No ui.reinit_lcd on any ExtUI (MarlinFirmware#23722)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* ♻️ Rename XATC z_values => z_offset

* 🧑‍💻 Update MightyBoard FET pins (MarlinFirmware#23728)

* 🚨 Fix TEMP_SENSOR_BOARD warnings (MarlinFirmware#23754)

* ✏️ Fix getLFNName parameter (MarlinFirmware#23752)

* 📌 Creality RAMPS optional SD_DETECT_PIN (MarlinFirmware#23740)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 Case Light, LED menus for E3V2 DWIN Enhanced UI (MarlinFirmware#23590)

* 🚸 Enhanced UI => Professional UI - with updates (MarlinFirmware#23624)

* ✨ More Nozzle Park move options (MarlinFirmware#23158)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* ♻️ Refactor HAL as singleton (MarlinFirmware#23357, MarlinFirmware#23871, MarlinFirmware#23897)

* ⚡️ Apply PTC on all probing (MarlinFirmware#23764)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 📝 Update Toolchange FS comments

* ✨ Dyze Design PT100 Amplifier Board (MarlinFirmware#23760)

* 🔧 Warning for MK3_FAN_PINS (MarlinFirmware#23727)

* 🐛 Fix TMC26X CS pins init (MarlinFirmware#23778)

* 🔨 More renamed.ini envs (MarlinFirmware#23786)

* 🎨  Move PROPORTIONAL_FONT_RATIO

* 🐛 Fix steps-to-mm with backlash (MarlinFirmware#23814)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🐛 ESP32 _delay_ms, fix u8g_esp32_spi.cpp (MarlinFirmware#23810)

* ✨ MKS Robin Nano 3.1 (MarlinFirmware#23795)

* 📺 BTT SKR Mini E3 with Fysetc V2.1 / MKS V3 / BTT V1 Mini 12864 (MarlinFirmware#23793)

* 🔧 SHOW_CUSTOM_BOOTSCREEN sanity-check (MarlinFirmware#23807)

* ✨ LCD Backlight Timer (MarlinFirmware#23768)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* ✨ M21 P / S / U - Select Volume (MarlinFirmware#23780)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🌐 Update German language (MarlinFirmware#23832)

* 🔨 Fix 'renamed' env (platform = ststm32) (MarlinFirmware#23831)

* 🐛 Fix backlash applied steps when config changes (MarlinFirmware#23826)

Followup to MarlinFirmware#23814

* 🚨 Fix BLTouch 5V pin tolerance checks (MarlinFirmware#23823)

* ⚡️ E3V2 blank bg for S1 compatibility (MarlinFirmware#23822)

* ✨ Weedo 62A Tina2 / Monoprice Cadet (MarlinFirmware#23817)

* 🐛 Fix M_State_grbl when G29 calls G28

* 🚸 Universal X_AXIS_TWIST_COMPENSATION (MarlinFirmware#23828)

* 🚸 Use Z_STEPPER_ALIGN_STEPPER_XY to enable

* ⚡️ Use seen_test in `M422`

* 🩹 Improve and apply XATC reset() (MarlinFirmware#23840)

* 🐛 Emergency Parser with STM32 Mass Storage (MarlinFirmware#23827)

* 🔧 Mark Thermal Variance Monitor EXPERIMENTAL

* 🚸 Improve M422 error messages

* 🩹 Fix 'hdsl' warning

* 🔧 DWIN_CREALITY_LCD_ENHANCED => DWIN_LCD_PROUI

Followup to MarlinFirmware#23624

* 📝 Update laser/spindle docs link (MarlinFirmware#23886)

* 🐛 Fix UI include

Followup to ~2

* fix g29 (MarlinFirmware#23887)

* 🚸 Update Ender3 V2/S1 Pro UI (MarlinFirmware#23878)

* 🚸 Fix, extend X Axis Twist Compensation (MarlinFirmware#23745)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 📌 Fix, extend Index Rev03 Mobo (MarlinFirmware#23851)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 M401 H - Report BLTouch HS State (MarlinFirmware#23724)

* 🧑‍💻 STM32G0Bx : Use PLLQ for USB clock (MarlinFirmware#23870)

* 🧑‍💻 Add ExtUI::onLevelingDone, match DWIN to ExtUI

* 🐛 Fix UBL 'G29 Q1' bug

* 🌐 Fix, add some menu labels (MarlinFirmware#23895)

* 🧑‍💻  Add standard BUZZ types

* 🩹 Fix FSTR / PSTR usage

* 🐛 Fix Chiron new TFT SD print after reset (MarlinFirmware#23855)

* 🔨 Drop extraneous build flag (MarlinFirmware#23862)

* ⚡️ G12 - Only require used axes to be homed (MarlinFirmware#23422)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 Test LIN_ADVANCE in a pins file

* 📝 Fix DEFAULT_DUAL_X_CARRIAGE_MODE comment

* 📝 Fix X2_MAX_POS comment (MarlinFirmware#23873)

* 🩹 Fix ExtUI build with Host Keepalive disabled (MarlinFirmware#23898)

* 🧑‍💻 Allow DIGIPOT Rsx / Vrefmax override (MarlinFirmware#23885)

* 🩹 Fix DWIN E3V2 display issues by allowing re-init (MarlinFirmware#23879)

* 🐛 MKS TinyBee - 2.5V ADC Vref (MarlinFirmware#23903)

* 🩹 Fix redundant var declaration (MarlinFirmware#23913)

* ⚡️ Fix noisy ADC - 16x oversampling with 12-bit ADC (MarlinFirmware#23867)

* 🩹 Fix xatc EEPROM debug (MarlinFirmware#23911)

* ✨ ESP32 - Hardware PWM for fan, cutter, servos (MarlinFirmware#23802)

* 📌 PandaPi V2.9 – Standalone mode (MarlinFirmware#23908)

* ✨ Encoder button noise filter (MarlinFirmware#23925)

* 🚸 Allow one servo with cutter on RAMPS

* 🔨 Allow I2CPE_ENC_n_INVERT set to false

* 🩹 No PE_MAGNET_ON_STATE without PARKING_EXTRUDER

* 🔧 No Switching Nozzle with MMU2

* 🔧 Sanity-checks for PULLDOWN, SINGLENOZZLE

* 🧑‍💻 Add neo.set_background_color(rgbw)

* 🔨 Suppress MMU2 resume_position warning

* 🎨 Apply _TERN where possible

* 🧑‍💻 PIO --silent in build_example

* 🩹 Fix ADC math overflow

* 🔨 Fix 'mftest -s'

* 🎨 Clean up tool change with tool sensor

* 🧑‍💻 EXTRUDER_LOOP macro

* 🎨 General cleanup, comments

* 🧑‍💻 Improve STATUS_BED_X

* 💡 Misc. cleanup, comments

* 🩹 Wrap endstop_diag.cpp (MarlinFirmware#23931)

* 🌐 Update Ukrainian language (MarlinFirmware#23935)

* 📌 Custom cable for Mini 12864 V1 + SKR Mini E3 V3.0 (MarlinFirmware#23936)

* ✏️ Encoder noise followup

Followup to MarlinFirmware#23925

* 🩹 Print English to serial out

* 🐛 Fix status_printf alert level

* 🎨 Format, use status macros

* 🚸 Clear "heating/cooling" message on temp reached

* ✨ STATUS_MESSAGE_TIMEOUT_SEC (MarlinFirmware#23135)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🐛 Fix MMU2 buzz (MarlinFirmware#23943)

Followup to 89a9c3a

* 🐛 Fix pulldown sanity check

* ✨ Configurable FREEZE pin state (MarlinFirmware#23944, MarlinFirmware#23948)

Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🔨 Fix Makefile GCC warning (MarlinFirmware#23957)

* 🐛 Fix MMU2 buzz (MarlinFirmware#23950)

Followup to MarlinFirmware#23943

* 📝 Fix extraneous URL args (MarlinFirmware#24125)

* 📝 Replace KB with K in pins

* 🐛 Some EEPROM size fixes (MarlinFirmware#24113)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* 🔨 Use first g++ in path for 'native' targets

* 🔨 Prevent build attribute define conflicts

* 🔨 Improved mfprep script

* 🎨  INI cleanup

* ✏️ Fix parking extruder compile (MarlinFirmware#23961)

Followup to d3e3e6a

* 🐛 Use ADC_VREF for Filament Width ADC Vref (MarlinFirmware#23977)

* 🌐 Clean up languages

* ✏️ Fix NOZZLE_PARK_Y_ONLY sanity-check (MarlinFirmware#23990)

* 🐛 Fix MightyBoard Rev. E EX2, extra MOSFETs (MarlinFirmware#23976)

* 📌 SKR Mini V1.1 TMC UART Pins (MarlinFirmware#23970)

* 🩹 SKR2 Pins DIAG flag (MarlinFirmware#23968)

Followup to MarlinFirmware#23050

* 🐛 Fix MKS Gen. L - EEB (MarlinFirmware#23965)

* 🐛 Fix MarlinUI on Ender 3 S1 (MarlinFirmware#23949)

* 🩹 Fix "elapsed" text on DOGLCD (MarlinFirmware#24087)

* 📝 Fix 'M150 S' comment

* ✨ enwi ESPNP board support (MarlinFirmware#24029)

* 🔨 Preflight check old abl files (MarlinFirmware#24010)

* ✏️ No such pin

* 🌐  Rename "LCD Timeout" string

* 🎨  misc. cleanup

* ✏️ Remove extra G29 line

Followup to 85a62bb

* 🎨  Misc. adjustments, spacing

* 🎨  Misc. USB flash code cleanup

* 🧑‍💻 IS_ULTRA_LCD => HAS_WIRED_LCD

* 🐛  Prevent BABYSTEP freeze

See MarlinFirmware#22830, MarlinFirmware#13300

* 🩹 Fix PRINTCOUNTER with EXTRUDERS 0 (MarlinFirmware#24063)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸  Home Y before X on belt printers

* 🐛  Home Z to Max after Z_SAFE_HOMING

* 🚸 Prevent accidental button press

* 🧑‍💻 Strip #errors in Configurations deployment

* 🧑‍💻 Simplify BIGTREE_SKR_2_F429 env

* 🎨  Combine common LPC1768 I2C code

* 🐛 Fix MKS_MINI_12864 build for ESP32 (MarlinFirmware#24071)

* 🐛 Prefer os.replace, fix TFT_LVGL_UI build (MarlinFirmware#24001)

* 🔨 Fix LPC176x debug build

See MarlinFirmware#23635

* 🩹 Apply 100% leveling correction below the bed

See MarlinFirmware#24002

* 🩹 Use LCD_CONTRAST_INIT in pins files

* 🐛 Fix STM32 Pins Debugging (MarlinFirmware#22896)

* 🩹 Fix and clean up E3V2 draw (MarlinFirmware#23979, MarlinFirmware#24013)

* 🐛 Fix Manual Move cold extrude override (MarlinFirmware#24045)

Followup to MarlinFirmware#19606

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🧑‍💻 Preheat menu improvements (MarlinFirmware#24017)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🌐 Update Russian language (MarlinFirmware#23978)

* 🌐 Update Chinese language (MarlinFirmware#23865)

* ✨ Add M3426 A<addr> parameter (MarlinFirmware#24130)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* 🧑‍💻 Define isr_float_t to assert a non-FPU float (MarlinFirmware#23969)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 💥 Rename ExtUI settings methods

* ♻️ Refactor and fix ABL Bilinear (MarlinFirmware#23868, MarlinFirmware#24009, MarlinFirmware#24107)

* 🐛 Fix PID edit menu for Bed, Chamber (MarlinFirmware#23987)

* 🔧 Sanity-check SWITCHING_TOOLHEAD_X_POS (MarlinFirmware#23985)

* ✏️ Fix FYSETC Mini Panel neopixel type (MarlinFirmware#24011, MarlinFirmware#24111)

* 🌐 Update Italian language (MarlinFirmware#24019)

* 🐛  Update M913, M914 report

Followup to MarlinFirmware#11248, MarlinFirmware#11249, MarlinFirmware#23400

* 🎨 Use LEDColor default C-CTOR

* 🩹 Fix DGUS_PREHEAT_UI enable with DGUS_LCD_CLASSIC (MarlinFirmware#24066)

* 🩹 Fix DEBUG_CARDREADER (MarlinFirmware#24023)

* 🩹 Fix ADVANCED_PAUSE_RESUME_PRIME check

Fixes MarlinFirmware#23824

* 🐛 Fix ProUI / JyersUI leveling preheat (MarlinFirmware#24060, MarlinFirmware#24064)

Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🧑‍💻 Handle PLR in manage_media

* 🩹 Fix ESP32 servos, SD_IGNORE_AT_STARTUP

Fixes MarlinFirmware#24007
Followup to aaf5bf0

* 🚸 More ExtUI events for ABL / UBL

* ⚰️ Clean up dead option (MarlinFirmware#24006)

* ♻️ Consolidate DGUSScreenHandler class (MarlinFirmware#24067)

* 📝 Obsolete freeze comment (MarlinFirmware#23964)

Followup to MarlinFirmware#23944

* 🔧 Move LASER_COOLANT_FLOW_METER to LASER_FEATURE

* 🎨 Tweak NEOPIXEL_LED format (MarlinFirmware#24110)

* ✏️Fix Markforged endstops/G38 (MarlinFirmware#24141)

* 📌 Use ESP3DLib master branch (MarlinFirmware#24140)

* 🔧 Fix Neo RGB sanity check (MarlinFirmware#24146)

* 🩹 Fix Fan Tail Speed Init (MarlinFirmware#24076)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🔨 OpenOCD Debug for VSCode

* ✏️ Fix spurious UTF

* 📌 Define RAMPS_SMART EXP headers, AZSMZ_12864

See MarlinFirmware#23501

* 🧑‍💻 Clarify acceleration factor

* 🩹 Fix accel dividend

* 🔨 Fix g++ locator for CI

* 🧑‍💻 General and Axis-based bitfield flags (MarlinFirmware#23989)

* 🩹 Fix ProUI leveling start message

* 🧑‍💻 Misc. LCD cleanup

* ✨ Creality CR-10 SmartPro (MarlinFirmware#24151)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* ✨ Add BOARD_CREALITY_V24S1_301F4

Co-Authored-By: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>

* 🔧 AVR/DUE Serial Port pin conflict checks (MarlinFirmware#24148)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* 🎨 Clean up warnings / extra check (MarlinFirmware#24163)

* 🚚 Move speed_lookuptable.h

* 🎨 Nextion cleanup

* 🔨 BTT Octopus ST-Link programming/debugging

* 🐛 Fix Mightyboard LED pin, fan override (MarlinFirmware#24168)

* 🔧 Allow board & probe dummy thermistors (MarlinFirmware#24165)

* 🐛 Fix AIR_ASSIST (MarlinFirmware#24162)

* 🚸 Improve MKS SGEN_L V2, Robin Nano V3 pins (MarlinFirmware#24147)

* 🧑‍💻 Clarify MSerialUSB, drop HardwareSerial workaround

* 🚸 DWIN/DACAI for Creality 4.2.3 (MarlinFirmware#24132)

* 🩹 Run TMC test last in setup (MarlinFirmware#24160)

* 🎨 HAL_MinSerial.* => MinSerial.*

* 🐛 Fix Due cli/sei (MarlinFirmware#24182)

Followup to MarlinFirmware#23357

* 🩹 Suppress ZERO() warning (MarlinFirmware#24178)

* 🩹 Fix MarlinUI allow-cold-extrude (MarlinFirmware#24176)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* 🚸 ProUI APRIL2022 updates (MarlinFirmware#24084)

* 🔨 Use PlatformIO Core 6.0 Dev for CI (MarlinFirmware#24194)

* 🔨 Require PIO >= 6.0.1 (MarlinFirmware#24205)

* 🐛 Fix FTDI_EVE_TOUCH_UI reboot loop (MarlinFirmware#24195)

* 🐛 Fix Polargraph G92 command (MarlinFirmware#24223)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Co-authored-by: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Co-authored-by: Mike La Spina <mike.laspina@shaw.ca>
Co-authored-by: Bob Kuhn <bob.kuhn@att.net>
Co-authored-by: Bones <97494397+SidSkiba@users.noreply.github.com>
Co-authored-by: Bruno Henrique de Paula <bruno.henriquy@gmail.com>
Co-authored-by: Kelroy <karlicio@gmail.com>
Co-authored-by: Stephen Hawes <sphawes@gmail.com>
Co-authored-by: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Co-authored-by: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Co-authored-by: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Co-authored-by: Taylor Talkington <taylor.talkington@gmail.com>
Co-authored-by: MOHAMMAD RASIM <mohammad.rasim96@gmail.com>
Co-authored-by: espr14 <espr14@gmail.com>
Co-authored-by: Thomas White <TomW1605@users.noreply.github.com>
Co-authored-by: Simon Pilepich <simon.pilepich@gmail.com>
Co-authored-by: jefflessard <jefflessard3@gmail.com>
Co-authored-by: John Robertson <john@cirtech.co.uk>
Co-authored-by: tombrazier <68918209+tombrazier@users.noreply.github.com>
Co-authored-by: sam <8531653+minteyay@users.noreply.github.com>
Co-authored-by: M. FURIC Franck <francknos@gmail.com>
Co-authored-by: kisslorand <50251547+kisslorand@users.noreply.github.com>
Co-authored-by: Ludy <Ludy87@users.noreply.github.com>
Co-authored-by: Julien Staub <atsju2@yahoo.fr>
Co-authored-by: Jack Wilsdon <jack.wilsdon@gmail.com>
Co-authored-by: Giuseppe499 <giuseppe499@live.it>
Co-authored-by: GatCode <gatcode@wdw.one>
Co-authored-by: BIGTREETECH <38851044+bigtreetech@users.noreply.github.com>
Co-authored-by: Nick <nick@n-wells.co.uk>
Co-authored-by: Mathew Winters <mathew@winters.org.nz>
Co-authored-by: Mrnt <github@maurent.com>
Co-authored-by: Jelmer van der Stel <steljwagh@users.noreply.github.com>
Co-authored-by: Mark <niujl123@sina.com>
Co-authored-by: Fredrik Andersson <fredrikandersson@mac.com>
Co-authored-by: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com>
Co-authored-by: Oleg Belov <obelov@audiology.ru>
Co-authored-by: Robby Candra <robbycandra.mail@gmail.com>
Co-authored-by: David Forrest <drf@vims.edu>
Co-authored-by: Manianac <2092573+manianac@users.noreply.github.com>
Co-authored-by: grauerfuchs <42082416+grauerfuchs@users.noreply.github.com>
Co-authored-by: Jon <jon@mscreations.net>
Co-authored-by: aegelsky <alexander.egelsky@gmail.com>
Co-authored-by: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Co-authored-by: Moritz Wirger <lj.moritorii@web.de>
Co-authored-by: Christian Piper <42127153+CAP1Sup@users.noreply.github.com>
Co-authored-by: stream2me <32234535+stream2me@users.noreply.github.com>
Co-authored-by: LPRtypeCN <1297207734@qq.com>
Co-authored-by: Roxy-3D <Roxy-3D@users.noreply.github.com>
Co-authored-by: Dominic <91095348+d0m1d@users.noreply.github.com>
Co-authored-by: Marcio T <mlt4356-github@yahoo.com>
Co-authored-by: Oliver Jean Eifler <olli.eifler@gmail.com>
Co-authored-by: Ivan Kravets <me@ikravets.com>
Co-authored-by: Arthur Masson <arthur.sw@gmail.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 811 changed files with 22,476 additions and 10,409 deletions.
1 change: 1 addition & 0 deletions .github/workflows/bump-date.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ jobs:
git commit -m "[cron] Bump distribution date ($DIST)" && \
git push
fi
exit 0
10 changes: 6 additions & 4 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- mks_robin_lite_maple
- mks_robin_pro_maple
#- mks_robin_nano35_maple
#- STM32F103RET6_creality_maple
#- STM32F103RE_creality_maple
- STM32F103VE_ZM3E4V2_USB_maple

# STM32 (ST) Environments
Expand All @@ -75,7 +75,8 @@ jobs:
#- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RET6_creality
- STM32F103RE_creality
- STM32F401RC_creality
- STM32F103VE_longer
- STM32F407VE_black
- STM32F401VE_STEVAL
Expand Down Expand Up @@ -137,8 +138,9 @@ jobs:

- name: Install PlatformIO
run: |
pip install -U https://github.com/platformio/platformio-core/archive/v5.2.5.zip
platformio update
pip install -U platformio
pio upgrade --dev
pio pkg update --global
- name: Run ${{ matrix.test-platform }} Tests
run: |
Expand Down
135 changes: 78 additions & 57 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,12 @@
//#define PS_OFF_SOUND // Beep 1s when power off
#define PSU_ACTIVE_STATE LOW // 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
//#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
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay

//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

//#define PSU_POWERUP_GCODE "M355 S1" // G-code to run after power-on (e.g., case light on)
//#define PSU_POWEROFF_GCODE "M355 S0" // G-code to run before power-off (e.g., case light off)
Expand All @@ -392,12 +396,14 @@
#define AUTO_POWER_CONTROLLERFAN
#define AUTO_POWER_CHAMBER_FAN
#define AUTO_POWER_COOLER_FAN
//#define AUTO_POWER_E_TEMP 50 // (°C) Turn on PSU if any extruder is over this temperature
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU if the chamber is over this temperature
//#define AUTO_POWER_COOLER_TEMP 26 // (°C) Turn on PSU if the cooler is over this temperature
#define POWER_TIMEOUT 30 // (s) Turn off power if the machine is idle for this duration
//#define POWER_OFF_DELAY 60 // (s) Delay of poweroff after M81 command. Useful to let fans run for extra time.
#endif
#if EITHER(AUTO_POWER_CONTROL, POWER_OFF_WAIT_FOR_COOLDOWN)
//#define AUTO_POWER_E_TEMP 50 // (°C) PSU on if any extruder is over this temperature
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) PSU on if the chamber is over this temperature
//#define AUTO_POWER_COOLER_TEMP 26 // (°C) PSU on if the cooler is over this temperature
#endif
#endif

//===========================================================================
Expand Down Expand Up @@ -439,6 +445,9 @@
* 5 : 100kΩ ATC Semitec 104GT-2/104NT-4-R025H42G - Used in ParCan, J-Head, and E3D, SliceEngineering 300°C
* 501 : 100kΩ Zonestar - Tronxy X3A
* 502 : 100kΩ Zonestar - used by hot bed in Zonestar Průša P802M
* 503 : 100kΩ Zonestar (Z8XM2) Heated Bed thermistor
* 504 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-B3950) Hotend Thermistor
* 505 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-3950) Bed Thermistor
* 512 : 100kΩ RPW-Ultra hotend
* 6 : 100kΩ EPCOS - Not as accurate as table #1 (created using a fluke thermocouple)
* 7 : 100kΩ Honeywell 135-104LAG-J01
Expand All @@ -458,6 +467,7 @@
* 61 : 100kΩ Formbot/Vivedino 350°C Thermistor - beta 3950
* 66 : 4.7MΩ Dyze Design High Temperature Thermistor
* 67 : 500kΩ SliceEngineering 450°C Thermistor
* 68 : PT100 amplifier board from Dyze Design
* 70 : 100kΩ bq Hephestos 2
* 75 : 100kΩ Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
* 2000 : 100kΩ Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor
Expand Down Expand Up @@ -1134,6 +1144,17 @@
#define BLTOUCH
#endif

/**
* MagLev V4 probe by MDD
*
* This probe is deployed and activated by powering a built-in electromagnet.
*/
//#define MAGLEV4
#if ENABLED(MAGLEV4)
//#define MAGLEV_TRIGGER_PIN 11 // Set to the connected digital output
#define MAGLEV_TRIGGER_DELAY 15 // Changing this risks overheating the coil
#endif

/**
* Touch-MI Probe by hotends.fr
*
Expand Down Expand Up @@ -1926,7 +1947,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 195
Expand Down Expand Up @@ -1961,8 +1982,7 @@
#if ENABLED(NOZZLE_PARK_FEATURE)
// Specify a park position as { X, Y, Z_raise }
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
//#define NOZZLE_PARK_X_ONLY // X move only is required to park
//#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
#define NOZZLE_PARK_MOVE 0 // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
#define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
Expand Down Expand Up @@ -2632,38 +2652,38 @@
//========================== Extensible UI Displays ===========================
//=============================================================================

//
// DGUS Touch Display with DWIN OS. (Choose one.)
// ORIGIN : https://www.aliexpress.com/item/32993409517.html
// FYSETC : https://www.aliexpress.com/item/32961471929.html
// MKS : https://www.aliexpress.com/item/1005002008179262.html
//
// Flash display with DGUS Displays for Marlin:
// - Format the SD card to FAT32 with an allocation size of 4kb.
// - Download files as specified for your type of display.
// - Plug the microSD card into the back of the display.
// - Boot the display and wait for the update to complete.
//
// ORIGIN (Marlin DWIN_SET)
// - Download https://github.com/coldtobi/Marlin_DGUS_Resources
// - Copy the downloaded DWIN_SET folder to the SD card.
//
// FYSETC (Supplier default)
// - Download https://github.com/FYSETC/FYSTLCD-2.0
// - Copy the downloaded SCREEN folder to the SD card.
//
// HIPRECY (Supplier default)
// - Download https://github.com/HiPrecy/Touch-Lcd-LEO
// - Copy the downloaded DWIN_SET folder to the SD card.
//
// MKS (MKS-H43) (Supplier default)
// - Download https://github.com/makerbase-mks/MKS-H43
// - Copy the downloaded DWIN_SET folder to the SD card.
//
// RELOADED (T5UID1)
// - Download https://github.com/Desuuuu/DGUS-reloaded/releases
// - Copy the downloaded DWIN_SET folder to the SD card.
//
/**
* DGUS Touch Display with DWIN OS. (Choose one.)
* ORIGIN : https://www.aliexpress.com/item/32993409517.html
* FYSETC : https://www.aliexpress.com/item/32961471929.html
* MKS : https://www.aliexpress.com/item/1005002008179262.html
*
* Flash display with DGUS Displays for Marlin:
* - Format the SD card to FAT32 with an allocation size of 4kb.
* - Download files as specified for your type of display.
* - Plug the microSD card into the back of the display.
* - Boot the display and wait for the update to complete.
*
* ORIGIN (Marlin DWIN_SET)
* - Download https://github.com/coldtobi/Marlin_DGUS_Resources
* - Copy the downloaded DWIN_SET folder to the SD card.
*
* FYSETC (Supplier default)
* - Download https://github.com/FYSETC/FYSTLCD-2.0
* - Copy the downloaded SCREEN folder to the SD card.
*
* HIPRECY (Supplier default)
* - Download https://github.com/HiPrecy/Touch-Lcd-LEO
* - Copy the downloaded DWIN_SET folder to the SD card.
*
* MKS (MKS-H43) (Supplier default)
* - Download https://github.com/makerbase-mks/MKS-H43
* - Copy the downloaded DWIN_SET folder to the SD card.
*
* RELOADED (T5UID1)
* - Download https://github.com/Desuuuu/DGUS-reloaded/releases
* - Copy the downloaded DWIN_SET folder to the SD card.
*/
//#define DGUS_LCD_UI_ORIGIN
//#define DGUS_LCD_UI_FYSETC
//#define DGUS_LCD_UI_HIPRECY
Expand Down Expand Up @@ -2855,7 +2875,7 @@
// Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
//
//#define DWIN_CREALITY_LCD // Creality UI
//#define DWIN_CREALITY_LCD_ENHANCED // Enhanced UI
//#define DWIN_LCD_PROUI // Pro UI by MRiscoC
//#define DWIN_CREALITY_LCD_JYERSUI // Jyers UI by Jacob Myers
//#define DWIN_MARLINUI_PORTRAIT // MarlinUI (portrait orientation)
//#define DWIN_MARLINUI_LANDSCAPE // MarlinUI (landscape orientation)
Expand All @@ -2868,7 +2888,7 @@
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus

//#define TOUCH_IDLE_SLEEP 300 // (secs) Turn off the TFT backlight if set (5mn)
//#define TOUCH_IDLE_SLEEP 300 // (s) Turn off the TFT backlight if set (5mn)

#define TOUCH_SCREEN_CALIBRATION

Expand Down Expand Up @@ -2978,30 +2998,31 @@
// Support for Adafruit NeoPixel LED driver
//#define NEOPIXEL_LED
#if ENABLED(NEOPIXEL_LED)
#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
//#define NEOPIXEL_PIN 4 // LED driving pin
//#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
//#define NEOPIXEL2_PIN 5
#define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip. (Longest strip when NEOPIXEL2_SEPARATE is disabled.)
#define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
#define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255)
//#define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup
#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW, NEO_RGBW, NEO_GRB, NEO_RBG, etc.
// See https://github.com/adafruit/Adafruit_NeoPixel/blob/master/Adafruit_NeoPixel.h
//#define NEOPIXEL_PIN 4 // LED driving pin
//#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
//#define NEOPIXEL2_PIN 5
#define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip. (Longest strip when NEOPIXEL2_SEPARATE is disabled.)
#define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
#define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255)
//#define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup

// Support for second Adafruit NeoPixel LED driver controlled with M150 S1 ...
//#define NEOPIXEL2_SEPARATE
#if ENABLED(NEOPIXEL2_SEPARATE)
#define NEOPIXEL2_PIXELS 15 // Number of LEDs in the second strip
#define NEOPIXEL2_BRIGHTNESS 127 // Initial brightness (0-255)
#define NEOPIXEL2_STARTUP_TEST // Cycle through colors at startup
#define NEOPIXEL2_PIXELS 15 // Number of LEDs in the second strip
#define NEOPIXEL2_BRIGHTNESS 127 // Initial brightness (0-255)
#define NEOPIXEL2_STARTUP_TEST // Cycle through colors at startup
#else
//#define NEOPIXEL2_INSERIES // Default behavior is NeoPixel 2 in parallel
//#define NEOPIXEL2_INSERIES // Default behavior is NeoPixel 2 in parallel
#endif

// Use some of the NeoPixel LEDs for static (background) lighting
//#define NEOPIXEL_BKGD_INDEX_FIRST 0 // Index of the first background LED
//#define NEOPIXEL_BKGD_INDEX_LAST 5 // Index of the last background LED
//#define NEOPIXEL_BKGD_INDEX_FIRST 0 // Index of the first background LED
//#define NEOPIXEL_BKGD_INDEX_LAST 5 // Index of the last background LED
//#define NEOPIXEL_BKGD_COLOR { 255, 255, 255, 0 } // R, G, B, W
//#define NEOPIXEL_BKGD_ALWAYS_ON // Keep the backlight on when other NeoPixels are off
//#define NEOPIXEL_BKGD_ALWAYS_ON // Keep the backlight on when other NeoPixels are off
#endif

/**
Expand Down
Loading

0 comments on commit 3386041

Please sign in to comment.