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

Updates from 3.0.10-10 to 3.0.10-11

This commit is contained in:
3d-gussner 2017-04-30 08:38:30 +02:00
parent 770907a4be
commit 3c0bb7552a
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/Marlin_main.cpp
View File

@ -2042,7 +2042,7 @@ void process_commands()
return; return;
} else if (code_seen("SERIAL HIGH")) { } else if (code_seen("SERIAL HIGH")) {
MYSERIAL.println("SERIAL HIGH"); MYSERIAL.println("SERIAL HIGH");
MYSERIAL.begin(1152000); MYSERIAL.begin(2500000);
return; return;
} else if(code_seen("Beat")) { } else if(code_seen("Beat")) {
// Kick farm link timer // Kick farm link timer
@ -2833,6 +2833,7 @@ void process_commands()
//enquecommand_P(PSTR("M190 S50")); //enquecommand_P(PSTR("M190 S50"));
for (int i = 0; i < PINDA_HEAT_T; i++) delay_keep_alive(1000); for (int i = 0; i < PINDA_HEAT_T; i++) delay_keep_alive(1000);
calibration_status_store(CALIBRATION_STATUS_PINDA); //invalidate temp. calibration in case that in will be aborted during the calibration process
current_position[Z_AXIS] = 5; current_position[Z_AXIS] = 5;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder);
@ -6321,6 +6322,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_
#endif #endif
void temp_compensation_start() { void temp_compensation_start() {
custom_message = true; custom_message = true;
custom_message_type = 5; custom_message_type = 5;
custom_message_state = PINDA_HEAT_T + 1; custom_message_state = PINDA_HEAT_T + 1;
@ -6335,11 +6337,12 @@ void temp_compensation_start() {
st_synchronize(); st_synchronize();
while (fabs(degBed() - target_temperature_bed) > 1) delay_keep_alive(1000); while (fabs(degBed() - target_temperature_bed) > 1) delay_keep_alive(1000);
for (int i = 0; i < PINDA_HEAT_T*2; i++) { for (int i = 0; i < PINDA_HEAT_T; i++) {
delay_keep_alive(500); delay_keep_alive(1000);
custom_message_state = PINDA_HEAT_T - i*0.5; custom_message_state = PINDA_HEAT_T - i;
if (custom_message_state == 99 || custom_message_state == 9) lcd_update(2); //force whole display redraw if number of digits changed
else lcd_update(1);
} }
custom_message_type = 0; custom_message_type = 0;
custom_message_state = 0; custom_message_state = 0;
custom_message = false; custom_message = false;

8
Firmware/ultralcd.cpp
View File

@ -3131,6 +3131,13 @@ static void extr_change_3() {
} }
//wrapper functions for unloading filament //wrapper functions for unloading filament
static void extr_unload_all() {
for (int i = 0; i < 4; i++) {
change_extr(i);
extr_unload();
}
}
static void extr_unload_0() { static void extr_unload_0() {
change_extr(0); change_extr(0);
extr_unload(); extr_unload();
@ -3166,6 +3173,7 @@ static void fil_unload_menu()
{ {
START_MENU(); START_MENU();
MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
MENU_ITEM(function, PSTR("Unload all"), extr_unload_all);
MENU_ITEM(function, PSTR("Unload filament 1"), extr_unload_0); MENU_ITEM(function, PSTR("Unload filament 1"), extr_unload_0);
MENU_ITEM(function, PSTR("Unload filament 2"), extr_unload_1); MENU_ITEM(function, PSTR("Unload filament 2"), extr_unload_1);
MENU_ITEM(function, PSTR("Unload filament 3"), extr_unload_2); MENU_ITEM(function, PSTR("Unload filament 3"), extr_unload_2);

6
Firmware/ultralcd_implementation_hitachi_HD44780.h
View File

@ -972,8 +972,10 @@ static void lcd_implementation_status_screen()
if (custom_message_type == 5) { if (custom_message_type == 5) {
lcd.setCursor(0, 3); lcd.setCursor(0, 3);
lcd_printPGM(MSG_PINDA_PREHEAT); lcd_printPGM(MSG_PINDA_PREHEAT);
lcd.setCursor(15, 3); if (custom_message_state <= PINDA_HEAT_T) {
if(custom_message_state <= PINDA_HEAT_T) lcd.print(custom_message_state); lcd_printPGM(PSTR(": "));
lcd.print(custom_message_state); //seconds
}
} }