Selaa lähdekoodia

Permit SD EEPROM emulation on E3V2 (#20353)

Jason Smith 4 vuotta sitten
vanhempi
commit
a4d6908d55
No account linked to committer's email address

+ 2
- 2
Marlin/src/lcd/dwin/e3v2/dwin.cpp Näytä tiedosto

216
 }
216
 }
217
 
217
 
218
 void HMI_SetLanguage() {
218
 void HMI_SetLanguage() {
219
-  #if ENABLED(EEPROM_SETTINGS)
219
+  #if BOTH(EEPROM_SETTINGS, IIC_BL24CXX_EEPROM)
220
     BL24CXX::read(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
220
     BL24CXX::read(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
221
   #endif
221
   #endif
222
   HMI_SetLanguageCache();
222
   HMI_SetLanguageCache();
225
 void HMI_ToggleLanguage() {
225
 void HMI_ToggleLanguage() {
226
   HMI_flag.language = HMI_IsChinese() ? DWIN_ENGLISH : DWIN_CHINESE;
226
   HMI_flag.language = HMI_IsChinese() ? DWIN_ENGLISH : DWIN_CHINESE;
227
   HMI_SetLanguageCache();
227
   HMI_SetLanguageCache();
228
-  #if ENABLED(EEPROM_SETTINGS)
228
+  #if BOTH(EEPROM_SETTINGS, IIC_BL24CXX_EEPROM)
229
     BL24CXX::write(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
229
     BL24CXX::write(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
230
   #endif
230
   #endif
231
 }
231
 }

+ 9
- 23
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h Näytä tiedosto

43
 // EEPROM
43
 // EEPROM
44
 //
44
 //
45
 #if NO_EEPROM_SELECTED
45
 #if NO_EEPROM_SELECTED
46
-  // FLASH
47
-  //#define FLASH_EEPROM_EMULATION
48
-
49
-  // I2C
50
-  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0 used only for display settings
51
-  #if ENABLED(IIC_BL24CXX_EEPROM)
52
-    #define IIC_EEPROM_SDA                  PA11
53
-    #define IIC_EEPROM_SCL                  PA12
54
-    #define MARLIN_EEPROM_SIZE             0x800  // 2Kb (24C16)
55
-  #else
56
-    #define SDCARD_EEPROM_EMULATION               // SD EEPROM until all EEPROM is BL24CXX
57
-    #define MARLIN_EEPROM_SIZE             0x800  // 2Kb
58
-  #endif
59
-
60
-  // SPI
61
-  //#define SPI_EEPROM                            // EEPROM on SPI-0
62
-  //#define SPI_CHAN_EEPROM1  ?
63
-  //#define SPI_EEPROM1_CS    ?
64
-
65
-  // 2K EEPROM
66
-  //#define SPI_EEPROM2_CS    ?
46
+  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0
47
+  //#define SDCARD_EEPROM_EMULATION
48
+#endif
67
 
49
 
68
-  // 32Mb FLASH
69
-  //#define SPI_FLASH_CS      ?
50
+#if ENABLED(IIC_BL24CXX_EEPROM)
51
+  #define IIC_EEPROM_SDA                  PA11
52
+  #define IIC_EEPROM_SCL                  PA12
53
+  #define MARLIN_EEPROM_SIZE             0x800  // 2Kb (24C16)
54
+#elif ENABLED(SDCARD_EEPROM_EMULATION)
55
+  #define MARLIN_EEPROM_SIZE             0x800  // 2Kb
70
 #endif
56
 #endif
71
 
57
 
72
 //
58
 //

+ 2
- 1
buildroot/tests/STM32F103RET6_creality-tests Näytä tiedosto

15
 
15
 
16
 use_example_configs "Creality/Ender-3 V2"
16
 use_example_configs "Creality/Ender-3 V2"
17
 opt_disable CLASSIC_JERK
17
 opt_disable CLASSIC_JERK
18
-exec_test $1 $2 "Ender 3 v2 w/o CLASSIC_JERK" "$3"
18
+opt_add SDCARD_EEPROM_EMULATION
19
+exec_test $1 $2 "Ender 3 v2, SD EEPROM, w/o CLASSIC_JERK" "$3"
19
 
20
 
20
 restore_configs
21
 restore_configs

Loading…
Peruuta
Tallenna