Skip to content

Commit ab6bdcd

Browse files
thinkyheadthinkyhead
committed
Clean vim poop, fix bugs
1 parent 9d49265 commit ab6bdcd

13 files changed

+1728
-1809
lines changed

‎Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,13 +515,13 @@ void DGUSScreenHandler::handleSettings(DGUS_VP_Variable &var, void *val_ptr) {
515515
#if ENABLED(PIDTEMP)
516516
#if HAS_HOTEND
517517
case VP_PID_AUTOTUNE_E0: // Autotune Extruder 0
518-
sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E0);
518+
sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), 0);
519519
queue.enqueue_one_now(buf);
520520
break;
521521
#endif
522522
#if HAS_MULTI_HOTEND
523523
case VP_PID_AUTOTUNE_E1:
524-
sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E1);
524+
sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), 1);
525525
queue.enqueue_one_now(buf);
526526
break;
527527
#endif

‎Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
3333

3434
typedef struct {
35-
ExtUI::extruder_t extruder; // which extruder to operate
35+
uint8_t extruder; // which extruder index to operate
3636
uint8_t action; // load or unload
3737
bool heated; // heating done ?
3838
float purge_length; // the length to extrude before unload, prevent filament jam

‎Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
361361
#if HAS_HOTEND
362362
VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, screen.sendFloatAsLongValueToDisplay<0>),
363363
VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, screen.handleTemperatureChanged, screen.sendWordValueToDisplay),
364-
VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
364+
VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[0], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
365365
VPHELPER(VP_EPos, &destination.e, nullptr, screen.sendFloatAsLongValueToDisplay<2>),
366366
VPHELPER(VP_MOVE_E0, nullptr, screen.handleManualExtrude, nullptr),
367367
VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, screen.handleHeaterControl, nullptr),
@@ -382,7 +382,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
382382
#if HAS_MULTI_HOTEND
383383
VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, screen.sendFloatAsLongValueToDisplay<0>),
384384
VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, screen.handleTemperatureChanged, screen.sendWordValueToDisplay),
385-
VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], screen.handleFlowRateChanged, screen.sendWordValueToDisplay), // ERROR: Flow is per-extruder, not per-hotend
385+
VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[1], screen.handleFlowRateChanged, screen.sendWordValueToDisplay), // ERROR: Flow is per-extruder, not per-hotend
386386
VPHELPER(VP_MOVE_E1, nullptr, screen.handleManualExtrude, nullptr),
387387
VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, screen.handleHeaterControl, nullptr),
388388
VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, screen.sendHeaterStatusToDisplay),

‎Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void DGUSScreenHandler::screenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
141141

142142
updateNewScreen(target);
143143

144-
#ifdef DEBUG_DGUSLCD
144+
#if ENABLED(DEBUG_DGUSLCD)
145145
if (!findScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
146146
#endif
147147
}
@@ -308,9 +308,9 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
308308

309309
if (filament_data.action == 0) { // Go back to utility screen
310310
#if HAS_HOTEND
311-
thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
311+
thermalManager.setTargetHotend(e_temp, 0);
312312
#if HAS_MULTI_HOTEND
313-
thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
313+
thermalManager.setTargetHotend(e_temp, 1);
314314
#endif
315315
#endif
316316
gotoScreen(DGUS_SCREEN_UTILITY);
@@ -320,13 +320,13 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
320320
default: return;
321321
#if HAS_HOTEND
322322
case VP_E0_FILAMENT_LOAD_UNLOAD:
323-
filament_data.extruder = ExtUI::extruder_t::E0;
323+
filament_data.extruder = 0;
324324
thermalManager.setTargetHotend(e_temp, filament_data.extruder);
325325
break;
326326
#endif
327327
#if HAS_MULTI_HOTEND
328328
case VP_E1_FILAMENT_LOAD_UNLOAD:
329-
filament_data.extruder = ExtUI::extruder_t::E1;
329+
filament_data.extruder = 1;
330330
thermalManager.setTargetHotend(e_temp, filament_data.extruder);
331331
break;
332332
#endif
@@ -348,7 +348,7 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
348348
//gotoScreen(DGUS_SCREEN_FILAMENT_LOADING);
349349
filament_data.heated = true;
350350
}
351-
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder) + movevalue;
351+
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder ? ExtUI::extruder_t::E1 : ExtUI::extruder_t::E0) + movevalue;
352352
}
353353
else { // unload filament
354354
if (!filament_data.heated) {
@@ -357,14 +357,14 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
357357
}
358358
// Before unloading extrude to prevent jamming
359359
if (filament_data.purge_length >= 0) {
360-
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder) + movevalue;
360+
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder ? ExtUI::extruder_t::E1 : ExtUI::extruder_t::E0) + movevalue;
361361
filament_data.purge_length -= movevalue;
362362
}
363363
else {
364-
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder) - movevalue;
364+
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder ? ExtUI::extruder_t::E1 : ExtUI::extruder_t::E0) - movevalue;
365365
}
366366
}
367-
ExtUI::setAxisPosition_mm(movevalue, filament_data.extruder);
367+
ExtUI::setAxisPosition_mm(movevalue, filament_data.extruder ? ExtUI::extruder_t::E1 : ExtUI::extruder_t::E0);
368368
}
369369
}
370370
#endif // DGUS_FILAMENT_LOADUNLOAD

