bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Code changes supporting up to 6 extruders

Browse Source
This commit is contained in:
Scott Lahteine
2018-09-13 01:35:55 -05:00
parent f5c210d33d
commit 1718eff54a
52 changed files with 848 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@@ -677,8 +677,8 @@ G29_TYPE GcodeSuite::G29() {
// Inner loop is Y with PROBE_Y_FIRST enabled
for (int8_t PR_INNER_VAR = inStart; PR_INNER_VAR != inStop; PR_INNER_VAR += inInc) {
float xBase = left_probe_bed_position + xGridSpacing * xCount,
yBase = front_probe_bed_position + yGridSpacing * yCount;
const float xBase = left_probe_bed_position + xGridSpacing * xCount,
yBase = front_probe_bed_position + yGridSpacing * yCount;
xProbe = FLOOR(xBase + (xBase < 0 ? 0 : 0.5));
yProbe = FLOOR(yBase + (yBase < 0 ? 0 : 0.5));

6
Marlin/src/gcode/feature/trinamic/M906.cpp
View File

@@ -86,6 +86,9 @@ void GcodeSuite::M906() {
#if AXIS_IS_TMC(E4)
case 4: TMC_SET_CURRENT(E4); break;
#endif
#if AXIS_IS_TMC(E5)
case 5: TMC_SET_CURRENT(E5); break;
#endif
}
} break;
}
@@ -128,6 +131,9 @@ void GcodeSuite::M906() {
#if AXIS_IS_TMC(E4)
TMC_SAY_CURRENT(E4);
#endif
#if AXIS_IS_TMC(E5)
TMC_SAY_CURRENT(E5);
#endif
}
}

12
Marlin/src/gcode/feature/trinamic/M911-M915.cpp
View File

@@ -74,6 +74,9 @@ void GcodeSuite::M911() {
#if M91x_USE_E(4)
tmc_report_otpw(stepperE4, TMC_E4);
#endif
#if M91x_USE_E(5)
tmc_report_otpw(stepperE5, TMC_E5);
#endif
}
/**
@@ -145,6 +148,9 @@ void GcodeSuite::M912() {
#if M91x_USE_E(4)
if (hasNone || eval == 4 || (hasE && eval < 0)) tmc_clear_otpw(stepperE4, TMC_E4);
#endif
#if M91x_USE_E(5)
if (hasNone || eval == 5 || (hasE && eval == 10)) tmc_clear_otpw(stepperE5, TMC_E5);
#endif
#endif
}
@@ -208,6 +214,9 @@ void GcodeSuite::M912() {
#if E_STEPPERS > 4 && AXIS_HAS_STEALTHCHOP(E4)
case 4: TMC_SET_PWMTHRS_E(4); break;
#endif
#if E_STEPPERS > 5 && AXIS_HAS_STEALTHCHOP(E5)
case 5: TMC_SET_PWMTHRS_E(5); break;
#endif
}
} break;
}
@@ -250,6 +259,9 @@ void GcodeSuite::M912() {
#if E_STEPPERS > 4 && AXIS_HAS_STEALTHCHOP(E4)
TMC_SAY_PWMTHRS_E(4);
#endif
#if E_STEPPERS > 5 && AXIS_HAS_STEALTHCHOP(E5)
TMC_SAY_PWMTHRS_E(5);
#endif
}
}
#endif // HYBRID_THRESHOLD