diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index ca3b9437d..2ac0e6e77 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -121,34 +121,24 @@ inline const char * SDCARD_ERROR(FRESULT result) const char * getFileExtension(const char * filename, uint8_t size=0, uint8_t extMaxLen=0, uint8_t *fnlen=NULL, uint8_t *extlen=NULL); const char * getBasename(const char * path); -// TODO REMOVE THE O9X FOURCC in 2.3 #if defined(PCBX12S) #define OTX_FOURCC 0x3478746F // otx for X12S - #define O9X_FOURCC 0x3178396F // we forgot it in 2.2 RC .. #elif defined(PCBX10) #define OTX_FOURCC 0x3778746F // otx for X10 - #define O9X_FOURCC 0x3478746F // match X12S, we forgot OTX_FOURCC before 2.2.1 RC2 #elif defined(PCBX9E) #define OTX_FOURCC 0x3578746F // otx for Taranis X9E - #define O9X_FOURCC 0x3378396F // o9x for Taranis X9E #elif defined(PCBXLITES) #define OTX_FOURCC 0x3B78746F // otx for Taranis X-Lite S - #define O9X_FOURCC 0x3B78396F // o9x for Taranis X-Lite S #elif defined(PCBXLITE) #define OTX_FOURCC 0x3978746F // otx for Taranis X-Lite - #define O9X_FOURCC 0x3978396F // o9x for Taranis X-Lite #elif defined(PCBX7) #define OTX_FOURCC 0x3678746F // otx for Taranis X7 - #define O9X_FOURCC 0x3378396F // o9x for Taranis X7 #elif defined(PCBX9LITE) #define OTX_FOURCC 0x3C78746F // otx for Taranis X9-Lite - #define O9X_FOURCC 0x3C78396F // o9x for Taranis X9-Lite #elif defined(PCBX9D) || defined(PCBX9DP) #define OTX_FOURCC 0x3378746F // otx for Taranis X9D - #define O9X_FOURCC 0x3378396F // o9x for Taranis X9D #elif defined(PCBSKY9X) #define OTX_FOURCC 0x3278746F // otx for sky9x - #define O9X_FOURCC 0x3278396F // o9x for sky9x #endif bool isFileAvailable(const char * filename, bool exclDir = false); diff --git a/radio/src/storage/eeprom_raw.cpp b/radio/src/storage/eeprom_raw.cpp index 2e93a6a70..3e286ec49 100644 --- a/radio/src/storage/eeprom_raw.cpp +++ b/radio/src/storage/eeprom_raw.cpp @@ -538,7 +538,7 @@ const char * eeRestoreModel(uint8_t i_fileDst, char *model_name) } uint8_t version = (uint8_t)buf[4]; - if ((*(uint32_t*)&buf[0] != OTX_FOURCC && *(uint32_t*)&buf[0] != O9X_FOURCC) || version < FIRST_CONV_EEPROM_VER || version > EEPROM_VER || buf[5] != 'M') { + if (*(uint32_t*)&buf[0] != OTX_FOURCC || version < FIRST_CONV_EEPROM_VER || version > EEPROM_VER || buf[5] != 'M') { f_close(&restoreFile); return STR_INCOMPATIBLE; } diff --git a/radio/src/storage/eeprom_rlc.cpp b/radio/src/storage/eeprom_rlc.cpp index bf1e18587..4bed375d9 100644 --- a/radio/src/storage/eeprom_rlc.cpp +++ b/radio/src/storage/eeprom_rlc.cpp @@ -557,7 +557,7 @@ const char * eeRestoreModel(uint8_t i_fileDst, char *model_name) } uint8_t version = (uint8_t)buf[4]; - if ((*(uint32_t*)&buf[0] != OTX_FOURCC && *(uint32_t*)&buf[0] != O9X_FOURCC) || version < FIRST_CONV_EEPROM_VER || version > EEPROM_VER || buf[5] != 'M') { + if (*(uint32_t*)&buf[0] != OTX_FOURCC || version < FIRST_CONV_EEPROM_VER || version > EEPROM_VER || buf[5] != 'M') { f_close(&g_oLogFile); return STR_INCOMPATIBLE; } diff --git a/radio/src/storage/sdcard_raw.cpp b/radio/src/storage/sdcard_raw.cpp index 4917a0c22..c0b129fc8 100644 --- a/radio/src/storage/sdcard_raw.cpp +++ b/radio/src/storage/sdcard_raw.cpp @@ -92,7 +92,7 @@ const char * openFile(const char * fullpath, FIL * file, uint16_t * size, uint8_ } *version = (uint8_t)buf[4]; - if ((*(uint32_t*)&buf[0] != OTX_FOURCC && *(uint32_t*)&buf[0] != O9X_FOURCC) || *version < FIRST_CONV_EEPROM_VER || *version > EEPROM_VER || buf[5] != 'M') { + if (*(uint32_t*)&buf[0] != OTX_FOURCC || *version < FIRST_CONV_EEPROM_VER || *version > EEPROM_VER || buf[5] != 'M') { f_close(file); return STR_INCOMPATIBLE; }