‎Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
358358
#if HAS_HOTEND
359359
VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, screen.sendFloatAsLongValueToDisplay<0>),
360360
VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, screen.handleTemperatureChanged, screen.sendWordValueToDisplay),
361-
VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
361+
VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[0], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
362362
VPHELPER(VP_EPos, &destination.e, nullptr, screen.sendFloatAsLongValueToDisplay<2>),
363363
VPHELPER(VP_MOVE_E0, nullptr, screen.handleManualExtrude, nullptr),
364364
VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, screen.handleHeaterControl, nullptr),

‎Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void DGUSScreenHandler::screenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
143143

144144
updateNewScreen(target);
145145

146-
#ifdef DEBUG_DGUSLCD
146+
#if ENABLED(DEBUG_DGUSLCD)
147147
if (!findScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
148148
#endif
149149
}
@@ -310,9 +310,9 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
310310

311311
if (filament_data.action == 0) { // Go back to utility screen
312312
#if HAS_HOTEND
313-
thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
313+
thermalManager.setTargetHotend(e_temp, 0);
314314
#if HAS_MULTI_HOTEND
315-
thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
315+
thermalManager.setTargetHotend(e_temp, 1);
316316
#endif
317317
#endif
318318
gotoScreen(DGUS_SCREEN_UTILITY);
@@ -322,13 +322,13 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
322322
default: return;
323323
#if HAS_HOTEND
324324
case VP_E0_FILAMENT_LOAD_UNLOAD:
325-
filament_data.extruder = ExtUI::extruder_t::E0;
325+
filament_data.extruder = 0;
326326
thermalManager.setTargetHotend(e_temp, filament_data.extruder);
327327
break;
328328
#endif
329329
#if HAS_MULTI_HOTEND
330330
case VP_E1_FILAMENT_LOAD_UNLOAD:
331-
filament_data.extruder = ExtUI::extruder_t::E1;
331+
filament_data.extruder = 1;
332332
thermalManager.setTargetHotend(e_temp, filament_data.extruder);
333333
break;
334334
#endif
@@ -350,7 +350,7 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
350350
//gotoScreen(DGUS_SCREEN_FILAMENT_LOADING);
351351
filament_data.heated = true;
352352
}
353-
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder) + movevalue;
353+
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder ? ExtUI::extruder_t::E1 : ExtUI::extruder_t::E0) + movevalue;
354354
}
355355
else { // unload filament
356356
if (!filament_data.heated) {
@@ -359,11 +359,11 @@ void DGUSScreenHandler::handleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
359359
}
360360
// Before unloading extrude to prevent jamming
361361
if (filament_data.purge_length >= 0) {
362-
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder) + movevalue;
362+
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder ? ExtUI::extruder_t::E1 : ExtUI::extruder_t::E0) + movevalue;
363363
filament_data.purge_length -= movevalue;
364364
}
365365
else {
366-
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder) - movevalue;
366+
movevalue = ExtUI::getAxisPosition_mm(filament_data.extruder ? ExtUI::extruder_t::E1 : ExtUI::extruder_t::E0) - movevalue;
367367
}
368368
}
369369
ExtUI::setAxisPosition_mm(movevalue, filament_data.extruder);

