Fix some other SERIAL_ECHO

parent b1fb1c6a
...@@ -178,7 +178,7 @@ void laser_wait_for_peripherals() { ...@@ -178,7 +178,7 @@ void laser_wait_for_peripherals() {
while(!laser_peripherals_ok()) { while(!laser_peripherals_ok()) {
if (millis() > timeout) { if (millis() > timeout) {
if (laser.diagnostics) { if (laser.diagnostics) {
ECHO_LM(ERR, "Peripheral control board failed to respond"); ECHO_LM(ER, "Peripheral control board failed to respond");
} }
Stop(); Stop();
break; break;
......
...@@ -889,8 +889,7 @@ float junction_deviation = 0.1; ...@@ -889,8 +889,7 @@ float junction_deviation = 0.1;
if (laser.diagnostics) { if (laser.diagnostics) {
if (block->laser_status == LASER_ON) { if (block->laser_status == LASER_ON) {
SERIAL_ECHO_START; ECHO_LM(INFO, "Laser firing enabled");
SERIAL_ECHOLNPGM("Laser firing enabled");
} }
} }
#endif // LASER #endif // LASER
......
...@@ -655,7 +655,7 @@ ISR(TIMER1_COMPA_vect) { ...@@ -655,7 +655,7 @@ ISR(TIMER1_COMPA_vect) {
#if ENABLED(LASER) #if ENABLED(LASER)
if (laser.dur != 0 && (laser.last_firing + laser.dur < micros())) { if (laser.dur != 0 && (laser.last_firing + laser.dur < micros())) {
if (laser.diagnostics) SERIAL_ECHOLN("Laser firing duration elapsed, in interrupt handler"); if (laser.diagnostics) ECHO_LM(INFO,"Laser firing duration elapsed, in interrupt handler");
laser_extinguish(); laser_extinguish();
#endif #endif
...@@ -717,7 +717,7 @@ ISR(TIMER1_COMPA_vect) { ...@@ -717,7 +717,7 @@ ISR(TIMER1_COMPA_vect) {
laser_fire(current_block->laser_intensity); laser_fire(current_block->laser_intensity);
} }
if (current_block->laser_status == LASER_OFF) { if (current_block->laser_status == LASER_OFF) {
if (laser.diagnostics) SERIAL_ECHOLN("Laser status set to off, in interrupt handler"); if (laser.diagnostics) ECHO_LM(INFO,"Laser status set to off, in interrupt handler");
laser_extinguish(); laser_extinguish();
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment