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

indentation

This commit is contained in:
3d-gussner 2021-02-07 10:37:41 +01:00
parent f4ca6ee59d
commit ae48e7c3ce
2 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Firmware/Marlin_main.cpp
View File

@ -6405,7 +6405,9 @@ Sigma_Exit:
- `S` - Time in silent mode - `S` - Time in silent mode
- `C` - Time to change/pause/user interaction - `C` - Time to change/pause/user interaction
*/ */
//!@todo update RepRap Gcode wiki
case 73: //M73 show percent done and time remaining case 73: //M73 show percent done and time remaining
{
if(code_seen('P')) print_percent_done_normal = code_value(); if(code_seen('P')) print_percent_done_normal = code_value();
if(code_seen('R')) print_time_remaining_normal = code_value(); if(code_seen('R')) print_time_remaining_normal = code_value();
if(code_seen('Q')) print_percent_done_silent = code_value(); if(code_seen('Q')) print_percent_done_silent = code_value();
@ -6423,9 +6425,8 @@ Sigma_Exit:
print_time_to_change = code_value(); print_time_to_change = code_value();
printf_P(_N("Time to next change in mins: %d\n"), print_time_to_change); printf_P(_N("Time to next change in mins: %d\n"), print_time_to_change);
} }
break; break;
}
/*! /*!
### M104 - Set hotend temperature <a href="https://reprap.org/wiki/G-code#M104:_Set_Extruder_Temperature">M104: Set Extruder Temperature</a> ### M104 - Set hotend temperature <a href="https://reprap.org/wiki/G-code#M104:_Set_Extruder_Temperature">M104: Set Extruder Temperature</a>
#### Usage #### Usage
@ -11663,7 +11664,8 @@ void print_mesh_bed_leveling_table()
SERIAL_ECHOLN(); SERIAL_ECHOLN();
} }
uint16_t print_time_remaining() { uint16_t print_time_remaining()
{
uint16_t print_t = PRINT_TIME_REMAINING_INIT; uint16_t print_t = PRINT_TIME_REMAINING_INIT;
#ifdef TMC2130 #ifdef TMC2130
if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_remaining_normal; if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_remaining_normal;
@ -11675,7 +11677,8 @@ uint16_t print_time_remaining() {
return print_t; return print_t;
} }
uint16_t print_time_to_change_remaining() { uint16_t print_time_to_change_remaining()
{
uint16_t print_t = PRINT_TIME_REMAINING_INIT; uint16_t print_t = PRINT_TIME_REMAINING_INIT;
#ifdef TMC2130 #ifdef TMC2130
if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_to_change; if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_to_change;
@ -11692,18 +11695,22 @@ uint8_t calc_percent_done()
//in case that we have information from M73 gcode return percentage counted by slicer, else return percentage counted as byte_printed/filesize //in case that we have information from M73 gcode return percentage counted by slicer, else return percentage counted as byte_printed/filesize
uint8_t percent_done = 0; uint8_t percent_done = 0;
#ifdef TMC2130 #ifdef TMC2130
if (SilentModeMenu == SILENT_MODE_OFF && print_percent_done_normal <= 100) { if (SilentModeMenu == SILENT_MODE_OFF && print_percent_done_normal <= 100)
{
percent_done = print_percent_done_normal; percent_done = print_percent_done_normal;
} }
else if (print_percent_done_silent <= 100) { else if (print_percent_done_silent <= 100)
{
percent_done = print_percent_done_silent; percent_done = print_percent_done_silent;
} }
#else #else
if (print_percent_done_normal <= 100) { if (print_percent_done_normal <= 100)
{
percent_done = print_percent_done_normal; percent_done = print_percent_done_normal;
} }
#endif //TMC2130 #endif //TMC2130
else { else
{
percent_done = card.percentDone(); percent_done = card.percentDone();
} }
return percent_done; return percent_done;