Skip to content

Commit

Permalink
Bugfix 2.0.x (#16)
Browse files Browse the repository at this point in the history
* 🐛 Fix Artillery Ruby (startup code, build flags) (MarlinFirmware#23446)

* 🎨 Misc. cleanup, comments

* 📺 Tune ULTI_CONTROLLER encoder, enable PCA9632 (MarlinFirmware#23461)

* 🌐 Localize E3V2 Enhanced UI (MarlinFirmware#23424)

* 📌 LCD_FOR_MELZI for BTT E3 RRF (MarlinFirmware#23453)

* [cron] Bump distribution date (2022-01-07)

* [cron] Bump distribution date (2022-01-08)

* 🚸 Do G34 "Z Backoff" at full current

* [cron] Bump distribution date (2022-01-09)

* 🔨 Get FIRMWARE_BIN from env

* ✨ Firmware Upload via Binary Transfer (MarlinFirmware#23462)

* 🩹 Reset DWIN CrealityUI print progress on start (MarlinFirmware#23481)

* 🐛 Fix EEPROM_INIT_NOW build hash test (MarlinFirmware#23479)

* 🚸 BLTouch HS menu item for DWIN Enhanced UI (MarlinFirmware#23480)

* 🔨 Rename (not copy) with board_build.rename

* 📌 Improve Longer3D fan PWM (MarlinFirmware#23477)

* 🌐 Update Slovak language (MarlinFirmware#23475)

* 🚑️ Fix preheat target bug

Fixes Jyers#1651

* 🌐 Update auto home axis strings

* [cron] Bump distribution date (2022-01-10)

* 🚸 Include extra axes in position report (MarlinFirmware#23490)

* 🧑‍💻 Fewer string macros

* 🎨 Followup to MarlinFirmware#23462

* 🩹 Fix some logical axis usage

* 🚸 Wait for cooldown in MarlinUI power-off (MarlinFirmware#23476)

* [cron] Bump distribution date (2022-01-11)

* 📝 kHz => KHz

* 🧑‍💻 Adjust FastIO AVR timer enums, macros

* 🎨 Misc. spindle/laser adjustments

* [cron] Bump distribution date (2022-01-12)

* 💡 Misc. cleanup, comments

* 🧑‍💻 Move PB0 init for MKS_ROBIN_NANO

* 🐛 Fix Arduino build issues (MarlinFirmware#23510)

* 🚑️ Fix M105 regression (MarlinFirmware#23505)

Fixes MarlinFirmware#23504

* 🐛 Fix SHOW_REMAINING_TIME compile (MarlinFirmware#23503)

* 🚸 Fix E3V2 Enhanced UI time labels (MarlinFirmware#23502)

* 📝 KHz => kHz (MarlinFirmware#23512)

* 🐛 Fix, improve PWM on AVR (MarlinFirmware#23463)

* [cron] Bump distribution date (2022-01-13)

* [cron] Bump distribution date (2022-01-14)

* 🧑‍💻 Misc. updates for extra axes (MarlinFirmware#23521)

* 🩹 Followup to extra axes

* 🔨 Set upload_command for CHEETAH v20 (MarlinFirmware#23515)

* 🔧 Skip unused axis names

* [cron] Bump distribution date (2022-01-15)

* [cron] Bump distribution date (2022-01-16)

* 🐛 Fix, improve PWM on AVR (MarlinFirmware#23520)

* ⚡️ SPI+DMA+interrupt method (STM32 / MKS UI) (MarlinFirmware#23464)

* ✨ Z Offset Wizard for TFT_LVGL_UI (English) (MarlinFirmware#23489)

* 🩹 Fan speed followup

* 💄 MarlinUI+DOGM leveled bed bitmaps (MarlinFirmware#23539)

* 🐛 Fix PLR for E3V2 Enhanced UI (MarlinFirmware#23543)

* 🐛 Fix Ultimain 2 E-autofan pin mapping (MarlinFirmware#23466)

* 🐛 Finish and organize temp sensors (MarlinFirmware#23519)

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2022-01-17)

* 🚸 Suppressible pin warnings (MarlinFirmware#23530)

Co-authored-by: Scott Lahteine <[email protected]>

* 💄 Improve Ender3 v2 DWIN MarlinUI (MarlinFirmware#23369)

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2022-01-18)

* ✨ Long filename open/create/write (MarlinFirmware#23526)

Co-authored-by: Scott Lahteine <[email protected]>

* 🔨 Suppressible CONFIGURATION_EMBEDDING warning (MarlinFirmware#23545)

* 💥 Generalize extra debugging

* 🐛 Fix Octopus v1.x probe pin (MarlinFirmware#23548)

* 🐛 Fix RAMPS 1.4 Plus EXP headers (MarlinFirmware#23523)

* 📌 RAMPS AUX 1-2 headers (MarlinFirmware#23544)

* [cron] Bump distribution date (2022-01-19)

* 🐛 Fix conditional M81 suicide (MarlinFirmware#23549)

* 🎨 Misc. style and cleanup

* 🎨 LCD_SCREEN_ROT_* => LCD_SCREEN_ROTATE

* 📝 Tweak G26 Q description

* 🩹 Fix Robin Nano BOARD_INIT

* 🧑‍💻 Add chmod to mfprep

* [cron] Bump distribution date (2022-01-20)

* 🩹 BOARD_INIT followup

* 🩹 Fix power.h compile (MarlinFirmware#23573)

* [cron] Bump distribution date (2022-01-21)

* ♻️ Adjust LCD init, contrast default, settings load

* 🐛 Fix LCD contrast/brightness init (MarlinFirmware#23567)

Co-authored-by: Scott Lahteine <[email protected]>

* 🧑‍💻 Fix up some AUX / EXP pins (MarlinFirmware#23577)

* [cron] Bump distribution date (2022-01-22)

* 🔨 Creality RCT6 (256K) variants (MarlinFirmware#23599)

Co-authored-by: Scott Lahteine <[email protected]>

* 🩹 Fix DWIN float debugging (MarlinFirmware#23601)

* 🐛 Fix Creality DWIN LCD with SKR Mini E3 V3 (MarlinFirmware#23593)

* 🐛 Fix DGUS_Reloaded G-code execution (MarlinFirmware#23592)

* ⚡️ Tuned Thermistor 66 (T-D500) (MarlinFirmware#23585)

* [cron] Bump distribution date (2022-01-25)

* 🧑‍💻 HAS_MARLINUI_MENU, HAS_MANUAL_MOVE_MENU

* ✏️ Fix MKS enum

* ✅ FYSETC TFT81050 CI Test (MarlinFirmware#23604)

* ✨ BOARD_CREALITY_V24S1_301 (MarlinFirmware#23620)

Co-Authored-By: Miguel Risco-Castillo <[email protected]>

* [cron] Bump distribution date (2022-01-26)

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

Co-authored-by: Scott Lahteine <[email protected]>

* 📝 Update Creality 4.2.2 driver warning

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

Followup to MarlinFirmware#23464

* [cron] Bump distribution date (2022-01-27)

* 🧑‍💻 Simplify Fast PWM timer macros

* [cron] Bump distribution date (2022-01-28)

* 🐛 Fix EZBoard V2 timer conflict (MarlinFirmware#23648)

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

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

* [cron] Bump distribution date (2022-01-30)

* 🐛 Fix EZBoard V2 Environment for OpenBLT (MarlinFirmware#23659)

* [cron] Bump distribution date (2022-02-01)

* 🐛 Fix M852 report (MarlinFirmware#23660)

* 🔧 Board temp sensor check

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

* [cron] Bump distribution date (2022-02-02)

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

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

* [cron] Bump distribution date (2022-02-04)

* 💡 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)

* [cron] Bump distribution date (2022-02-05)

* ✨ 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)

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

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

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

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

* 🐛 Fix missing u8g_esp32_spi (MarlinFirmware#23562)

* [cron] Bump distribution date (2022-02-06)

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

* [cron] Bump distribution date (2022-02-07)

* 🧑‍💻 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)

* [cron] Bump distribution date (2022-02-08)

* 🔧 Update MIXING_EXTRUDER sanity checks

Fixing MarlinFirmware#23693

* ✨ Optional HOST_STATUS_NOTIFICATIONS (MarlinFirmware#22833)

* 🧑‍💻 Drop hostui.flag

* [cron] Bump distribution date (2022-02-09)

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

Co-authored-by: Scott Lahteine <[email protected]>

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

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2022-02-10)

* 🐛 Fix XYZEval::set(XY, Z) and (XY, Z, E) (MarlinFirmware#23704)

Fix regression in MarlinFirmware#21953

Co-authored-by: Scott Lahteine <[email protected]>

* 🩹 Simplify quick homing feedrate (MarlinFirmware#23714)

Co-authored-by: Scott Lahteine <[email protected]>

* 🧑‍💻 Wrap MMU1 pins

* ✨ Pxmalion Core i3 (MarlinFirmware#23711)

* 🎨 Misc. DGUS cleanup

* [cron] Bump distribution date (2022-02-11)

* 💥 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)

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

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2022-02-12)

* 🔧 HAS_LCDPRINT conditional

* 📝 Update conditionals descriptions

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

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2022-02-14)

* 🐛 Fix XATC divide-by-zero (MarlinFirmware#23743)

* ♻️ Rename XATC z_values => z_offset

* [cron] Bump distribution date (2022-02-16)

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

* [cron] Bump distribution date (2022-02-17)

* 🐛 Patch Creality RAMPS FET / FAN pins

Improvement for multi-hotend setup by TH3D.

* [cron] Bump distribution date (2022-02-18)

* 🐛 Fix HAS_TMC26X feature path (MarlinFirmware#23757)

* 🚨 Fix TEMP_SENSOR_BOARD warnings (MarlinFirmware#23754)

* ✏️ Fix getLFNName parameter (MarlinFirmware#23752)

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

* [cron] Bump distribution date (2022-02-19)

* 📌 Creality RAMPS optional SD_DETECT_PIN (MarlinFirmware#23740)

Co-authored-by: Scott Lahteine <[email protected]>

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

Co-authored-by: Scott Lahteine <[email protected]>

* 📝 Update Toolchange FS comments

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

* 🔧 Warning for MK3_FAN_PINS (MarlinFirmware#23727)

* 🔨 Workspace file with recommendation

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

* 🐛 Ibid.

* [cron] Bump distribution date (2022-02-22)

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

* [cron] Bump distribution date (2022-02-23)

* 🎨  Move PROPORTIONAL_FONT_RATIO

* [cron] Bump distribution date (2022-02-25)

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

Co-authored-by: Scott Lahteine <[email protected]>

* 🐛 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 <[email protected]>

* [cron] Bump distribution date (2022-02-27)

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

Co-authored-by: Scott Lahteine <[email protected]>

* [cron] Bump distribution date (2022-02-28)

* 🌐 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)

* [cron] Bump distribution date (2022-03-02)

* 🐛 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`

* [cron] Bump distribution date (2022-03-03)

* 🚸 12345.6 num-to-string

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

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

* 🔧 Mark Thermal Variance Monitor EXPERIMENTAL

* ✏️ num-to-string followup

* [cron] Bump distribution date (2022-03-05)

* 🚸 TH3D EZBoard V2 TMC slave addresses (MarlinFirmware#23857)

* 🚸 Improve M422 error messages

* 🩹 Fix 'hdsl' warning

* [cron] Bump distribution date (2022-03-11)

* 🔧 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)

* 🐛 Restore STM32 / STM32F1 12-bit ADC (MarlinFirmware#23871)

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

Co-authored-by: Scott Lahteine <[email protected]>

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

Co-authored-by: Scott Lahteine <[email protected]>

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

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

* [cron] Bump distribution date (2022-03-12)

* 🧑‍💻 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)

* [cron] Bump distribution date (2022-03-13)

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

Co-authored-by: Scott Lahteine <[email protected]>

* 🚸 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)

* 🐛 Fix STM32F1 HAL build (MarlinFirmware#23897)

Followup to MarlinFirmware#23357

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

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

* [cron] Bump distribution date (2022-03-14)

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

* [cron] Bump distribution date (2022-03-18)

* 🩹 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)

* [cron] Bump distribution date (2022-03-19)

* ✏️ Misc. cleanup

* ✨ Encoder button noise filter (MarlinFirmware#23925)

* [cron] Bump distribution date (2022-03-21)

Co-authored-by: Kyle Hu <[email protected]>
Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: Anson Liu <[email protected]>
Co-authored-by: Lefteris Garyfalakis <[email protected]>
Co-authored-by: jdegenstein <[email protected]>
Co-authored-by: ClockeNessMnstr <[email protected]>
Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: GHGiampy <[email protected]>
Co-authored-by: Miguel Risco-Castillo <[email protected]>
Co-authored-by: Tanguy Pruvot <[email protected]>
Co-authored-by: Roman Moravčík <[email protected]>
Co-authored-by: David Ross Smith <[email protected]>
Co-authored-by: DerAndere <[email protected]>
Co-authored-by: mistic100 <[email protected]>
Co-authored-by: ellensp <[email protected]>
Co-authored-by: Jim Watson <[email protected]>
Co-authored-by: Keith Bennett <[email protected]>
Co-authored-by: Mike La Spina <[email protected]>
Co-authored-by: George Fu <[email protected]>
Co-authored-by: Sola <[email protected]>
Co-authored-by: A. Herlas <[email protected]>
Co-authored-by: Taylor Talkington <[email protected]>
Co-authored-by: zerkix <[email protected]>
Co-authored-by: John Lagonikas <[email protected]>
Co-authored-by: Salvatore Bramante <[email protected]>
Co-authored-by: Fahad Alduraibi <[email protected]>
Co-authored-by: DejitaruJin <[email protected]>
Co-authored-by: Lars <[email protected]>
Co-authored-by: Timofey Titovets <[email protected]>
Co-authored-by: Timothy Hoogland <[email protected]>
Co-authored-by: Maeyanie <[email protected]>
Co-authored-by: Bob Kuhn <[email protected]>
Co-authored-by: Bones <[email protected]>
Co-authored-by: Bruno Henrique de Paula <[email protected]>
Co-authored-by: Kelroy <[email protected]>
Co-authored-by: Stephen Hawes <[email protected]>
Co-authored-by: InsanityAutomation <[email protected]>
Co-authored-by: MOHAMMAD RASIM <[email protected]>
Co-authored-by: Mads Ynddal <[email protected]>
Co-authored-by: espr14 <[email protected]>
Co-authored-by: Thomas White <[email protected]>
Co-authored-by: John Robertson <[email protected]>
Co-authored-by: Giuseppe499 <[email protected]>
Co-authored-by: Simon Pilepich <[email protected]>
Co-authored-by: jefflessard <[email protected]>
Co-authored-by: tombrazier <[email protected]>
Co-authored-by: sam <[email protected]>
Co-authored-by: M. FURIC Franck <[email protected]>
Co-authored-by: kisslorand <[email protected]>
Co-authored-by: Ludy <[email protected]>
Co-authored-by: Julien Staub <[email protected]>
Co-authored-by: Jack Wilsdon <[email protected]>
Co-authored-by: GatCode <[email protected]>
Co-authored-by: BIGTREETECH <[email protected]>
Co-authored-by: Nick <[email protected]>
Co-authored-by: Mathew Winters <[email protected]>
Co-authored-by: Mrnt <[email protected]>
Co-authored-by: Jelmer van der Stel <[email protected]>
Co-authored-by: Mark <[email protected]>
Co-authored-by: Fredrik Andersson <[email protected]>
  • Loading branch information
Show file tree
Hide file tree
Showing 892 changed files with 27,182 additions and 11,753 deletions.
4 changes: 2 additions & 2 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,7 @@ jobs:
#- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RET6_creality
- STM32F103RE_creality
- STM32F103VE_longer
- STM32F407VE_black
- STM32F401VE_STEVAL
Expand Down
14 changes: 8 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
# Generated files
_Version.h
bdf2u8g
marlin_config.json
mczip.h
*.gen
*.sublime-workspace

#
# OS
Expand All @@ -37,7 +41,6 @@ applet/
*.rej
*.bak
*.idea
*.s
*.i
*.ii
*.swp
Expand Down Expand Up @@ -137,20 +140,19 @@ __vm/
vc-fileutils.settings

# Visual Studio Code
.vscode
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/*.db
.vscode/*
!.vscode/extensions.json

#Simulation
imgui.ini
eeprom.dat
spi_flash.bin

#cmake
CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
build/

# CLion
cmake-build-*
Expand Down
11 changes: 11 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"marlinfirmware.auto-build",
"platformio.platformio-ide"
],
"unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack"
]
}
63 changes: 46 additions & 17 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@

// @section machine

// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_RAMPS_14_EFB
#endif

/**
* Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
Expand Down Expand Up @@ -137,11 +142,6 @@
// Enable the Bluetooth serial interface on AT90USB devices
//#define BLUETOOTH

// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_RAMPS_14_EFB
#endif

// Name displayed in the LCD "Ready" message and Info menu
//#define CUSTOM_MACHINE_NAME "3D Printer"

Expand Down Expand Up @@ -371,8 +371,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 @@ -384,12 +388,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 @@ -431,6 +437,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 @@ -450,6 +459,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 @@ -756,6 +766,7 @@
//#define COREZX
//#define COREZY
//#define MARKFORGED_XY // MarkForged. See https://reprap.org/forum/read.php?152,504042
//#define MARKFORGED_YX

// Enable for a belt style printer with endless "Z" motion
//#define BELTPRINTER
Expand Down Expand Up @@ -1088,6 +1099,17 @@
*/
//#define BLTOUCH

/**
* 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 @@ -1836,6 +1858,7 @@
#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_INIT_NOW // Init EEPROM on first boot after a new build.
#endif

//
Expand Down Expand Up @@ -1891,8 +1914,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 @@ -2458,6 +2480,11 @@
//#define FYSETC_MINI_12864_2_1 // Type A/B. NeoPixel RGB Backlight
//#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.

//
// BigTreeTech Mini 12864 V1.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
//
//#define BTT_MINI_12864_V1

//
// Factory display for Creality CR-10
// https://www.aliexpress.com/item/32833148327.html
Expand Down Expand Up @@ -2780,7 +2807,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 @@ -2793,7 +2820,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 All @@ -2819,6 +2846,11 @@
//#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // (mm) Distance to move per key-press

//
// EasyThreeD ET-4000+ with button input and status LED
//
//#define EASYTHREED_UI

//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================
Expand All @@ -2829,9 +2861,6 @@
// :[1,2,3,4,5,6,7,8]
//#define NUM_M106_FANS 1

// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
//#define FAST_PWM_FAN

// 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.
Expand Down
Loading

0 comments on commit 5d38f8b

Please sign in to comment.