📝 Replace KB with K in pins

This commit is contained in:
Scott Lahteine
2022-05-04 12:47:15 -05:00
parent c7e8ba7857
commit eeda8b451a
59 changed files with 88 additions and 88 deletions

View File

@ -52,9 +52,9 @@
#if ENABLED(I2C_EEPROM)
#define IIC_EEPROM_SDA PB7
#define IIC_EEPROM_SCL PB6
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#elif ENABLED(SDCARD_EEPROM_EMULATION)
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -33,9 +33,9 @@
#if EITHER(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
//

View File

@ -29,7 +29,7 @@
#if NO_EEPROM_SELECTED
#define I2C_EEPROM
#define SOFT_I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#define I2C_SDA_PIN PB7
#define I2C_SCL_PIN PB6
#undef NO_EEPROM_SELECTED

View File

@ -33,9 +33,9 @@
#if EITHER(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
//

View File

@ -33,9 +33,9 @@
#if EITHER(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
//

View File

@ -43,9 +43,9 @@
//
#if EITHER(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 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -44,10 +44,10 @@
#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) // 2KB, but will use 2x more (4KB)
#define EEPROM_PAGE_SIZE (0x800U) // 2K, but will use 2x more (4K)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
#else
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2K, require this amount of RAM
#endif
//

View File

@ -41,7 +41,7 @@
#if EITHER(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)
#endif

View File

@ -53,9 +53,9 @@
//
#if EITHER(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
//

View File

@ -32,7 +32,7 @@
//
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE 0x800 // 2KB
#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
#endif

View File

@ -40,9 +40,9 @@
//
#if EITHER(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
//

View File

@ -37,9 +37,9 @@
#if EITHER(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
//

View File

@ -53,7 +53,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 MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -53,7 +53,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 MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -58,7 +58,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 MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -53,7 +53,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 MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -53,9 +53,9 @@
#endif
#if ENABLED(I2C_EEPROM)
//#define MARLIN_EEPROM_SIZE 0x8000UL // 32KB
//#define MARLIN_EEPROM_SIZE 0x8000UL // 32K
#elif ENABLED(FLASH_EEPROM_EMULATION)
//#define MARLIN_EEPROM_SIZE 0x1000UL // 4KB
//#define MARLIN_EEPROM_SIZE 0x1000UL // 4K
//#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
#endif

View File

@ -194,19 +194,19 @@
#define EEPROM_SCK_PIN BOARD_SPI1_SCK_PIN // PA5 pin 30
#define EEPROM_MISO_PIN BOARD_SPI1_MISO_PIN // PA6 pin 31
#define EEPROM_MOSI_PIN BOARD_SPI1_MOSI_PIN // PA7 pin 32
#define EEPROM_PAGE_SIZE 0x1000U // 4KB (from datasheet)
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64KB for now...
#define EEPROM_PAGE_SIZE 0x1000U // 4K (from datasheet)
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64K for now...
#elif HAS_SPI_FLASH
#define SPI_FLASH_SIZE 0x40000U // limit to 256KB (M993 will reboot with 512)
#define SPI_FLASH_SIZE 0x40000U // limit to 256K (M993 will reboot with 512)
#define SPI_FLASH_CS_PIN PC5
#define SPI_FLASH_MOSI_PIN PA7
#define SPI_FLASH_MISO_PIN PA6
#define SPI_FLASH_SCK_PIN PA5
#elif ENABLED(FLASH_EEPROM_EMULATION)
// SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
#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)
#else
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2K, require this amount of RAM
#endif

View File

@ -46,16 +46,16 @@
#define I2C_EEPROM
#undef NO_EEPROM_SELECTED
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#define USE_SHARED_EEPROM 1 // Use Platform-independent Arduino functions for I2C EEPROM
#define E2END 0xFFFF // EEPROM end address AT24C256 (32kB)
*/
#if EITHER(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
#define SPI_DEVICE 2

View File

@ -53,7 +53,7 @@
#endif
#if ENABLED(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)
#endif

View File

@ -54,7 +54,7 @@
#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
#define I2C_EEPROM // EEPROM on I2C-0
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -27,7 +27,7 @@
// Onboard I2C EEPROM
#if NO_EEPROM_SELECTED
#define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x1000// 4KB
#define MARLIN_EEPROM_SIZE 0x1000// 4K
#undef NO_EEPROM_SELECTED
#endif

View File

@ -40,9 +40,9 @@
//
#if EITHER(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
//

View File

@ -45,9 +45,9 @@
//
#if EITHER(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
#define SPI_DEVICE 2

View File

@ -54,7 +54,7 @@
#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
#define I2C_EEPROM // EEPROM on I2C-0
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//

View File

@ -42,9 +42,9 @@
#endif
#if EITHER(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
#define SPI_DEVICE 2

View File

@ -33,9 +33,9 @@
#if EITHER(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
//

View File

@ -51,10 +51,10 @@
#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) // 2KB, but will use 2x more (4KB)
#define EEPROM_PAGE_SIZE (0x800U) // 2K, but will use 2x more (4K)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE
#else
#define MARLIN_EEPROM_SIZE (0x800U) // On SD, Limit to 2KB, require this amount of RAM
#define MARLIN_EEPROM_SIZE (0x800U) // On SD, Limit to 2K, require this amount of RAM
#endif
//

View File

@ -30,9 +30,9 @@
#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800) // 2KB
#define EEPROM_PAGE_SIZE (0x800) // 2K
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
#endif
//=============================================================================

View File

@ -30,9 +30,9 @@
#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800) // 2KB
#define EEPROM_PAGE_SIZE (0x800) // 2K
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
#endif
//#define OPTION_DUALZ_DRIVE

View File

@ -30,9 +30,9 @@
#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE (0x800) // 2KB
#define EEPROM_PAGE_SIZE (0x800) // 2K
#define EEPROM_START_ADDRESS (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2K
#endif
//#define OPTION_DUALZ_DRIVE