MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Unsigned eeprom mesh addresses

Browse Source
This commit is contained in:
Scott Lahteine 2018-06-15 15:51:45 -05:00
parent f88adcbfd5
commit da94e0bd27
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1607,7 +1607,7 @@ void MarlinSettings::postprocess() {
} }
#endif #endif
int16_t MarlinSettings::meshes_start_index() { uint16_t MarlinSettings::meshes_start_index() {
return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8; // Pad the end of configuration data so it can float up return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8; // Pad the end of configuration data so it can float up
// or down a little bit without disrupting the mesh data // or down a little bit without disrupting the mesh data
} }

8
Marlin/src/module/configuration_store.h
View File

@ -63,8 +63,8 @@ class MarlinSettings {
#if ENABLED(AUTO_BED_LEVELING_UBL) // Eventually make these available if any leveling system #if ENABLED(AUTO_BED_LEVELING_UBL) // Eventually make these available if any leveling system
// That can store is enabled // That can store is enabled
static int16_t meshes_start_index(); static uint16_t meshes_start_index();
FORCE_INLINE static int16_t meshes_end_index() { return meshes_end; } FORCE_INLINE static uint16_t meshes_end_index() { return meshes_end; }
static uint16_t calc_num_meshes(); static uint16_t calc_num_meshes();
static int mesh_slot_offset(const int8_t slot); static int mesh_slot_offset(const int8_t slot);
static void store_mesh(const int8_t slot); static void store_mesh(const int8_t slot);
@ -98,8 +98,8 @@ class MarlinSettings {
#if ENABLED(AUTO_BED_LEVELING_UBL) // Eventually make these available if any leveling system #if ENABLED(AUTO_BED_LEVELING_UBL) // Eventually make these available if any leveling system
// That can store is enabled // That can store is enabled
static constexpr int16_t meshes_end = E2END - 128; // 128 is a placeholder for the size of the MAT; the MAT will always static constexpr uint16_t meshes_end = E2END - 128; // 128 is a placeholder for the size of the MAT; the MAT will always
// live at the very end of the eeprom // live at the very end of the eeprom
#endif #endif