Fix minor compiler warning in mdichild.cpp, and some cleanup in eeprominterface.cpp.

This commit is contained in:
Max Paperno
2017-01-21 16:47:54 -05:00
parent 5144550e4e
commit 3e9a60b9b7
2 changed files with 19 additions and 19 deletions
+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] != GeneralSettings::SWITCH_3POS)
if (index < 0 && switchConfig[info.index] != SWITCH_3POS)
return false;
else if (info.position == 1)
return switchConfig[info.index] == GeneralSettings::SWITCH_3POS;
return switchConfig[info.index] == SWITCH_3POS;
else
return switchConfig[info.index] != GeneralSettings::SWITCH_NONE;
return switchConfig[info.index] != SWITCH_NONE;
}
bool GeneralSettings::switchSourceAllowedTaranis(int index) const
{
return switchConfig[index] != GeneralSettings::SWITCH_NONE;
return switchConfig[index] != SWITCH_NONE;
}
bool GeneralSettings::isPotAvailable(int index) const