From 1c7012726ae6368d9acabcc88e6f68528d1aea32 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 10 Dec 2017 20:23:59 +0100 Subject: [PATCH] FourCC added for X10 (last minute change, not tested at all (#5495) FourCC added for X10 --- companion/src/storage/storage.h | 3 ++- radio/src/sdcard.h | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/companion/src/storage/storage.h b/companion/src/storage/storage.h index 8c4f76a3c..73b7d1506 100644 --- a/companion/src/storage/storage.h +++ b/companion/src/storage/storage.h @@ -71,8 +71,9 @@ class StorageFormat { switch (board) { case Board::BOARD_X12S: - case Board::BOARD_X10: return 0x3478746F; + case Board::BOARD_X10: + return 0x3778746F; case Board::BOARD_TARANIS_X7: return 0x3678746F; case Board::BOARD_TARANIS_X9E: diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index c4ba537c9..9eb2c1adb 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -115,16 +115,19 @@ inline const pm_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); // TODO REMOVE THE O9X FOURCC in 2.3 -#if defined(PCBHORUS) - #define OTX_FOURCC 0x3478746F // otx for Horus +#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 0x3478396F // we forgot it in 2.2 RC .. #elif defined(PCBX9E) #define OTX_FOURCC 0x3578746F // otx for Taranis X9E #define O9X_FOURCC 0x3378396F // o9x for Taranis X9E #elif defined(PCBX7) #define OTX_FOURCC 0x3678746F // otx for Taranis X7 #define O9X_FOURCC 0x3378396F // o9x for Taranis X7 -#elif defined(PCBTARANIS) +#elif defined(PCBX9D) || defined(PCBX9DP) #define OTX_FOURCC 0x3378746F // otx for Taranis X9D #define O9X_FOURCC 0x3378396F // o9x for Taranis X9D #elif defined(PCBSKY9X)