From 6027c519e4f5873dbe4247cef1f9d4b52aa0bf4f Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 23 Jan 2017 11:08:39 -0800 Subject: [PATCH] Force symlimits and ppmca for ARM (#4267) Make PPM_LIMITS_SYMETRICAL(symlimits), PPM_CENTER_ADJUSTABLE(ppmca) and CURVES mandatory on ARM platforms. --- companion/src/firmwares/opentx/opentxinterface.cpp | 9 --------- radio/util/fwoptions.py | 6 ------ 2 files changed, 15 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 34a350488..efcaf790c 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1314,10 +1314,7 @@ void registerOpenTxFirmwares() firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); firmware->addOption("nofp", QObject::tr("No flight modes")); - firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); - firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); @@ -1465,10 +1462,7 @@ void registerOpenTxFirmwares() firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); firmware->addOption("nofp", QObject::tr("No flight modes")); - firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); - firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); @@ -1488,10 +1482,7 @@ void registerOpenTxFirmwares() firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); firmware->addOption("nofp", QObject::tr("No flight modes")); - firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); - firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index 958016475..d3185f54c 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -192,11 +192,8 @@ options_sky9x = { "heli": ("HELI", "YES", "NO"), "templates": ("TEMPLATES", "YES", "NO"), "nofp": ("FLIGHT_MODES", "NO", "YES"), - "nocurves": ("CURVES", "NO", "YES"), - "ppmca": ("PPM_CENTER_ADJUSTABLE", "YES", "NO"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "gvars": ("GVARS", "YES", "NO"), - "symlimits": ("PPM_LIMITS_SYMETRICAL", "YES", "NO"), "potscroll": ("NAVIGATION", "POTS", "NO"), "autosource": ("AUTOSOURCE", "YES", "NO"), "autoswitch": ("AUTOSWITCH", "YES", "NO"), @@ -216,11 +213,8 @@ options_ar9x = { "heli": ("HELI", "YES", "NO"), "templates": ("TEMPLATES", "YES", "NO"), "nofp": ("FLIGHT_MODES", "NO", "YES"), - "nocurves": ("CURVES", "NO", "YES"), - "ppmca": ("PPM_CENTER_ADJUSTABLE", "YES", "NO"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "gvars": ("GVARS", "YES", "NO"), - "symlimits": ("PPM_LIMITS_SYMETRICAL", "YES", "NO"), "potscroll": ("NAVIGATION", "POTS", "NO"), "autosource": ("AUTOSOURCE", "YES", "NO"), "autoswitch": ("AUTOSWITCH", "YES", "NO"),