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

Add Change time behind existing message

This commit is contained in:
3d-gussner 2021-02-10 09:29:47 +01:00
parent 4998cfb70d
commit b13d4b71d4
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Firmware/Marlin_main.cpp
View File

@ -6397,36 +6397,30 @@ Sigma_Exit:
### M73 - Set/get print progress <a href="https://reprap.org/wiki/G-code#M73:_Set.2FGet_build_percentage">M73: Set/Get build percentage</a> ### M73 - Set/get print progress <a href="https://reprap.org/wiki/G-code#M73:_Set.2FGet_build_percentage">M73: Set/Get build percentage</a>
#### Usage #### Usage
M73 [ P | R | Q | S | C ] M73 [ P | R | Q | S | C | D ]
#### Parameters #### Parameters
- `P` - Percent in normal mode - `P` - Percent in normal mode
- `R` - Time remaining in normal mode - `R` - Time remaining in normal mode
- `Q` - Percent in silent mode - `Q` - Percent in silent mode
- `S` - Time in silent mode - `S` - Time in silent mode
- `C` - Time to change/pause/user interaction - `C` - Time to change/pause/user interaction in normal mode
- `D` - Time to change/pause/user interaction in silent mode
*/ */
//!@todo update RepRap Gcode wiki //!@todo update RepRap Gcode wiki
case 73: //M73 show percent done and time remaining case 73: //M73 show percent done, time remaining and time to change/pause
{ {
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();
if(code_seen('S')) print_time_remaining_silent = code_value(); if(code_seen('S')) print_time_remaining_silent = code_value();
{
const char* _msg_mode_done_remain = _N("%S MODE: Percent done: %d; print time remaining in mins: %d\n");
printf_P(_msg_mode_done_remain, _N("NORMAL"), int(print_percent_done_normal), print_time_remaining_normal);
printf_P(_msg_mode_done_remain, _N("SILENT"), int(print_percent_done_silent), print_time_remaining_silent);
}
if(code_seen('C')) print_time_to_change_normal = code_value(); if(code_seen('C')) print_time_to_change_normal = code_value();
if(code_seen('D')) print_time_to_change_silent = code_value(); if(code_seen('D')) print_time_to_change_silent = code_value();
{ {
const char* _msg_mode_done_remain = _N("%S MODE: Change in mins: %d\n"); const char* _msg_mode_done_remain = _N("%S MODE: Percent done: %d; print time remaining in mins: %d; Change in mins: %d\n");
printf_P(_msg_mode_done_remain, _N("NORMAL"), print_time_to_change_normal); printf_P(_msg_mode_done_remain, _N("NORMAL"), int(print_percent_done_normal), print_time_remaining_normal, print_time_to_change_normal);
printf_P(_msg_mode_done_remain, _N("SILENT"), print_time_to_change_silent); printf_P(_msg_mode_done_remain, _N("SILENT"), int(print_percent_done_silent), print_time_remaining_silent, print_time_to_change_silent);
} }
break; break;
} }