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

UBL no longer needs ubl_state

Browse Source
This commit is contained in:
Scott Lahteine
2017-10-13 21:56:27 -05:00
parent 8dd08425fd
commit 1344ca4b2f
5 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/module/configuration_store.cpp
View File

@@ -89,7 +89,7 @@
*
* AUTO_BED_LEVELING_UBL: 2 bytes
* 324 G29 A planner.leveling_active (bool)
* 325 G29 S ubl.state.storage_slot (int8_t)
* 325 G29 S ubl.storage_slot (int8_t)
*
* DELTA: 48 bytes
* 344 M666 XYZ delta_endstop_adj (float x3)
@@ -411,7 +411,7 @@ void MarlinSettings::postprocess() {
#if ENABLED(AUTO_BED_LEVELING_UBL)
EEPROM_WRITE(planner.leveling_active);
EEPROM_WRITE(ubl.state.storage_slot);
EEPROM_WRITE(ubl.storage_slot);
#else
const bool ubl_active = false;
const int8_t storage_slot = -1;
@@ -634,8 +634,8 @@ void MarlinSettings::postprocess() {
}
#if ENABLED(UBL_SAVE_ACTIVE_ON_M500)
if (ubl.state.storage_slot >= 0)
store_mesh(ubl.state.storage_slot);
if (ubl.storage_slot >= 0)
store_mesh(ubl.storage_slot);
#endif
EEPROM_FINISH();
return !eeprom_error;
@@ -798,7 +798,7 @@ void MarlinSettings::postprocess() {
#if ENABLED(AUTO_BED_LEVELING_UBL)
EEPROM_READ(planner.leveling_active);
EEPROM_READ(ubl.state.storage_slot);
EEPROM_READ(ubl.storage_slot);
#else
uint8_t dummyui8;
EEPROM_READ(dummyb);
@@ -1015,10 +1015,10 @@ void MarlinSettings::postprocess() {
ubl.reset();
}
if (ubl.state.storage_slot >= 0) {
load_mesh(ubl.state.storage_slot);
if (ubl.storage_slot >= 0) {
load_mesh(ubl.storage_slot);
#if ENABLED(EEPROM_CHITCHAT)
SERIAL_ECHOPAIR("Mesh ", ubl.state.storage_slot);
SERIAL_ECHOPAIR("Mesh ", ubl.storage_slot);
SERIAL_ECHOLNPGM(" loaded from storage.");
#endif
}
@@ -1570,7 +1570,7 @@ void MarlinSettings::reset() {
SERIAL_EOL();
ubl.report_state();
SERIAL_ECHOLNPAIR("\nActive Mesh Slot: ", ubl.state.storage_slot);
SERIAL_ECHOLNPAIR("\nActive Mesh Slot: ", ubl.storage_slot);
SERIAL_ECHOPAIR("EEPROM can hold ", calc_num_meshes());
SERIAL_ECHOLNPGM(" meshes.\n");
}