josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make count_e() constexpr.

This commit is contained in:
Marek Bel 2019-06-11 19:22:08 +02:00
parent 4effff9e99
commit 21f4669600
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/ultralcd.cpp
View File

@ -246,7 +246,7 @@ static char snmm_stop_print_menu();
#ifdef SDCARD_SORT_ALPHA #ifdef SDCARD_SORT_ALPHA
static void lcd_sort_type_set(); static void lcd_sort_type_set();
#endif #endif
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length); static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
static void lcd_babystep_z(); static void lcd_babystep_z();
static void lcd_send_status(); static void lcd_send_status();
#ifdef FARM_CONNECT_MESSAGE #ifdef FARM_CONNECT_MESSAGE
@ -1680,10 +1680,9 @@ void lcd_commands()
} }
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length) { static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length) {
//returns filament length in mm which needs to be extrude to form line with extrusion_length * extrusion_width * layer heigth dimensions //returns filament length in mm which needs to be extrude to form line with extrusion_length * extrusion_width * layer heigth dimensions
float extr = extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4); return (extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4));
return extr;
} }
void lcd_return_to_status() void lcd_return_to_status()