|
@@ -92,7 +92,7 @@ uint16_t max_display_update_time = 0;
|
92
|
92
|
|
93
|
93
|
#if ENABLED(DAC_STEPPER_CURRENT)
|
94
|
94
|
#include "stepper_dac.h" //was dac_mcp4728.h MarlinMain uses stepper dac for the m-codes
|
95
|
|
- int16_t driverPercent[XYZE];
|
|
95
|
+ uint8_t driverPercent[XYZE];
|
96
|
96
|
#endif
|
97
|
97
|
|
98
|
98
|
#if ENABLED(ULTIPANEL)
|
|
@@ -185,6 +185,7 @@ uint16_t max_display_update_time = 0;
|
185
|
185
|
typedef void _name##_void
|
186
|
186
|
|
187
|
187
|
DECLARE_MENU_EDIT_TYPE(int, int3);
|
|
188
|
+ DECLARE_MENU_EDIT_TYPE(uint8_t, int8);
|
188
|
189
|
DECLARE_MENU_EDIT_TYPE(float, float3);
|
189
|
190
|
DECLARE_MENU_EDIT_TYPE(float, float32);
|
190
|
191
|
DECLARE_MENU_EDIT_TYPE(float, float43);
|
|
@@ -1253,10 +1254,10 @@ void kill_screen(const char* lcd_msg) {
|
1253
|
1254
|
dac_driver_getValues();
|
1254
|
1255
|
START_MENU();
|
1255
|
1256
|
MENU_BACK(MSG_CONTROL);
|
1256
|
|
- MENU_ITEM_EDIT_CALLBACK(int3, MSG_X " " MSG_DAC_PERCENT, &driverPercent[X_AXIS], 0, 100, dac_driver_commit);
|
1257
|
|
- MENU_ITEM_EDIT_CALLBACK(int3, MSG_Y " " MSG_DAC_PERCENT, &driverPercent[Y_AXIS], 0, 100, dac_driver_commit);
|
1258
|
|
- MENU_ITEM_EDIT_CALLBACK(int3, MSG_Z " " MSG_DAC_PERCENT, &driverPercent[Z_AXIS], 0, 100, dac_driver_commit);
|
1259
|
|
- MENU_ITEM_EDIT_CALLBACK(int3, MSG_E " " MSG_DAC_PERCENT, &driverPercent[E_AXIS], 0, 100, dac_driver_commit);
|
|
1257
|
+ MENU_ITEM_EDIT_CALLBACK(int8, MSG_X " " MSG_DAC_PERCENT, &driverPercent[X_AXIS], 0, 100, dac_driver_commit);
|
|
1258
|
+ MENU_ITEM_EDIT_CALLBACK(int8, MSG_Y " " MSG_DAC_PERCENT, &driverPercent[Y_AXIS], 0, 100, dac_driver_commit);
|
|
1259
|
+ MENU_ITEM_EDIT_CALLBACK(int8, MSG_Z " " MSG_DAC_PERCENT, &driverPercent[Z_AXIS], 0, 100, dac_driver_commit);
|
|
1260
|
+ MENU_ITEM_EDIT_CALLBACK(int8, MSG_E " " MSG_DAC_PERCENT, &driverPercent[E_AXIS], 0, 100, dac_driver_commit);
|
1260
|
1261
|
MENU_ITEM(function, MSG_DAC_EEPROM_WRITE, dac_driver_eeprom_write);
|
1261
|
1262
|
END_MENU();
|
1262
|
1263
|
}
|
|
@@ -3932,6 +3933,7 @@ void kill_screen(const char* lcd_msg) {
|
3932
|
3933
|
typedef void _name
|
3933
|
3934
|
|
3934
|
3935
|
DEFINE_MENU_EDIT_TYPE(int, int3, itostr3, 1);
|
|
3936
|
+ DEFINE_MENU_EDIT_TYPE(uint8_t, int8, i8tostr3, 1);
|
3935
|
3937
|
DEFINE_MENU_EDIT_TYPE(float, float3, ftostr3, 1.0);
|
3936
|
3938
|
DEFINE_MENU_EDIT_TYPE(float, float32, ftostr32, 100.0);
|
3937
|
3939
|
DEFINE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000.0);
|