111,7 → 111,8 |
// length is the length of the pure data not including checksum and revision number. |
void writeChecksummedBlock(uint8_t revisionNumber, uint8_t* data, uint16_t offset, uint16_t length) { |
uint16_t CRC = CRC16(data, length); |
eeprom_write_word(&EEPromArray[offset], CRC); |
eeprom_write_byte(&EEPromArray[offset], CRC&0xff); |
eeprom_write_byte(&EEPromArray[offset+1], CRC>>8); |
eeprom_write_byte(&EEPromArray[offset+2], revisionNumber); |
eeprom_write_block(data, &EEPromArray[offset+3], length); |
} |
119,10 → 120,10 |
// offset is where the checksum is stored, offset+1 is the revision number, and offset+2... are the data. |
// length is the length of the pure data not including checksum and revision number. |
uint8_t readChecksummedBlock(uint8_t revisionNumber, uint8_t* target, uint16_t offset, uint16_t length) { |
uint16_t CRCRead = eeprom_read_word(&EEPromArray[offset]); |
uint16_t CRCRead = eeprom_read_byte(&EEPromArray[offset]) | (eeprom_read_byte(&EEPromArray[offset+1])<<8); |
uint8_t revisionNumberRead = eeprom_read_byte(&EEPromArray[offset+2]); |
eeprom_read_block(target, &EEPromArray[offset+3], length); |
uint16_t CRCCalculated = CRC(target, length); |
uint16_t CRCCalculated = CRC16(target, length); |
|
uint8_t CRCError = (CRCRead != CRCCalculated); |
uint8_t revisionMismatch = (revisionNumber != revisionNumberRead); |
130,7 → 131,7 |
if (CRCError && revisionMismatch) printf("\n\rEEPROM CRC error and revision mismatch; "); |
else if (CRCError) printf("\n\rEEPROM CRC error; "); |
else if (revisionMismatch) printf("\n\rEEPROM revision mismatch; "); |
return (checksumError || revisionMismatch); |
return (CRCError || revisionMismatch); |
} |
|
/***************************************************/ |
159,7 → 160,7 |
// parameter version check |
if (setnumber<1 ||setnumber>5 || paramSet_readFromEEProm(setnumber)) { |
// if version check faild |
printf("writing default parameter sets"); |
printf("\n\rwriting default parameter sets"); |
for (uint8_t i=5; i>0; i--) { |
paramSet_default(i); |
paramSet_writeToEEProm(i); |
174,10 → 175,6 |
/***************************************************/ |
/* MixerTable */ |
/***************************************************/ |
uint8_t mixerMatrix_readFromEEProm(void) { |
return readChecksummedBlock(EEMIXER_REVISION, (uint8_t*)&mixerMatrix, EEPROM_ADR_MIXER_TABLE, sizeof(mixerMatrix_t)); |
} |
|
void mixerMatrix_writeToEEProm(void) { |
writeChecksummedBlock(EEMIXER_REVISION, (uint8_t*)&mixerMatrix, EEPROM_ADR_MIXER_TABLE, sizeof(mixerMatrix_t)); |
} |
184,7 → 181,7 |
|
void mixerMatrix_readOrDefault(void) { |
// load mixer table |
if (mixerMatrix_readFromEEProm()) { |
if (readChecksummedBlock(EEMIXER_REVISION, (uint8_t*)&mixerMatrix, EEPROM_ADR_MIXER_TABLE, sizeof(mixerMatrix_t))) { |
printf("writing default mixerMatrix"); |
mixerMatrix_default(); // Quadro |
mixerMatrix_writeToEEProm(); |
196,23 → 193,19 |
requiredMotors++; |
} |
|
printf("\n\r\rMixer-Config: '%s' (%u Motors)",mixerMatrix.name, requiredMotors); |
printf("\n\r\r=============================="); |
printf("\n\rMixer-Config: '%s' (%u Motors)",mixerMatrix.name, requiredMotors); |
printf("\n\r==================================="); |
} |
|
/***************************************************/ |
/* ChannelMap */ |
/***************************************************/ |
uint8_t channelMap_readFromEEProm(void) { |
return readChecksummedBlock(CHANNELMAP_REVISION, (uint8_t*)&channelMap, EEPROM_ADR_CHANNELMAP, sizeof(channelMap_t)); |
} |
|
void channelMap_writeToEEProm(void) { |
writeChecksummedBlock(CHANNELMAP_REVISION, (uint8_t*)&channelMap, EEPROM_ADR_CHANNELMAP, sizeof(channelMap_t)); |
} |
|
void channelMap_readOrDefault(void) { |
if (channelMap_readFromEEProm()) { |
if (readChecksummedBlock(CHANNELMAP_REVISION, (uint8_t*)&channelMap, EEPROM_ADR_CHANNELMAP, sizeof(channelMap_t))) { |
printf("writing default channel map"); |
channelMap_default(); |
channelMap_writeToEEProm(); |