Problem with invalid EEPROMS
This commit is contained in:
+8
-13
@@ -47,20 +47,16 @@ void generalDefault()
|
|||||||
bool eeLoadGeneral()
|
bool eeLoadGeneral()
|
||||||
{
|
{
|
||||||
theFile.openRlc(FILE_GENERAL);
|
theFile.openRlc(FILE_GENERAL);
|
||||||
uint8_t sz = 0;
|
if (theFile.readRlc((uint8_t*)&g_eeGeneral, 1) == 1 && g_eeGeneral.myVers == EEPROM_VER) {
|
||||||
|
|
||||||
if (theFile.readRlc((uint8_t*)&g_eeGeneral, 1) == 1) {
|
|
||||||
theFile.openRlc(FILE_GENERAL); // TODO include this openRlc inside readRlc
|
theFile.openRlc(FILE_GENERAL); // TODO include this openRlc inside readRlc
|
||||||
if (g_eeGeneral.myVers == EEPROM_VER) {
|
if (theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral)) <= sizeof(EEGeneral)) {
|
||||||
sz = theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral));
|
uint16_t sum=0;
|
||||||
|
for (int i=0; i<12;i++) sum += g_eeGeneral.calibMid[i];
|
||||||
|
if (g_eeGeneral.chkSum == sum) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sz <= sizeof(EEGeneral)) {
|
|
||||||
uint16_t sum=0;
|
|
||||||
for(int i=0; i<12;i++) sum+=g_eeGeneral.calibMid[i];
|
|
||||||
return g_eeGeneral.chkSum == sum;
|
|
||||||
}
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,8 +169,7 @@ void eeReadAll()
|
|||||||
{
|
{
|
||||||
if(!EeFsOpen() ||
|
if(!EeFsOpen() ||
|
||||||
EeFsck() < 0 ||
|
EeFsck() < 0 ||
|
||||||
!eeLoadGeneral()
|
!eeLoadGeneral())
|
||||||
)
|
|
||||||
{
|
{
|
||||||
alert(STR_BADEEPROMDATA, true);
|
alert(STR_BADEEPROMDATA, true);
|
||||||
message(STR_EEPROMFORMATTING);
|
message(STR_EEPROMFORMATTING);
|
||||||
|
|||||||
Reference in New Issue
Block a user