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

Merge branch 'MK2' into MK2

This commit is contained in:
Michal Průša 2016-12-14 15:01:33 +01:00 committed by GitHub
parent 16e34501a0 734ca2eb43
commit 8f3f10765a
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin.h
View File

@ -284,6 +284,8 @@ extern unsigned long stoptime;
extern bool is_usb_printing;
extern unsigned int usb_printing_counter;
extern unsigned long kicktime;
extern unsigned long total_filament_used;
void save_statistics(unsigned long _total_filament_used, unsigned long _total_print_time);
extern unsigned int heating_status;

7
Firmware/Marlin_main.cpp
View File

@ -255,6 +255,8 @@ int extruder_multiply[EXTRUDERS] = {100
bool is_usb_printing = false;
unsigned long kicktime = millis()+100000;
unsigned int usb_printing_counter;
int lcd_change_fil_state = 0;
@ -1789,6 +1791,7 @@ void process_commands()
lcd_force_language_selection();
} else if(code_seen("Lz")) {
EEPROM_save_B(EEPROM_BABYSTEP_Z,0);
} else if (code_seen("SERIAL LOW")) {
MYSERIAL.println("SERIAL LOW");
MYSERIAL.begin(BAUDRATE);
@ -1797,6 +1800,10 @@ void process_commands()
MYSERIAL.println("SERIAL HIGH");
MYSERIAL.begin(1152000);
return;
} else if(code_seen("Beat")) {
// Kick farm link timer
kicktime = millis();
}
//else if (code_seen('Cal')) {
// lcd_calibration();

11
Firmware/ultralcd_implementation_hitachi_HD44780.h
View File

@ -763,6 +763,17 @@ static void lcd_implementation_status_screen()
lcd_printPGM(PSTR(" F"));
lcd.print(farm_no);
lcd_printPGM(PSTR(" "));
// Beat display
lcd.setCursor(LCD_WIDTH - 1, 0);
if ( (millis() - kicktime) < 60000 ) {
lcd_printPGM(PSTR("L"));
}else{
lcd_printPGM(PSTR(" "));
}
}
//Print time elapsed