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

Unbreak build with !PINDA_THERMISTOR

Browse Source
This commit is contained in:
Yuri D'Elia 2022-12-25 12:38:54 +01:00 committed by DRracer
parent 0c583ff90a
commit f158a75041
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View File

@ -2882,7 +2882,7 @@ static void gcode_G80()
run = true;
repeatcommand_front(); // repeat G80 with all its parameters
enquecommand_front_P(G28W0);
break;
return;
}
run = false;
#endif //PINDA_THERMISTOR
@ -10468,12 +10468,12 @@ static void temp_compensation_start() {
if ((int)degHotend(active_extruder) > extrude_min_temp) {
current_position[E_AXIS] -= default_retraction;
}
plan_buffer_line_curposXYZE(400, active_extruder);
plan_buffer_line_curposXYZE(400);
current_position[X_AXIS] = PINDA_PREHEAT_X;
current_position[Y_AXIS] = PINDA_PREHEAT_Y;
current_position[Z_AXIS] = PINDA_PREHEAT_Z;
plan_buffer_line_curposXYZE(3000 / 60, active_extruder);
plan_buffer_line_curposXYZE(3000 / 60);
st_synchronize();
while (fabs(degBed() - target_temperature_bed) > 1) delay_keep_alive(1000);
@ -10492,7 +10492,7 @@ static void temp_compensation_apply() {
int z_shift = 0;
float z_shift_mm;
if (calibration_status() == CALIBRATION_STATUS_CALIBRATED) {
if (calibration_status_pinda()) {
if (target_temperature_bed % 10 == 0 && target_temperature_bed >= 60 && target_temperature_bed <= 100) {
i_add = (target_temperature_bed - 60) / 10;
z_shift = eeprom_read_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i_add);

9
Firmware/ultralcd.cpp
View File

@ -4941,11 +4941,10 @@ static void lcd_settings_menu()
#if defined (TMC2130) && defined (LINEARITY_CORRECTION)
MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);////MSG_LIN_CORRECTION c=18
#endif //LINEARITY_CORRECTION && TMC2130
#ifdef PINDA_THERMISTOR
if(has_temperature_compensation())
{
MENU_ITEM_TOGGLE_P(_T(MSG_PINDA_CALIBRATION), eeprom_read_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE) ? _T(MSG_ON) : _T(MSG_OFF), lcd_temp_calibration_set);
}
#endif
#ifdef HAS_SECOND_SERIAL_PORT
MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set);
#endif //HAS_SECOND_SERIAL
@ -5031,10 +5030,10 @@ static void lcd_calibration_menu()
MENU_ITEM_SUBMENU_P(_i("Show end stops"), menu_show_end_stops);////MSG_SHOW_END_STOPS c=18
#endif
MENU_ITEM_GCODE_P(_i("Reset XYZ calibr."), PSTR("M44"));////MSG_CALIBRATE_BED_RESET c=18
#ifdef PINDA_THERMISTOR
if(has_temperature_compensation())
{
MENU_ITEM_FUNCTION_P(_T(MSG_PINDA_CALIBRATION), lcd_calibrate_pinda);
}
#endif
}
#ifdef TEMP_MODEL
MENU_ITEM_SUBMENU_P(_n("Temp Model cal."), lcd_temp_model_cal);