Merge upstream changes from Marlin 2.1.2 #397

2022-12-19T08:42:58-06:00

stklcode commented

2022-12-19 08:42:58 -06:00

(Migrated from github.com)

Description

This PR updates the upstream sources to Marlin 2.1.2

Changes

Merged all upstream changes, hopefully preserving all patches
- Added contorller fan pin for ANYCUBIC_4_MAX_PRO_ENDSTOPS

#if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
  #define X_MAX_PIN                           43
  #define Y_STOP_PIN                          19

  #define CONTROLLER_FAN_PIN            FAN1_PIN // PATCH: knutwurst
#elif ANY(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA, KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_MEGA_X, KNUTWURST_4MAXP2, KNUTWURST_CHIRON)   // PATCH: Knutwurst

https://github.com/stklcode/Marlin-2-0-x-Anycubic-i3-MEGA-S/blob/marlin-212/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h#L67-L72

I have no idea, whether this is correct, there was no controller fan pin defined previously, but now a sanity check fails.
Maybe another solution is required here like disabling the controller fan in Configuraiton_adv.h for these environments.

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

### Description This PR updates the upstream sources to [Marlin 2.1.2](https://github.com/MarlinFirmware/Marlin/tree/2.1.2) #### Changes * Merged all upstream changes, hopefully preserving all patches * Added contorller fan pin for `ANYCUBIC_4_MAX_PRO_ENDSTOPS` ```c #if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS) #define X_MAX_PIN 43 #define Y_STOP_PIN 19 #define CONTROLLER_FAN_PIN FAN1_PIN // PATCH: knutwurst #elif ANY(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA, KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_MEGA_X, KNUTWURST_4MAXP2, KNUTWURST_CHIRON) // PATCH: Knutwurst ``` https://github.com/stklcode/Marlin-2-0-x-Anycubic-i3-MEGA-S/blob/marlin-212/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h#L67-L72 I have no idea, whether this is correct, there was no controller fan pin defined previously, but now a sanity check fails. Maybe another solution is required here like disabling the controller fan in _Configuraiton_adv.h_ for these environments. ### 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

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#397