zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Permit SD EEPROM emulation on E3V2 (#20353)

Browse source
This commit is contained in:
Jason Smith 2020-12-02 03:23:34 -08:00 committed by GitHub
parent a4618309ce
commit a4d6908d55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/dwin/e3v2/dwin.cpp
View file

@ -216,7 +216,7 @@ void HMI_SetLanguageCache() {
} }
void HMI_SetLanguage() { void HMI_SetLanguage() {
#if ENABLED(EEPROM_SETTINGS) #if BOTH(EEPROM_SETTINGS, IIC_BL24CXX_EEPROM)
BL24CXX::read(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language)); BL24CXX::read(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
#endif #endif
HMI_SetLanguageCache(); HMI_SetLanguageCache();
@ -225,7 +225,7 @@ void HMI_SetLanguage() {
void HMI_ToggleLanguage() { void HMI_ToggleLanguage() {
HMI_flag.language = HMI_IsChinese() ? DWIN_ENGLISH : DWIN_CHINESE; HMI_flag.language = HMI_IsChinese() ? DWIN_ENGLISH : DWIN_CHINESE;
HMI_SetLanguageCache(); HMI_SetLanguageCache();
#if ENABLED(EEPROM_SETTINGS) #if BOTH(EEPROM_SETTINGS, IIC_BL24CXX_EEPROM)
BL24CXX::write(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language)); BL24CXX::write(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
#endif #endif
} }

22
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View file

@ -43,32 +43,18 @@
// EEPROM // EEPROM
// //
#if NO_EEPROM_SELECTED #if NO_EEPROM_SELECTED
// FLASH #define IIC_BL24CXX_EEPROM // EEPROM on I2C-0
//#define FLASH_EEPROM_EMULATION //#define SDCARD_EEPROM_EMULATION
#endif
// I2C
#define IIC_BL24CXX_EEPROM // EEPROM on I2C-0 used only for display settings
#if ENABLED(IIC_BL24CXX_EEPROM) #if ENABLED(IIC_BL24CXX_EEPROM)
#define IIC_EEPROM_SDA PA11 #define IIC_EEPROM_SDA PA11
#define IIC_EEPROM_SCL PA12 #define IIC_EEPROM_SCL PA12
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16) #define MARLIN_EEPROM_SIZE 0x800 // 2Kb (24C16)
#else #elif ENABLED(SDCARD_EEPROM_EMULATION)
#define SDCARD_EEPROM_EMULATION // SD EEPROM until all EEPROM is BL24CXX
#define MARLIN_EEPROM_SIZE 0x800 // 2Kb #define MARLIN_EEPROM_SIZE 0x800 // 2Kb
#endif #endif
// SPI
//#define SPI_EEPROM // EEPROM on SPI-0
//#define SPI_CHAN_EEPROM1 ?
//#define SPI_EEPROM1_CS ?
// 2K EEPROM
//#define SPI_EEPROM2_CS ?
// 32Mb FLASH
//#define SPI_FLASH_CS ?
#endif
// //
// Servos // Servos
// //

3
buildroot/tests/STM32F103RET6_creality-tests
View file

@ -15,6 +15,7 @@ exec_test $1 $2 "Ender 3 v2" "$3"
use_example_configs "Creality/Ender-3 V2" use_example_configs "Creality/Ender-3 V2"
opt_disable CLASSIC_JERK opt_disable CLASSIC_JERK
exec_test $1 $2 "Ender 3 v2 w/o CLASSIC_JERK" "$3" opt_add SDCARD_EEPROM_EMULATION
exec_test $1 $2 "Ender 3 v2, SD EEPROM, w/o CLASSIC_JERK" "$3"
restore_configs restore_configs