bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

[2.0.x] PersistentStore update followup (#11549)

Browse Source
This commit is contained in:
Chris Pepper
2018-08-14 23:54:12 +01:00
committed by Scott Lahteine
parent 846bd24eb9
commit 5573ef62c6
13 changed files with 25 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/HAL/HAL_DUE/Servo_Due.cpp
View File

@ -45,7 +45,7 @@
#if HAS_SERVOS
#include <Arduino.h>
#include "../servo.h"
#include "../shared/servo.h"
#include "../shared/servo_private.h"
static volatile int8_t Channel[_Nbr_16timers]; // counter for the servo being pulsed for each timer (or -1 if refresh interval)
@ -158,4 +158,3 @@ void finISR(timer16_Sequence_t timer) {
#endif // HAS_SERVOS
#endif // ARDUINO_ARCH_SAM

5
Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
View File

@ -26,8 +26,13 @@
#if ENABLED(EEPROM_SETTINGS)
#include "../../inc/MarlinConfig.h"
#include "../shared/persistent_store_api.h"
#if DISABLED(I2C_EEPROM) && DISABLED(SPI_EEPROM)
#define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp)
#endif
extern void eeprom_flush(void);
bool PersistentStore::access_start() { return true; }

59
Marlin/src/HAL/HAL_DUE/persistent_store_impl.cpp
View File

@ -1,59 +0,0 @@
#ifdef ARDUINO_ARCH_SAM
#include "../shared/persistent_store_api.h"
#include "../../inc/MarlinConfig.h"
#if ENABLED(EEPROM_SETTINGS)
extern void eeprom_flush(void);
namespace HAL {
namespace PersistentStore {
bool access_start() { return true; }
bool access_finish() {
#if DISABLED(I2C_EEPROM) && DISABLED(SPI_EEPROM)
eeprom_flush();
#endif
return true;
}
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {
while (size--) {
uint8_t * const p = (uint8_t * const)pos;
uint8_t v = *value;
// EEPROM has only ~100,000 write cycles,
// so only write bytes that have changed!
if (v != eeprom_read_byte(p)) {
eeprom_write_byte(p, v);
if (eeprom_read_byte(p) != v) {
SERIAL_ECHO_START();
SERIAL_ECHOLNPGM(MSG_ERR_EEPROM_WRITE);
return true;
}
}
crc16(crc, &v, 1);
pos++;
value++;
};
return false;
}
bool read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc, const bool writing/*=true*/) {
do {
uint8_t c = eeprom_read_byte((unsigned char*)pos);
if (writing) *value = c;
crc16(crc, &c, 1);
pos++;
value++;
} while (--size);
return false;
}
}
}
#endif // EEPROM_SETTINGS
#endif // __AVR__