Fix some compilation issues

parent ef9534f4
...@@ -885,7 +885,8 @@ float junction_deviation = 0.1; ...@@ -885,7 +885,8 @@ float junction_deviation = 0.1;
} else { } else {
block->steps_l = 0; block->steps_l = 0;
} }
block->step_event_count = max(block->steps_x, max(block->steps_y, max(block->steps_z, max(block->steps_e, block->steps_l)))); // NEXTIME
block->step_event_count = max(block->steps[X_AXIS], max(block->steps[Y_AXIS], max(block->steps[Z_AXIS], max(block->steps[E_AXIS], block->steps_l))));
if (laser.diagnostics) { if (laser.diagnostics) {
if (block->laser_status == LASER_ON) { if (block->laser_status == LASER_ON) {
......
...@@ -657,6 +657,7 @@ ISR(TIMER1_COMPA_vect) { ...@@ -657,6 +657,7 @@ ISR(TIMER1_COMPA_vect) {
if (laser.dur != 0 && (laser.last_firing + laser.dur < micros())) { if (laser.dur != 0 && (laser.last_firing + laser.dur < micros())) {
if (laser.diagnostics) ECHO_LM(INFO,"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
// If there is no current block, attempt to pop one from the buffer // If there is no current block, attempt to pop one from the buffer
...@@ -808,9 +809,9 @@ ISR(TIMER1_COMPA_vect) { ...@@ -808,9 +809,9 @@ ISR(TIMER1_COMPA_vect) {
if (current_block->laser_mode == PULSED && current_block->laser_status == LASER_ON) { // Pulsed Firing Mode if (current_block->laser_mode == PULSED && current_block->laser_status == LASER_ON) { // Pulsed Firing Mode
laser_fire(current_block->laser_intensity); laser_fire(current_block->laser_intensity);
if (laser.diagnostics) { if (laser.diagnostics) {
SERIAL_ECHOPAIR("X: ", counter_x); ECHO_MV("X: ", counter_x);
SERIAL_ECHOPAIR("Y: ", counter_y); ECHO_MV("Y: ", counter_y);
SERIAL_ECHOPAIR("L: ", counter_l); ECHO_MV("L: ", counter_l);
} }
} }
#if ENABLED(LASER_RASTER) #if ENABLED(LASER_RASTER)
...@@ -819,7 +820,7 @@ ISR(TIMER1_COMPA_vect) { ...@@ -819,7 +820,7 @@ ISR(TIMER1_COMPA_vect) {
// going from darkened paper to burning through paper. // going from darkened paper to burning through paper.
laser_fire(current_block->laser_raster_data[counter_raster]); laser_fire(current_block->laser_raster_data[counter_raster]);
if (laser.diagnostics) { if (laser.diagnostics) {
SERIAL_ECHOPAIR("Pixel: ", (float)current_block->laser_raster_data[counter_raster]); ECHO_MV("Pixel: ", (float)current_block->laser_raster_data[counter_raster]);
} }
counter_raster++; counter_raster++;
} }
...@@ -827,7 +828,7 @@ ISR(TIMER1_COMPA_vect) { ...@@ -827,7 +828,7 @@ ISR(TIMER1_COMPA_vect) {
counter_l -= current_block->step_event_count; counter_l -= current_block->step_event_count;
} }
if (current_block->laser_duration != 0 && (laser.last_firing + current_block->laser_duration < micros())) { if (current_block->laser_duration != 0 && (laser.last_firing + current_block->laser_duration < micros())) {
if (laser.diagnostics) SERIAL_ECHOLN("Laser firing duration elapsed, in interrupt fast loop"); if (laser.diagnostics) ECHO_LM(INFO, "Laser firing duration elapsed, in interrupt fast loop");
laser_extinguish(); laser_extinguish();
} }
#endif // LASER #endif // LASER
......
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