Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

[X10] Conversion fix

Browse source
This commit is contained in:
Bertrand Songis 2019-08-23 14:55:23 +02:00
parent 9296d0c83b
commit e5c0b9c4ea
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/storage/conversions/datastructs_218.h
View file

@ -532,10 +532,16 @@ PACK(struct ModelData_v218 {
#define THEME_DATA #define THEME_DATA
#endif #endif
#if defined(PCBHORUS)
#define NUM_CALIBRATION_INPUTS 13
#else
#define NUM_CALIBRATION_INPUTS (NUM_STICKS+STORAGE_NUM_POTS+STORAGE_NUM_SLIDERS)
#endif
PACK(struct RadioData_v218 { PACK(struct RadioData_v218 {
uint8_t version; uint8_t version;
uint16_t variant; uint16_t variant;
CalibData calib[NUM_STICKS+STORAGE_NUM_POTS+STORAGE_NUM_SLIDERS+STORAGE_NUM_MOUSE_ANALOGS]; CalibData calib[NUM_CALIBRATION_INPUTS];
uint16_t chkSum; uint16_t chkSum;
N_HORUS_FIELD(int8_t currModel); N_HORUS_FIELD(int8_t currModel);
N_HORUS_FIELD(uint8_t contrast); N_HORUS_FIELD(uint8_t contrast);

2
radio/src/tests/conversions.cpp
View file

@ -102,7 +102,7 @@ TEST(X10Conversions, ConversionRadioFrom22)
simuFatfsSetPaths(TESTS_PATH "/tests/", TESTS_PATH "/tests/"); simuFatfsSetPaths(TESTS_PATH "/tests/", TESTS_PATH "/tests/");
loadRadioSettings("/radio_22_x10.bin"); loadRadioSettings("/radio_22_x10.bin");
EXPECT_EQ(218, g_eeGeneral.version); EXPECT_EQ(219, g_eeGeneral.version);
EXPECT_STRNEQ("en", g_eeGeneral.ttsLanguage); EXPECT_STRNEQ("en", g_eeGeneral.ttsLanguage);
EXPECT_STRNEQ("model1.bin", g_eeGeneral.currModelFilename); EXPECT_STRNEQ("model1.bin", g_eeGeneral.currModelFilename);
} }