bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use MARLIN_EEPROM_SIZE with E2END as fallback (#18059)

Browse Source
This commit is contained in:
Scott Lahteine
2020-05-22 02:15:40 -05:00
committed by GitHub
parent 31eb487da5
commit 461647fcee
49 changed files with 205 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View File

@ -49,7 +49,9 @@
#define BOARD_INFO_NAME "RAMPS 1.4"
#endif
#define E2END 0xFFF // 4KB
#ifndef MARLIN_EEPROM_SIZE
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#endif
#define IS_RAMPS_EFB

2
Marlin/src/pins/sam/pins_RADDS.h
View File

@ -206,7 +206,7 @@
#endif
#define I2C_EEPROM
#define E2END 0x1FFF // 8KB
#define MARLIN_EEPROM_SIZE 0x2000 // 8KB
//
// M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
View File

@ -41,7 +41,7 @@
#undef INVERTED_FAN_PINS
#define I2C_EEPROM
#define E2END 0xFFFF // 64K in a 24C512
#define MARLIN_EEPROM_SIZE 0x10000 // 64K in a 24C512
#ifndef PS_ON_PIN
#define PS_ON_PIN 12

2
Marlin/src/pins/sam/pins_RAMPS_SMART.h
View File

@ -70,7 +70,7 @@
// I2C EEPROM with 4K of space
#define I2C_EEPROM
#define E2END 0xFFF
#define MARLIN_EEPROM_SIZE 0x1000
#define RESET_PIN 42 // Resets the board if the jumper is attached

2
Marlin/src/pins/sam/pins_RURAMPS4D_11.h
View File

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

2
Marlin/src/pins/sam/pins_RURAMPS4D_13.h
View File

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

2
Marlin/src/pins/samd/pins_RAMPS_144.h
View File

@ -46,7 +46,7 @@
//
//#define QSPI_EEPROM // Use AGCM4 onboard QSPI EEPROM (Uses 4K of RAM)
#define I2C_EEPROM // EEPROM on I2C-0
#define E2END 0x7FFF // 32K (24lc256)
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
//
// Limit Switches

6
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View File

@ -37,8 +37,7 @@
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#undef E2END
#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//
@ -172,7 +171,6 @@
* EXP1
*/
#if HAS_SPI_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -276,7 +274,7 @@
//
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#define SDCARD_CONNECTION ONBOARD
#endif
#if SD_CONNECTION_IS(ONBOARD)

3
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
View File

@ -35,8 +35,7 @@
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#undef E2END
#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@ -37,7 +37,7 @@
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#define E2END (EEPROM_PAGE_SIZE - 1)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//

3
Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
View File

@ -42,8 +42,7 @@
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#undef E2END
#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//

3
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
View File

@ -40,8 +40,7 @@
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#undef E2END
#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//

2
Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
View File

@ -54,7 +54,7 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#endif
//

2
Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
View File

@ -54,7 +54,7 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#endif
//

2
Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
View File

@ -54,7 +54,7 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#endif
//

2
Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
View File

@ -54,7 +54,7 @@
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#endif
//

6
Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
View File

@ -43,11 +43,11 @@
// Enable EEPROM Emulation for this board, so that we don't overwrite factory data
//#define I2C_EEPROM // AT24C64
//#define E2END 0x7FFFUL // 64KB
//#define MARLIN_EEPROM_SIZE 0x8000UL // 64KB
//#define FLASH_EEPROM_EMULATION
//#define E2END 0xFFFUL // 4KB
//#define E2END (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL - 1UL)
//#define MARLIN_EEPROM_SIZE 0x1000UL // 4KB
//#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
//#define EEPROM_CHITCHAT
//#define DEBUG_EEPROM_READWRITE

7
Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
View File

@ -152,7 +152,6 @@
#define FLASH_EEPROM_EMULATION
#endif
#undef E2END
#if ENABLED(SPI_EEPROM)
// SPI1 EEPROM Winbond W25Q64 (8MB/64Mbits)
#define SPI_CHAN_EEPROM1 1
@ -161,12 +160,12 @@
#define EEPROM_MISO BOARD_SPI1_MISO_PIN // PA6 pin 31
#define EEPROM_MOSI BOARD_SPI1_MOSI_PIN // PA7 pin 32
#define EEPROM_PAGE_SIZE 0x1000U // 4KB (from datasheet)
#define E2END (16UL * (EEPROM_PAGE_SIZE) - 1UL) // Limit to 64KB for now...
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64KB for now...
#elif ENABLED(FLASH_EEPROM_EMULATION)
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#define E2END (EEPROM_PAGE_SIZE - 1)
#define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
#else
#define E2END (0x7FFU) // On SD, Limit to 2KB, require this amount of RAM
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
#endif

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
View File

@ -43,7 +43,7 @@
// 2K in a AT24C16N
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
#define E2END (EEPROM_PAGE_SIZE - 1)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif
//

4
Marlin/src/pins/stm32f4/pins_ARMED.h
View File

@ -39,9 +39,7 @@
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#define I2C_EEPROM
#undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
//
// Limit Switches

2
Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
View File

@ -40,8 +40,8 @@
#define DEFAULT_MACHINE_NAME "STM32F407VET6"
//#define I2C_EEPROM
//#define E2END 0x1FFF // 8KB
#define SRAM_EEPROM_EMULATION
#define MARLIN_EEPROM_SIZE 0x2000 // 8KB
//
// Servos

3
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
View File

@ -33,8 +33,7 @@
// Onboard I2C EEPROM
#define I2C_EEPROM
#undef E2END
#define E2END 0x1FFF // EEPROM end address 24C64 (64Kb = 8KB)
#define MARLIN_EEPROM_SIZE 0x2000 // 8KB (24C64 ... 64Kb = 8KB)
#define TP // Enable to define servo and probe pins

3
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
View File

@ -31,8 +31,7 @@
#define BOARD_WEBSITE_URL "github.com/FLYmaker/FLYF407ZG"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#undef E2END
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
//
// Servos

3
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
View File

@ -51,8 +51,7 @@
// 128 kB sector allocated for EEPROM emulation.
#define FLASH_EEPROM_LEVELING
#elif ENABLED(I2C_EEPROM)
#undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#endif
//

4
Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
View File

@ -36,8 +36,8 @@
//#define I2C_EEPROM
#ifndef E2END
#define E2END 0xFFF // 4KB
#ifndef MARLIN_EEPROM_SIZE
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#endif
// Ignore temp readings during development.

5
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
View File

@ -35,10 +35,7 @@
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//#define I2C_EEPROM
#ifdef E2END
#undef E2END
#endif
#define E2END 0xFFF // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
//
// Limit Switches

3
Marlin/src/pins/stm32f4/pins_VAKE403D.h
View File

@ -31,8 +31,7 @@
#define BOARD_INFO_NAME "STM32F4 VAkE"
//#define I2C_EEPROM
#define E2END 0xFFF // EEPROM end address (4kB)
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
//
// Servos

4
Marlin/src/pins/stm32f7/pins_THE_BORG.h
View File

@ -30,8 +30,8 @@
#define BOARD_INFO_NAME "The-Borge"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#ifndef E2END
#define E2END 0xFFF // EEPROM end address
#ifndef MARLIN_EEPROM_SIZE
#define MARLIN_EEPROM_SIZE 0x1000
#endif
// Ignore temp readings during development.