From 7740a81edb986403ba855cb8e2c5c9d2bec14d5a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 11 May 2023 17:37:40 +0200 Subject: [PATCH] Do not store a global mbl_z_probe_nr flash: -6 sram: 0? (somehow) --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 2 -- Firmware/mesh_bed_calibration.cpp | 2 +- Firmware/ultralcd.cpp | 3 ++- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 470b55e23..b0c024c0e 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -22,7 +22,6 @@ #include "pins.h" #include "Timer.h" #include "mmu2.h" -extern uint8_t mbl_z_probe_nr; #ifndef AT90USB #define HardwareSerial_h // trick to disable the standard HWserial diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 186585638..d15ab8a8f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -148,8 +148,6 @@ CardReader card; #endif -uint8_t mbl_z_probe_nr = 3; //numer of Z measurements for each point in mesh bed leveling calibration - //used for PINDA temp calibration and pause print #define DEFAULT_RETRACTION 1 #define DEFAULT_RETRACTION_MM 4 //MM diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index ec8b205c3..979e57572 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3124,7 +3124,7 @@ void mbl_settings_init() { //magnet elimination: use aaproximate Z-coordinate instead of measured values for points which are near magnets eeprom_init_default_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION, 1); eeprom_init_default_byte((uint8_t*)EEPROM_MBL_POINTS_NR, 3); - mbl_z_probe_nr = eeprom_init_default_byte((uint8_t*)EEPROM_MBL_PROBE_NR, 3); + eeprom_init_default_byte((uint8_t*)EEPROM_MBL_PROBE_NR, 3); } //parameter ix: index of mesh bed leveling point in X-axis (for meas_points == 7 is valid range from 0 to 6; for meas_points == 3 is valid range from 0 to 2 ) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cf353d4ac..14c8d12ab 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5457,7 +5457,7 @@ static void mbl_mesh_toggle() { } static void mbl_probe_nr_toggle() { - mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR); + uint8_t 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; @@ -5472,6 +5472,7 @@ static void lcd_mesh_bed_leveling_settings() bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); uint8_t points_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); + uint8_t mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR); char sToggle[4]; //enough for nxn format MENU_BEGIN();