Browse Source

🐛 Followup to JyersUI

Scott Lahteine 3 years ago
parent
commit
67d82ff228
3 changed files with 5 additions and 10 deletions
  1. 0
    4
      Marlin/src/MarlinCore.h
  2. 0
    4
      Marlin/src/gcode/gcode.h
  3. 5
    2
      Marlin/src/lcd/e3v2/jyersui/dwin.cpp

+ 0
- 4
Marlin/src/MarlinCore.h View File

23
 
23
 
24
 #include "inc/MarlinConfig.h"
24
 #include "inc/MarlinConfig.h"
25
 
25
 
26
-#ifdef DEBUG_GCODE_PARSER
27
-  #include "gcode/parser.h"
28
-#endif
29
-
30
 #include <math.h>
26
 #include <math.h>
31
 #include <stdio.h>
27
 #include <stdio.h>
32
 #include <stdlib.h>
28
 #include <stdlib.h>

+ 0
- 4
Marlin/src/gcode/gcode.h View File

22
 #pragma once
22
 #pragma once
23
 
23
 
24
 /**
24
 /**
25
- * gcode.h - Temporary container for all gcode handlers
26
- */
27
-
28
-/**
29
  * -----------------
25
  * -----------------
30
  * G-Codes in Marlin
26
  * G-Codes in Marlin
31
  * -----------------
27
  * -----------------

+ 5
- 2
Marlin/src/lcd/e3v2/jyersui/dwin.cpp View File

33
 #include "../../marlinui.h"
33
 #include "../../marlinui.h"
34
 #include "../../../MarlinCore.h"
34
 #include "../../../MarlinCore.h"
35
 
35
 
36
+#include "../../../gcode/gcode.h"
36
 #include "../../../module/temperature.h"
37
 #include "../../../module/temperature.h"
37
 #include "../../../module/planner.h"
38
 #include "../../../module/planner.h"
38
 #include "../../../module/settings.h"
39
 #include "../../../module/settings.h"
180
 CrealityDWINClass CrealityDWIN;
181
 CrealityDWINClass CrealityDWIN;
181
 
182
 
182
 #if HAS_MESH
183
 #if HAS_MESH
184
+
183
   struct Mesh_Settings {
185
   struct Mesh_Settings {
184
     bool viewer_asymmetric_range = false;
186
     bool viewer_asymmetric_range = false;
185
     bool viewer_print_value = false;
187
     bool viewer_print_value = false;
362
       if (v_min > 3e+10F) v_min = 0.0000001;
364
       if (v_min > 3e+10F) v_min = 0.0000001;
363
       if (v_max > 3e+10F) v_max = 0.0000001;
365
       if (v_max > 3e+10F) v_max = 0.0000001;
364
       if (range > 3e+10F) range = 0.0000001;
366
       if (range > 3e+10F) range = 0.0000001;
365
-      char msg[32];
367
+      char msg[46];
366
       if (viewer_asymmetric_range) {
368
       if (viewer_asymmetric_range) {
367
         dtostrf(-v_min, 1, 3, str_1);
369
         dtostrf(-v_min, 1, 3, str_1);
368
         dtostrf( v_max, 1, 3, str_2);
370
         dtostrf( v_max, 1, 3, str_2);
378
 
380
 
379
   };
381
   };
380
   Mesh_Settings mesh_conf;
382
   Mesh_Settings mesh_conf;
381
-#endif
383
+
384
+#endif // HAS_MESH
382
 
385
 
383
 /* General Display Functions */
386
 /* General Display Functions */
384
 
387
 

Loading…
Cancel
Save