|
@@ -47,7 +47,7 @@ const uint16_t VPList_Boot[] PROGMEM = {
|
47
|
47
|
};
|
48
|
48
|
|
49
|
49
|
const uint16_t VPList_Main[] PROGMEM = {
|
50
|
|
- /* VP_M117, for completeness, but it cannot be auto-uploaded. */
|
|
50
|
+ // VP_M117, for completeness, but it cannot be auto-uploaded.
|
51
|
51
|
#if HAS_HOTEND
|
52
|
52
|
VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
|
53
|
53
|
#if HOTENDS >= 2
|
|
@@ -83,7 +83,7 @@ const uint16_t VPList_Temp[] PROGMEM = {
|
83
|
83
|
};
|
84
|
84
|
|
85
|
85
|
const uint16_t VPList_Status[] PROGMEM = {
|
86
|
|
- /* VP_M117, for completeness, but it cannot be auto-uploaded */
|
|
86
|
+ // VP_M117, for completeness, but it cannot be auto-uploaded
|
87
|
87
|
#if HAS_HOTEND
|
88
|
88
|
VP_T_E0_Is, VP_T_E0_Set,
|
89
|
89
|
#if HOTENDS >= 2
|
|
@@ -104,7 +104,7 @@ const uint16_t VPList_Status[] PROGMEM = {
|
104
|
104
|
};
|
105
|
105
|
|
106
|
106
|
const uint16_t VPList_Status2[] PROGMEM = {
|
107
|
|
- /* VP_M117, for completeness, but it cannot be auto-uploaded */
|
|
107
|
+ // VP_M117, for completeness, but it cannot be auto-uploaded
|
108
|
108
|
#if HAS_HOTEND
|
109
|
109
|
VP_Flowrate_E0,
|
110
|
110
|
#if HOTENDS >= 2
|
|
@@ -292,28 +292,28 @@ const uint16_t VPList_Z_Offset[] PROGMEM = {
|
292
|
292
|
};
|
293
|
293
|
|
294
|
294
|
const struct VPMapping VPMap[] PROGMEM = {
|
295
|
|
- { DGUSLCD_SCREEN_BOOT, VPList_Boot },
|
296
|
|
- { DGUSLCD_SCREEN_MAIN, VPList_Main },
|
297
|
|
- { DGUSLCD_SCREEN_TEMPERATURE, VPList_Temp },
|
298
|
|
- { DGUSLCD_SCREEN_STATUS, VPList_Status },
|
299
|
|
- { DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
|
300
|
|
- { DGUSLCD_SCREEN_PREHEAT, VPList_Preheat },
|
301
|
|
- { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
|
302
|
|
- { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
|
303
|
|
- { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
|
304
|
|
- { DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating },
|
305
|
|
- { DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload },
|
306
|
|
- { DGUSLCD_SCREEN_FILAMENT_UNLOADING, VPList_Filament_load_unload },
|
|
295
|
+ { DGUSLCD_SCREEN_BOOT, VPList_Boot },
|
|
296
|
+ { DGUSLCD_SCREEN_MAIN, VPList_Main },
|
|
297
|
+ { DGUSLCD_SCREEN_TEMPERATURE, VPList_Temp },
|
|
298
|
+ { DGUSLCD_SCREEN_STATUS, VPList_Status },
|
|
299
|
+ { DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
|
|
300
|
+ { DGUSLCD_SCREEN_PREHEAT, VPList_Preheat },
|
|
301
|
+ { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
|
|
302
|
+ { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
|
|
303
|
+ { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
|
|
304
|
+ { DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating },
|
|
305
|
+ { DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload },
|
|
306
|
+ { DGUSLCD_SCREEN_FILAMENT_UNLOADING, VPList_Filament_load_unload },
|
307
|
307
|
{ DGUSLCD_SCREEN_SDPRINTMANIPULATION, VPList_SD_PrintManipulation },
|
308
|
|
- { DGUSLCD_SCREEN_SDFILELIST, VPList_SDFileList },
|
309
|
|
- { DGUSLCD_SCREEN_SDPRINTTUNE, VPList_SDPrintTune },
|
310
|
|
- { DGUSLCD_SCREEN_WAITING, VPList_PIDTuningWaiting },
|
311
|
|
- { DGUSLCD_SCREEN_FLC_PREHEAT, VPList_FLCPreheat },
|
312
|
|
- { DGUSLCD_SCREEN_FLC_PRINTING, VPList_FLCPrinting },
|
313
|
|
- { DGUSLCD_SCREEN_STEPPERMM, VPList_StepPerMM },
|
314
|
|
- { DGUSLCD_SCREEN_PID_E, VPList_PIDE0 },
|
315
|
|
- { DGUSLCD_SCREEN_PID_BED, VPList_PIDBED },
|
316
|
|
- { DGUSLCD_SCREEN_INFOS, VPList_Infos },
|
|
308
|
+ { DGUSLCD_SCREEN_SDFILELIST, VPList_SDFileList },
|
|
309
|
+ { DGUSLCD_SCREEN_SDPRINTTUNE, VPList_SDPrintTune },
|
|
310
|
+ { DGUSLCD_SCREEN_WAITING, VPList_PIDTuningWaiting },
|
|
311
|
+ { DGUSLCD_SCREEN_FLC_PREHEAT, VPList_FLCPreheat },
|
|
312
|
+ { DGUSLCD_SCREEN_FLC_PRINTING, VPList_FLCPrinting },
|
|
313
|
+ { DGUSLCD_SCREEN_STEPPERMM, VPList_StepPerMM },
|
|
314
|
+ { DGUSLCD_SCREEN_PID_E, VPList_PIDE0 },
|
|
315
|
+ { DGUSLCD_SCREEN_PID_BED, VPList_PIDBED },
|
|
316
|
+ { DGUSLCD_SCREEN_INFOS, VPList_Infos },
|
317
|
317
|
{ 0 , nullptr } // List is terminated with an nullptr as table entry.
|
318
|
318
|
};
|
319
|
319
|
|
|
@@ -395,7 +395,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
|
395
|
395
|
VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
|
396
|
396
|
VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
|
397
|
397
|
VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
|
398
|
|
- #if ENABLED(PIDTEMP)
|
|
398
|
+ #if ENABLED(PIDTEMPBED)
|
399
|
399
|
VPHELPER(VP_BED_PID_P, &thermalManager.temp_bed.pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
|
400
|
400
|
VPHELPER(VP_BED_PID_I, &thermalManager.temp_bed.pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
|
401
|
401
|
VPHELPER(VP_BED_PID_D, &thermalManager.temp_bed.pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
|
|
@@ -445,11 +445,11 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
|
445
|
445
|
VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
|
446
|
446
|
VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
|
447
|
447
|
VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
|
448
|
|
- VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
|
449
|
|
- VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
|
450
|
|
- VPHELPER_STR(VP_SD_FileName2, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
|
451
|
|
- VPHELPER_STR(VP_SD_FileName3, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
|
452
|
|
- VPHELPER_STR(VP_SD_FileName4, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
|
|
448
|
+ VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
|
|
449
|
+ VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
|
|
450
|
+ VPHELPER_STR(VP_SD_FileName2, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
|
|
451
|
+ VPHELPER_STR(VP_SD_FileName3, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
|
|
452
|
+ VPHELPER_STR(VP_SD_FileName4, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
|
453
|
453
|
VPHELPER(VP_SD_ResumePauseAbort, nullptr, ScreenHandler.DGUSLCD_SD_ResumePauseAbort, nullptr),
|
454
|
454
|
VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, ScreenHandler.DGUSLCD_SD_ReallyAbort, nullptr),
|
455
|
455
|
VPHELPER(VP_SD_Print_Setting, nullptr, ScreenHandler.DGUSLCD_SD_PrintTune, nullptr),
|