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

Merge pull request #1115 from mkbel/MK3_dev 

Merge MK3 into Mk3_dev
This commit is contained in:
mkbel 2018-09-07 09:26:28 +02:00 committed by GitHub
parent 3f55c815a8 ebfbf4ac3f
commit ec64f4865d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin.h
View File

@ -354,9 +354,9 @@ extern bool mmu_print_saved;
//estimated time to end of the print //estimated time to end of the print
extern uint8_t print_percent_done_normal; extern uint8_t print_percent_done_normal;
extern uint32_t print_time_remaining_normal; extern uint16_t print_time_remaining_normal;
extern uint8_t print_percent_done_silent; extern uint8_t print_percent_done_silent;
extern uint32_t print_time_remaining_silent; extern uint16_t print_time_remaining_silent;
#define PRINT_TIME_REMAINING_INIT 0xffff #define PRINT_TIME_REMAINING_INIT 0xffff

16
Firmware/Marlin_main.cpp
View File

@ -472,9 +472,9 @@ bool mmu_print_saved = false;
// storing estimated time to end of print counted by slicer // storing estimated time to end of print counted by slicer
uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT; uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT;
uint32_t print_time_remaining_normal = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes uint16_t print_time_remaining_normal = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes
uint8_t print_percent_done_silent = PRINT_PERCENT_DONE_INIT; uint8_t print_percent_done_silent = PRINT_PERCENT_DONE_INIT;
uint32_t print_time_remaining_silent = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes uint16_t print_time_remaining_silent = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes
//=========================================================================== //===========================================================================
//=============================Private Variables============================= //=============================Private Variables=============================
@ -8839,9 +8839,13 @@ void print_mesh_bed_leveling_table()
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
if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_remaining_normal; if (SilentModeMenu == SILENT_MODE_OFF) print_t = print_time_remaining_normal;
else print_t = print_time_remaining_silent; else print_t = print_time_remaining_silent;
if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100 * print_t / feedmultiply; #else
print_t = print_time_remaining_normal;
#endif //TMC2130
if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100ul * print_t / feedmultiply;
return print_t; return print_t;
} }
@ -8849,12 +8853,18 @@ 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
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
if (print_percent_done_normal <= 100) {
percent_done = print_percent_done_normal;
}
#endif //TMC2130
else { else {
percent_done = card.percentDone(); percent_done = card.percentDone();
} }

2
Firmware/lcd.cpp
View File

@ -686,7 +686,7 @@ LongTimer lcd_timeoutToStatus;
uint8_t lcd_clicked(void) uint8_t lcd_clicked(void)
{ {
bool clicked = LCD_CLICKED; bool clicked = LCD_CLICKED;
if(clicked) lcd_button_pressed = 1; if(clicked) lcd_button_pressed = 0;
return clicked; return clicked;
} }