thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow servo features in combination (#16960)

Browse Source
This commit is contained in:
Scott Lahteine
2020-02-26 06:26:54 -06:00
committed by GitHub
parent daa32013b1
commit 0a7e7a6fa5
6 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/configuration_store.cpp
View File

@@ -2541,7 +2541,7 @@ void MarlinSettings::reset() {
//
#if ENABLED(EDITABLE_SERVO_ANGLES)
COPY(servo_angles, base_servo_angles);
COPY(servo_angles, base_servo_angles); // When not editable only one copy of servo angles exists
#endif
//
@@ -3091,7 +3091,7 @@ void MarlinSettings::reset() {
#endif
#elif ENABLED(SWITCHING_NOZZLE)
case SWITCHING_NOZZLE_SERVO_NR:
#elif (ENABLED(BLTOUCH) && defined(BLTOUCH_ANGLES)) || (defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR))
#elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES))
case Z_PROBE_SERVO_NR:
#endif
CONFIG_ECHO_START();