Merge upstream changes from Marlin 2.1.2.1 #462

2023-05-26T11:55:04-05:00

stklcode commented

2023-05-26 11:55:04 -05:00

(Migrated from github.com)

Description

This PR updates the upstream sources to Marlin 2.1.2.1

Diff 2.1.2...2.1.2.1

Changes

Merged all upstream changes, hopefully preserving all patches

Build tested for all targets.

Benefits

The updates introduces new features and bugfixes in Marlin. It also brings this project closer to upstream for future development.

Configurations

Upstream defaults and minor changes have been merged into the configurations. If I didn't miss anything, no changes to our changes required.

None.

Side note

Patch based on https://github.com/stklcode/Marlin/tree/knutwurst-2.1.2.1

### Description This PR updates the upstream sources to [Marlin 2.1.2.1](https://github.com/MarlinFirmware/Marlin/tree/2.1.2.1) Diff [2.1.2...2.1.2.1](https://github.com/MarlinFirmware/Marlin/compare/2.1.2...2.1.2.1) #### Changes * Merged all upstream changes, hopefully preserving all patches Build tested for all targets. ### Benefits The updates introduces new features and bugfixes in Marlin. It also brings this project closer to upstream for future development. ### Configurations Upstream defaults and minor changes have been merged into the configurations. If I didn't miss anything, no changes to our changes required. ### Related Issues None. ---- ### Side note Patch based on https://github.com/stklcode/Marlin/tree/knutwurst-2.1.2.1

stklcode commented

2023-05-26 12:06:11 -05:00

(Migrated from github.com)

There is one open issue for all targets:

In file included from Marlin/src/module/../inc/MarlinConfigPre.h:37:0,
                 from Marlin/src/module/../inc/MarlinConfig.h:28,
                 from Marlin/src/module/../MarlinCore.h:24,
                 from Marlin/src/module/temperature.cpp:30:
Marlin/src/module/temperature.cpp:323:33: error: static assertion failed: HEATER_0_MAXTEMP (300) is too high for thermistor_1.h with HOTEND_OVERSHOOT=15.
   #define CHECK_MAXTEMP_(N,M,S) static_assert( \

see https://github.com/MarlinFirmware/Marlin/pull/25407 for details.

We have increased max. temperature for heater 0 to 300, overshoot to 15 and thermistor type 1 which has a limit 300:
22dedaeb81/Marlin/Configuration.h (L743)
22dedaeb81/Marlin/Configuration.h (L760)
22dedaeb81/Marlin/Configuration.h (L652-L656)

Apparently there is now a hard check on MAXTEMP - HOTEND_OVERSHOOT (which is 285 for thermistor type 1).
We have 3 options here:

lower the temperature to 285 #define HEATER_0_MAXTEMP 285
set overshoot to 0 #define HOTEND_OVERSHOOT 0
set max temperature condionally for 4MAXP4 only (which uses a different thermistor):

#if ENABLED(KNUTWURST_4MAXP2) 
 #define HEATER_0_MAXTEMP 300
#else 
 #define HEATER_0_MAXTEMP 275
#endif

My personal favorite is option 3. Without further modification I'd assume it should be practically impossible to reach stable >260°C, so the 275 should be fine for most users.

There is one open issue for all targets: > ``` > In file included from Marlin/src/module/../inc/MarlinConfigPre.h:37:0, > from Marlin/src/module/../inc/MarlinConfig.h:28, > from Marlin/src/module/../MarlinCore.h:24, > from Marlin/src/module/temperature.cpp:30: > Marlin/src/module/temperature.cpp:323:33: error: static assertion failed: HEATER_0_MAXTEMP (300) is too high for thermistor_1.h with HOTEND_OVERSHOOT=15. > #define CHECK_MAXTEMP_(N,M,S) static_assert( \ > ``` see https://github.com/MarlinFirmware/Marlin/pull/25407 for details. We have increased max. temperature for heater 0 to 300, overshoot to 15 and thermistor type 1 which has a limit 300: https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/blob/22dedaeb8109582710f43c8b0ba3bb96c30a880b/Marlin/Configuration.h#L743 https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/blob/22dedaeb8109582710f43c8b0ba3bb96c30a880b/Marlin/Configuration.h#L760 https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/blob/22dedaeb8109582710f43c8b0ba3bb96c30a880b/Marlin/Configuration.h#L652-L656 Apparently there is now a hard check on MAXTEMP - HOTEND_OVERSHOOT (which is 285 for thermistor type 1). We have 3 options here: 1. lower the temperature to 285 `#define HEATER_0_MAXTEMP 285` 2. set overshoot to 0 `#define HOTEND_OVERSHOOT 0` 3. set max temperature condionally for 4MAXP4 only (which uses a different thermistor): ``` #if ENABLED(KNUTWURST_4MAXP2) #define HEATER_0_MAXTEMP 300 #else #define HEATER_0_MAXTEMP 275 #endif ``` My personal favorite is option 3. Without further modification I'd assume it should be practically impossible to reach stable >260°C, so the 275 should be fine for most users.

knutwurst commented

2023-05-28 11:11:19 -05:00

(Migrated from github.com)

Nice job as always :)
I just want to fix the current bugs that are due to my own code first. If everything works out, I'll take the step of merging your PR.

Nice job as always :) I just want to fix the current bugs that are due to my own code first. If everything works out, I'll take the step of merging your PR.

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: wp/Marlin-2-0-x-Anycubic-i3-MEGA-S#462