‎Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ const uint16_t VPList_Main[] PROGMEM = {
144144
0x0000
145145
};
146146
*/
147+
147148
const uint16_t MKSList_Home[] PROGMEM = {
148149
INFO_BAR
149150

@@ -158,7 +159,7 @@ const uint16_t MKSList_Setting[] PROGMEM = {
158159

159160
const uint16_t MKSList_Tool[] PROGMEM = {
160161
INFO_BAR
161-
162+
162163
// LCD BackLight
163164
VP_LCD_BLK,
164165

@@ -401,7 +402,7 @@ const struct VPMapping VPMap[] PROGMEM = {
401402
{ MKSLCD_SCREEN_AXIS_ACC_MAX, MKSList_MaxAcc }, // Page 53
402403
{ MKSLCD_SCREEN_LEVEL_DATA, MKSList_Level_Point }, // Page 48
403404
{ MKSLCD_PrintPause_SET, MKSList_PrintPauseConfig }, // Page 49
404-
//{ MKSLCD_FILAMENT_DATA, MKSList_SD_File }, // Page 50
405+
//{ MKSLCD_FILAMENT_DATA, MKSList_SD_File }, // Page 50
405406
{ MKSLCD_SCREEN_Config, MKSList_TempOnly }, // Page 46
406407
{ MKSLCD_SCREEN_Config_MOTOR, MKSList_MotionConfig }, // Page 47
407408
{ MKSLCD_PID, MKSList_PID }, // Page 56
@@ -469,7 +470,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
469470
#if HAS_HOTEND
470471
VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, screen.sendFloatAsLongValueToDisplay<0>),
471472
VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, screen.handleTemperatureChanged, screen.sendWordValueToDisplay),
472-
VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
473+
VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[0], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
473474
VPHELPER(VP_EPos, &destination.e, nullptr, screen.sendFloatAsLongValueToDisplay<2>),
474475
VPHELPER(VP_MOVE_E0, nullptr, screen.handleManualExtrude, nullptr),
475476
VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, screen.handleHeaterControl, nullptr),
@@ -494,7 +495,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
494495
#if HAS_MULTI_HOTEND
495496
VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, screen.sendFloatAsLongValueToDisplay<0>),
496497
VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, screen.handleTemperatureChanged, screen.sendWordValueToDisplay),
497-
VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
498+
VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[1], screen.handleFlowRateChanged, screen.sendWordValueToDisplay),
498499
VPHELPER(VP_MOVE_E1, nullptr, screen.handleManualExtrude, nullptr),
499500
VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, screen.handleHeaterControl, nullptr),
500501
VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, screen.sendHeaterStatusToDisplay),
@@ -631,28 +632,28 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
631632
#endif
632633

