|
@@ -6688,6 +6688,17 @@ static void mbl_mesh_set() {
|
|
|
eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mesh_nr);
|
|
|
}
|
|
|
|
|
|
+static void mbl_probe_nr_set() {
|
|
|
+ mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR);
|
|
|
+ switch (mbl_z_probe_nr) {
|
|
|
+ case 1: mbl_z_probe_nr = 3; break;
|
|
|
+ case 3: mbl_z_probe_nr = 5; break;
|
|
|
+ case 5: mbl_z_probe_nr = 1; break;
|
|
|
+ default: mbl_z_probe_nr = 3; break;
|
|
|
+ }
|
|
|
+ eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, mbl_z_probe_nr);
|
|
|
+}
|
|
|
+
|
|
|
static void lcd_mesh_bed_leveling_settings()
|
|
|
{
|
|
|
|
|
@@ -6695,25 +6706,20 @@ static void lcd_mesh_bed_leveling_settings()
|
|
|
uint8_t points_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR);
|
|
|
|
|
|
MENU_BEGIN();
|
|
|
- // leaving menu - this condition must be immediately before MENU_ITEM_BACK_P
|
|
|
- if (((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving)
|
|
|
- {
|
|
|
- eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, (uint8_t)mbl_z_probe_nr);
|
|
|
- }
|
|
|
MENU_ITEM_BACK_P(_T(MSG_SETTINGS));
|
|
|
- if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set);
|
|
|
- else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set);
|
|
|
- MENU_ITEM_EDIT_int3_P(_i("Z-probe nr."), &mbl_z_probe_nr, 1, 5);
|
|
|
+ if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); ////MSG_MESH_3x3 c=18 r=0
|
|
|
+ else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); ////MSG_MESH_7x7 c=18 r=0
|
|
|
+ switch (mbl_z_probe_nr) {
|
|
|
+ case 1: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [1]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0
|
|
|
+ case 5: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [5]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0
|
|
|
+ default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0
|
|
|
+ }
|
|
|
if (points_nr == 7) {
|
|
|
if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_set);
|
|
|
else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_set);
|
|
|
}
|
|
|
else menu_item_text_P(_i("Magnets comp.[N/A]"));
|
|
|
MENU_END();
|
|
|
- /*if(menu_leaving)
|
|
|
- {
|
|
|
- eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mbl_z_probe_nr);
|
|
|
- }*/
|
|
|
//SETTINGS_MBL_MODE;
|
|
|
}
|
|
|
|