From 53e9e8c7b3a4f852f4a2abef9c00797acdf4528a Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Sun, 17 Mar 2019 01:00:47 -0400 Subject: [PATCH] close the night... --- Marlin/Configuration_adv.h | 2 ++ Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index e41e1dcd6c..171bf2c28c 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -531,6 +531,8 @@ #if ENABLED(ULTIPANEL) || ENABLED(EXTENSIBLE_UI) #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel +#endif +#if ENABLED(ULTIPANEL) #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions #define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder #endif diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp index 8bd834d3b5..bebc0c53e1 100644 --- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp @@ -60,10 +60,10 @@ bool PoweroffContinue = false; extern const char *injected_commands_P; char commandbuf[30]; +//RTSSHOW rtscheck; void onStartup() { Serial2.begin(115200); - LanguageRecbuf = 0; //Force language to English, 1=Chinese but currently not implemented AutoLevelStatus = 1; //Set auto leveling on int showcount = 0; @@ -382,6 +382,12 @@ char commandbuf[30]; } +RTSSHOW::RTSSHOW(){ + recdat.head[0] = snddat.head[0] = FHONE; + recdat.head[1] = snddat.head[1] = FHTWO; + memset(databuf,0, sizeof(databuf)); +} + int RTSSHOW::RTS_RecData() { while(Serial2.available() > 0 && (recnum < SizeofDatabuf))