Merge pull request #2105 from davxlw/davxlw_mixers_monitor_next

Mixers monitor + build option
This commit is contained in:
Bertrand Songis
2015-02-22 11:39:00 +01:00
16 changed files with 354 additions and 320 deletions
+1
View File
@@ -1340,6 +1340,7 @@ enum Capability {
MavlinkTelemetry, MavlinkTelemetry,
HasInputDiff, HasInputDiff,
HasMixerExpo, HasMixerExpo,
MixersMonitor
}; };
class SimulatorInterface; class SimulatorInterface;
@@ -747,6 +747,8 @@ int OpenTxFirmware::getCapability(const Capability capability)
case HasInputDiff: case HasInputDiff:
case HasMixerExpo: case HasMixerExpo:
return (IS_TARANIS(board) ? true : false); return (IS_TARANIS(board) ? true : false);
case MixersMonitor:
return id.contains("mixersmon") ? 1 : 0;
default: default:
return 0; return 0;
} }
@@ -1290,6 +1292,7 @@ void registerOpenTxFirmwares()
openTx->addOption("haptic", QObject::tr("Haptic module installed")); openTx->addOption("haptic", QObject::tr("Haptic module installed"));
openTx->addOption("lua", QObject::tr("Support for Lua model scripts")); openTx->addOption("lua", QObject::tr("Support for Lua model scripts"));
openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)")); openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)"));
openTx->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
addOpenTxCommonOptions(openTx); addOpenTxCommonOptions(openTx);
firmwares.push_back(openTx); firmwares.push_back(openTx);
@@ -1299,6 +1302,7 @@ void registerOpenTxFirmwares()
openTx->addOption("nogvars", QObject::tr("Disable Global variables")); openTx->addOption("nogvars", QObject::tr("Disable Global variables"));
openTx->addOption("lua", QObject::tr("Support for Lua model scripts")); openTx->addOption("lua", QObject::tr("Support for Lua model scripts"));
openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)")); openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)"));
openTx->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
addOpenTxCommonOptions(openTx); addOpenTxCommonOptions(openTx);
firmwares.push_back(openTx); firmwares.push_back(openTx);
@@ -1308,6 +1312,7 @@ void registerOpenTxFirmwares()
openTx->addOption("nogvars", QObject::tr("Disable Global variables")); openTx->addOption("nogvars", QObject::tr("Disable Global variables"));
openTx->addOption("lua", QObject::tr("Support for Lua model scripts")); openTx->addOption("lua", QObject::tr("Support for Lua model scripts"));
openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)")); openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)"));
openTx->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
addOpenTxCommonOptions(openTx); addOpenTxCommonOptions(openTx);
firmwares.push_back(openTx); firmwares.push_back(openTx);
+7 -7
View File
@@ -298,12 +298,12 @@ MENUS_LOCK = NO
# MASSSTORAGE: The TX will appear as a drive # MASSSTORAGE: The TX will appear as a drive
USB = JOYSTICK USB = JOYSTICK
# Channel monitor display behavior # Mixers monitor view added to Channels monitor one
# Values = NO, YES # Values = NO, YES
# YES - hide the fact that channel is inverted in limits tab # YES - Adds mixers output view to Channels monitor screen,
# and show inverted channel value with opposite sign # pressing [ENT] switches between views.
# NO - normal behavior, show real channel values # NO - classic Channels monitor
CHANNELS_MONITOR_INV_HIDE = NO MIXERS_MONITOR = NO
# Use newlib-nano # Use newlib-nano
# Values = NO, YES # Values = NO, YES
@@ -955,8 +955,8 @@ ifeq ($(PCB), TARANIS)
CPPSRC += haptic.cpp CPPSRC += haptic.cpp
CPPSRC += targets/taranis/haptic_driver.cpp CPPSRC += targets/taranis/haptic_driver.cpp
endif endif
ifeq ($(CHANNELS_MONITOR_INV_HIDE), YES) ifeq ($(MIXERS_MONITOR), YES)
CPPDEFS += -DCHANNELS_MONITOR_INV_HIDE CPPDEFS += -DMIXERS_MONITOR
endif endif
ifeq ($(PCBREV), REV9E) ifeq ($(PCBREV), REV9E)
CPPSRC += targets/taranis/rotenc_driver.cpp CPPSRC += targets/taranis/rotenc_driver.cpp
+21 -5
View File
@@ -41,6 +41,9 @@ void menuChannelsView(uint8_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;
#endif
uint8_t ch; uint8_t ch;
switch(event) switch(event)
@@ -52,6 +55,11 @@ void menuChannelsView(uint8_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):
mixersView = !mixersView;
break;
#endif
} }
if (secondPage) if (secondPage)
@@ -59,6 +67,11 @@ void menuChannelsView(uint8_t event)
else else
ch = 0; ch = 0;
#ifdef MIXERS_MONITOR
if (mixersView)
lcd_putsCenter(0*FH, MIXERS_MONITOR);
else
#endif
lcd_putsCenter(0*FH, CHANNELS_MONITOR); lcd_putsCenter(0*FH, CHANNELS_MONITOR);
lcd_invert_line(0); lcd_invert_line(0);
@@ -73,13 +86,12 @@ void menuChannelsView(uint8_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];
#else
int32_t val = channelOutputs[ch]; int32_t val = channelOutputs[ch];
uint8_t ofs = (col ? 0 : 1);
#if defined(CHANNELS_MONITOR_INV_HIDE)
//if channel output is inverted, show it with oposite sign
if (g_model.limitData[ch].revert) val = -val;
#endif #endif
uint8_t ofs = (col ? 0 : 1);
// Channel name if present, number if not // Channel name if present, number if not
uint8_t lenLabel = ZLEN(g_model.limitData[ch].name); uint8_t lenLabel = ZLEN(g_model.limitData[ch].name);
@@ -106,7 +118,11 @@ void menuChannelsView(uint8_t event)
// Gauge // Gauge
lcd_rect(x+LCD_W/2-3-wbar-ofs, y, wbar+1, 6); lcd_rect(x+LCD_W/2-3-wbar-ofs, y, wbar+1, 6);
#ifdef MIXERS_MONITOR
uint16_t lim = mixersView ? 512*2*2 : (g_model.extendedLimits ? 640*2 : 512*2);
#else
uint16_t lim = g_model.extendedLimits ? 640*2 : 512*2; uint16_t lim = g_model.extendedLimits ? 640*2 : 512*2;
#endif
uint8_t len = limit((uint8_t)1, uint8_t((abs(val) * wbar/2 + lim/2) / lim), uint8_t(wbar/2)); uint8_t len = limit((uint8_t)1, uint8_t((abs(val) * wbar/2 + lim/2) / lim), uint8_t(wbar/2));
uint8_t x0 = (val>0) ? x+LCD_W/2-ofs-3-wbar/2 : x+LCD_W/2-ofs-2-wbar/2-len; uint8_t x0 = (val>0) ? x+LCD_W/2-ofs-3-wbar/2 : x+LCD_W/2-ofs-2-wbar/2-len;
lcd_hline(x0, y+1, len); lcd_hline(x0, y+1, len);
+1
View File
@@ -480,6 +480,7 @@ const pm_char STR_OWN[] PROGMEM = TR_OWN;
const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER; const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER;
const pm_char STR_DATE[] PROGMEM = TR_DATE; const pm_char STR_DATE[] PROGMEM = TR_DATE;
const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR; const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR;
const pm_char STR_MIXERS_MONITOR[] PROGMEM = TR_MIXERS_MONITOR;
const pm_char STR_PATH_TOO_LONG[] PROGMEM = TR_PATH_TOO_LONG; const pm_char STR_PATH_TOO_LONG[] PROGMEM = TR_PATH_TOO_LONG;
const pm_char STR_VIEW_TEXT[] PROGMEM = TR_VIEW_TEXT; const pm_char STR_VIEW_TEXT[] PROGMEM = TR_VIEW_TEXT;
const pm_char STR_FLASH_BOOTLOADER[] PROGMEM = TR_FLASH_BOOTLOADER; const pm_char STR_FLASH_BOOTLOADER[] PROGMEM = TR_FLASH_BOOTLOADER;
+1
View File
@@ -645,6 +645,7 @@ extern const pm_char STR_OWN[];
extern const pm_char STR_ROTARY_ENCODER[]; extern const pm_char STR_ROTARY_ENCODER[];
extern const pm_char STR_DATE[]; extern const pm_char STR_DATE[];
extern const pm_char STR_CHANNELS_MONITOR[]; extern const pm_char STR_CHANNELS_MONITOR[];
extern const pm_char STR_MIXERS_MONITOR[];
extern const pm_char STR_PATH_TOO_LONG[]; extern const pm_char STR_PATH_TOO_LONG[];
extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_VIEW_TEXT[];
extern const pm_char STR_FLASH_BOOTLOADER[]; extern const pm_char STR_FLASH_BOOTLOADER[];
+1
View File
@@ -791,6 +791,7 @@
#define TR_DATE "Datum" #define TR_DATE "Datum"
#define TR_ROTARY_ENCODER "R.Encs" #define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "MONITOR KANÁLU" #define TR_CHANNELS_MONITOR "MONITOR KANÁLU"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Cesta je moc dlouhá" #define TR_PATH_TOO_LONG "Cesta je moc dlouhá"
#define TR_VIEW_TEXT "Zobrazit text" #define TR_VIEW_TEXT "Zobrazit text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+1
View File
@@ -795,6 +795,7 @@
#define TR_DATE "Datum:" #define TR_DATE "Datum:"
#define TR_ROTARY_ENCODER "Drehgeber" #define TR_ROTARY_ENCODER "Drehgeber"
#define TR_CHANNELS_MONITOR "Kanal-Monitor" #define TR_CHANNELS_MONITOR "Kanal-Monitor"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Pfad zu Lang" #define TR_PATH_TOO_LONG "Pfad zu Lang"
#define TR_VIEW_TEXT "View Text" #define TR_VIEW_TEXT "View Text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+2 -1
View File
@@ -835,7 +835,8 @@
#define TR_OWN "Own" #define TR_OWN "Own"
#define TR_DATE "Date" #define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs" #define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "CHANNEL MONITOR" #define TR_CHANNELS_MONITOR "CHANNELS MONITOR"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Path too long" #define TR_PATH_TOO_LONG "Path too long"
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+1
View File
@@ -788,6 +788,7 @@
#define TR_DATE "Fecha" #define TR_DATE "Fecha"
#define TR_ROTARY_ENCODER "R.Encs" #define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "MONITOR CANALES" #define TR_CHANNELS_MONITOR "MONITOR CANALES"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Path too long" #define TR_PATH_TOO_LONG "Path too long"
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+2 -1
View File
@@ -787,7 +787,8 @@
#define TR_OWN "Own" #define TR_OWN "Own"
#define TR_DATE "Date" #define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs" #define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "CHANNEL MONITOR" #define TR_CHANNELS_MONITOR "CHANNELS MONITOR"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Path too long" #define TR_PATH_TOO_LONG "Path too long"
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+1
View File
@@ -788,6 +788,7 @@
#define TR_DATE "Date" #define TR_DATE "Date"
#define TR_ROTARY_ENCODER "Enc.Rot." #define TR_ROTARY_ENCODER "Enc.Rot."
#define TR_CHANNELS_MONITOR "MONITEUR CANAUX" #define TR_CHANNELS_MONITOR "MONITEUR CANAUX"
#define TR_MIXERS_MONITOR "MONITEUR MIXAGES "
#define TR_PATH_TOO_LONG "Chemin trop long" #define TR_PATH_TOO_LONG "Chemin trop long"
#define TR_VIEW_TEXT "Voir texte" #define TR_VIEW_TEXT "Voir texte"
#define TR_FLASH_BOOTLOADER "Flasher BootLoader" #define TR_FLASH_BOOTLOADER "Flasher BootLoader"
+1
View File
@@ -788,6 +788,7 @@
#define TR_DATE "Data" #define TR_DATE "Data"
#define TR_ROTARY_ENCODER "R.Encs" #define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "MONITOR CANALI" #define TR_CHANNELS_MONITOR "MONITOR CANALI"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Path troppo lungo" #define TR_PATH_TOO_LONG "Path troppo lungo"
#define TR_VIEW_TEXT "Vedi testo" #define TR_VIEW_TEXT "Vedi testo"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+1
View File
@@ -786,6 +786,7 @@
#define TR_DATE "Data" #define TR_DATE "Data"
#define TR_ROTARY_ENCODER "R.Encs" #define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "MONITOR KANAŁÓW" #define TR_CHANNELS_MONITOR "MONITOR KANAŁÓW"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Ścieżka za długa" #define TR_PATH_TOO_LONG "Ścieżka za długa"
#define TR_VIEW_TEXT "Pokaż tekst" #define TR_VIEW_TEXT "Pokaż tekst"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+1
View File
@@ -788,6 +788,7 @@
#define TR_DATE "Data" #define TR_DATE "Data"
#define TR_ROTARY_ENCODER "R.Encs" #define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "CHANNELS MONITOR" #define TR_CHANNELS_MONITOR "CHANNELS MONITOR"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "Path too long" #define TR_PATH_TOO_LONG "Path too long"
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
+1
View File
@@ -788,6 +788,7 @@
#define TR_DATE "Datum" #define TR_DATE "Datum"
#define TR_ROTARY_ENCODER "R.Enks" #define TR_ROTARY_ENCODER "R.Enks"
#define TR_CHANNELS_MONITOR "Kanalöversikt" #define TR_CHANNELS_MONITOR "Kanalöversikt"
#define TR_MIXERS_MONITOR "MIXERS MONITOR"
#define TR_PATH_TOO_LONG "För lång sökväg" #define TR_PATH_TOO_LONG "För lång sökväg"
#define TR_VIEW_TEXT "Visa Text" #define TR_VIEW_TEXT "Visa Text"
#define TR_FLASH_BOOTLOADER "Skriv BootLoader" #define TR_FLASH_BOOTLOADER "Skriv BootLoader"