Bladeren bron

E3 V2 DWIN cleanup

Scott Lahteine 4 jaren geleden
bovenliggende
commit
250bfac0cc
2 gewijzigde bestanden met toevoegingen van 400 en 409 verwijderingen
  1. 374
    383
      Marlin/src/lcd/dwin/e3v2/dwin.cpp
  2. 26
    26
      Marlin/src/lcd/dwin/e3v2/dwin.h

+ 374
- 383
Marlin/src/lcd/dwin/e3v2/dwin.cpp
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 26
- 26
Marlin/src/lcd/dwin/e3v2/dwin.h Bestand weergeven

52
   MaxSpeed_value,
52
   MaxSpeed_value,
53
   MaxAcceleration,
53
   MaxAcceleration,
54
   MaxAcceleration_value,
54
   MaxAcceleration_value,
55
-  MaxCorner,
56
-  MaxCorner_value,
55
+  MaxJerk,
56
+  MaxJerk_value,
57
   Step,
57
   Step,
58
   Step_value,
58
   Step_value,
59
 
59
 
150
 
150
 
151
 #define ICON_MaxSpeed             51
151
 #define ICON_MaxSpeed             51
152
 #define ICON_MaxAccelerated       52
152
 #define ICON_MaxAccelerated       52
153
-#define ICON_MaxCorner            53
153
+#define ICON_MaxJerk              53
154
 #define ICON_Step                 54
154
 #define ICON_Step                 54
155
 #define ICON_PrintSize            55
155
 #define ICON_PrintSize            55
156
 #define ICON_Version              56
156
 #define ICON_Version              56
164
 #define ICON_MaxAccY              64
164
 #define ICON_MaxAccY              64
165
 #define ICON_MaxAccZ              65
165
 #define ICON_MaxAccZ              65
166
 #define ICON_MaxAccE              66
166
 #define ICON_MaxAccE              66
167
-#define ICON_MaxSpeedCornerX      67
168
-#define ICON_MaxSpeedCornerY      68
169
-#define ICON_MaxSpeedCornerZ      69
170
-#define ICON_MaxSpeedCornerE      70
167
+#define ICON_MaxSpeedJerkX        67
168
+#define ICON_MaxSpeedJerkY        68
169
+#define ICON_MaxSpeedJerkZ        69
170
+#define ICON_MaxSpeedJerkE        70
171
 #define ICON_StepX                71
171
 #define ICON_StepX                71
172
 #define ICON_StepY                72
172
 #define ICON_StepY                72
173
 #define ICON_StepZ                73
173
 #define ICON_StepZ                73
231
   int16_t print_speed     = 100;
231
   int16_t print_speed     = 100;
232
   float Max_Feedspeed     = 0;
232
   float Max_Feedspeed     = 0;
233
   float Max_Acceleration  = 0;
233
   float Max_Acceleration  = 0;
234
-  float Max_Corner        = 0;
234
+  float Max_Jerk          = 0;
235
   float Max_Step          = 0;
235
   float Max_Step          = 0;
236
   float Move_X_scale      = 0;
236
   float Move_X_scale      = 0;
237
   float Move_Y_scale      = 0;
237
   float Move_Y_scale      = 0;
261
     char feedspeed_flag;
261
     char feedspeed_flag;
262
   #endif
262
   #endif
263
   char acc_flag;
263
   char acc_flag;
264
-  char corner_flag;
264
+  char jerk_flag;
265
   char step_flag;
265
   char step_flag;
266
 } HMI_Flag;
266
 } HMI_Flag;
267
 
267
 
314
 
314
 
315
 void HMI_MaxFeedspeedXYZE(void);
315
 void HMI_MaxFeedspeedXYZE(void);
316
 void HMI_MaxAccelerationXYZE(void);
316
 void HMI_MaxAccelerationXYZE(void);
317
-void HMI_MaxCornerXYZE(void);
317
+void HMI_MaxJerkXYZE(void);
318
 void HMI_StepXYZE(void);
318
 void HMI_StepXYZE(void);
319
 
319
 
320
 void update_variable(void);
320
 void update_variable(void);
332
 
332
 
333
 // Other
333
 // Other
334
 bool Pause_HeatStatus();
334
 bool Pause_HeatStatus();
335
-void HMI_StartFrame(const bool with_update); // startup screen
336
-void HMI_MainMenu(void);          // main process screen
337
-void HMI_SelectFile(void);        // file page
338
-void HMI_Printing(void);          // print page
339
-void HMI_Prepare(void);           // prepare page
340
-void HMI_Control(void);           // control page
341
-void HMI_Leveling(void);          // Level the page
342
-void HMI_AxisMove(void);          // Axis movement menu
343
-void HMI_Temperature(void);       // Temperature menu
344
-void HMI_Motion(void);            // Sports menu
345
-void HMI_Info(void);              // Information menu
346
-void HMI_Tune(void);              // Adjust the menu
335
+void HMI_StartFrame(const bool with_update); // Startup screen
336
+void HMI_MainMenu(void);    // Main process screen
337
+void HMI_SelectFile(void);  // File page
338
+void HMI_Printing(void);    // Print page
339
+void HMI_Prepare(void);     // Prepare page
340
+void HMI_Control(void);     // Control page
341
+void HMI_Leveling(void);    // Level the page
342
+void HMI_AxisMove(void);    // Axis movement menu
343
+void HMI_Temperature(void); // Temperature menu
344
+void HMI_Motion(void);      // Sports menu
345
+void HMI_Info(void);        // Information menu
346
+void HMI_Tune(void);        // Adjust the menu
347
 
347
 
348
 #if HAS_HOTEND
348
 #if HAS_HOTEND
349
   void HMI_PLAPreheatSetting(void); // PLA warm-up setting
349
   void HMI_PLAPreheatSetting(void); // PLA warm-up setting
350
   void HMI_ABSPreheatSetting(void); // ABS warm-up setting
350
   void HMI_ABSPreheatSetting(void); // ABS warm-up setting
351
 #endif
351
 #endif
352
 
352
 
353
-void HMI_MaxSpeed(void);          // Maximum speed submenu
354
-void HMI_MaxAcceleration(void);   // Maximum acceleration submenu
355
-void HMI_MaxCorner(void);         // Maximum corner speed submenu
356
-void HMI_Step(void);              // transmission ratio
353
+void HMI_MaxSpeed(void);        // Maximum speed submenu
354
+void HMI_MaxAcceleration(void); // Maximum acceleration submenu
355
+void HMI_MaxJerk(void);         // Maximum jerk speed submenu
356
+void HMI_Step(void);            // Transmission ratio
357
 
357
 
358
 void HMI_Init(void);
358
 void HMI_Init(void);
359
 void DWIN_Update(void);
359
 void DWIN_Update(void);

Laden…
Annuleren
Opslaan