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

[Taranis X9E] Pots and Switches full support. Removed 2x2 switches

Browse Source 
feature
This commit is contained in:
bsongis
2015-03-09 18:51:14 +01:00
parent dd0d34ba14
commit 0eeb0437db
16 changed files with 318 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/eeprom_conversions.cpp
+3 -9
View File
@@ -837,9 +837,6 @@ int ConvertSwitch_216_to_217(int swtch)
#if defined(REV9E)
if (swtch >= SWSRC_SI0)
swtch += 10*2;
#else
if (swtch >= SWSRC_SI0)
swtch += 6*2;
#endif
return swtch;
@@ -857,10 +854,6 @@ int ConvertSource_216_to_217(int source)
// SI to SR switches added
if (source >= MIXSRC_SI)
source += 10;
#elif defined(PCBTARANIS)
// SI to SN switches added
if (source >= MIXSRC_SI)
source += 6;
#endif
// Telemetry conversions
if (source >= MIXSRC_FIRST_TELEM)
@@ -1465,8 +1458,9 @@ void ConvertModel_216_to_217(ModelData &model)
memcpy(newModel.curveNames, oldModel.curveNames, sizeof(newModel.curveNames));
memcpy(newModel.inputNames, oldModel.inputNames, sizeof(newModel.inputNames));
#endif
newModel.nPotsToWarn = oldModel.nPotsToWarn;
memcpy(newModel.potPosition, oldModel.potPosition, sizeof(newModel.potPosition));
newModel.potsWarnMode = oldModel.nPotsToWarn >> 6;
newModel.potsWarnEnabled = oldModel.nPotsToWarn & 0x1f;
memcpy(newModel.potsWarnPosition, oldModel.potPosition, sizeof(newModel.potsWarnPosition));
}
void ConvertModel(int id, int version)