wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

swap Z motors for all targets and use predefined mappings

Browse Source 
Z endstop mapping has changed as side effect of the upstream merge, so
it does no longer match the motor mapping.
Define SWAP_Z_MOTORS to resolve this issue without manipulation of the
upstream pin mapping.

Also use predefined mapping instead of custom overrides.
This commit is contained in:
Stefan Kalscheuer
2022-12-21 19:49:48 +01:00
parent bd0f3a9aa5
commit d43d99bead
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/Configuration.h
View File

@@ -55,6 +55,15 @@
*/ */
// #define KNUTWURST_DEBUG // #define KNUTWURST_DEBUG
/*
* Adjust the Trigorilla pin mapping.
*/
#if ENABLED(KNUTWURST_CHIRON)
#define TRIGORILLA_MAPPING_CHIRON
#else
#define TRIGORILLA_MAPPING_I3MEGA
#define SWAP_Z_MOTORS
#endif
/* /*
* This enables the integrated Laser engaving feature * This enables the integrated Laser engaving feature

4
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View File

@@ -69,7 +69,7 @@
#define Y_STOP_PIN 19 #define Y_STOP_PIN 19
#define CONTROLLER_FAN_PIN FAN1_PIN // PATCH: knutwurst #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 #elif EITHER(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA)
// Chiron uses AUX header for Y and Z endstops // Chiron uses AUX header for Y and Z endstops
#define Y_STOP_PIN 42 // AUX #define Y_STOP_PIN 42 // AUX
#define Z_STOP_PIN 43 // AUX #define Z_STOP_PIN 43 // AUX
@@ -86,7 +86,7 @@
#define OUTAGECON_PIN 58 #define OUTAGECON_PIN 58
#endif #endif
#if EITHER(TRIGORILLA_MAPPING_CHIRON, KNUTWURST_CHIRON) // PATCH: Knutwurst #if ENABLED(TRIGORILLA_MAPPING_CHIRON)
#ifndef FIL_RUNOUT_PIN #ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 33 #define FIL_RUNOUT_PIN 33
#endif #endif