Tweak serial output code

This commit is contained in:
Scott Lahteine 2019-02-02 23:32:48 -06:00
parent a5e3384691
commit 4fa1c52688
10 changed files with 14 additions and 14 deletions

View file

@ -176,7 +176,7 @@ TMC26XStepper::TMC26XStepper(const int16_t in_steps, int16_t cs_pin, int16_t dir
void TMC26XStepper::start() { void TMC26XStepper::start() {
#ifdef TMC_DEBUG1 #ifdef TMC_DEBUG1
SERIAL_ECHOPGM("\n TMC26X stepper library \n"); SERIAL_ECHOLNPGM("\n TMC26X stepper library");
SERIAL_ECHOPAIR("\n CS pin: ", cs_pin); SERIAL_ECHOPAIR("\n CS pin: ", cs_pin);
SERIAL_ECHOPAIR("\n DIR pin: ", dir_pin); SERIAL_ECHOPAIR("\n DIR pin: ", dir_pin);
SERIAL_ECHOPAIR("\n STEP pin: ", step_pin); SERIAL_ECHOPAIR("\n STEP pin: ", step_pin);

View file

@ -203,7 +203,7 @@
SERIAL_ECHOPGM("\nBed Topography Report"); SERIAL_ECHOPGM("\nBed Topography Report");
if (human) { if (human) {
SERIAL_ECHOPGM(":\n\n"); SERIAL_ECHOLNPGM(":\n");
serial_echo_xy(4, MESH_MIN_X, MESH_MAX_Y); serial_echo_xy(4, MESH_MIN_X, MESH_MAX_Y);
serial_echo_xy(twixt, MESH_MAX_X, MESH_MAX_Y); serial_echo_xy(twixt, MESH_MAX_X, MESH_MAX_Y);
SERIAL_EOL(); SERIAL_EOL();

View file

@ -1407,7 +1407,7 @@
#endif #endif
if (abort_flag) { if (abort_flag) {
SERIAL_ECHOPGM("?Error probing point. Aborting operation.\n"); SERIAL_ECHOLNPGM("?Error probing point. Aborting operation.");
return; return;
} }
} }

View file

@ -62,7 +62,7 @@ void Mixer::normalize(const uint8_t tool_index) {
SERIAL_ECHO_F(collector[i] / csum, 3); SERIAL_ECHO_F(collector[i] / csum, 3);
SERIAL_CHAR(' '); SERIAL_CHAR(' ');
} }
SERIAL_ECHOPGM("]\n"); SERIAL_ECHOLNPGM("]");
#endif #endif
// Scale all values so their maximum is COLOR_A_MASK // Scale all values so their maximum is COLOR_A_MASK

View file

@ -517,11 +517,11 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
*/ */
void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_length/*=0*/, const float &purge_length/*=ADVANCED_PAUSE_PURGE_LENGTH*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) { void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_length/*=0*/, const float &purge_length/*=ADVANCED_PAUSE_PURGE_LENGTH*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
/* /*
SERIAL_ECHOPGM("start of resume_print()\n"); SERIAL_ECHOLNPGM("start of resume_print()");
SERIAL_ECHOPAIR("\ndual_x_carriage_mode:", dual_x_carriage_mode); SERIAL_ECHOPAIR("\ndual_x_carriage_mode:", dual_x_carriage_mode);
SERIAL_ECHOPAIR("\nextruder_duplication_enabled:", extruder_duplication_enabled); SERIAL_ECHOPAIR("\nextruder_duplication_enabled:", extruder_duplication_enabled);
SERIAL_ECHOPAIR("\nactive_extruder:", active_extruder); SERIAL_ECHOPAIR("\nactive_extruder:", active_extruder);
SERIAL_ECHOPGM("\n\n"); SERIAL_ECHOLNPGM("\n");
//*/ //*/
if (!did_pause_print) return; if (!did_pause_print) return;

View file

@ -63,8 +63,8 @@
if (dual_x_carriage_mode == DXC_SCALED_DUPLICATION_MODE) { if (dual_x_carriage_mode == DXC_SCALED_DUPLICATION_MODE) {
if (previous_mode != DXC_DUPLICATION_MODE) { if (previous_mode != DXC_DUPLICATION_MODE) {
SERIAL_ECHOPGM("Printer must be in DXC_DUPLICATION_MODE prior to \n"); SERIAL_ECHOLNPGM("Printer must be in DXC_DUPLICATION_MODE prior to ");
SERIAL_ECHOPGM("specifying DXC_SCALED_DUPLICATION_MODE.\n"); SERIAL_ECHOLNPGM("specifying DXC_SCALED_DUPLICATION_MODE.");
dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE; dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
return; return;
} }

View file

@ -357,7 +357,7 @@ void GCodeParser::unknown_command_error() {
SERIAL_ECHO(string_arg); SERIAL_ECHO(string_arg);
SERIAL_CHAR('"'); SERIAL_CHAR('"');
} }
SERIAL_ECHOPGM("\n\n"); SERIAL_ECHOLNPGM("\n");
for (char c = 'A'; c <= 'Z'; ++c) { for (char c = 'A'; c <= 'Z'; ++c) {
if (seen(c)) { if (seen(c)) {
SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':"); SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':");
@ -376,7 +376,7 @@ void GCodeParser::unknown_command_error() {
} }
else else
SERIAL_ECHOPGM(" (no value)"); SERIAL_ECHOPGM(" (no value)");
SERIAL_ECHOPGM("\n\n"); SERIAL_ECHOLNPGM("\n");
} }
} }
} }

