Skip to content

[2.0.x] Use the new const functions of the persistentStore api #11544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 3 commits into from
Aug 14, 2018
Merged

[2.0.x] Use the new const functions of the persistentStore api #11544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
009ba02
Use the new const functions of the persistentStore api
hasenbanck Aug 14, 2018
44d0470
Fix invalid memory access
hasenbanck Aug 14, 2018
ed5339d
Patch compile error and formatting
thinkyhead Aug 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Marlin/src/HAL/shared/persistent_store_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ class PersistentStore {
static bool read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing=true);
static size_t capacity();

static inline bool write_data(const int pos, uint8_t* value, const size_t size) {
static inline bool write_data(const int pos, const uint8_t* value, const size_t size=sizeof(uint8_t)) {
int data_pos = pos;
uint16_t crc = 0;
return write_data(data_pos, value, size, &crc);
}

static inline bool read_data(const int pos, uint8_t* value, const size_t size) {
static inline bool write_data(const int pos, const uint8_t value) { return write_data(pos, &value); }

static inline bool read_data(const int pos, uint8_t* value, const size_t size=1) {
int data_pos = pos;
uint16_t crc = 0;
return read_data(data_pos, value, size, &crc);
Expand Down
5 changes: 1 addition & 4 deletions Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,8 +1169,6 @@
*/
void unified_bed_leveling::g29_eeprom_dump() {
uint8_t cccc;
int kkkk;
uint16_t crc = 0;

SERIAL_ECHO_START();
SERIAL_ECHOLNPGM("EEPROM Dump:");
Expand All @@ -1180,8 +1178,7 @@
print_hex_word(i);
SERIAL_ECHOPGM(": ");
for (uint16_t j = 0; j < 16; j++) {
kkkk = i + j;
persistentStore.read_data(kkkk, &cccc, sizeof(uint8_t), &crc);
persistentStore.read_data(i + j, &cccc, sizeof(uint8_t));
print_hex_byte(cccc);
SERIAL_ECHO(' ');
}
Expand Down
23 changes: 8 additions & 15 deletions Marlin/src/module/printcounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,8 @@ void PrintCounter::initStats() {

saveStats();

uint16_t crc = 0;
int a = address;
persistentStore.access_start();
persistentStore.write_data(a, (uint8_t*)0x16, sizeof(uint8_t), &crc);
persistentStore.write_data(address, (uint8_t)0x16);
persistentStore.access_finish();
}

Expand All @@ -88,16 +86,13 @@ void PrintCounter::loadStats() {
#endif

// Check if the EEPROM block is initialized
uint16_t crc = 0;
int a = address;
uint8_t value;
uint8_t value = 0;
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.read_data(address, &value, sizeof(uint8_t));
if (value != 0x16)
initStats();
else
persistentStore.read_data(address + sizeof(uint8_t), (uint8_t*)&data, sizeof(printStatistics));
persistentStore.access_finish();
loaded = true;
}
Expand All @@ -111,10 +106,8 @@ void PrintCounter::saveStats() {
if (!isLoaded()) return;

// Saves the struct to EEPROM
uint16_t crc = 0;
int a = (address + sizeof(uint8_t));
persistentStore.access_start();
persistentStore.write_data(a, (uint8_t*)&data, sizeof(printStatistics), &crc);
persistentStore.write_data(address + sizeof(uint8_t), (uint8_t*)&data, sizeof(printStatistics));
persistentStore.access_finish();
}

Expand Down