633634
#if HAS_TRINAMIC_CONFIG // TMC Current Setting
634-
#if AXIS_IS_TMC(X)
635+
#if X_IS_TRINAMIC
635636
VPHELPER(VP_TMC_X_Current, &stepperX.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
636637
#endif
637-
#if AXIS_IS_TMC(Y)
638+
#if Y_IS_TRINAMIC
638639
VPHELPER(VP_TMC_Y_Current, &stepperY.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
639640
#endif
640-
#if AXIS_IS_TMC(Z)
641+
#if Z_IS_TRINAMIC
641642
VPHELPER(VP_TMC_Z_Current, &stepperZ.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
642643
#endif
643-
#if AXIS_IS_TMC(E0)
644+
#if E0_IS_TRINAMIC
644645
VPHELPER(VP_TMC_E0_Current, &stepperE0.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
645646
#endif
646-
#if AXIS_IS_TMC(E1)
647+
#if E1_IS_TRINAMIC
647648
VPHELPER(VP_TMC_E1_Current, &stepperE1.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
648649
#endif
649-
#if AXIS_IS_TMC(X2)
650+
#if X2_IS_TRINAMIC
650651
VPHELPER(VP_TMC_X1_Current, &stepperX2.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
651652
#endif
652-
#if AXIS_IS_TMC(Y2)
653+
#if Y2_IS_TRINAMIC
653654
VPHELPER(VP_TMC_Y1_Current, &stepperY2.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
654655
#endif
655-
#if AXIS_IS_TMC(Z2)
656+
#if Z2_IS_TRINAMIC
656657
VPHELPER(VP_TMC_Z1_Current, &stepperZ2.val_mA, screen.tmcChangeConfig, screen.sendWordValueToDisplay),
657658
#endif
658659
#endif

‎Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -435,16 +435,16 @@ constexpr uint16_t SP_T_Bed_Set = 0x5040;
435435
constexpr uint16_t VP_PrintsTotal = 0x3380;
436436
constexpr uint16_t VP_PrintsTotal_LEN = 16;
437437

438-
constexpr uint16_t VP_File_Pictutr0 = 0x3400;
439-
constexpr uint16_t VP_File_Pictutr1 = 0x3402;
440-
constexpr uint16_t VP_File_Pictutr2 = 0x3404;
441-
constexpr uint16_t VP_File_Pictutr3 = 0x3406;
442-
constexpr uint16_t VP_File_Pictutr4 = 0x3408;
443-
constexpr uint16_t VP_File_Pictutr5 = 0x340A;
444-
constexpr uint16_t VP_File_Pictutr6 = 0x340C;
445-
constexpr uint16_t VP_File_Pictutr7 = 0x340E;
446-
constexpr uint16_t VP_File_Pictutr8 = 0x3410;
447-
constexpr uint16_t VP_File_Pictutr9 = 0x3412;
438+
constexpr uint16_t VP_File_Picture0 = 0x3400;
439+
constexpr uint16_t VP_File_Picture1 = 0x3402;
440+
constexpr uint16_t VP_File_Picture2 = 0x3404;
441+
constexpr uint16_t VP_File_Picture3 = 0x3406;
442+
constexpr uint16_t VP_File_Picture4 = 0x3408;
443+
constexpr uint16_t VP_File_Picture5 = 0x340A;
444+
constexpr uint16_t VP_File_Picture6 = 0x340C;
445+
constexpr uint16_t VP_File_Picture7 = 0x340E;
446+
constexpr uint16_t VP_File_Picture8 = 0x3410;
447+
constexpr uint16_t VP_File_Picture9 = 0x3412;
448448

449449
constexpr uint16_t VP_BED_STATUS = 0x341C;
450450

@@ -486,7 +486,7 @@ constexpr uint16_t SP_T_Bed_Set = 0x5040;
486486
constexpr uint16_t VP_PID_AUTOTUNE_E0 = 0x3800;
487487
constexpr uint16_t VP_PID_AUTOTUNE_E1 = 0x3802;
488488
constexpr uint16_t VP_PID_AUTOTUNE_BED = 0x380C;
489-
489+
490490
// Calibrate Z
491491
constexpr uint16_t VP_Z_CALIBRATE = 0x3810;
492492

@@ -585,7 +585,7 @@ constexpr uint16_t SP_T_Bed_Set = 0x5040;
585585
constexpr uint16_t VP_Extrusion_Dis = 0x5230;
586586
constexpr uint16_t VP_HeatBed_Dis = 0x5240;
587587

588-
constexpr uint16_t VP_Printting_Dis = 0x5430;
588+
constexpr uint16_t VP_Printing_Dis = 0x5430;
589589
constexpr uint16_t VP_FactoryDefaults_Dis = 0x54C0;
590590
constexpr uint16_t VP_StoreSetting_Dis = 0x54B0;
591591
constexpr uint16_t VP_Info_EEPROM_2_Dis = 0x54D0;
@@ -618,8 +618,8 @@ constexpr uint16_t SP_T_Bed_Set = 0x5040;
618618

619619
constexpr uint16_t VP_Length_Dis = 0x5B00;
620620

621-
constexpr uint16_t VP_PrintConfrim_Info_Dis = 0x5B90;
622-
constexpr uint16_t VP_StopPrintConfrim_Info_Dis = 0x5B80;
621+
constexpr uint16_t VP_PrintConfirm_Info_Dis = 0x5B90;
622+
constexpr uint16_t VP_StopPrintConfirm_Info_Dis = 0x5B80;
623623

624624
constexpr uint16_t VP_Point_One_Dis = 0x5BA0;
625625
constexpr uint16_t VP_Point_Two_Dis = 0x5BB0;

0 commit comments

Comments
 (0)