View file

@ -144,7 +144,7 @@ bool enqueue_and_echo_command(const char* cmd) {
//SERIAL_ECHOPGM("\") \n"); //SERIAL_ECHOPGM("\") \n");
if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') { if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') {
//SERIAL_ECHOPGM("Null command found... Did not queue!\n"); //SERIAL_ECHOLNPGM("Null command found... Did not queue!");
return true; return true;
} }

View file

@ -1961,7 +1961,7 @@ void MarlinSettings::postprocess() {
const bool status = persistentStore.write_data(pos, (uint8_t *)&ubl.z_values, sizeof(ubl.z_values), &crc); const bool status = persistentStore.write_data(pos, (uint8_t *)&ubl.z_values, sizeof(ubl.z_values), &crc);
persistentStore.access_finish(); persistentStore.access_finish();
if (status) SERIAL_ECHOPGM("?Unable to save mesh data.\n"); if (status) SERIAL_ECHOLNPGM("?Unable to save mesh data.");
else CHITCHAT_ECHOLNPAIR("Mesh saved in slot ", slot); else CHITCHAT_ECHOLNPAIR("Mesh saved in slot ", slot);
#else #else
@ -1990,7 +1990,7 @@ void MarlinSettings::postprocess() {
const uint16_t status = persistentStore.read_data(pos, dest, sizeof(ubl.z_values), &crc); const uint16_t status = persistentStore.read_data(pos, dest, sizeof(ubl.z_values), &crc);
persistentStore.access_finish(); persistentStore.access_finish();
if (status) SERIAL_ECHOPGM("?Unable to load mesh data.\n"); if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
else CHITCHAT_ECHOLNPAIR("Mesh loaded from slot ", slot); else CHITCHAT_ECHOLNPAIR("Mesh loaded from slot ", slot);
EEPROM_FINISH(); EEPROM_FINISH();

View file

@ -872,7 +872,7 @@ void Endstops::update() {
#if HAS_Z3_MAX #if HAS_Z3_MAX
ES_REPORT_CHANGE(Z3_MAX); ES_REPORT_CHANGE(Z3_MAX);
#endif #endif
SERIAL_ECHOPGM("\n\n"); SERIAL_ECHOLNPGM("\n");
analogWrite(LED_PIN, local_LED_status); analogWrite(LED_PIN, local_LED_status);
local_LED_status ^= 255; local_LED_status ^= 255;
old_live_state_local = live_state_local; old_live_state_local = live_state_local;