From 896734c06bc74c0eef63e509c18d62a5b5ede7a7 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 23 Jul 2018 14:30:41 +0200 Subject: [PATCH] Display '!' instead of 'FR' on status screen when feedrate or acceleration limit reached. --- Firmware/planner.cpp | 14 ++++++++++---- Firmware/planner.h | 2 ++ Firmware/ultralcd.cpp | 8 +++++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 9b08ea67..e89cbef8 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -109,6 +109,8 @@ static float previous_speed[NUM_AXIS]; // Speed of previous path line segment static float previous_nominal_speed; // Nominal speed of previous path line segment static float previous_safe_speed; // Exit speed limited by a jerk to full halt of a previous last segment. +uint8_t maxlimit_status; + #ifdef AUTOTEMP float autotemp_max=250; float autotemp_min=210; @@ -961,11 +963,15 @@ Having the real displacement of the head, we can calculate the total movement le // Calculate and limit speed in mm/sec for each axis float current_speed[4]; float speed_factor = 1.0; //factor <=1 do decrease speed +// maxlimit_status &= ~0xf; for(int i=0; i < 4; i++) { current_speed[i] = delta_mm[i] * inverse_second; if(fabs(current_speed[i]) > max_feedrate[i]) + { speed_factor = min(speed_factor, max_feedrate[i] / fabs(current_speed[i])); + maxlimit_status |= (1 << i); + } } // Correct the speed @@ -993,13 +999,13 @@ Having the real displacement of the head, we can calculate the total movement le // Limit acceleration per axis //FIXME Vojtech: One shall rather limit a projection of the acceleration vector instead of using the limit. if(((float)block->acceleration_st * (float)block->steps_x.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[X_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[X_AXIS]; + { block->acceleration_st = axis_steps_per_sqr_second[X_AXIS]; maxlimit_status |= (X_AXIS_MASK << 4); } if(((float)block->acceleration_st * (float)block->steps_y.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[Y_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[Y_AXIS]; + { block->acceleration_st = axis_steps_per_sqr_second[Y_AXIS]; maxlimit_status |= (Y_AXIS_MASK << 4); } if(((float)block->acceleration_st * (float)block->steps_e.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[E_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[E_AXIS]; + { block->acceleration_st = axis_steps_per_sqr_second[E_AXIS]; maxlimit_status |= (Z_AXIS_MASK << 4); } if(((float)block->acceleration_st * (float)block->steps_z.wide / (float)block->step_event_count.wide ) > axis_steps_per_sqr_second[Z_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[Z_AXIS]; + { block->acceleration_st = axis_steps_per_sqr_second[Z_AXIS]; maxlimit_status |= (E_AXIS_MASK << 4); } } // Acceleration of the segment, in mm/sec^2 block->acceleration = block->acceleration_st / steps_per_mm; diff --git a/Firmware/planner.h b/Firmware/planner.h index 779fc79b..8d648c8e 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -182,6 +182,8 @@ extern float mintravelfeedrate; extern unsigned long axis_steps_per_sqr_second[NUM_AXIS]; extern long position[NUM_AXIS]; +extern uint8_t maxlimit_status; + #ifdef AUTOTEMP extern bool autotemp_enabled; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6996cfd4..fcbb7a51 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -653,7 +653,13 @@ static void lcd_implementation_status_screen() //Print Feedrate lcd_set_cursor(LCD_WIDTH - 8-2, 1); lcd_puts_P(PSTR(" ")); - lcd_print(LCD_STR_FEEDRATE[0]); + if (maxlimit_status) + { + maxlimit_status = 0; + lcd_print('!'); + } + else + lcd_print(LCD_STR_FEEDRATE[0]); lcd_print(itostr3(feedmultiply)); lcd_puts_P(PSTR("% ")); #endif /* PLANNER_DIAGNOSTICS */