CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

All EEPROM access uses persistentStore

Browse Source
This commit is contained in:
Nils Hasenbanck 2018-08-12 09:50:39 +02:00 committed by Scott Lahteine
parent 6a8b906318
commit 577aeb4aa9
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -29,6 +29,7 @@
#include "ubl.h" #include "ubl.h"
#include "../../../Marlin.h" #include "../../../Marlin.h"
#include "../../../HAL/persistent_store_api.h"
#include "../../../libs/hex_print_routines.h" #include "../../../libs/hex_print_routines.h"
#include "../../../module/configuration_store.h" #include "../../../module/configuration_store.h"
#include "../../../lcd/ultralcd.h" #include "../../../lcd/ultralcd.h"
@ -1167,24 +1168,27 @@
* right now, it is good to have the extra information. Soon... we prune this. * right now, it is good to have the extra information. Soon... we prune this.
*/ */
void unified_bed_leveling::g29_eeprom_dump() { void unified_bed_leveling::g29_eeprom_dump() {
unsigned char cccc; uint8_t cccc;
unsigned int kkkk; // Needs to be of unspecfied size to compile clean on all platforms int kkkk;
uint16_t crc = 0;
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPGM("EEPROM Dump:"); SERIAL_ECHOLNPGM("EEPROM Dump:");
persistentStore.access_start();
for (uint16_t i = 0; i < persistentStore.capacity(); i += 16) { for (uint16_t i = 0; i < persistentStore.capacity(); i += 16) {
if (!(i & 0x3)) idle(); if (!(i & 0x3)) idle();
print_hex_word(i); print_hex_word(i);
SERIAL_ECHOPGM(": "); SERIAL_ECHOPGM(": ");
for (uint16_t j = 0; j < 16; j++) { for (uint16_t j = 0; j < 16; j++) {
kkkk = i + j; kkkk = i + j;
eeprom_read_block(&cccc, (const void *)kkkk, sizeof(unsigned char)); persistentStore.read_data(kkkk, &cccc, sizeof(uint8_t), &crc);
print_hex_byte(cccc); print_hex_byte(cccc);
SERIAL_ECHO(' '); SERIAL_ECHO(' ');
} }
SERIAL_EOL(); SERIAL_EOL();
} }
SERIAL_EOL(); SERIAL_EOL();
persistentStore.access_finish();
} }
/** /**

32
Marlin/src/module/printcounter.cpp
View File

@ -31,6 +31,7 @@ Stopwatch print_job_timer; // Global Print Job Timer instance
#include "printcounter.h" #include "printcounter.h"
#include "../Marlin.h" #include "../Marlin.h"
#include "../HAL/persistent_store_api.h"
PrintCounter print_job_timer; // Global Print Job Timer instance PrintCounter print_job_timer; // Global Print Job Timer instance
@ -73,7 +74,12 @@ void PrintCounter::initStats() {
data = { 0, 0, 0, 0, 0.0 }; data = { 0, 0, 0, 0, 0.0 };
saveStats(); saveStats();
eeprom_write_byte((uint8_t*)address, 0x16);
uint16_t crc = 0;
int a = address;
persistentStore.access_start();
persistentStore.write_data(a, (uint8_t*)0x16, sizeof(uint8_t), &crc);
persistentStore.access_finish();
} }
void PrintCounter::loadStats() { void PrintCounter::loadStats() {
@ -81,11 +87,18 @@ void PrintCounter::loadStats() {
debug(PSTR("loadStats")); debug(PSTR("loadStats"));
#endif #endif
// Checks if the EEPROM block is initialized // Check if the EEPROM block is initialized
if (eeprom_read_byte((uint8_t*)address) != 0x16) initStats(); uint16_t crc = 0;
else eeprom_read_block(&data, int a = address;
(void*)(address + sizeof(uint8_t)), sizeof(printStatistics)); uint8_t value;
persistentStore.access_start();
persistentStore.read_data(a, &value, sizeof(uint8_t), &crc);
if (value != 0x16) initStats();
else {
a = address + sizeof(uint8_t);
persistentStore.read_data(a, (uint8_t*)&data, sizeof(printStatistics), &crc);
}
persistentStore.access_finish();
loaded = true; loaded = true;
} }
@ -98,8 +111,11 @@ void PrintCounter::saveStats() {
if (!isLoaded()) return; if (!isLoaded()) return;
// Saves the struct to EEPROM // Saves the struct to EEPROM
eeprom_update_block(&data, uint16_t crc = 0;
(void*)(address + sizeof(uint8_t)), sizeof(printStatistics)); int a = (address + sizeof(uint8_t));
persistentStore.access_start();
persistentStore.write_data(a, (uint8_t*)&data, sizeof(printStatistics), &crc);
persistentStore.access_finish();
} }
void PrintCounter::showStats() { void PrintCounter::showStats() {