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

[Horus] Companion default types for switches / pots / sliders

Browse Source
This commit is contained in:
Bertrand Songis
2016-12-23 23:49:51 +01:00
parent d9981b25d9
commit 74c03f0d4e
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/eeprominterface.cpp
+10 -1
View File
@@ -1067,7 +1067,16 @@ GeneralSettings::GeneralSettings()
}
BoardEnum board = GetEepromInterface()->getBoard();
if (IS_TARANIS(board)) {
if (board == BOARD_HORUS) {
potConfig[0] = POT_WITH_DETENT;
potConfig[1] = POT_MULTIPOS_SWITCH;
potConfig[2] = POT_WITH_DETENT;
sliderConfig[0] = SLIDER_WITH_DETENT;
sliderConfig[1] = SLIDER_WITH_DETENT;
sliderConfig[2] = SLIDER_WITH_DETENT;
sliderConfig[3] = SLIDER_WITH_DETENT;
}
else if (IS_TARANIS(board)) {
potConfig[0] = POT_WITH_DETENT;
potConfig[1] = POT_WITH_DETENT;
sliderConfig[0] = SLIDER_WITH_DETENT;
companion/src/firmwares/opentx/opentxeeprom.cpp
+6 -1
View File
@@ -3675,7 +3675,12 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
internalField.Append(new UnsignedField<8>(generalData.hw_uartMode));
}
if (IS_HORUS(board)) {
internalField.Append(new SpareBitsField<32>()); // switchConfig
for (int i=0; i<16; i++) {
if (i < MAX_SWITCHES(board, version))
internalField.Append(new UnsignedField<2>(generalData.switchConfig[i]));
else
internalField.Append(new SpareBitsField<2>());
}
}
for (int i=0; i<4; i++) {
if (i < MAX_POTS(board, version))
companion/src/firmwares/opentx/opentxinterface.cpp
+1 -1
View File
@@ -598,7 +598,7 @@ int OpenTxFirmware::getCapability(Capability capability)
return 18;
else if (board == BOARD_TARANIS_X7)
return 6;
else if (IS_TARANIS(board))
else if (IS_TARANIS(board) || board == BOARD_HORUS)
return 8;
else
return 7;