From 6ed146c37cbcaf7aa15926db7aa5279758497f0c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 10 Jul 2019 18:41:12 +0200 Subject: [PATCH] Fix EEPROM conflict. --- Firmware/eeprom.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 258c1668..e2b8fdd9 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -196,15 +196,16 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #define EEPROM_CHECK_MODE (EEPROM_MMU_STEALTH-1) // uint8 #define EEPROM_NOZZLE_DIAMETER (EEPROM_CHECK_MODE-1) // uint8 #define EEPROM_NOZZLE_DIAMETER_uM (EEPROM_NOZZLE_DIAMETER-2) // uint16 -#define EEPROM_CHECK_MODEL (EEPROM_NOZZLE_DIAMETER_uM-1) // uint8 -#define EEPROM_CHECK_VERSION (EEPROM_CHECK_MODEL-1) // uint8 -#define EEPROM_CHECK_GCODE (EEPROM_CHECK_VERSION-1) // uint8 #define EEPROM_SHEETS_BASE (EEPROM_NOZZLE_DIAMETER_uM - EEPROM_SHEETS_SIZEOF) // Sheets static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); +#define EEPROM_CHECK_MODEL (EEPROM_SHEETS_BASE-1) // uint8 +#define EEPROM_CHECK_VERSION (EEPROM_CHECK_MODEL-1) // uint8 +#define EEPROM_CHECK_GCODE (EEPROM_CHECK_VERSION-1) // uint8 + //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_SHEETS_BASE +#define EEPROM_LAST_ITEM EEPROM_CHECK_GCODE // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!!