thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

🐛 Some EEPROM size fixes (#24113) 

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Keith Bennett 3 years ago
parent
81a6834876
commit
3cea0a00b1
No account linked to committer's email address
12 changed files with 17 additions and 17 deletions
Unified View Show Diff Stats
  1. 2
    2
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  2. 1
    1
      Marlin/src/pins/sam/pins_RURAMPS4D_11.h
  3. 1
    1
      Marlin/src/pins/sam/pins_RURAMPS4D_13.h
  4. 1
    1
      Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
  5. 1
    1
      Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
  6. 2
    2
      Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
  7. 2
    2
      Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
  8. 2
    2
      Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
  9. 1
    1
      Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
  10. 1
    1
      Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
  11. 2
    2
      Marlin/src/pins/stm32f4/pins_LERDGE_S.h
  12. 1
    1
      Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h

+ 2
- 2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h View File

46 
 #endif
 46 
 #endif
47
47
48 
 #if ENABLED(I2C_EEPROM)
 48 
 #if ENABLED(I2C_EEPROM)
49 
-  #define MARLIN_EEPROM_SIZE              0x8000  // 32Kb
49 
+  #define MARLIN_EEPROM_SIZE              0x8000  // 32K
50 
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
 50 
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
51 
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
51 
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
52 
 #endif
 52 
 #endif
53
53
54 
 //
 54 
 //

+ 1
- 1
Marlin/src/pins/sam/pins_RURAMPS4D_11.h View File

179 
 //
 179 
 //
180 
 // EEPROM
 180 
 // EEPROM
181 
 //
 181 
 //
182 
-#define MARLIN_EEPROM_SIZE                0x8000  // 32Kb (24lc256)
182 
+#define MARLIN_EEPROM_SIZE                0x8000  // 32K (24lc256)
183 
 #define I2C_EEPROM                                // EEPROM on I2C-0
 183 
 #define I2C_EEPROM                                // EEPROM on I2C-0
184 
 //#define EEPROM_SD                               // EEPROM on SDCARD
 184 
 //#define EEPROM_SD                               // EEPROM on SDCARD
185 
 //#define SPI_EEPROM                              // EEPROM on SPI-0
 185 
 //#define SPI_EEPROM                              // EEPROM on SPI-0

+ 1
- 1
Marlin/src/pins/sam/pins_RURAMPS4D_13.h View File

162 
 //
 162 
 //
163 
 // EEPROM
 163 
 // EEPROM
164 
 //
 164 
 //
165 
-#define MARLIN_EEPROM_SIZE                0x8000  // 32Kb (24lc256)
165 
+#define MARLIN_EEPROM_SIZE                0x8000  // 32K (24lc256)
166 
 #define I2C_EEPROM                                // EEPROM on I2C-0
 166 
 #define I2C_EEPROM                                // EEPROM on I2C-0
167 
 //#define EEPROM_SD                               // EEPROM on SDCARD
 167 
 //#define EEPROM_SD                               // EEPROM on SDCARD
168 
 //#define SPI_EEPROM                              // EEPROM on SPI-0
 168 
 //#define SPI_EEPROM                              // EEPROM on SPI-0

+ 1
- 1
Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h View File

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

+ 1
- 1
Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h View File

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

+ 2
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h View File

51 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 51 
 #if ENABLED(IIC_BL24CXX_EEPROM)
52 
   #define IIC_EEPROM_SDA                    PA11
 52 
   #define IIC_EEPROM_SDA                    PA11
53 
   #define IIC_EEPROM_SCL                    PA12
 53 
   #define IIC_EEPROM_SCL                    PA12
54 
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb (24C16)
54 
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K (24C16)
55 
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
 55 
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
56 
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
56 
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
57 
 #endif
 57 
 #endif
58
58
59 
 //
 59 
 //

+ 2
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h View File

52 
   #if ENABLED(IIC_BL24CXX_EEPROM)
 52 
   #if ENABLED(IIC_BL24CXX_EEPROM)
53 
     #define IIC_EEPROM_SDA                  PA11
 53 
     #define IIC_EEPROM_SDA                  PA11
54 
     #define IIC_EEPROM_SCL                  PA12
 54 
     #define IIC_EEPROM_SCL                  PA12
55 
-    #define MARLIN_EEPROM_SIZE             0x800  // 2Kb (24C16)
55 
+    #define MARLIN_EEPROM_SIZE             0x800  // 2K (24C16)
56 
   #else
 56 
   #else
57 
     #define SDCARD_EEPROM_EMULATION               // SD EEPROM until all EEPROM is BL24CXX
 57 
     #define SDCARD_EEPROM_EMULATION               // SD EEPROM until all EEPROM is BL24CXX
58 
-    #define MARLIN_EEPROM_SIZE             0x800  // 2Kb
58 
+    #define MARLIN_EEPROM_SIZE             0x800  // 2K
59 
   #endif
 59 
   #endif
60
60
61 
   // SPI
 61 
   // SPI

+ 2
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h View File

47 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 47 
 #if ENABLED(IIC_BL24CXX_EEPROM)
48 
   #define IIC_EEPROM_SDA                    PA11
 48 
   #define IIC_EEPROM_SDA                    PA11
49 
   #define IIC_EEPROM_SCL                    PA12
 49 
   #define IIC_EEPROM_SCL                    PA12
50 
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb (24C16)
50 
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K (24C16)
51 
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
 51 
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
52 
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
52 
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
53 
 #endif
 53 
 #endif
54
54
55 
 //
 55 
 //

+ 1
- 1
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h View File

37
37
38 
 // Onboard I2C EEPROM
 38 
 // Onboard I2C EEPROM
39 
 #define I2C_EEPROM
 39 
 #define I2C_EEPROM
40 
-#define MARLIN_EEPROM_SIZE                0x2000  // 8K (24C64 ... 64Kb = 8K)
40 
+#define MARLIN_EEPROM_SIZE                0x2000  // 8K (24C64)
41
41
42 
 //
 42 
 //
43 
 // Servos
 43 
 // Servos

+ 1
- 1
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h View File

28
28
29 
 // Onboard I2C EEPROM
 29 
 // Onboard I2C EEPROM
30 
 #define I2C_EEPROM
 30 
 #define I2C_EEPROM
31 
-#define MARLIN_EEPROM_SIZE                0x8000  // 32K (24C32A)
31 
+#define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)
32 
 #define I2C_SCL_PIN                         PB8
 32 
 #define I2C_SCL_PIN                         PB8
33 
 #define I2C_SDA_PIN                         PB9
 33 
 #define I2C_SDA_PIN                         PB9
34
34

+ 2
- 2
Marlin/src/pins/stm32f4/pins_LERDGE_S.h View File

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

+ 1
- 1
Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h View File

30
30
31 
 // Onboard I2C EEPROM
 31 
 // Onboard I2C EEPROM
32 
 #define I2C_EEPROM
 32 
 #define I2C_EEPROM
33 
-#define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32 ... 32Kb = 4K)
33 
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32)
34
34
35 
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 35 
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
36
36

Write Preview
Loading…
Cancel
Save