Browse Source

MKS H43 fix, cleanup (#21500)

Followup to #21485
Sola 4 years ago
parent
commit
6747d350a5
No account linked to committer's email address

+ 1
- 1
Marlin/Configuration.h View File

2374
 //#define DGUS_LCD_UI_FYSETC
2374
 //#define DGUS_LCD_UI_FYSETC
2375
 //#define DGUS_LCD_UI_HIPRECY
2375
 //#define DGUS_LCD_UI_HIPRECY
2376
 
2376
 
2377
-// #define DGUS_LCD_UI_MKS
2377
+//#define DGUS_LCD_UI_MKS
2378
 #if ENABLED(DGUS_LCD_UI_MKS)
2378
 #if ENABLED(DGUS_LCD_UI_MKS)
2379
   #define USE_MKS_GREEN_UI
2379
   #define USE_MKS_GREEN_UI
2380
 #endif
2380
 #endif

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp View File

176
 #if HAS_PID_HEATING
176
 #if HAS_PID_HEATING
177
   void DGUSScreenHandler::DGUSLCD_SendTemperaturePID(DGUS_VP_Variable &var) {
177
   void DGUSScreenHandler::DGUSLCD_SendTemperaturePID(DGUS_VP_Variable &var) {
178
     float value = *(float *)var.memadr;
178
     float value = *(float *)var.memadr;
179
+    value /= 10;
179
     float valuesend = 0;
180
     float valuesend = 0;
180
     switch (var.VP) {
181
     switch (var.VP) {
181
       default: return;
182
       default: return;
343
     SetupConfirmAction(nullptr);
344
     SetupConfirmAction(nullptr);
344
     GotoScreen(DGUSLCD_SCREEN_POPUP);
345
     GotoScreen(DGUSLCD_SCREEN_POPUP);
345
   }
346
   }
346
-
347
 #endif // SDSUPPORT
347
 #endif // SDSUPPORT
348
 
348
 
349
 void DGUSScreenHandler::ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr) {
349
 void DGUSScreenHandler::ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr) {

+ 6
- 3
Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp View File

44
 #endif
44
 #endif
45
 
45
 
46
 uint16_t manualMoveStep = 1;
46
 uint16_t manualMoveStep = 1;
47
-float distanceFilament = 10;
47
+uint16_t distanceFilament = 10;
48
 uint16_t FilamentSpeed = 25;
48
 uint16_t FilamentSpeed = 25;
49
 float ZOffset_distance = 0.1;
49
 float ZOffset_distance = 0.1;
50
 float mesh_adj_distance = 0.01;
50
 float mesh_adj_distance = 0.01;
554
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
554
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
555
       VPHELPER(VP_LOAD_Filament, nullptr, &ScreenHandler.MKS_FilamentLoad, nullptr),
555
       VPHELPER(VP_LOAD_Filament, nullptr, &ScreenHandler.MKS_FilamentLoad, nullptr),
556
       VPHELPER(VP_UNLOAD_Filament, nullptr, &ScreenHandler.MKS_FilamentUnLoad, nullptr),
556
       VPHELPER(VP_UNLOAD_Filament, nullptr, &ScreenHandler.MKS_FilamentUnLoad, nullptr),
557
-      VPHELPER(VP_Filament_distance, &distanceFilament, &ScreenHandler.GetManualFilament, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
557
+      VPHELPER(VP_Filament_distance, &distanceFilament, &ScreenHandler.GetManualFilament, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
558
       VPHELPER(VP_Filament_speed, &FilamentSpeed, &ScreenHandler.GetManualFilamentSpeed, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
558
       VPHELPER(VP_Filament_speed, &FilamentSpeed, &ScreenHandler.GetManualFilamentSpeed, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
559
     #endif
559
     #endif
560
   #endif
560
   #endif
733
 
733
 
734
 
734
 
735
   // SDCard File listing
735
   // SDCard File listing
736
-  VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
736
+  
737
   #if ENABLED(SDSUPPORT)
737
   #if ENABLED(SDSUPPORT)
738
+    VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
738
     VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
739
     VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
739
     VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
740
     VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
740
     VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
741
     VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
759
       VPHELPER(VP_OFFSET_Y, &probe.offset.y, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
760
       VPHELPER(VP_OFFSET_Y, &probe.offset.y, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
760
       VPHELPER(VP_OFFSET_Z, &probe.offset.z, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
761
       VPHELPER(VP_OFFSET_Z, &probe.offset.z, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
761
     #endif
762
     #endif
763
+  #else 
764
+    VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.PrintReturn, nullptr),
762
   #endif
765
   #endif
763
 
766
 
764
   #if ENABLED(DGUS_UI_WAITING)
767
   #if ENABLED(DGUS_UI_WAITING)

+ 2
- 2
Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.h View File

36
 #define MKS_FINSH
36
 #define MKS_FINSH
37
 
37
 
38
 extern uint16_t manualMoveStep;
38
 extern uint16_t manualMoveStep;
39
-extern float    distanceFilament;
39
+extern uint16_t distanceFilament;
40
 extern uint16_t FilamentSpeed;
40
 extern uint16_t FilamentSpeed;
41
 extern float    ZOffset_distance;
41
 extern float    ZOffset_distance;
42
 extern float    mesh_adj_distance;
42
 extern float    mesh_adj_distance;
55
 
55
 
56
 extern float z_offset_add;
56
 extern float z_offset_add;
57
 
57
 
58
-xyz_int_t tmc_step;
58
+extern xyz_int_t tmc_step;
59
 
59
 
60
 extern uint16_t lcd_default_light;
60
 extern uint16_t lcd_default_light;
61
 
61
 

+ 6
- 1
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp View File

270
     GotoScreen(MKSLCD_SCREEN_PrintDone);
270
     GotoScreen(MKSLCD_SCREEN_PrintDone);
271
   }
271
   }
272
 
272
 
273
+#else
274
+  void DGUSScreenHandler::PrintReturn(DGUS_VP_Variable& var, void *val_ptr) {
275
+    uint16_t value = swap16(*(uint16_t*)val_ptr);
276
+    if (value == 0x0F) GotoScreen(DGUSLCD_SCREEN_MAIN);
277
+  }
273
 #endif // SDSUPPORT
278
 #endif // SDSUPPORT
274
 
279
 
275
 void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
280
 void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
1215
         }
1220
         }
1216
         else {
1221
         else {
1217
           #if EITHER(HAS_MULTI_HOTEND, SINGLENOZZLE)
1222
           #if EITHER(HAS_MULTI_HOTEND, SINGLENOZZLE)
1218
-            swap_tool = 2;
1223
+            swap_tool = 1;
1219
           #endif
1224
           #endif
1220
         }
1225
         }
1221
       #endif
1226
       #endif

+ 5
- 2
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.h View File

158
     static void GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr);
158
     static void GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr);
159
   #endif
159
   #endif
160
 
160
 
161
-  // File touched.
162
-  static void DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr);
161
+  
163
   #if ENABLED(SDSUPPORT)
162
   #if ENABLED(SDSUPPORT)
164
     // Callback for VP "Display wants to change screen when there is a SD card"
163
     // Callback for VP "Display wants to change screen when there is a SD card"
165
     static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
164
     static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
166
     // Scroll buttons on the file listing screen.
165
     // Scroll buttons on the file listing screen.
167
     static void DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable &var, void *val_ptr);
166
     static void DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable &var, void *val_ptr);
167
+    // File touched.
168
+    static void DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr);
168
     // start print after confirmation received.
169
     // start print after confirmation received.
169
     static void DGUSLCD_SD_StartPrint(DGUS_VP_Variable &var, void *val_ptr);
170
     static void DGUSLCD_SD_StartPrint(DGUS_VP_Variable &var, void *val_ptr);
170
     // User hit the pause, resume or abort button.
171
     // User hit the pause, resume or abort button.
183
     static void SDCardError();
184
     static void SDCardError();
184
     // Marlin informed us about SD print completion.
185
     // Marlin informed us about SD print completion.
185
     static void SDPrintingFinished();
186
     static void SDPrintingFinished();
187
+  #else 
188
+    static void PrintReturn(DGUS_VP_Variable &var, void *val_ptr);
186
   #endif
189
   #endif
187
 
190
 
188
   // OK Button the Confirm screen.
191
   // OK Button the Confirm screen.

Loading…
Cancel
Save