From 9463f49ba1e3664fd08785302291793ba3cb7847 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 19 Oct 2015 07:56:10 +0200 Subject: [PATCH] Fixes #2797 - Model Restore broken on Sky9X / 9XR-PRO It seems I am not allowed to write the 4bytes header separately. It's overwritten by 4 zeroes at the next write. --- radio/src/eeprom_raw.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/radio/src/eeprom_raw.cpp b/radio/src/eeprom_raw.cpp index 1b801f0a7..d97787f52 100644 --- a/radio/src/eeprom_raw.cpp +++ b/radio/src/eeprom_raw.cpp @@ -700,22 +700,25 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name) eepromEraseBlock(address+EEPROM_BLOCK_SIZE); // write header - EepromFileHeader header = { uint16_t(i_fileDst+1), size }; - eepromWrite(address, (uint8_t *)&header, sizeof(header)); - address += sizeof(header); + EepromFileHeader * header = (EepromFileHeader *)eepromWriteBuffer; + header->fileIndex = i_fileDst+1; + header->size = size; + + int offset = 4; // write model - while (size > 0) { - uint16_t blockSize = min(size, EEPROM_BUFFER_SIZE); - result = f_read(&restoreFile, eepromWriteBuffer, blockSize, &read); + do { + uint16_t blockSize = min(size, EEPROM_BUFFER_SIZE-offset); + result = f_read(&restoreFile, eepromWriteBuffer+offset, blockSize, &read); if (result != FR_OK || read != blockSize) { f_close(&g_oLogFile); return SDCARD_ERROR(result); } - eepromWrite(address, eepromWriteBuffer, blockSize); + eepromWrite(address, eepromWriteBuffer, blockSize+offset); size -= blockSize; - address += blockSize; - } + address += EEPROM_BUFFER_SIZE; + offset = 0; + } while (size > 0); // write FAT eepromHeader.files[i_fileDst+1].exists = 1;