Merge branch 'bsongis/Issue660' into next
Conflicts: companion/src/firmwares/opentx/opentxinterface.cpp
This commit is contained in:
@@ -486,6 +486,7 @@ class GeneralSettings {
|
||||
int PPM_Multiplier;
|
||||
int hapticLength;
|
||||
unsigned int reNavigation;
|
||||
unsigned int stickReverse;
|
||||
bool hideNameOnSplash;
|
||||
bool enablePpmsim;
|
||||
unsigned int speakerPitch;
|
||||
|
||||
Reference in New Issue
Block a user