CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EEPROM_EMULATED_WITH_SRAM => SRAM_EEPROM_EMULATION

Browse Source
This commit is contained in:
Scott Lahteine 2019-07-09 21:30:07 -05:00
parent cb60001784
commit 01e8813286
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/HAL/HAL_STM32/HAL.cpp
View File

@ -28,13 +28,13 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#include "../shared/Delay.h" #include "../shared/Delay.h"
#if ENABLED(EEPROM_EMULATED_WITH_SRAM) #if ENABLED(SRAM_EEPROM_EMULATION)
#if STM32F7xx #if STM32F7xx
#include "stm32f7xx_ll_pwr.h" #include "stm32f7xx_ll_pwr.h"
#elif STM32F4xx #elif STM32F4xx
#include "stm32f4xx_ll_pwr.h" #include "stm32f4xx_ll_pwr.h"
#else #else
#error "EEPROM_EMULATED_WITH_SRAM is currently only supported for STM32F4xx and STM32F7xx" #error "SRAM_EEPROM_EMULATION is currently only supported for STM32F4xx and STM32F7xx"
#endif #endif
#endif #endif
@ -100,7 +100,7 @@ void HAL_init(void) {
OUT_WRITE(LED_PIN, LOW); OUT_WRITE(LED_PIN, LOW);
#endif #endif
#if ENABLED(EEPROM_EMULATED_WITH_SRAM) #if ENABLED(SRAM_EEPROM_EMULATION)
// Enable access to backup SRAM // Enable access to backup SRAM
__HAL_RCC_PWR_CLK_ENABLE(); __HAL_RCC_PWR_CLK_ENABLE();
HAL_PWR_EnableBkUpAccess(); HAL_PWR_EnableBkUpAccess();

14
Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
View File

@ -28,20 +28,20 @@
#include "../shared/persistent_store_api.h" #include "../shared/persistent_store_api.h"
#if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM) #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
#include <EEPROM.h> #include <EEPROM.h>
static bool eeprom_data_written = false; static bool eeprom_data_written = false;
#endif #endif
bool PersistentStore::access_start() { bool PersistentStore::access_start() {
#if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM) #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
eeprom_buffer_fill(); eeprom_buffer_fill();
#endif #endif
return true; return true;
} }
bool PersistentStore::access_finish() { bool PersistentStore::access_finish() {
#if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM) #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
if (eeprom_data_written) { if (eeprom_data_written) {
eeprom_buffer_flush(); eeprom_buffer_flush();
eeprom_data_written = false; eeprom_data_written = false;
@ -66,7 +66,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
return true; return true;
} }
} }
#elif DISABLED(EEPROM_EMULATED_WITH_SRAM) #elif DISABLED(SRAM_EEPROM_EMULATION)
eeprom_buffered_write_byte(pos, v); eeprom_buffered_write_byte(pos, v);
#else #else
*(__IO uint8_t *)(BKPSRAM_BASE + (uint8_t * const)pos) = v; *(__IO uint8_t *)(BKPSRAM_BASE + (uint8_t * const)pos) = v;
@ -76,7 +76,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
pos++; pos++;
value++; value++;
}; };
#if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM) #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
eeprom_data_written = true; eeprom_data_written = true;
#endif #endif
@ -89,7 +89,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
const uint8_t c = ( const uint8_t c = (
#if EITHER(SPI_EEPROM, I2C_EEPROM) #if EITHER(SPI_EEPROM, I2C_EEPROM)
eeprom_read_byte((uint8_t*)pos) eeprom_read_byte((uint8_t*)pos)
#elif DISABLED(EEPROM_EMULATED_WITH_SRAM) #elif DISABLED(SRAM_EEPROM_EMULATION)
eeprom_buffered_read_byte(pos) eeprom_buffered_read_byte(pos)
#else #else
(*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos))) (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
@ -107,7 +107,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t PersistentStore::capacity() { size_t PersistentStore::capacity() {
#if EITHER(SPI_EEPROM, I2C_EEPROM) #if EITHER(SPI_EEPROM, I2C_EEPROM)
return E2END + 1; return E2END + 1;
#elif DISABLED(EEPROM_EMULATED_WITH_SRAM) #elif DISABLED(SRAM_EEPROM_EMULATION)
return E2END + 1; return E2END + 1;
#else #else
return 4096; // 4kB return 4096; // 4kB

2
Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h
View File

@ -31,7 +31,7 @@
#define BOARD_NAME "BIGTREE SKR Pro V1.1" #define BOARD_NAME "BIGTREE SKR Pro V1.1"
#define EEPROM_EMULATED_WITH_SRAM #define SRAM_EEPROM_EMULATION
// //
// Servos // Servos

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

@ -41,7 +41,7 @@
//#define I2C_EEPROM //#define I2C_EEPROM
//#define E2END 0x1FFF // EEPROM end address (8kB) //#define E2END 0x1FFF // EEPROM end address (8kB)
#define EEPROM_EMULATED_WITH_SRAM #define SRAM_EEPROM_EMULATION
#if HOTENDS > 2 || E_STEPPERS > 2 #if HOTENDS > 2 || E_STEPPERS > 2
#error "Black STM32F4VET6 supports up to 2 hotends / E-steppers." #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."