mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2026-02-15 08:59:45 -07:00
🎨 Flash EEPROM pins cleanup
This commit is contained in:
parent
86f03cf57a
commit
1e2e0c3a36
107 changed files with 174 additions and 173 deletions
|
|
@ -63,7 +63,7 @@
|
|||
#define FLASH_SECTOR (FLASH_SECTOR_TOTAL - 1)
|
||||
#endif
|
||||
#ifndef FLASH_UNIT_SIZE
|
||||
#define FLASH_UNIT_SIZE 0x20000 // 128kB
|
||||
#define FLASH_UNIT_SIZE 0x20000 // 128K
|
||||
#endif
|
||||
|
||||
#ifndef FLASH_ADDRESS_START
|
||||
|
|
@ -75,11 +75,11 @@
|
|||
#define SLOT_ADDRESS(slot) (FLASH_ADDRESS_START + (slot * (MARLIN_EEPROM_SIZE)))
|
||||
|
||||
#ifdef STM32H7xx
|
||||
#define FLASHWORD_SIZE 32U // STM32H7xx a FLASHWORD is 32 bytes (256 bits)
|
||||
#define FLASH_FLAGS_TO_CLEAR (FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR | FLASH_FLAG_PGSERR)
|
||||
#define FLASHWORD_SIZE 32U // STM32H7xx a FLASHWORD is 32 bytes (256 bits)
|
||||
#define FLASH_FLAGS_TO_CLEAR (FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR | FLASH_FLAG_PGSERR)
|
||||
#else
|
||||
#define FLASHWORD_SIZE 4U // STM32F4xx a FLASHWORD is 4 bytes sizeof(uint32_t)
|
||||
#define FLASH_FLAGS_TO_CLEAR (FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR)
|
||||
#define FLASHWORD_SIZE 4U // STM32F4xx a FLASHWORD is 4 bytes sizeof(uint32_t)
|
||||
#define FLASH_FLAGS_TO_CLEAR (FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR)
|
||||
#endif
|
||||
|
||||
#define EMPTY_UINT32 ((uint32_t)-1)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
// Store settings in the last two pages
|
||||
#ifndef MARLIN_EEPROM_SIZE
|
||||
#define MARLIN_EEPROM_SIZE ((EEPROM_PAGE_SIZE) * 2)
|
||||
#define MARLIN_EEPROM_SIZE ((EEPROM_PAGE_SIZE) * 2UL)
|
||||
#endif
|
||||
size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
// EEPROM
|
||||
//
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
|
||||
//
|
||||
// Limit Switches
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@
|
|||
#if ENABLED(IIC_BL24CXX_EEPROM)
|
||||
#define IIC_EEPROM_SDA PA11
|
||||
#define IIC_EEPROM_SCL PA12
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#elif ENABLED(SDCARD_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -66,9 +66,9 @@
|
|||
#if ENABLED(IIC_BL24CXX_EEPROM)
|
||||
#define IIC_EEPROM_SDA PA12
|
||||
#define IIC_EEPROM_SCL PA11
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#elif ENABLED(SDCARD_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -48,9 +48,9 @@
|
|||
#endif
|
||||
|
||||
#if ENABLED(I2C_EEPROM)
|
||||
#define MARLIN_EEPROM_SIZE 0x8000 // 32K
|
||||
#define MARLIN_EEPROM_SIZE 0x8000U // 32K
|
||||
#elif ENABLED(SDCARD_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
// Onboard I2C EEPROM
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K (AT24C32)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K (AT24C32)
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
//
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define I2C_EEPROM // AT24C32
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
* Geeetech GT2560 V4.1b Pins
|
||||
* Schematic: https://www.geeetech.com/download.html?spm=a2g0s.imconversation.0.0.22d23e5fXlQBWv&download_id=45
|
||||
* ATmega2560
|
||||
*/
|
||||
*/
|
||||
|
||||
#define ALLOW_MEGA1280
|
||||
#include "env_validate.h"
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
* --- --- --- ---
|
||||
* J3 J4 J5 J6
|
||||
*
|
||||
*/
|
||||
*/
|
||||
|
||||
#ifndef X_STOP_PIN
|
||||
#ifndef X_MIN_PIN
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef MARLIN_EEPROM_SIZE
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -503,4 +503,4 @@
|
|||
* ======
|
||||
* | 12 | (12) PB6 ** Pin25 ** D12
|
||||
* ======
|
||||
*/
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#define USBCON
|
||||
|
||||
#ifndef MARLIN_EEPROM_SIZE
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8KB
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#define DEFAULT_MACHINE_NAME "RP2040 Test"
|
||||
|
||||
#ifndef MARLIN_EEPROM_SIZE
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
//
|
||||
#if ANY(NO_EEPROM_SELECTED, I2C_EEPROM)
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1F400 // 16K
|
||||
#define MARLIN_EEPROM_SIZE 0x1F400U // 128000 bytes
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
//
|
||||
#if ANY(NO_EEPROM_SELECTED, I2C_EEPROM)
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8K
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#undef INVERTED_FAN_PINS
|
||||
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x10000 // 64K in a 24C512
|
||||
#define MARLIN_EEPROM_SIZE 0x10000U // 64K in a 24C512
|
||||
|
||||
#ifndef PS_ON_PIN
|
||||
#define PS_ON_PIN 12
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
// I2C EEPROM with 4K of space
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
|
||||
// See EEPROM device datasheet for the following values. These are for 24xx256
|
||||
#define EEPROM_DEVICE_ADDRESS 0x50 // 7 bit i2c address (without R/W bit)
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@
|
|||
//
|
||||
// EEPROM
|
||||
//
|
||||
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
|
||||
#define MARLIN_EEPROM_SIZE 0x8000U // 32K (24lc256)
|
||||
#define I2C_EEPROM // EEPROM on I2C-0
|
||||
//#define EEPROM_SD // EEPROM on SDCARD
|
||||
//#define SPI_EEPROM // EEPROM on SPI-0
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@
|
|||
//
|
||||
// EEPROM
|
||||
//
|
||||
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
|
||||
#define MARLIN_EEPROM_SIZE 0x8000U // 32K (24lc256)
|
||||
#define I2C_EEPROM // EEPROM on I2C-0
|
||||
//#define EEPROM_SD // EEPROM on SDCARD
|
||||
//#define SPI_EEPROM // EEPROM on SPI-0
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
*/
|
||||
//#define FLASH_EEPROM_EMULATION
|
||||
#define I2C_EEPROM // EEPROM on I2C-0
|
||||
#define MARLIN_EEPROM_SIZE 0x10000 // 64K (CAT24C512)
|
||||
#define MARLIN_EEPROM_SIZE 0x10000U // 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
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
*/
|
||||
//#define FLASH_EEPROM_EMULATION
|
||||
#define I2C_EEPROM // EEPROM on I2C-0
|
||||
#define MARLIN_EEPROM_SIZE 0x10000 // 64K (CAT24C512)
|
||||
#define MARLIN_EEPROM_SIZE 0x10000U // 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
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
*/
|
||||
//#define FLASH_EEPROM_EMULATION
|
||||
//#define I2C_EEPROM // EEPROM on I2C-0
|
||||
#define MARLIN_EEPROM_SIZE 500 // 4000 bytes
|
||||
#define MARLIN_EEPROM_SIZE 500U // 4000 bytes
|
||||
|
||||
//This its another option to emulate an EEPROM, but its more efficient to dont loose the data the first One.
|
||||
//#define SDCARD_EEPROM_EMULATION
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
//
|
||||
//#define QSPI_EEPROM // Use AGCM4 onboard QSPI EEPROM (Uses 4K of RAM)
|
||||
#define I2C_EEPROM // EEPROM on I2C-0
|
||||
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
|
||||
#define MARLIN_EEPROM_SIZE 0x8000U // 32K (24lc256)
|
||||
|
||||
//
|
||||
// Foam Cutter requirements
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#if NO_EEPROM_SELECTED
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#ifndef MARLIN_EEPROM_SIZE
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@
|
|||
#if ENABLED(I2C_EEPROM)
|
||||
#define IIC_EEPROM_SDA PB7
|
||||
#define IIC_EEPROM_SCL PB6
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#elif ENABLED(SDCARD_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#if NO_EEPROM_SELECTED
|
||||
#define I2C_EEPROM
|
||||
#define SOFT_I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#define I2C_SDA_PIN PB7
|
||||
#define I2C_SCL_PIN PB6
|
||||
#undef NO_EEPROM_SELECTED
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@
|
|||
|
||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K, but will use 2x more (4K)
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#else
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2K, require this amount of RAM
|
||||
|
|
|
|||
|
|
@ -51,9 +51,9 @@
|
|||
#if ENABLED(IIC_BL24CXX_EEPROM)
|
||||
#define IIC_EEPROM_SDA PA11
|
||||
#define IIC_EEPROM_SCL PA12
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#elif ANY(SDCARD_EEPROM_EMULATION, FLASH_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@
|
|||
#ifndef IIC_EEPROM_SCL
|
||||
#define IIC_EEPROM_SCL PA12
|
||||
#endif
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#elif ENABLED(SDCARD_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@
|
|||
#if ENABLED(IIC_BL24CXX_EEPROM)
|
||||
#define IIC_EEPROM_SDA PA11
|
||||
#define IIC_EEPROM_SCL PA12
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#else
|
||||
#define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -47,9 +47,9 @@
|
|||
#if ENABLED(IIC_BL24CXX_EEPROM)
|
||||
#define IIC_EEPROM_SDA PA11
|
||||
#define IIC_EEPROM_SCL PA12
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#elif ENABLED(SDCARD_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
#if ENABLED(IIC_BL24CXX_EEPROM)
|
||||
#define IIC_EEPROM_SDA PC2
|
||||
#define IIC_EEPROM_SCL PC3
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#else
|
||||
#define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
#undef NO_EEPROM_SELECTED
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
//
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
//
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE 0x800 // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE) // 256K firmware space
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL) // 256K firmware space
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
//
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
// Enable EEPROM Emulation for this board as it doesn't have EEPROM
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@
|
|||
#endif
|
||||
|
||||
#if ENABLED(I2C_EEPROM)
|
||||
//#define MARLIN_EEPROM_SIZE 0x8000UL // 32K
|
||||
//#define MARLIN_EEPROM_SIZE 0x8000U // 32K
|
||||
#elif ENABLED(FLASH_EEPROM_EMULATION)
|
||||
//#define MARLIN_EEPROM_SIZE 0x1000UL // 4K
|
||||
//#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
//#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -205,9 +205,9 @@
|
|||
#define SPI_FLASH_MOSI_PIN PA7
|
||||
#elif ENABLED(FLASH_EEPROM_EMULATION)
|
||||
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#else
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2K, require this amount of RAM
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -33,16 +33,16 @@
|
|||
#define DISABLE_JTAG
|
||||
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2KB
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (512) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
|
||||
/**
|
||||
* This board works with this SERIAL_PORT_* configuration
|
||||
* #define SERIAL_PORT 3
|
||||
* #define BAUDRATE 115200
|
||||
* #define SERIAL_PORT_2 -1
|
||||
*/
|
||||
*/
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
#define I2C_EEPROM
|
||||
#undef NO_EEPROM_SELECTED
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#define USE_SHARED_EEPROM 1 // Use Platform-independent Arduino functions for I2C EEPROM
|
||||
#define E2END 0xFFFF // EEPROM end address AT24C256 (32kB)
|
||||
*/
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@
|
|||
#endif
|
||||
|
||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, I2C_EEPROM)
|
||||
#define I2C_EEPROM // EEPROM on I2C-0
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
// Onboard I2C EEPROM
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000// 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#undef NO_EEPROM_SELECTED
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
//
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@
|
|||
//
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, I2C_EEPROM)
|
||||
#define I2C_EEPROM // EEPROM on I2C-0
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
#endif
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
// Onboard I2C EEPROM
|
||||
//
|
||||
#define IIC_BL24CXX_EEPROM // Use I2C EEPROM onboard IC (AT24C04C, Size 4K, PageSize 16B)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#define IIC_EEPROM_SDA PB7
|
||||
#define IIC_EEPROM_SCL PB6
|
||||
#define EEPROM_DEVICE_ADDRESS 0xA0
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#if ANY(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@
|
|||
#endif
|
||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K, but will use 2x more (4K)
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#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
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define EEPROM_PAGE_SIZE (0x800) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
#define IIC_EEPROM_SDA PB11
|
||||
#define IIC_EEPROM_SCL PB10
|
||||
#define EEPROM_DEVICE_ADDRESS 0xA0
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#define FLASH_EEPROM_EMULATION
|
||||
//#define I2C_EEPROM
|
||||
#endif
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
|
||||
#define HAL_TIMER_RATE F_CPU
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
#define FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_LEVELING
|
||||
#define FLASH_SECTOR (FLASH_SECTOR_TOTAL - 1)
|
||||
#define FLASH_UNIT_SIZE 0x4000 // 16kB
|
||||
#define FLASH_UNIT_SIZE 0x4000U // 16K
|
||||
#define MARLIN_EEPROM_SIZE FLASH_UNIT_SIZE
|
||||
#undef NO_EEPROM_SELECTED
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
//#define I2C_EEPROM
|
||||
#define SRAM_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8K
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
// Onboard I2C EEPROM
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
// Onboard I2C EEPROM
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8K (24C64)
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K (24C64)
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#if ANY(NO_EEPROM_SELECTED, I2C_EEPROM)
|
||||
#undef NO_EEPROM_SELECTED
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K (AT24C32)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K (AT24C32)
|
||||
#define SOFT_I2C_EEPROM // Force the use of Software I2C
|
||||
#define I2C_SCL_PIN PB8
|
||||
#define I2C_SDA_PIN PB9
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
#define SOFT_I2C_EEPROM // Force the use of Software I2C
|
||||
#define I2C_SCL_PIN PB8
|
||||
#define I2C_SDA_PIN PB9
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@
|
|||
#if ENABLED(IIC_BL24CXX_EEPROM)
|
||||
#define IIC_EEPROM_SDA PA11
|
||||
#define IIC_EEPROM_SCL PA12
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (24C16)
|
||||
#elif ENABLED(SDCARD_EEPROM_EMULATION)
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -26,18 +26,18 @@
|
|||
#define BOARD_INFO_NAME "STM32F401RET6"
|
||||
#define DEFAULT_MACHINE_NAME "Ender-5 S1"
|
||||
|
||||
#define IIC_BL24CXX_EEPROM // EEPROM on I2C-0 used only for display settings
|
||||
#define IIC_BL24CXX_EEPROM // EEPROM on I2C-0 used only for display settings
|
||||
#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 0x800U // 2K (24C16)
|
||||
#else
|
||||
#define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb
|
||||
#define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K
|
||||
#endif
|
||||
|
||||
// SPI
|
||||
//#define SPI_EEPROM // EEPROM on SPI-0
|
||||
//#define SPI_EEPROM // EEPROM on SPI-0
|
||||
//#define SPI_CHAN_EEPROM1 ?
|
||||
//#define SPI_EEPROM1_CS ?
|
||||
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@
|
|||
// the 128kB sector allocated for EEPROM emulation.
|
||||
#define FLASH_EEPROM_LEVELING
|
||||
#elif ENABLED(I2C_EEPROM)
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8K
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K
|
||||
#endif
|
||||
|
||||
#ifndef MARLIN_EEPROM_SIZE
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#if NO_EEPROM_SELECTED
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
// 128 kB sector allocated for EEPROM emulation.
|
||||
#define FLASH_EEPROM_LEVELING
|
||||
#elif ENABLED(I2C_EEPROM)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#endif
|
||||
|
||||
#if ENABLED(I2C_EEPROM)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
#define I2C_EEPROM
|
||||
#define I2C_SCL_PIN PF1
|
||||
#define I2C_SDA_PIN PF0
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4KB
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#define SOFT_I2C_EEPROM // Force the use of Software I2C
|
||||
#define I2C_SCL_PIN PG14
|
||||
#define I2C_SDA_PIN PG13
|
||||
#define MARLIN_EEPROM_SIZE 0x10000
|
||||
#define MARLIN_EEPROM_SIZE 0x10000U // 64K
|
||||
#endif
|
||||
|
||||
#define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#define I2C_EEPROM
|
||||
#define I2C_SCL_PIN PB8
|
||||
#define I2C_SDA_PIN PB9
|
||||
#define MARLIN_EEPROM_SIZE 0x10000 // FM24CL64 F-RAM 64K (8Kx8)
|
||||
#define MARLIN_EEPROM_SIZE 0x10000U // FM24CL64 F-RAM 64K (8Kx8)
|
||||
|
||||
#define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
|
||||
//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
|
||||
#define I2C_EEPROM // Need use jumpers set i2c for EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#define I2C_SCL_PIN PB8 // I2C_SCL and CAN_RX
|
||||
#define I2C_SDA_PIN PB9 // I2C_SDA and CAN_TX
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
|
||||
#if ANY(NO_EEPROM_SELECTED, I2C_EEPROM)
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#define I2C_SCL_PIN PB6
|
||||
#define I2C_SDA_PIN PB7
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
|
||||
//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
|
||||
#define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
// Onboard I2C EEPROM
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K (AT24C32)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K (AT24C32)
|
||||
#define I2C_SCL_PIN PB8
|
||||
#define I2C_SDA_PIN PB9
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
*/
|
||||
|
||||
#define SRAM_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8K
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K
|
||||
|
||||
// I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
|
||||
#define HAS_MCP3426_ADC
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
*/
|
||||
|
||||
#define SRAM_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8K
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K
|
||||
|
||||
// I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
|
||||
#define HAS_MCP3426_ADC
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@
|
|||
#if NO_EEPROM_SELECTED
|
||||
#if MB(RUMBA32_V1_0)
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#elif MB(RUMBA32_V1_1)
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x2000 // 8K (24LC64T-I/OT)
|
||||
#define MARLIN_EEPROM_SIZE 0x2000U // 8K (24LC64T-I/OT)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K (24LC32AT-I/OT)
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K (24LC32AT-I/OT)
|
||||
#endif
|
||||
|
||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
// Onboard I2C EEPROM
|
||||
#if NO_EEPROM_SELECTED
|
||||
#define I2C_EEPROM
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#define I2C_SCL_PIN PB6
|
||||
#define I2C_SDA_PIN PB7
|
||||
#undef NO_EEPROM_SELECTED
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@
|
|||
#endif
|
||||
|
||||
#if ENABLED(FLASH_EEPROM_EMULATION)
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
|
||||
#define EEPROM_PAGE_SIZE (0x800U) // 2K, but will use 2x more (4K)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#else
|
||||
#define MARLIN_EEPROM_SIZE 0x800 // 2K (FT24C16A)
|
||||
#define MARLIN_EEPROM_SIZE 0x800U // 2K (FT24C16A)
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
//
|
||||
#define SPI_FLASH // W25Q16
|
||||
#if ENABLED(SPI_FLASH)
|
||||
#define SPI_FLASH_SIZE 0x1000000 // 16MB
|
||||
#define SPI_FLASH_SIZE 0x1000000 // 16MB
|
||||
#define SPI_FLASH_CS_PIN PG15
|
||||
#define SPI_FLASH_MOSI_PIN PB5
|
||||
#define SPI_FLASH_MISO_PIN PB4
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
//
|
||||
#define ONBOARD_SDIO
|
||||
#define SD_DETECT_PIN -1
|
||||
#define SDIO_CLOCK 4500000
|
||||
#define SDIO_CLOCK 4500000
|
||||
#define SDIO_READ_RETRIES 16
|
||||
|
||||
#define SDIO_D0_PIN PC8
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
#ifndef FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define EEPROM_PAGE_SIZE (0x800UL) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 1UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 1UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#endif
|
||||
|
||||
//#define USES_DIAG_JUMPERS
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@
|
|||
#ifndef FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define EEPROM_PAGE_SIZE (0x800UL) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@
|
|||
#ifndef FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define EEPROM_PAGE_SIZE (0x800UL) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@
|
|||
#ifndef FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define EEPROM_PAGE_SIZE (0x800UL) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@
|
|||
#ifndef FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define EEPROM_PAGE_SIZE (0x800UL) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -50,9 +50,9 @@
|
|||
#ifndef FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define EEPROM_PAGE_SIZE (0x800UL) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
#define SOFT_I2C_EEPROM // Force the use of Software I2C
|
||||
#define I2C_SCL_PIN PB6
|
||||
#define I2C_SDA_PIN PB7
|
||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
|
||||
#define MARLIN_EEPROM_SIZE 0x1000U // 4K
|
||||
#endif
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@
|
|||
#ifndef FLASH_EEPROM_EMULATION
|
||||
#define FLASH_EEPROM_EMULATION
|
||||
#endif
|
||||
#define EEPROM_PAGE_SIZE (0x800UL) // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
|
||||
#define EEPROM_PAGE_SIZE 0x800U // 2K
|
||||
#define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
|
||||
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
|
||||
#endif
|
||||
|
||||
// Avoid conflict with TIMER_TONE
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue