bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Numerous UBL-related changes:

Browse Source 
* relocated ubl state to config. store:
 * removed a number of ubl state variables and padding which were largely unused - saved 58 bytes of both SRAM and EEPROM;
 * modified ubl sanity_check - no longer checks removed state variables that were otherwise unused, where checking didn't seem to accomplish anything, ultimately;
 * removed pre_initialized state, saving 64 bytes of SRAM;
 * removed automatic saving of UBL state after UBL activation/deactivation;
* consolidated multiple GRID_MAX_POINTS_X/Y to 'Global Leveling' section of EEPROM;
* minor update to G29 Sx notes/instructions;
* renamed mesh load and save parameter to 'slot' from 'm' for clarity;
This commit is contained in:
Brian
2017-04-22 17:04:28 -04:00
committed by Roxy-3D
parent f1a4758cef
commit f41fb2b635
6 changed files with 67 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/ubl_G29.cpp
View File

@ -247,8 +247,8 @@
* current state of the Unified Bed Leveling system in the EEPROM.
*
* S # Store Store the current Mesh at the specified location in EEPROM. Activate this location
* for subsequent Load and Store operations. It will also store the current state of
* the Unified Bed Leveling system in the EEPROM.
* for subsequent Load and Store operations. Valid storage slot numbers begin at 0 and
* extend to a limit related to the available EEPROM storage.
*
* S -1 Store Store the current Mesh as a print out that is suitable to be feed back into the system
* at a later date. The GCode output can be saved and later replayed by the host software
@ -574,8 +574,6 @@
}
ubl.load_mesh(storage_slot);
ubl.state.eeprom_storage_slot = storage_slot;
if (storage_slot != ubl.state.eeprom_storage_slot)
ubl.store_state();
SERIAL_PROTOCOLLNPGM("Done.\n");
}
@ -609,9 +607,6 @@
}
ubl.store_mesh(storage_slot);
ubl.state.eeprom_storage_slot = storage_slot;
//
// if (storage_slot != ubl.state.eeprom_storage_slot)
ubl.store_state(); // Always save an updated copy of the UBL State info
SERIAL_PROTOCOLLNPGM("Done.\n");
}
@ -1048,7 +1043,6 @@
if (code_seen('A')) { // Activate the Unified Bed Leveling System
ubl.state.active = 1;
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System activated.\n");
ubl.store_state();
}
c_flag = code_seen('C') && code_has_value();
@ -1057,7 +1051,6 @@
if (code_seen('D')) { // Disable the Unified Bed Leveling System
ubl.state.active = 0;
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System de-activated.\n");
ubl.store_state();
}
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)