Skip to content

Commit

Permalink
🐛 Some EEPROM size fixes (MarlinFirmware#24113)
Browse files Browse the repository at this point in the history
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
  • Loading branch information
thisiskeithb and thinkyhead authored May 5, 2022
1 parent 81a6834 commit 3cea0a0
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
#endif

#if ENABLED(I2C_EEPROM)
#define MARLIN_EEPROM_SIZE 0x8000 // 32Kb
#define MARLIN_EEPROM_SIZE 0x8000 // 32K
#elif ENABLED(SDCARD_EEPROM_EMULATION)
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb
#define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif

//
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/sam/pins_RURAMPS4D_11.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
//
// EEPROM
//
#define MARLIN_EEPROM_SIZE 0x8000 // 32Kb (24lc256)
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
#define I2C_EEPROM // EEPROM on I2C-0
//#define EEPROM_SD // EEPROM on SDCARD
//#define SPI_EEPROM // EEPROM on SPI-0
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/sam/pins_RURAMPS4D_13.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
//
// EEPROM
//
#define MARLIN_EEPROM_SIZE 0x8000 // 32Kb (24lc256)
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
#define I2C_EEPROM // EEPROM on I2C-0
//#define EEPROM_SD // EEPROM on SDCARD
//#define SPI_EEPROM // EEPROM on SPI-0
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*/
//#define FLASH_EEPROM_EMULATION
#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.
//#define SDCARD_EEPROM_EMULATION
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/
//#define FLASH_EEPROM_EMULATION
#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.
//#define SDCARD_EEPROM_EMULATION
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
#if ENABLED(IIC_BL24CXX_EEPROM)
#define IIC_EEPROM_SDA PA11
#define IIC_EEPROM_SCL PA12
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16)
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
#elif ENABLED(SDCARD_EEPROM_EMULATION)
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb
#define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif

//
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
#if ENABLED(IIC_BL24CXX_EEPROM)
#define IIC_EEPROM_SDA PA11
#define IIC_EEPROM_SCL PA12
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16)
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
#else
#define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb
#define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif

// SPI
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
#if ENABLED(IIC_BL24CXX_EEPROM)
#define IIC_EEPROM_SDA PA11
#define IIC_EEPROM_SCL PA12
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16)
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
#elif ENABLED(SDCARD_EEPROM_EMULATION)
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb
#define MARLIN_EEPROM_SIZE 0x800 // 2K
#endif

//
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

// Onboard I2C EEPROM
#define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x2000 // 8K (24C64 ... 64Kb = 8K)
#define MARLIN_EEPROM_SIZE 0x2000 // 8K (24C64)

//
// Servos
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

// Onboard 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_SDA_PIN PB9

Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/stm32f4/pins_LERDGE_S.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@
#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_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
#define SOFT_I2C_EEPROM // Force the use of Software I2C
#define I2C_SDA_PIN PG13
#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
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2K, require this amount of RAM
#endif
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

// Onboard 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

Expand Down

0 comments on commit 3cea0a0

Please sign in to comment.