From 27659ae69e64618e569384b60fbe6da4b7c9fc10 Mon Sep 17 00:00:00 2001
From: PavelSindler <sindlerpa@gmail.com>
Date: Tue, 6 Mar 2018 16:48:39 +0100
Subject: [PATCH] steps per unit changed to 0.95%; changed temp cal. warnings,
changed pin for PINDA probe
---
Firmware/Configuration_prusa.h | 2 +-
Firmware/Marlin_main.cpp | 7 ++++---
Firmware/pins_Rambo_1_3.h | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h
index 014c2f7f..d9d84e58 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 f6327fc7..fc0ed271 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