Skip to content

Fix conditional M81 suicide issue #23549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

zeleps
Copy link
Contributor

@zeleps zeleps commented Jan 17, 2022

Description

Recent changes to M81 implementation omitted invocation of suicide() (where it applies) when powering off conditions are met.

Benefits

Bug fix

Related Issues

#23396

@zeleps
Copy link
Contributor Author

zeleps commented Jan 17, 2022

Also added some serial output messages, mainly for debugging reasons, but it might be sensible to keep some of them, since M81 is not a frequent operation and the messages have an informational value. I don't know what the policy on sending messages over the serial is, I'd like to know more for future contributions.

@thinkyhead thinkyhead force-pushed the bugfix-2.0.x-FixPowerOffBySuicide branch from 4fc4a54 to 85b2151 Compare January 19, 2022 06:30
@thinkyhead
Copy link
Member

thinkyhead commented Jan 19, 2022

I'd like to know more for future contributions.

We want to avoid increasing the base build size for the sake of smaller boards with only 64K or 128K of flash, so try to keep messages concise and re-use existing strings whenever possible.

In the future we might use a define like MCU_FLASH_SIZE or have an option like VERBOSITY that will produce a build with more serial messages. Some messages are better to keep hidden unless M111 sets a higher debug level.

Most of the time users are not paying attention to the serial output, so it's not a suitable way to ensure user awareness. Alerts which need user attention or confirmation should use the facilities provided by HOST_PROMPT_SUPPORT. And, we may also want to look at adding standard full-screen modal alerts to MarlinUI.

@thinkyhead thinkyhead merged commit 0aea3ae into MarlinFirmware:bugfix-2.0.x Jan 19, 2022
@zeleps zeleps deleted the bugfix-2.0.x-FixPowerOffBySuicide branch January 19, 2022 10:05
@ellensp
Copy link
Contributor

ellensp commented Feb 11, 2022

@zeleps
Please elaborate on why this was added

#if ENABLED(MKS_PWC)
  #if ENABLED(TFT_LVGL_UI)
    #if ENABLED(PSU_CONTROL)
      #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
    #endif

It doesn't make much sense

MKS_PWC is a sub define of PSU_CONTROL in Configuration.h. You cannot enable MKS_PWC without first enabling PSU_CONTROL in the current configuration structure.

#if ENABLED(PSU_CONTROL)
  //#define MKS_PWC                 // Using the MKS PWC add-on

@zeleps
Copy link
Contributor Author

zeleps commented Feb 11, 2022

@ellensp I didn't add that, @thinkyhead did at commit 3e0218d.

@ellensp
Copy link
Contributor

ellensp commented Feb 11, 2022

@zeleps Sorry I didn't look deep enough, hate how he slips things in like that

@ellensp
Copy link
Contributor

ellensp commented Feb 11, 2022

@thinkyhead
Please elaborate on why this was added

#if ENABLED(MKS_PWC)
  #if ENABLED(TFT_LVGL_UI)
    #if ENABLED(PSU_CONTROL)
      #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
    #endif

It doesn't make much sense

MKS_PWC is a sub define of PSU_CONTROL in Configuration.h. You cannot enable MKS_PWC without first enabling PSU_CONTROL in the current configuration structure.

#if ENABLED(PSU_CONTROL)
  //#define MKS_PWC                 // Using the MKS PWC add-on

This is in relation to issue #23698

@Liriel-666
Copy link

Nothing new?

just-trey added a commit to just-trey/Marlin that referenced this pull request Mar 22, 2022
* 🐛 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]>
@Liriel-666
Copy link

verified? when will it be fixed?

@thisiskeithb
Copy link
Member

@Liriel-666: This is a closed (merged) pull request. Pull the latest bugfix if you’re wanting to use this patch.

@Liriel-666
Copy link

Äm I tried the latest Bugfix several Minute ago and it doesnt change! The same error that it is not possible to use.
I dont see any changes of the code

@Liriel-666
Copy link

Liriel-666 commented Apr 1, 2022

In the Bugfix of 2.0.x 01.04.2022 21:34 MET

//
// Power Supply Control
//
#if ENABLED(MKS_PWC)
  #if ENABLED(TFT_LVGL_UI)
    #if ENABLED(PSU_CONTROL)
      #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
    #endif
    #undef MKS_PWC
    #define SUICIDE_PIN                     PB2
    #define SUICIDE_PIN_STATE               LOW

@Liriel-666
Copy link

Liriel-666 commented Apr 1, 2022

the error when compiling

