SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix & clean up ExtUI (#14748)

Browse source
This commit is contained in:
Ludy 2019-07-28 05:44:05 +02:00 committed by Scott Lahteine
parent 59e97e5e52
commit 97e9c95f47
4 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
View file

@ -29,6 +29,10 @@
#include "../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../feature/bedlevel/bedlevel.h" #include "../../../feature/bedlevel/bedlevel.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../../lcd/extensible_ui/ui_api.h"
#endif
mesh_bed_leveling mbl; mesh_bed_leveling mbl;
float mesh_bed_leveling::z_offset, float mesh_bed_leveling::z_offset,

4
Marlin/src/gcode/bedlevel/mbl/G29.cpp
View file

@ -38,6 +38,10 @@
#include "../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../module/stepper.h" #include "../../../module/stepper.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../../lcd/extensible_ui/ui_api.h"
#endif
// Save 130 bytes with non-duplication of PSTR // Save 130 bytes with non-duplication of PSTR
inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM(" not entered."); } inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM(" not entered."); }

29
Marlin/src/lcd/extui_malyan_lcd.cpp
View file

@ -114,20 +114,18 @@ void write_to_lcd(const char * const message) {
void process_lcd_c_command(const char* command) { void process_lcd_c_command(const char* command) {
switch (command[0]) { switch (command[0]) {
case 'C': // Cope with both V1 early rev and later LCDs. case 'C': // Cope with both V1 early rev and later LCDs.
case 'S': { case 'S':
feedrate_percentage = atoi(command + 1) * 10; feedrate_percentage = atoi(command + 1) * 10;
LIMIT(feedrate_percentage, 10, 999); LIMIT(feedrate_percentage, 10, 999);
} break; break;
case 'T': {
thermalManager.setTargetHotend(atoi(command + 1), 0);
} break;
case 'P': {
thermalManager.setTargetBed(atoi(command + 1));
} break;
default: case 'T': thermalManager.setTargetHotend(atoi(command + 1), 0); break;
SERIAL_ECHOLNPAIR("UNKNOWN C COMMAND", command);
return; #if HAS_HEATED_BED
case 'P': thermalManager.setTargetBed(atoi(command + 1)); break;
#endif
default: SERIAL_ECHOLNPAIR("UNKNOWN C COMMAND", command);
} }
} }
@ -149,11 +147,9 @@ void process_lcd_eb_command(const char* command) {
char message_buffer[MAX_CURLY_COMMAND]; char message_buffer[MAX_CURLY_COMMAND];
sprintf_P(message_buffer, sprintf_P(message_buffer,
PSTR("{T0:%03.0f/%03i}{T1:000/000}{TP:%03.0f/%03i}{TQ:%03i}{TT:%s}"), PSTR("{T0:%03.0f/%03i}{T1:000/000}{TP:%03.0f/%03i}{TQ:%03i}{TT:%s}"),
thermalManager.degHotend(0), thermalManager.degHotend(0), thermalManager.degTargetHotend(0),
thermalManager.degTargetHotend(0),
#if HAS_HEATED_BED #if HAS_HEATED_BED
thermalManager.degBed(), thermalManager.degBed(), thermalManager.degTargetBed(),
thermalManager.degTargetBed(),
#else #else
0, 0, 0, 0,
#endif #endif
@ -162,7 +158,8 @@ void process_lcd_eb_command(const char* command) {
#else #else
0, 0,
#endif #endif
elapsed_buffer); elapsed_buffer
);
write_to_lcd(message_buffer); write_to_lcd(message_buffer);
} break; } break;

4
Marlin/src/module/configuration_store.cpp
View file

@ -98,10 +98,8 @@
#include "../feature/runout.h" #include "../feature/runout.h"
#endif #endif
#include "../lcd/extensible_ui/ui_api.h"
#if ENABLED(EXTRA_LIN_ADVANCE_K) #if ENABLED(EXTRA_LIN_ADVANCE_K)
extern float saved_extruder_advance_K[EXTRUDERS]; extern float saved_extruder_advance_K[EXTRUDERS];
#endif #endif
#if EXTRUDERS > 1 #if EXTRUDERS > 1