bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix axis char printing

Browse Source
This commit is contained in:
Scott Lahteine
2021-04-07 15:43:07 -05:00
parent facbbba789
commit 1879eede0d
14 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
View File

@ -639,7 +639,7 @@ namespace Anycubic {
float newposition = atof(&panel_command[6]);
#if ACDEBUG(AC_ACTION)
SERIAL_ECHOLNPAIR("Nudge ", panel_command[4], " axis ", newposition);
SERIAL_ECHOLNPAIR("Nudge ", AS_CHAR(panel_command[4]), " axis ", newposition);
#endif
switch (panel_command[4]) {

6
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp
View File

@ -188,7 +188,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
if (!movevalue) {
// homing
DEBUG_ECHOPAIR(" homing ", axiscode);
DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
char buf[6] = "G28 X";
buf[4] = axiscode;
//DEBUG_ECHOPAIR(" ", buf);
@ -199,7 +199,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
}
else {
// movement
DEBUG_ECHOPAIR(" move ", axiscode);
DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
bool old_relative_mode = relative_mode;
if (!relative_mode) {
//DEBUG_ECHOPGM(" G91");
@ -235,7 +235,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
return;
cannotmove:
DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
return;
}

6
Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp
View File

@ -188,7 +188,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
if (!movevalue) {
// homing
DEBUG_ECHOPAIR(" homing ", axiscode);
DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
char buf[6] = "G28 X";
buf[4] = axiscode;
//DEBUG_ECHOPAIR(" ", buf);
@ -199,7 +199,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
}
else {
// movement
DEBUG_ECHOPAIR(" move ", axiscode);
DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
bool old_relative_mode = relative_mode;
if (!relative_mode) {
//DEBUG_ECHOPGM(" G91");
@ -235,7 +235,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
return;
cannotmove:
DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
return;
}

8
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
View File

@ -835,7 +835,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
if (!movevalue) {
// homing
DEBUG_ECHOPAIR(" homing ", axiscode);
DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
// char buf[6] = "G28 X";
// buf[4] = axiscode;
@ -850,14 +850,14 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
else if (movevalue == 5) {
DEBUG_ECHOPAIR("send M84");
char buf[6];
snprintf_P(buf,6,PSTR("M84 %c"),axiscode);
snprintf_P(buf,6,PSTR("M84 %c"), axiscode);
queue.enqueue_one_now(buf);
ForceCompleteUpdate();
return;
}
else {
// movement
DEBUG_ECHOPAIR(" move ", axiscode);
DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
bool old_relative_mode = relative_mode;
if (!relative_mode) {
@ -895,7 +895,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
return;
cannotmove:
DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
return;
}

6
Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
View File

@ -188,7 +188,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
if (!movevalue) {
// homing
DEBUG_ECHOPAIR(" homing ", axiscode);
DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
char buf[6] = "G28 X";
buf[4] = axiscode;
//DEBUG_ECHOPAIR(" ", buf);
@ -199,7 +199,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
}
else {
// movement
DEBUG_ECHOPAIR(" move ", axiscode);
DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
bool old_relative_mode = relative_mode;
if (!relative_mode) {
//DEBUG_ECHOPGM(" G91");
@ -235,7 +235,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
return;
cannotmove:
DEBUG_ECHOLNPAIR(" cannot move ", axiscode);
DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
return;
}

8
Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp
View File

@ -144,10 +144,10 @@ bool NextionTFT::ReadTFTCommand() {
#if NEXDEBUG(N_SOME)
uint8_t req = atoi(&nextion_command[1]);
if (req > 7 && req != 20)
DEBUG_ECHOLNPAIR( "> ", nextion_command[0],
"\n> ", nextion_command[1],
"\n> ", nextion_command[2],
"\n> ", nextion_command[3],
DEBUG_ECHOLNPAIR( "> ", AS_CHAR(nextion_command[0]),
"\n> ", AS_CHAR(nextion_command[1]),
"\n> ", AS_CHAR(nextion_command[2]),
"\n> ", AS_CHAR(nextion_command[3]),
"\nprinter_state:", printer_state);
#endif
}

4
Marlin/src/lcd/marlinui.cpp
View File

@ -761,7 +761,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
// For Cartesian / Core motion simply move to the current_position
planner.buffer_line(current_position, fr_mm_s, axis == E_AXIS ? e_index : active_extruder);
//SERIAL_ECHOLNPAIR("Add planner.move with Axis ", axis, " at FR ", fr_mm_s);
//SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
axis = NO_AXIS;
@ -782,7 +782,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
#endif
start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
axis = move_axis;
//SERIAL_ECHOLNPAIR("Post Move with Axis ", axis, " soon.");
//SERIAL_ECHOLNPAIR("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
}
#if ENABLED(AUTO_BED_LEVELING_UBL)