Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 20:10:08 +03:00
Code Issues Wiki Activity

Revert "Fix Horus haptic mode (#4224)"

Browse source 
This reverts commit 9bbc595eb1.
This commit is contained in:
Andre Bernet 2017-01-22 17:20:28 +01:00
parent 9666a7f649
commit 7990973b35
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -3595,16 +3595,12 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
} }
if (version >= 216 && IS_TARANIS(board)) if (version >= 216 && IS_TARANIS(board))
internalField.Append(new SignedField<3>(generalData.splashDuration)); internalField.Append(new SignedField<3>(generalData.splashDuration));
else if ((version >= 213 && !IS_HORUS(board)) || (!IS_ARM(board) && version >= 212)) else if (version >= 213 || (!IS_ARM(board) && version >= 212))
internalField.Append(new UnsignedField<3>(generalData.splashMode)); // TODO internalField.Append(new UnsignedField<3>(generalData.splashMode)); // TODO
else if (!IS_HORUS(board)) else
internalField.Append(new SpareBitsField<3>()); internalField.Append(new SpareBitsField<3>());
internalField.Append(new SignedField<2>((int &)generalData.hapticMode)); internalField.Append(new SignedField<2>((int &)generalData.hapticMode));
if (IS_HORUS(board))
internalField.Append(new SpareBitsField<3>());
if (IS_ARM(board)) if (IS_ARM(board))
internalField.Append(new SignedField<8>(generalData.switchesDelay)); internalField.Append(new SignedField<8>(generalData.switchesDelay));
else else

1
radio/src/datastructs.h
View file

@ -999,7 +999,6 @@ PACK(struct RadioData {
NOBACKUP(uint8_t mavbaud:3); NOBACKUP(uint8_t mavbaud:3);
SPLASH_MODE; /* 3bits */ SPLASH_MODE; /* 3bits */
NOBACKUP(int8_t hapticMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all NOBACKUP(int8_t hapticMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all
HORUS_FIELD(int8_t splashSpares:3);
AVR_FIELD(uint8_t blOffBright:4) AVR_FIELD(uint8_t blOffBright:4)
AVR_FIELD(uint8_t blOnBright:4) AVR_FIELD(uint8_t blOnBright:4)
ARM_FIELD(int8_t switchesDelay) ARM_FIELD(int8_t switchesDelay)