piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

FourCC added for X10 (last minute change, not tested at all (#5495)

Browse Source 
FourCC added for X10
This commit is contained in:
Bertrand Songis
2017-12-10 20:23:59 +01:00
committed by GitHub
parent e3bbbdcecf
commit 1c7012726a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/storage/storage.h
+2 -1
View File
@@ -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:
radio/src/sdcard.h
+6 -3
View File
@@ -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)