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

UI and stall reset for extra TMC axes (#17818)

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-30 22:52:33 -05:00
committed by GitHub
parent 6edc2c3690
commit a226b281af
5 changed files with 85 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
View File

@@ -34,39 +34,21 @@ void StepperBumpSensitivityScreen::onRedraw(draw_mode_t what) {
widgets_t w(what);
w.precision(0, BaseNumericAdjustmentScreen::DEFAULT_LOWEST);
w.heading( GET_TEXT_F(MSG_TMC_HOMING_THRS));
w.color(x_axis) .adjuster( 2, GET_TEXT_F(MSG_AXIS_X), getTMCBumpSensitivity(X),
#if X_SENSORLESS
true
#else
false
#endif
);
w.color(y_axis) .adjuster( 4, GET_TEXT_F(MSG_AXIS_Y), getTMCBumpSensitivity(Y),
#if Y_SENSORLESS
true
#else
false
#endif
);
w.color(z_axis) .adjuster( 6, GET_TEXT_F(MSG_AXIS_Z), getTMCBumpSensitivity(Z),
#if Z_SENSORLESS
true
#else
false
#endif
);
w.color(x_axis) .adjuster( 2, GET_TEXT_F(MSG_AXIS_X), getTMCBumpSensitivity(X), ENABLED(X_SENSORLESS));
w.color(y_axis) .adjuster( 4, GET_TEXT_F(MSG_AXIS_Y), getTMCBumpSensitivity(Y), ENABLED(Y_SENSORLESS));
w.color(z_axis) .adjuster( 6, GET_TEXT_F(MSG_AXIS_Z), getTMCBumpSensitivity(Z), ENABLED(Z_SENSORLESS));
w.increments();
}
bool StepperBumpSensitivityScreen::onTouchHeld(uint8_t tag) {
const float increment = getIncrement();
switch (tag) {
case 2: UI_DECREMENT(TMCBumpSensitivity, X ); break;
case 3: UI_INCREMENT(TMCBumpSensitivity, X ); break;
case 4: UI_DECREMENT(TMCBumpSensitivity, Y ); break;
case 5: UI_INCREMENT(TMCBumpSensitivity, Y ); break;
case 6: UI_DECREMENT(TMCBumpSensitivity, Z ); break;
case 7: UI_INCREMENT(TMCBumpSensitivity, Z ); break;
case 2: UI_DECREMENT(TMCBumpSensitivity, X ); break;
case 3: UI_INCREMENT(TMCBumpSensitivity, X2 ); break;
case 4: UI_DECREMENT(TMCBumpSensitivity, Y ); break;
case 5: UI_INCREMENT(TMCBumpSensitivity, Y2 ); break;
case 6: UI_DECREMENT(TMCBumpSensitivity, Z ); break;
case 7: UI_INCREMENT(TMCBumpSensitivity, Z2 ); break;
default:
return false;
}