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

[Companion] Move SwitchType enum to RadioData GeneralSettings (#4249)

Browse Source 
* [Companion] Move SwitchType enum to RadioData GeneralSettings for consistency.

* Fix default 9X switch index positions & trainer switch name.
This commit is contained in:
Max Paperno
2017-01-18 07:33:28 +01:00
committed by Bertrand Songis
parent 56dc2f94ce
commit d29c381c19
6 changed files with 145 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/eeprominterface.cpp
+4 -4
View File
@@ -1055,17 +1055,17 @@ bool GeneralSettings::switchPositionAllowedTaranis(int index) const
if (index == 0)
return true;
SwitchInfo info = switchInfoFromSwitchPositionTaranis(abs(index));
if (index < 0 && switchConfig[info.index] != Firmware::SWITCH_3POS)
if (index < 0 && switchConfig[info.index] != GeneralSettings::SWITCH_3POS)
return false;
else if (info.position == 1)
return switchConfig[info.index] == Firmware::SWITCH_3POS;
return switchConfig[info.index] == GeneralSettings::SWITCH_3POS;
else
return switchConfig[info.index] != Firmware::SWITCH_NONE;
return switchConfig[info.index] != GeneralSettings::SWITCH_NONE;
}
bool GeneralSettings::switchSourceAllowedTaranis(int index) const
{
return switchConfig[index] != Firmware::SWITCH_NONE;
return switchConfig[index] != GeneralSettings::SWITCH_NONE;
}
bool GeneralSettings::isPotAvailable(int index) const