Remove mixermon option (make it always true) (#4573)
* Remove mixermon option (make it always true) * Cosmetics * Compile fix
This commit is contained in:
@@ -139,7 +139,6 @@ enum Capability {
|
|||||||
MavlinkTelemetry,
|
MavlinkTelemetry,
|
||||||
HasInputDiff,
|
HasInputDiff,
|
||||||
HasMixerExpo,
|
HasMixerExpo,
|
||||||
MixersMonitor,
|
|
||||||
HasBatMeterRange,
|
HasBatMeterRange,
|
||||||
DangerousFunctions,
|
DangerousFunctions,
|
||||||
HasModelCategories
|
HasModelCategories
|
||||||
|
|||||||
@@ -714,8 +714,6 @@ int OpenTxFirmware::getCapability(::Capability capability)
|
|||||||
case HasInputDiff:
|
case HasInputDiff:
|
||||||
case HasMixerExpo:
|
case HasMixerExpo:
|
||||||
return (IS_HORUS_OR_TARANIS(board) ? true : false);
|
return (IS_HORUS_OR_TARANIS(board) ? true : false);
|
||||||
case MixersMonitor:
|
|
||||||
return id.contains("mixersmon") ? 1 : 0;
|
|
||||||
case HasBatMeterRange:
|
case HasBatMeterRange:
|
||||||
return (IS_HORUS_OR_TARANIS(board) ? true : id.contains("battgraph"));
|
return (IS_HORUS_OR_TARANIS(board) ? true : id.contains("battgraph"));
|
||||||
case DangerousFunctions:
|
case DangerousFunctions:
|
||||||
@@ -1161,7 +1159,6 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware)
|
|||||||
void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
|
void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
|
||||||
{
|
{
|
||||||
addOpenTxFrskyOptions(firmware);
|
addOpenTxFrskyOptions(firmware);
|
||||||
firmware->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
|
|
||||||
firmware->addOption("internalppm", QObject::tr("Support for PPM internal module hack"));
|
firmware->addOption("internalppm", QObject::tr("Support for PPM internal module hack"));
|
||||||
firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
||||||
}
|
}
|
||||||
@@ -1486,7 +1483,6 @@ void registerOpenTxFirmwares()
|
|||||||
firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
|
||||||
firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
|
||||||
firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
|
||||||
firmware->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
|
|
||||||
firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
|
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"));
|
firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
|
||||||
firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
|
||||||
|
|||||||
@@ -25,9 +25,8 @@ void menuChannelsView(event_t event)
|
|||||||
static bool longNames = false;
|
static bool longNames = false;
|
||||||
bool newLongNames = false;
|
bool newLongNames = false;
|
||||||
static bool secondPage = false;
|
static bool secondPage = false;
|
||||||
#ifdef MIXERS_MONITOR
|
|
||||||
static bool mixersView = false;
|
static bool mixersView = false;
|
||||||
#endif
|
|
||||||
uint8_t ch;
|
uint8_t ch;
|
||||||
|
|
||||||
switch(event)
|
switch(event)
|
||||||
@@ -39,11 +38,9 @@ void menuChannelsView(event_t event)
|
|||||||
case EVT_KEY_FIRST(KEY_LEFT):
|
case EVT_KEY_FIRST(KEY_LEFT):
|
||||||
secondPage = !secondPage;
|
secondPage = !secondPage;
|
||||||
break;
|
break;
|
||||||
#ifdef MIXERS_MONITOR
|
|
||||||
case EVT_KEY_FIRST(KEY_ENTER):
|
case EVT_KEY_FIRST(KEY_ENTER):
|
||||||
mixersView = !mixersView;
|
mixersView = !mixersView;
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (secondPage)
|
if (secondPage)
|
||||||
@@ -51,12 +48,12 @@ void menuChannelsView(event_t event)
|
|||||||
else
|
else
|
||||||
ch = 0;
|
ch = 0;
|
||||||
|
|
||||||
#ifdef MIXERS_MONITOR
|
if (mixersView) {
|
||||||
if (mixersView)
|
lcdDrawTextAlignedCenter(0, MIXERS_MONITOR);
|
||||||
lcdDrawTextAlignedCenter(0*FH, MIXERS_MONITOR);
|
}
|
||||||
else
|
else {
|
||||||
#endif
|
lcdDrawTextAlignedCenter(0, CHANNELS_MONITOR);
|
||||||
lcdDrawTextAlignedCenter(0*FH, CHANNELS_MONITOR);
|
}
|
||||||
|
|
||||||
lcdInvertLine(0);
|
lcdInvertLine(0);
|
||||||
|
|
||||||
@@ -70,11 +67,7 @@ void menuChannelsView(event_t event)
|
|||||||
// Channels
|
// Channels
|
||||||
for (uint8_t line=0; line<8; line++) {
|
for (uint8_t line=0; line<8; line++) {
|
||||||
uint8_t y = 9+line*7;
|
uint8_t y = 9+line*7;
|
||||||
#ifdef MIXERS_MONITOR
|
|
||||||
int32_t val = (mixersView) ? ex_chans[ch] : channelOutputs[ch];
|
int32_t val = (mixersView) ? ex_chans[ch] : channelOutputs[ch];
|
||||||
#else
|
|
||||||
int32_t val = channelOutputs[ch];
|
|
||||||
#endif
|
|
||||||
uint8_t ofs = (col ? 0 : 1);
|
uint8_t ofs = (col ? 0 : 1);
|
||||||
|
|
||||||
// Channel name if present, number if not
|
// Channel name if present, number if not
|
||||||
|
|||||||
@@ -42,11 +42,9 @@ void menuChannelsView(event_t event)
|
|||||||
case EVT_KEY_FIRST(KEY_LEFT):
|
case EVT_KEY_FIRST(KEY_LEFT):
|
||||||
secondPage = !secondPage;
|
secondPage = !secondPage;
|
||||||
break;
|
break;
|
||||||
#ifdef MIXERS_MONITOR
|
|
||||||
case EVT_KEY_FIRST(KEY_ENTER):
|
case EVT_KEY_FIRST(KEY_ENTER):
|
||||||
mixersView = !mixersView;
|
mixersView = !mixersView;
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (secondPage)
|
if (secondPage)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
|
option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
|
||||||
option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
|
option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
|
||||||
option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF)
|
option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF)
|
||||||
option(MIXERS_MONITOR "Enable Mixers Monitor screen (not available on X7 yet)" OFF)
|
|
||||||
|
|
||||||
if(PCB STREQUAL X9E)
|
if(PCB STREQUAL X9E)
|
||||||
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
||||||
@@ -142,8 +141,4 @@ if(TARANIS_INTERNAL_PPM)
|
|||||||
add_definitions(-DTARANIS_INTERNAL_PPM)
|
add_definitions(-DTARANIS_INTERNAL_PPM)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MIXERS_MONITOR AND NOT PCB STREQUAL X7)
|
|
||||||
add_definitions(-DMIXERS_MONITOR)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${BITMAPS_TARGET})
|
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${BITMAPS_TARGET})
|
||||||
|
|||||||
@@ -244,7 +244,6 @@ options_taranis = {
|
|||||||
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
|
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
|
||||||
"massstorage": ("USB", "MASSSTORAGE", None),
|
"massstorage": ("USB", "MASSSTORAGE", None),
|
||||||
"cli": ("USB", "SERIAL", None),
|
"cli": ("USB", "SERIAL", None),
|
||||||
"mixersmon": ("MIXERS_MONITOR", "YES", "NO"),
|
|
||||||
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
|
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
|
||||||
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
|
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
|
||||||
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
|
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
|
||||||
@@ -264,7 +263,6 @@ options_taranisplus = {
|
|||||||
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
|
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
|
||||||
"massstorage": ("USB", "MASSSTORAGE", None),
|
"massstorage": ("USB", "MASSSTORAGE", None),
|
||||||
"cli": ("USB", "SERIAL", None),
|
"cli": ("USB", "SERIAL", None),
|
||||||
"mixersmon": ("MIXERS_MONITOR", "YES", "NO"),
|
|
||||||
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
|
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
|
||||||
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
|
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
|
||||||
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
|
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
|
||||||
@@ -284,7 +282,6 @@ options_taranisx9e = {
|
|||||||
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
|
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
|
||||||
"massstorage": ("USB", "MASSSTORAGE", None),
|
"massstorage": ("USB", "MASSSTORAGE", None),
|
||||||
"cli": ("USB", "SERIAL", None),
|
"cli": ("USB", "SERIAL", None),
|
||||||
"mixersmon": ("MIXERS_MONITOR", "YES", "NO"),
|
|
||||||
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
|
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
|
||||||
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
|
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
|
||||||
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
|
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
|
||||||
|
|||||||
Reference in New Issue
Block a user