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

Message that temp calibration has not been run yet is displayed only if temp. calibration is activated

Browse source
This commit is contained in:
PavelSindler 2017-04-06 19:44:03 +02:00
parent 08a59f7fef
commit ccdf5e9c41
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View file

@ -1164,7 +1164,7 @@ void setup()
// Show the message.
lcd_show_fullscreen_message_and_wait_P(MSG_BABYSTEP_Z_NOT_SET);
lcd_update_enable(true);
} else if (calibration_status() == CALIBRATION_STATUS_PINDA) {
} else if (calibration_status() == CALIBRATION_STATUS_PINDA && temp_cal_active == true) {
lcd_show_fullscreen_message_and_wait_P(MSG_PINDA_NOT_CALIBRATED);
lcd_update_enable(true);
} else if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION) {
@ -3228,7 +3228,7 @@ void process_commands()
* This G-code will be performed at the end of a calibration script.
*/
case 87:
calibration_status_store(CALIBRATION_STATUS_PINDA);
calibration_status_store(CALIBRATION_STATUS_PINDA);
break;
/**
@ -6268,8 +6268,8 @@ void temp_compensation_apply() {
st_synchronize();
plan_set_z_position(current_position[Z_AXIS]);
}
else {
//message that we have no temp compensation data
else {
//message that we have no temp compensation data ?
}
}

2
Firmware/mesh_bed_calibration.cpp
View file

@ -2155,7 +2155,7 @@ void babystep_apply()
{
// Apply Z height correction aka baby stepping before mesh bed leveling gets activated.
if(calibration_status() <= CALIBRATION_STATUS_PINDA)
{
{
check_babystep(); //checking if babystep is in allowed range, otherwise setting babystep to 0
// End of G80: Apply the baby stepping value.