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

Merge branch 'MK3' into MK3

Browse Source
This commit is contained in:
XPila 2017-11-27 04:49:23 +01:00 committed by GitHub
commit 3b892e16d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View File

@ -1091,7 +1091,7 @@ void setup()
if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
lcd_wizard(0); lcd_wizard(0);
} }
else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active
if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED || if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED ||
calibration_status() == CALIBRATION_STATUS_UNKNOWN) { calibration_status() == CALIBRATION_STATUS_UNKNOWN) {
// Reset the babystepping values, so the printer will not move the Z axis up when the babystepping is enabled. // Reset the babystepping values, so the printer will not move the Z axis up when the babystepping is enabled.
@ -1919,6 +1919,7 @@ bool gcode_M45(bool onlyZ) {
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
bool result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false); bool result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false);
if(result) lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET); if(result) lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET);
lcd_show_fullscreen_message_and_wait_P(MSG_CONFIRM_NOZZLE_CLEAN);
lcd_show_fullscreen_message_and_wait_P(MSG_PAPER); lcd_show_fullscreen_message_and_wait_P(MSG_PAPER);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
lcd_display_message_fullscreen_P(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1); lcd_display_message_fullscreen_P(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1);

3
Firmware/ultralcd.cpp
View File

@ -1114,6 +1114,7 @@ void lcd_commands()
enquecommand_P(PSTR("G1 Z10 F1300.000")); enquecommand_P(PSTR("G1 Z10 F1300.000"));
enquecommand_P(PSTR("G1 X10 Y180 F4000")); //home X axis enquecommand_P(PSTR("G1 X10 Y180 F4000")); //home X axis
enquecommand_P(PSTR("M84"));// disable motors enquecommand_P(PSTR("M84"));// disable motors
lcd_timeoutToStatus = millis() - 1; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen
lcd_commands_step = 1; lcd_commands_step = 1;
} }
if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty())
@ -3577,7 +3578,9 @@ void lcd_wizard(int state) {
case 10: //repeat first layer cal.? case 10: //repeat first layer cal.?
wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_REPEAT_V2_CAL, false); wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_REPEAT_V2_CAL, false);
if (wizard_event) { if (wizard_event) {
//reset status and live adjust z value in eeprom
calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST); calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST);
EEPROM_save_B(EEPROM_BABYSTEP_Z, 0);
lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED); lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED);
state = 9; state = 9;
} }

3
Firmware/ultralcd_implementation_hitachi_HD44780.h
View File

@ -1205,14 +1205,12 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char*
lcd.setCursor(0, row); lcd.setCursor(0, row);
lcd.print('>'); lcd.print('>');
int i = 1; int i = 1;
int j = 0; int j = 0;
char* longFilenameTMP = longFilename; char* longFilenameTMP = longFilename;
while((c = *longFilenameTMP) != '\0') while((c = *longFilenameTMP) != '\0')
{ {
lcd.setCursor(i, row); lcd.setCursor(i, row);
lcd.print(c); lcd.print(c);
i++; i++;
@ -1223,6 +1221,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char*
longFilenameTMP = longFilename + j; longFilenameTMP = longFilename + j;
n = LCD_WIDTH - 1; n = LCD_WIDTH - 1;
for(int g = 0; g<300 ;g++){ for(int g = 0; g<300 ;g++){
manage_heater();
if(LCD_CLICKED || ( enc_dif != encoderDiff )){ if(LCD_CLICKED || ( enc_dif != encoderDiff )){
longFilenameTMP = longFilename; longFilenameTMP = longFilename;
*(longFilenameTMP + LCD_WIDTH - 2) = '\0'; *(longFilenameTMP + LCD_WIDTH - 2) = '\0';