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

EEPROM_EMULATED_WITH_SRAM => SRAM_EEPROM_EMULATION

Scott Lahteine 6 years ago
parent
cb60001784
commit
01e8813286
4 changed files with 12 additions and 12 deletions
Unified View Show Diff Stats
  1. 3
    3
      Marlin/src/HAL/HAL_STM32/HAL.cpp
  2. 7
    7
      Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
  3. 1
    1
      Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h
  4. 1
    1
      Marlin/src/pins/pins_BLACK_STM32F407VE.h

+ 3
- 3
Marlin/src/HAL/HAL_STM32/HAL.cpp View File

28 
 #include "../../inc/MarlinConfig.h"
 28 
 #include "../../inc/MarlinConfig.h"
29 
 #include "../shared/Delay.h"
 29 
 #include "../shared/Delay.h"
30
30
31 
-#if ENABLED(EEPROM_EMULATED_WITH_SRAM)
31 
+#if ENABLED(SRAM_EEPROM_EMULATION)
32 
   #if STM32F7xx
 32 
   #if STM32F7xx
33 
     #include "stm32f7xx_ll_pwr.h"
 33 
     #include "stm32f7xx_ll_pwr.h"
34 
   #elif STM32F4xx
 34 
   #elif STM32F4xx
35 
     #include "stm32f4xx_ll_pwr.h"
 35 
     #include "stm32f4xx_ll_pwr.h"
36 
   #else
 36 
   #else
37 
-    #error "EEPROM_EMULATED_WITH_SRAM is currently only supported for STM32F4xx and STM32F7xx"
37 
+    #error "SRAM_EEPROM_EMULATION is currently only supported for STM32F4xx and STM32F7xx"
38 
   #endif
 38 
   #endif
39 
 #endif
 39 
 #endif
40
40
100 
     OUT_WRITE(LED_PIN, LOW);
 100 
     OUT_WRITE(LED_PIN, LOW);
101 
   #endif
 101 
   #endif
102
102
103 
-  #if ENABLED(EEPROM_EMULATED_WITH_SRAM)
103 
+  #if ENABLED(SRAM_EEPROM_EMULATION)
104 
   // Enable access to backup SRAM
 104 
   // Enable access to backup SRAM
105 
   __HAL_RCC_PWR_CLK_ENABLE();
 105 
   __HAL_RCC_PWR_CLK_ENABLE();
106 
   HAL_PWR_EnableBkUpAccess();
 106 
   HAL_PWR_EnableBkUpAccess();

+ 7
- 7
Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp View File

28
28
29 
 #include "../shared/persistent_store_api.h"
 29 
 #include "../shared/persistent_store_api.h"
30
30
31 
-#if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
31 
+#if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
32 
   #include <EEPROM.h>
 32 
   #include <EEPROM.h>
33 
   static bool eeprom_data_written = false;
 33 
   static bool eeprom_data_written = false;
34 
 #endif
 34 
 #endif
35
35
36 
 bool PersistentStore::access_start() {
 36 
 bool PersistentStore::access_start() {
37 
-  #if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
37 
+  #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
38 
     eeprom_buffer_fill();
 38 
     eeprom_buffer_fill();
39 
   #endif
 39 
   #endif
40 
   return true;
 40 
   return true;
41 
 }
 41 
 }
42
42
43 
 bool PersistentStore::access_finish() {
 43 
 bool PersistentStore::access_finish() {
44 
-  #if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
44 
+  #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
45 
     if (eeprom_data_written) {
 45 
     if (eeprom_data_written) {
46 
       eeprom_buffer_flush();
 46 
       eeprom_buffer_flush();
47 
       eeprom_data_written = false;
 47 
       eeprom_data_written = false;
66 
           return true;
 66 
           return true;
67 
         }
 67 
         }
68 
       }
 68 
       }
69 
-    #elif DISABLED(EEPROM_EMULATED_WITH_SRAM)
69 
+    #elif DISABLED(SRAM_EEPROM_EMULATION)
70 
       eeprom_buffered_write_byte(pos, v);
 70 
       eeprom_buffered_write_byte(pos, v);
71 
     #else
 71 
     #else
72 
       *(__IO uint8_t *)(BKPSRAM_BASE + (uint8_t * const)pos) = v;
 72 
       *(__IO uint8_t *)(BKPSRAM_BASE + (uint8_t * const)pos) = v;
76 
     pos++;
 76 
     pos++;
77 
     value++;
 77 
     value++;
78 
   };
 78 
   };
79 
-  #if NONE(EEPROM_EMULATED_WITH_SRAM, SPI_EEPROM, I2C_EEPROM)
79 
+  #if NONE(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
80 
     eeprom_data_written = true;
 80 
     eeprom_data_written = true;
81 
   #endif
 81 
   #endif
82
82
89 
     const uint8_t c = (
 89 
     const uint8_t c = (
90 
       #if EITHER(SPI_EEPROM, I2C_EEPROM)
 90 
       #if EITHER(SPI_EEPROM, I2C_EEPROM)
91 
         eeprom_read_byte((uint8_t*)pos)
 91 
         eeprom_read_byte((uint8_t*)pos)
92 
-      #elif DISABLED(EEPROM_EMULATED_WITH_SRAM)
92 
+      #elif DISABLED(SRAM_EEPROM_EMULATION)
93 
         eeprom_buffered_read_byte(pos)
 93 
         eeprom_buffered_read_byte(pos)
94 
       #else
 94 
       #else
95 
         (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
 95 
         (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
107 
 size_t PersistentStore::capacity() {
 107 
 size_t PersistentStore::capacity() {
108 
   #if EITHER(SPI_EEPROM, I2C_EEPROM)
 108 
   #if EITHER(SPI_EEPROM, I2C_EEPROM)
109 
     return E2END + 1;
 109 
     return E2END + 1;
110 
-  #elif DISABLED(EEPROM_EMULATED_WITH_SRAM)
110 
+  #elif DISABLED(SRAM_EEPROM_EMULATION)
111 
     return E2END + 1;
 111 
     return E2END + 1;
112 
   #else
 112 
   #else
113 
     return 4096; // 4kB
 113 
     return 4096; // 4kB

+ 1
- 1
Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h View File

31
31
32 
 #define BOARD_NAME "BIGTREE SKR Pro V1.1"
 32 
 #define BOARD_NAME "BIGTREE SKR Pro V1.1"
33
33
34 
-#define EEPROM_EMULATED_WITH_SRAM
34 
+#define SRAM_EEPROM_EMULATION
35
35
36 
 //
 36 
 //
37 
 // Servos
 37 
 // Servos

+ 1
- 1
Marlin/src/pins/pins_BLACK_STM32F407VE.h View File

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

Write Preview
Loading…
Cancel
Save