Merge pull request #97 from PavelSindler/wizard

show live adjust Z option in main menu during First layer cal.

Firmware/Configuration_prusa.h

@@ -49,7 +49,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define X_MAX_POS 255
 #define X_MIN_POS 0
 #define Y_MAX_POS 210
-#define Y_MIN_POS -12 //orig -4
+#define Y_MIN_POS -4 //orig -4
 #define Z_MAX_POS 210
 #define Z_MIN_POS 0.15
 
@@ -317,7 +317,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc.
 
 #define X_PROBE_OFFSET_FROM_EXTRUDER 23     // Z probe to nozzle X offset: -left  +right
-#define Y_PROBE_OFFSET_FROM_EXTRUDER 9     // Z probe to nozzle Y offset: -front +behind
+#define Y_PROBE_OFFSET_FROM_EXTRUDER 5     // Z probe to nozzle Y offset: -front +behind
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4  // Z probe to nozzle Z offset: -below (always!)
 #endif
 

Firmware/mesh_bed_calibration.cpp

@@ -20,7 +20,7 @@ float   world2machine_shift[2];
 #define WEIGHT_FIRST_ROW_Y_LOW  (0.0f)
 
 #define BED_ZERO_REF_X (- 22.f + X_PROBE_OFFSET_FROM_EXTRUDER) // -22 + 23 = 1
-#define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER) // -0.6 + 9 = 8.4
+#define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER) // -0.6 + 5 = 4.4
 
 // Scaling of the real machine axes against the programmed dimensions in the firmware.
 // The correction is tiny, here around 0.5mm on 250mm length.
@@ -56,29 +56,24 @@ const float bed_skew_angle_extreme = (0.25f * M_PI / 180.f);
 // Positions of the bed reference points in the machine coordinates, referenced to the P.I.N.D.A sensor.
 // The points are the following: center front, center right, center rear, center left.
 const float bed_ref_points_4[] PROGMEM = {
-	//115.f - BED_ZERO_REF_X,   8.4f - BED_ZERO_REF_Y,
-	//216.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
-	//115.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y,
-	//13.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y
-
-	13.f - BED_ZERO_REF_X,   8.4f - BED_ZERO_REF_Y,
-	221.f - BED_ZERO_REF_X,  8.4f - BED_ZERO_REF_Y,
-	221.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y,
-	13.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y
+	13.f - BED_ZERO_REF_X,   10.4f - BED_ZERO_REF_Y,
+	221.f - BED_ZERO_REF_X,  10.4f - BED_ZERO_REF_Y,
+	221.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y,
+	13.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y
 };
 
 const float bed_ref_points[] PROGMEM = {
-	13.f - BED_ZERO_REF_X,   8.4f - BED_ZERO_REF_Y,
-	115.f - BED_ZERO_REF_X,   8.4f - BED_ZERO_REF_Y,
-	216.f - BED_ZERO_REF_X,   8.4f - BED_ZERO_REF_Y,
+	13.f - BED_ZERO_REF_X,   10.4f - BED_ZERO_REF_Y,
+	115.f - BED_ZERO_REF_X,   10.4f - BED_ZERO_REF_Y,
+	216.f - BED_ZERO_REF_X,   10.4f - BED_ZERO_REF_Y,
 
-	216.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
-	115.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
-	13.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
+	216.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y,
+	115.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y,
+	13.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y,
 
-	13.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y,
-	115.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y,
-	216.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y
+	13.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y,
+	115.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y,
+	216.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y
 };
 #else
 

Firmware/ultralcd.cpp

@@ -4817,7 +4817,7 @@ static void lcd_main_menu()
         
     }*/
     
-  if ( ( IS_SD_PRINTING || is_usb_printing ) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag)
+  if ( ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL) ) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag)
   {
 	MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);//8
   }