wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Take anycubic's approach to implement power outage support. SD card wearing can be prevented by disabling it via POWER_OUTAGE_TEST flag.

Browse Source
This commit is contained in:
Knutwurst
2020-06-11 15:36:23 +02:00
parent a52dc3c7e9
commit d090049594
7 changed files with 134 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Marlin/src/module/configuration_store.cpp
View File

@@ -56,6 +56,8 @@
#include "../gcode/gcode.h"
#include "../MarlinCore.h"
#include "../sd/cardreader.h"
#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
#include "../HAL/shared/eeprom_api.h"
#endif
@@ -522,6 +524,9 @@ void MarlinSettings::postprocess() {
#define EEPROM_READ_ALWAYS(VAR) do{ persistentStore.read_data(eeprom_index, (uint8_t*)&VAR, sizeof(VAR), &working_crc); }while(0)
#define EEPROM_ASSERT(TST,ERR) do{ if (!(TST)) { SERIAL_ERROR_MSG(ERR); eeprom_error = true; } }while(0)
#define EEPROM_WRITE_VAR(pos, value) persistentStore.write_data(pos, (uint8_t*)&value, sizeof(value))
#define EEPROM_READ_VAR(pos, value) persistentStore.read_data(pos, (uint8_t*)&value, sizeof(value))
#if ENABLED(DEBUG_EEPROM_READWRITE)
#define _FIELD_TEST(FIELD) \
EEPROM_ASSERT( \
@@ -3682,6 +3687,45 @@ void MarlinSettings::reset() {
#endif
}
#ifdef POWER_OUTAGE_TEST
float last_position[4] = { 0.0,0.0,0.0,0.0 };
long last_sd_position[1] = { 0 };
void OutageSave()
{
char ver[4] = "000";
int j = 20;
EEPROM_WRITE_VAR(j,ver);
last_sd_position[0] = card.GetLastSDpos();
last_position[0] = current_position[E_AXIS];
last_position[1] = current_position[Z_AXIS];
last_position[2] = current_position[Y_AXIS];
last_position[3] = current_position[X_AXIS];
EEPROM_WRITE_VAR(j,last_sd_position[0]);
EEPROM_WRITE_VAR(j,last_position[0]); //E
EEPROM_WRITE_VAR(j,last_position[1]); //Z
EEPROM_WRITE_VAR(j,last_position[2]); //Y
EEPROM_WRITE_VAR(j,last_position[3]); //X
}
void OutageRead()
{
int i = 20;
char stored_ver[4];
char ver[4] = EEPROM_VERSION;
EEPROM_READ_VAR(i,stored_ver);
EEPROM_READ_VAR(i,last_sd_position[0]);
EEPROM_READ_VAR(i,last_position[0]); //E
EEPROM_READ_VAR(i,last_position[1]); //Z
EEPROM_READ_VAR(i,last_position[2]); //Y
EEPROM_READ_VAR(i,last_position[3]); //X
}
#endif
#endif // !DISABLE_M503
#pragma pack(pop)

9
Marlin/src/module/configuration_store.h
View File

@@ -27,6 +27,15 @@
#include "../HAL/shared/eeprom_api.h"
#endif
#ifdef POWER_OUTAGE_TEST
static bool RestartFlag = false;
void OutageSave();
void OutageRead();
extern float last_position[4];
extern long last_sd_position[1];
#endif
class MarlinSettings {
public:
static uint16_t datasize();