In file included from c:\drucker\marlin-bugfix-2.0.x--01.04.22\marlin\src\pins\stm32f4/pins_MKS_ROBIN_NANO_V3.h:72,
                 from c:\drucker\marlin-bugfix-2.0.x--01.04.22\marlin\src\pins\pins.h:675,
                 from c:\drucker\marlin-bugfix-2.0.x--01.04.22\marlin\src\inc\marlinconfig.h:35,
                 from buildroot/share/PlatformIO/scripts/common-dependencies.h:29:
c:\drucker\marlin-bugfix-2.0.x--01.04.22\marlin\src\pins\stm32f4/pins_MKS_ROBIN_NANO_V3_common.h:169:8: error: #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
  169 |       #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
      |        ^~~~~
CalledProcessError: Command '"C:\Users\Laen\.platformio\packages\toolchain-gccarmnoneeabi\bin\arm-none-eabi-g++.exe" -D__MARLIN_FIRMWARE__ -DNDEBUG -DHAL_STM32 -DUSBCON -DUSBD_USE_CDC -DTIM_IRQ_PRIO=13 -DADC_RESOLUTION=12 -DPIN_WIRE_SCL=PB6 -DPIN_WIRE_SDA=PB7 -DHAL_PCD_MODULE_ENABLED -D__MARLIN_DEPS__ -w -dM -E -x c++ buildroot/share/PlatformIO/scripts/common-dependencies.h' returned non-zero exit status 1.:   
  File "C:\Users\Laen\.platformio\penv\lib\site-packages\platformio\builder\main.py", line 179:
    env.SConscript(item, exports="env")
  File "C:\Users\Laen\.platformio\packages\tool-scons\scons-local-4.3.0\SCons\Script\SConscript.py", line 597:
    return _SConscript(self.fs, *files, **subst_kw)
  File "C:\Users\Laen\.platformio\packages\tool-scons\scons-local-4.3.0\SCons\Script\SConscript.py", line 285:
    exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals)
  File "C:\drucker\Marlin-bugfix-2.0.x--01.04.22\buildroot\share\PlatformIO\scripts\common-dependencies.py", line 247:
    apply_features_config()
  File "C:\drucker\Marlin-bugfix-2.0.x--01.04.22\buildroot\share\PlatformIO\scripts\common-dependencies.py", line 133:
    if not env.MarlinFeatureIsEnabled(feature):
  File "C:\Users\Laen\.platformio\packages\tool-scons\scons-local-4.3.0\SCons\Util.py", line 742:
    return self.method(*nargs, **kwargs)
  File "C:\drucker\Marlin-bugfix-2.0.x--01.04.22\buildroot\share\PlatformIO\scripts\common-dependencies.py", line 216:
    load_marlin_features()
  File "C:\drucker\Marlin-bugfix-2.0.x--01.04.22\buildroot\share\PlatformIO\scripts\common-dependencies.py", line 204:
    define_list = run_preprocessor(env)
  File "C:\drucker\Marlin-bugfix-2.0.x--01.04.22\buildroot\share\PlatformIO\scripts\preprocessor.py", line 42:
    define_list = subprocess.check_output(cmd, shell=True).splitlines()
  File "C:\Users\Laen\.platformio\python3\lib\subprocess.py", line 424:
    return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
  File "C:\Users\Laen\.platformio\python3\lib\subprocess.py", line 528:
    raise CalledProcessError(retcode, process.args,

I dont see any change in the Code and in compiling

thinkyhead pushed a commit that referenced this pull request May 7, 2022
mh-dm pushed a commit to mh-dm/Marlin that referenced this pull request May 15, 2022
PhilomathJ pushed a commit to PhilomathJ/Marlin-Firmware that referenced this pull request Jul 18, 2022
tomek2k1 pushed a commit to tomek2k1/Marlin that referenced this pull request Jan 13, 2023
@stef-ladefense
Copy link
Contributor

please, considere this
#23396 (comment)

@thisiskeithb
Copy link
Member

please, considere this
#23396 (comment)

@stef-ladefense: Please create a proper Bug Report or open a PR for review.

@stef-ladefense
Copy link
Contributor

@thisiskeithb
sorry no time, I will be unavailable for at least the next 3 weeks (medical)

@ellensp
Copy link
Contributor

ellensp commented Apr 1, 2023

already added PR #25612

@thinkyhead
Copy link
Member

Please elaborate on why this was added

It was a modification from a forced setting to an alert. The original code was:

#if ENABLED(MKS_PWC)
  #if ENABLED(TFT_LVGL_UI)
    #undef PSU_CONTROL
    #undef MKS_PWC
    #define SUICIDE_PIN                     PB2
    #define SUICIDE_PIN_STATE               LOW
  #else
    #define PS_ON_PIN                       PB2   // PW_OFF
  #endif
  #define KILL_PIN                          PA2
  #define KILL_PIN_STATE                    HIGH
#endif

ogdhekne pushed a commit to ogdhekne/Marlin that referenced this pull request Mar 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants