3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-31 22:20:56 +00:00
Code Issues Releases Wiki Activity

🐛 Followup to JyersUI

Browse source
This commit is contained in:
Scott Lahteine 2021-09-10 18:49:57 -05:00
parent bcfaf3990a
commit 67d82ff228
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/MarlinCore.h
View file

@ -23,10 +23,6 @@
#include "inc/MarlinConfig.h" #include "inc/MarlinConfig.h"
#ifdef DEBUG_GCODE_PARSER
#include "gcode/parser.h"
#endif
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

4
Marlin/src/gcode/gcode.h
View file

@ -21,10 +21,6 @@
*/ */
#pragma once #pragma once
/**
* gcode.h - Temporary container for all gcode handlers
*/
/** /**
* ----------------- * -----------------
* G-Codes in Marlin * G-Codes in Marlin

7
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View file

@ -33,6 +33,7 @@
#include "../../marlinui.h" #include "../../marlinui.h"
#include "../../../MarlinCore.h" #include "../../../MarlinCore.h"
#include "../../../gcode/gcode.h"
#include "../../../module/temperature.h" #include "../../../module/temperature.h"
#include "../../../module/planner.h" #include "../../../module/planner.h"
#include "../../../module/settings.h" #include "../../../module/settings.h"
@ -180,6 +181,7 @@ bool probe_deployed = false;
CrealityDWINClass CrealityDWIN; CrealityDWINClass CrealityDWIN;
#if HAS_MESH #if HAS_MESH
struct Mesh_Settings { struct Mesh_Settings {
bool viewer_asymmetric_range = false; bool viewer_asymmetric_range = false;
bool viewer_print_value = false; bool viewer_print_value = false;
@ -362,7 +364,7 @@ CrealityDWINClass CrealityDWIN;
if (v_min > 3e+10F) v_min = 0.0000001; if (v_min > 3e+10F) v_min = 0.0000001;
if (v_max > 3e+10F) v_max = 0.0000001; if (v_max > 3e+10F) v_max = 0.0000001;
if (range > 3e+10F) range = 0.0000001; if (range > 3e+10F) range = 0.0000001;
char msg[32]; char msg[46];
if (viewer_asymmetric_range) { if (viewer_asymmetric_range) {
dtostrf(-v_min, 1, 3, str_1); dtostrf(-v_min, 1, 3, str_1);
dtostrf( v_max, 1, 3, str_2); dtostrf( v_max, 1, 3, str_2);
@ -378,7 +380,8 @@ CrealityDWINClass CrealityDWIN;
}; };
Mesh_Settings mesh_conf; Mesh_Settings mesh_conf;
#endif
#endif // HAS_MESH
/* General Display Functions */ /* General Display Functions */