diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h index 23da83c4..861fac87 100644 --- a/Firmware/Configuration_prusa.h +++ b/Firmware/Configuration_prusa.h @@ -35,7 +35,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,133} // Endstop inverting const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 88c13722..ecb8e30a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3228,9 +3228,6 @@ void process_commands() #ifdef PINDA_THERMISTOR if (true) { - lcd_show_fullscreen_message_and_wait_P(MSG_TEMP_CAL_WARNING); - 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 (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])) { // We don't know where we are! HOME! // Push the commands to the front of the message queue in the reverse order! @@ -3239,6 +3236,10 @@ void process_commands() enquecommand_front_P((PSTR("G28 W0"))); break; } + lcd_show_fullscreen_message_and_wait_P(MSG_TEMP_CAL_WARNING); + 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); + lcd_update_enable(true); KEEPALIVE_STATE(NOT_BUSY); //no need to print busy messages as we print current temperatures periodicaly SERIAL_ECHOLNPGM("PINDA probe calibration start"); diff --git a/Firmware/pins_Rambo_1_3.h b/Firmware/pins_Rambo_1_3.h index b8ef9d43..2f2c4dd0 100644 --- a/Firmware/pins_Rambo_1_3.h +++ b/Firmware/pins_Rambo_1_3.h @@ -52,14 +52,14 @@ #define TEMP_0_PIN 0 //A0 #define HEATER_1_PIN -1 -#define TEMP_1_PIN 1 //A1 +#define TEMP_1_PIN -1 //A1 #define HEATER_2_PIN -1 #define TEMP_2_PIN -1 #define TEMP_AMBIENT_PIN 6 //A6 -#define TEMP_PINDA_PIN 3 //A3 +#define TEMP_PINDA_PIN 1 //A1 diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 870e60e9..bfbed880 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1494,8 +1494,8 @@ extern "C" { void adc_ready(void) //callback from adc when sampling finished { current_temperature_raw[0] = adc_values[0]; - current_temperature_bed_raw = adc_values[2]; - current_temperature_raw_pinda = adc_values[3]; + current_temperature_raw_pinda = adc_values[1]; + current_temperature_bed_raw = adc_values[2]; #ifdef VOLT_PWR_PIN current_voltage_raw_pwr = adc_values[4]; #endif