SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add STM32F1 support for SD-based EEPROM

Browse source
This commit is contained in:
Scott Lahteine 2018-07-06 22:32:15 -05:00
parent 63f4c9bdb9
commit d05e832f29
8 changed files with 29 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/src/HAL/HAL_AVR/persistent_store_impl.cpp
View file

@ -9,13 +9,8 @@
namespace HAL { namespace HAL {
namespace PersistentStore { namespace PersistentStore {
bool access_start() { bool access_start() { return true; }
return true; bool access_finish() { return true; }
}
bool access_finish(){
return true;
}
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) { bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {
while (size--) { while (size--) {

10
Marlin/src/HAL/HAL_DUE/persistent_store_impl.cpp
View file

@ -11,14 +11,12 @@ extern void eeprom_flush(void);
namespace HAL { namespace HAL {
namespace PersistentStore { namespace PersistentStore {
bool access_start() { bool access_start() { return true; }
return true;
}
bool access_finish(){ bool access_finish() {
#if DISABLED(I2C_EEPROM) && DISABLED(SPI_EEPROM) #if DISABLED(I2C_EEPROM) && DISABLED(SPI_EEPROM)
eeprom_flush(); eeprom_flush();
#endif #endif
return true; return true;
} }

2
Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
View file

@ -54,7 +54,7 @@ bool access_start() {
return true; return true;
} }
bool access_finish(){ bool access_finish() {
FLASH_Lock(); FLASH_Lock();
firstWrite = false; firstWrite = false;
return true; return true;

26
Marlin/src/HAL/HAL_STM32F1/persistent_store_impl.cpp
View file

@ -44,37 +44,35 @@
namespace HAL { namespace HAL {
namespace PersistentStore { namespace PersistentStore {
#define CONFIG_FILE_NAME "eeprom.dat"
#define HAL_STM32F1_EEPROM_SIZE 4096 #define HAL_STM32F1_EEPROM_SIZE 4096
char HAL_STM32F1_eeprom_content[HAL_STM32F1_EEPROM_SIZE]; char HAL_STM32F1_eeprom_content[HAL_STM32F1_EEPROM_SIZE];
char eeprom_filename[] = "eeprom.dat";
bool access_start() { bool access_start() {
if (!card.cardOK) return false; if (!card.cardOK) return false;
int16_t bytes_read = 0; int16_t bytes_read = 0;
const char eeprom_zero = 0xFF; constexpr char eeprom_zero = 0xFF;
card.openFile((char *)CONFIG_FILE_NAME,true); card.openFile(eeprom_filename, true);
bytes_read = card.read (HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE); bytes_read = card.read(HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
if (bytes_read == -1) return false; if (bytes_read < 0) return false;
for (; bytes_read < HAL_STM32F1_EEPROM_SIZE; bytes_read++) { for (; bytes_read < HAL_STM32F1_EEPROM_SIZE; bytes_read++)
HAL_STM32F1_eeprom_content[bytes_read] = eeprom_zero; HAL_STM32F1_eeprom_content[bytes_read] = eeprom_zero;
}
card.closefile(); card.closefile();
return true; return true;
} }
bool access_finish(){ bool access_finish() {
if (!card.cardOK) return false; if (!card.cardOK) return false;
int16_t bytes_written = 0; card.openFile(eeprom_filename, true);
card.openFile((char *)CONFIG_FILE_NAME,true); int16_t bytes_written = card.write(HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
bytes_written = card.write (HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
card.closefile(); card.closefile();
return (bytes_written == HAL_STM32F1_EEPROM_SIZE); return (bytes_written == HAL_STM32F1_EEPROM_SIZE);
} }
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) { bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++)
HAL_STM32F1_eeprom_content [pos + i] = value[i]; HAL_STM32F1_eeprom_content[pos + i] = value[i];
}
crc16(crc, value, size); crc16(crc, value, size);
pos += size; pos += size;
return false; return false;

1
Marlin/src/HAL/HAL_STM32F4/persistent_store_impl.cpp
View file

@ -33,7 +33,6 @@ namespace HAL {
namespace PersistentStore { namespace PersistentStore {
bool access_start() { return true; } bool access_start() { return true; }
bool access_finish() { return true; } bool access_finish() { return true; }
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) { bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {

9
Marlin/src/HAL/HAL_STM32F7/persistent_store_impl.cpp
View file

@ -33,13 +33,8 @@
namespace HAL { namespace HAL {
namespace PersistentStore { namespace PersistentStore {
bool access_start() { bool access_start() { return true; }
return true; bool access_finish() { return true; }
}
bool access_finish(){
return true;
}
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) { bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {
while (size--) { while (size--) {

9
Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_impl.cpp
View file

@ -9,13 +9,8 @@
namespace HAL { namespace HAL {
namespace PersistentStore { namespace PersistentStore {
bool access_start() { bool access_start() { return true; }
return true; bool access_finish() { return true; }
}
bool access_finish() {
return true;
}
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) { bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {
while (size--) { while (size--) {

5
Marlin/src/sd/cardreader.h
View file

@ -121,6 +121,11 @@ public:
FORCE_INLINE uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; } FORCE_INLINE uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; }
FORCE_INLINE char* getWorkDirName() { workDir.getFilename(filename); return filename; } FORCE_INLINE char* getWorkDirName() { workDir.getFilename(filename); return filename; }
#if defined(__STM32F1__) && ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
FORCE_INLINE int16_t read(void* buf, uint16_t nbyte) { return file.isOpen() ? file.read(buf, nbyte) : -1; }
FORCE_INLINE int16_t write(void* buf, uint16_t nbyte) { return file.isOpen() ? file.write(buf, nbyte) : -1; }
#endif
Sd2Card& getSd2Card() { return sd2card; } Sd2Card& getSd2Card() { return sd2card; }
#if ENABLED(AUTO_REPORT_SD_STATUS) #if ENABLED(AUTO_REPORT_SD_STATUS)