|
@@ -35,20 +35,41 @@ void StepperCurrentScreen::onRedraw(draw_mode_t what) {
|
35
|
35
|
w.precision(0);
|
36
|
36
|
w.units(GET_TEXT_F(MSG_UNITS_MILLIAMP));
|
37
|
37
|
w.heading( GET_TEXT_F(MSG_TMC_CURRENT));
|
38
|
|
- w.color(x_axis) .adjuster( 2, GET_TEXT_F(MSG_AXIS_X), getAxisCurrent_mA(X) );
|
39
|
|
- w.color(y_axis) .adjuster( 4, GET_TEXT_F(MSG_AXIS_Y), getAxisCurrent_mA(Y) );
|
40
|
|
- w.color(z_axis) .adjuster( 6, GET_TEXT_F(MSG_AXIS_Z), getAxisCurrent_mA(Z) );
|
41
|
|
- #if EXTRUDERS == 1
|
42
|
|
- w.color(e_axis).adjuster( 8, GET_TEXT_F(MSG_AXIS_E), getAxisCurrent_mA(E0) );
|
43
|
|
- #elif HAS_MULTI_EXTRUDER
|
44
|
|
- w.color(e_axis).adjuster( 8, GET_TEXT_F(MSG_AXIS_E1), getAxisCurrent_mA(E0) );
|
45
|
|
- w.color(e_axis).adjuster(10, GET_TEXT_F(MSG_AXIS_E2), getAxisCurrent_mA(E1) );
|
46
|
|
- #if EXTRUDERS > 2
|
47
|
|
- w.color(e_axis).adjuster(12, GET_TEXT_F(MSG_AXIS_E3), getAxisCurrent_mA(E2) );
|
48
|
|
- #endif
|
49
|
|
- #if EXTRUDERS > 3
|
50
|
|
- w.color(e_axis).adjuster(14, GET_TEXT_F(MSG_AXIS_E4), getAxisCurrent_mA(E3) );
|
|
38
|
+ #if AXIS_IS_TMC(X)
|
|
39
|
+ w.color(x_axis) .adjuster( 2, GET_TEXT_F(MSG_AXIS_X), getAxisCurrent_mA(X) );
|
|
40
|
+ #endif
|
|
41
|
+ #if AXIS_IS_TMC(X2)
|
|
42
|
+ w.color(x_axis) .adjuster( 4, GET_TEXT_F(MSG_AXIS_X2), getAxisCurrent_mA(X2) );
|
|
43
|
+ #endif
|
|
44
|
+ #if AXIS_IS_TMC(Y)
|
|
45
|
+ w.color(y_axis) .adjuster( 6, GET_TEXT_F(MSG_AXIS_Y), getAxisCurrent_mA(Y) );
|
|
46
|
+ #endif
|
|
47
|
+ #if AXIS_IS_TMC(Y2)
|
|
48
|
+ w.color(x_axis) .adjuster( 8, GET_TEXT_F(MSG_AXIS_Y2), getAxisCurrent_mA(Y2) );
|
|
49
|
+ #endif
|
|
50
|
+ #if AXIS_IS_TMC(Z)
|
|
51
|
+ w.color(z_axis) .adjuster(10, GET_TEXT_F(MSG_AXIS_Z), getAxisCurrent_mA(Z) );
|
|
52
|
+ #endif
|
|
53
|
+ #if AXIS_IS_TMC(Z2)
|
|
54
|
+ w.color(z_axis) .adjuster(12, GET_TEXT_F(MSG_AXIS_Z2), getAxisCurrent_mA(Z2) );
|
|
55
|
+ #endif
|
|
56
|
+ #if AXIS_IS_TMC(E0)
|
|
57
|
+ w.color(e_axis) .adjuster(14, GET_TEXT_F(
|
|
58
|
+ #if EXTRUDERS == 1
|
|
59
|
+ MSG_AXIS_E
|
|
60
|
+ #else
|
|
61
|
+ MSG_AXIS_E1
|
51
|
62
|
#endif
|
|
63
|
+ ), getAxisCurrent_mA(E0) );
|
|
64
|
+ #endif
|
|
65
|
+ #if AXIS_IS_TMC(E1)
|
|
66
|
+ w.color(e_axis).adjuster(16, GET_TEXT_F(MSG_AXIS_E2), getAxisCurrent_mA(E1) );
|
|
67
|
+ #endif
|
|
68
|
+ #if AXIS_IS_TMC(E2)
|
|
69
|
+ w.color(e_axis).adjuster(18, GET_TEXT_F(MSG_AXIS_E3), getAxisCurrent_mA(E2) );
|
|
70
|
+ #endif
|
|
71
|
+ #if AXIS_IS_TMC(E3)
|
|
72
|
+ w.color(e_axis).adjuster(20, GET_TEXT_F(MSG_AXIS_E4), getAxisCurrent_mA(E3) );
|
52
|
73
|
#endif
|
53
|
74
|
w.increments();
|
54
|
75
|
}
|
|
@@ -56,25 +77,45 @@ void StepperCurrentScreen::onRedraw(draw_mode_t what) {
|
56
|
77
|
bool StepperCurrentScreen::onTouchHeld(uint8_t tag) {
|
57
|
78
|
const float increment = getIncrement();
|
58
|
79
|
switch (tag) {
|
59
|
|
- case 2: UI_DECREMENT(AxisCurrent_mA, X ); break;
|
60
|
|
- case 3: UI_INCREMENT(AxisCurrent_mA, X ); break;
|
61
|
|
- case 4: UI_DECREMENT(AxisCurrent_mA, Y ); break;
|
62
|
|
- case 5: UI_INCREMENT(AxisCurrent_mA, Y ); break;
|
63
|
|
- case 6: UI_DECREMENT(AxisCurrent_mA, Z ); break;
|
64
|
|
- case 7: UI_INCREMENT(AxisCurrent_mA, Z ); break;
|
65
|
|
- case 8: UI_DECREMENT(AxisCurrent_mA, E0); break;
|
66
|
|
- case 9: UI_INCREMENT(AxisCurrent_mA, E0); break;
|
67
|
|
- #if HAS_MULTI_EXTRUDER
|
68
|
|
- case 10: UI_DECREMENT(AxisCurrent_mA, E1); break;
|
69
|
|
- case 11: UI_INCREMENT(AxisCurrent_mA, E1); break;
|
|
80
|
+ #if AXIS_IS_TMC(X)
|
|
81
|
+ case 2: UI_DECREMENT(AxisCurrent_mA, X ); break;
|
|
82
|
+ case 3: UI_INCREMENT(AxisCurrent_mA, X ); break;
|
|
83
|
+ #endif
|
|
84
|
+ #if AXIS_IS_TMC(X2)
|
|
85
|
+ case 4: UI_DECREMENT(AxisCurrent_mA, X2 ); break;
|
|
86
|
+ case 5: UI_INCREMENT(AxisCurrent_mA, X2 ); break;
|
|
87
|
+ #endif
|
|
88
|
+ #if AXIS_IS_TMC(Y)
|
|
89
|
+ case 6: UI_DECREMENT(AxisCurrent_mA, Y ); break;
|
|
90
|
+ case 7: UI_INCREMENT(AxisCurrent_mA, Y ); break;
|
|
91
|
+ #endif
|
|
92
|
+ #if AXIS_IS_TMC(Y2)
|
|
93
|
+ case 8: UI_DECREMENT(AxisCurrent_mA, Y2 ); break;
|
|
94
|
+ case 9: UI_INCREMENT(AxisCurrent_mA, Y2 ); break;
|
|
95
|
+ #endif
|
|
96
|
+ #if AXIS_IS_TMC(Z)
|
|
97
|
+ case 10: UI_DECREMENT(AxisCurrent_mA, Z ); break;
|
|
98
|
+ case 11: UI_INCREMENT(AxisCurrent_mA, Z ); break;
|
|
99
|
+ #endif
|
|
100
|
+ #if AXIS_IS_TMC(Z2)
|
|
101
|
+ case 12: UI_DECREMENT(AxisCurrent_mA, Z2 ); break;
|
|
102
|
+ case 13: UI_INCREMENT(AxisCurrent_mA, Z2 ); break;
|
|
103
|
+ #endif
|
|
104
|
+ #if AXIS_IS_TMC(E0)
|
|
105
|
+ case 14: UI_DECREMENT(AxisCurrent_mA, E0); break;
|
|
106
|
+ case 15: UI_INCREMENT(AxisCurrent_mA, E0); break;
|
|
107
|
+ #endif
|
|
108
|
+ #if AXIS_IS_TMC(E1)
|
|
109
|
+ case 16: UI_DECREMENT(AxisCurrent_mA, E1); break;
|
|
110
|
+ case 17: UI_INCREMENT(AxisCurrent_mA, E1); break;
|
70
|
111
|
#endif
|
71
|
|
- #if EXTRUDERS > 2
|
72
|
|
- case 12: UI_DECREMENT(AxisCurrent_mA, E2); break;
|
73
|
|
- case 13: UI_INCREMENT(AxisCurrent_mA, E2); break;
|
|
112
|
+ #if AXIS_IS_TMC(E2)
|
|
113
|
+ case 18: UI_DECREMENT(AxisCurrent_mA, E2); break;
|
|
114
|
+ case 19: UI_INCREMENT(AxisCurrent_mA, E2); break;
|
74
|
115
|
#endif
|
75
|
|
- #if EXTRUDERS > 3
|
76
|
|
- case 14: UI_DECREMENT(AxisCurrent_mA, E3); break;
|
77
|
|
- case 15: UI_INCREMENT(AxisCurrent_mA, E3); break;
|
|
116
|
+ #if AXIS_IS_TMC(E3)
|
|
117
|
+ case 20: UI_DECREMENT(AxisCurrent_mA, E3); break;
|
|
118
|
+ case 21: UI_INCREMENT(AxisCurrent_mA, E3); break;
|
78
|
119
|
#endif
|
79
|
120
|
default:
|
80
|
121
|
return false;
|