🐛 Some EEPROM size fixes (#24113)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
This commit is contained in:
Keith Bennett 2022-05-05 00:38:48 -07:00 committed by Scott Lahteine
parent eeda8b451a
commit 81f403025c
12 changed files with 17 additions and 17 deletions

View File

@ -46,9 +46,9 @@
#endif #endif
#if ENABLED(I2C_EEPROM) #if ENABLED(I2C_EEPROM)
#define MARLIN_EEPROM_SIZE 0x8000 // 32Kb #define MARLIN_EEPROM_SIZE 0x8000 // 32K
#elif ENABLED(SDCARD_EEPROM_EMULATION) #elif ENABLED(SDCARD_EEPROM_EMULATION)
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb #define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif #endif
// //

View File

@ -179,7 +179,7 @@
// //
// EEPROM // EEPROM
// //
#define MARLIN_EEPROM_SIZE 0x8000 // 32Kb (24lc256) #define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
#define I2C_EEPROM // EEPROM on I2C-0 #define I2C_EEPROM // EEPROM on I2C-0
//#define EEPROM_SD // EEPROM on SDCARD //#define EEPROM_SD // EEPROM on SDCARD
//#define SPI_EEPROM // EEPROM on SPI-0 //#define SPI_EEPROM // EEPROM on SPI-0

View File

@ -162,7 +162,7 @@
// //
// EEPROM // EEPROM
// //
#define MARLIN_EEPROM_SIZE 0x8000 // 32Kb (24lc256) #define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
#define I2C_EEPROM // EEPROM on I2C-0 #define I2C_EEPROM // EEPROM on I2C-0
//#define EEPROM_SD // EEPROM on SDCARD //#define EEPROM_SD // EEPROM on SDCARD
//#define SPI_EEPROM // EEPROM on SPI-0 //#define SPI_EEPROM // EEPROM on SPI-0

View File

@ -44,7 +44,7 @@
*/ */
//#define FLASH_EEPROM_EMULATION //#define FLASH_EEPROM_EMULATION
#define I2C_EEPROM // EEPROM on I2C-0 #define I2C_EEPROM // EEPROM on I2C-0
#define MARLIN_EEPROM_SIZE 0x70000 // 512K (CAT24C512) #define MARLIN_EEPROM_SIZE 0x10000 // 64K (CAT24C512)
// This is another option to emulate an EEPROM, but it's more efficient to not lose the data in the first place. // This is another option to emulate an EEPROM, but it's more efficient to not lose the data in the first place.
//#define SDCARD_EEPROM_EMULATION //#define SDCARD_EEPROM_EMULATION

View File

@ -48,7 +48,7 @@
*/ */
//#define FLASH_EEPROM_EMULATION //#define FLASH_EEPROM_EMULATION
#define I2C_EEPROM // EEPROM on I2C-0 #define I2C_EEPROM // EEPROM on I2C-0
#define MARLIN_EEPROM_SIZE 0x70000 // 512K (CAT24C512) #define MARLIN_EEPROM_SIZE 0x10000 // 64K (CAT24C512)
//This its another option to emulate an EEPROM, but its more efficient to dont loose the data the first One. //This its another option to emulate an EEPROM, but its more efficient to dont loose the data the first One.
//#define SDCARD_EEPROM_EMULATION //#define SDCARD_EEPROM_EMULATION

View File

@ -51,9 +51,9 @@
#if ENABLED(IIC_BL24CXX_EEPROM) #if ENABLED(IIC_BL24CXX_EEPROM)
#define IIC_EEPROM_SDA PA11 #define IIC_EEPROM_SDA PA11
#define IIC_EEPROM_SCL PA12 #define IIC_EEPROM_SCL PA12
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16) #define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
#elif ENABLED(SDCARD_EEPROM_EMULATION) #elif ENABLED(SDCARD_EEPROM_EMULATION)
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb #define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif #endif
// //

View File

@ -52,10 +52,10 @@
#if ENABLED(IIC_BL24CXX_EEPROM) #if ENABLED(IIC_BL24CXX_EEPROM)
#define IIC_EEPROM_SDA PA11 #define IIC_EEPROM_SDA PA11
#define IIC_EEPROM_SCL PA12 #define IIC_EEPROM_SCL PA12
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16) #define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
#else #else
#define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX #define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb #define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif #endif
// SPI // SPI

View File

@ -47,9 +47,9 @@
#if ENABLED(IIC_BL24CXX_EEPROM) #if ENABLED(IIC_BL24CXX_EEPROM)
#define IIC_EEPROM_SDA PA11 #define IIC_EEPROM_SDA PA11
#define IIC_EEPROM_SCL PA12 #define IIC_EEPROM_SCL PA12
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16) #define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
#elif ENABLED(SDCARD_EEPROM_EMULATION) #elif ENABLED(SDCARD_EEPROM_EMULATION)
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb #define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif #endif
// //

View File

@ -37,7 +37,7 @@
// Onboard I2C EEPROM // Onboard I2C EEPROM
#define I2C_EEPROM #define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x2000 // 8K (24C64 ... 64Kb = 8K) #define MARLIN_EEPROM_SIZE 0x2000 // 8K (24C64)
// //
// Servos // Servos

View File

@ -28,7 +28,7 @@
// Onboard I2C EEPROM // Onboard I2C EEPROM
#define I2C_EEPROM #define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24C32A) #define MARLIN_EEPROM_SIZE 0x1000 // 4KB (AT24C32)
#define I2C_SCL_PIN PB8 #define I2C_SCL_PIN PB8
#define I2C_SDA_PIN PB9 #define I2C_SDA_PIN PB9

View File

@ -187,12 +187,12 @@
#define EEPROM_MISO_PIN PB14 // datasheet: DO pin, found with multimeter, not tested #define EEPROM_MISO_PIN PB14 // datasheet: DO pin, found with multimeter, not tested
#define EEPROM_MOSI_PIN PB15 // datasheet: DI pin, found with multimeter, not tested #define EEPROM_MOSI_PIN PB15 // datasheet: DI pin, found with multimeter, not tested
#define EEPROM_PAGE_SIZE 0x1000U // 4K (from datasheet) #define EEPROM_PAGE_SIZE 0x1000U // 4K (from datasheet)
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64K for now... #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64K for now...
#elif ENABLED(I2C_EEPROM) // FM24CL64BG (CYP1813) 64Kbit F-RAM #elif ENABLED(I2C_EEPROM) // FM24CL64BG (CYP1813) 64Kbit F-RAM
#define SOFT_I2C_EEPROM // Force the use of Software I2C #define SOFT_I2C_EEPROM // Force the use of Software I2C
#define I2C_SDA_PIN PG13 #define I2C_SDA_PIN PG13
#define I2C_SCL_PIN PG14 // To be confirmed on the Lerdge S, but probably same as the K #define I2C_SCL_PIN PG14 // To be confirmed on the Lerdge S, but probably same as the K
#define MARLIN_EEPROM_SIZE 0x10000 #define MARLIN_EEPROM_SIZE 0x2000U // 8K
#else #else
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2K, require this amount of RAM #define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2K, require this amount of RAM
#endif #endif

View File

@ -30,7 +30,7 @@
// Onboard I2C EEPROM // Onboard I2C EEPROM
#define I2C_EEPROM #define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x1000 // 4K (24C32 ... 32Kb = 4K) #define MARLIN_EEPROM_SIZE 0x1000 // 4K (24C32)
#define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support #define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support