diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index 4ef4bbc89..9f1dec076 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -1340,6 +1340,7 @@ enum Capability { MavlinkTelemetry, HasInputDiff, HasMixerExpo, + MixersMonitor }; class SimulatorInterface; diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 2dce91aac..0b880b2db 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -747,6 +747,8 @@ int OpenTxFirmware::getCapability(const Capability capability) case HasInputDiff: case HasMixerExpo: return (IS_TARANIS(board) ? true : false); + case MixersMonitor: + return id.contains("mixersmon") ? 1 : 0; default: return 0; } @@ -1290,6 +1292,7 @@ void registerOpenTxFirmwares() openTx->addOption("haptic", QObject::tr("Haptic module installed")); 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("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views")); addOpenTxCommonOptions(openTx); firmwares.push_back(openTx); @@ -1299,6 +1302,7 @@ void registerOpenTxFirmwares() openTx->addOption("nogvars", QObject::tr("Disable Global variables")); 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("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views")); addOpenTxCommonOptions(openTx); firmwares.push_back(openTx); @@ -1308,6 +1312,7 @@ void registerOpenTxFirmwares() openTx->addOption("nogvars", QObject::tr("Disable Global variables")); 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("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views")); addOpenTxCommonOptions(openTx); firmwares.push_back(openTx); diff --git a/radio/src/Makefile b/radio/src/Makefile index fc4c63ee1..7424263a5 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -41,7 +41,7 @@ DOUBLE_WRITE_OK = NO # Must have avrdude interface AVRDUDE = /usr/local/bin/avrdude -# Device options for AVRDUDE Command. +# Device options for AVRDUDE Command. AVRDEVICE = -c usbasp -p m64 # Delay to start second AVRDUDE command (required by some). @@ -50,7 +50,7 @@ DELAY = 5 #----------- BUILD OPTIONS --------------------------- # PCB version -# Values: 9X, 9X128, 9X2561, 9XR, 9XR128, 9XR2561, GRUVIN9X, MEGA2560, SKY9X, 9XRPRO, TARANIS +# Values: 9X, 9X128, 9X2561, 9XR, 9XR128, 9XR2561, GRUVIN9X, MEGA2560, SKY9X, 9XRPRO, TARANIS # Old values STD and STD128 are mapped to 9X and 9X128 for compatibility PCB = 9X @@ -98,27 +98,27 @@ TEMPLATES = $(GUI) NAVIGATION = NO # Switches automatic selection -# Values = YES, NO +# Values = YES, NO AUTOSWITCH = NO # Stock sticks replaced by FrSky ones -# Values = YES, NO +# Values = YES, NO FRSKY_STICKS = NO # Sources automatic selection -# Values = YES, NO +# Values = YES, NO AUTOSOURCE = NO # Double keys support (+/- means invert, +/up means max, -/dwn means min, up/down means reset to default) -# Values = YES, NO +# Values = YES, NO DBLKEYS = NO # AUDIO Mods -# Values = YES, NO +# Values = YES, NO AUDIO = NO # VOICE Mods -# Values = YES, NO +# Values = YES, NO VOICE = NO # corrects different rounding for negative values. So instead of -99.9 you will see again -100.0 @@ -137,15 +137,15 @@ ARITHMETIC_OVERFLOW_CHECK = NO ACCURAT_THROTTLE_STATS = NO # HAPTIC Mods -# Values = YES, NO +# Values = YES, NO HAPTIC = NO # SmartieParts 2.2 Backlight support (inverted) -# Values = YES, NO +# Values = YES, NO SP22 = NO # Fade Backlight using PWM -# Values = YES, NO +# Values = YES, NO PWM_BACKLIGHT = NO # SPLASH on START @@ -181,7 +181,7 @@ OVERRIDE_CHANNEL_FUNCTION = YES # Values = YES, NO DANGEROUS_MODULE_FUNCTIONS = NO -# FrSky Hub +# FrSky Hub # Values = YES, NO FRSKY_HUB = YES @@ -189,7 +189,7 @@ FRSKY_HUB = YES # Values = YES, NO FAS_OFFSET = NO -# WS HowHigh +# WS HowHigh # Values = YES, NO WS_HOW_HIGH = YES @@ -197,11 +197,11 @@ WS_HOW_HIGH = YES # Values = YES, NO GAUGES = YES -# GPS +# GPS # Values = YES, NO GPS = YES -# Vario +# Vario # Values = YES, NO VARIO = YES @@ -242,7 +242,7 @@ TRANSLATIONS = EN TTS = $(TRANSLATIONS) # UNITS -# Values = imperial, metric +# Values = imperial, metric UNITS = METRIC # Default Tx Mode @@ -285,11 +285,11 @@ GVARS = NO 3POS = NO # Lua interpreter embedded -# Values = NO, NO_MODEL_SCRIPTS, YES +# Values = NO, NO_MODEL_SCRIPTS, YES LUA = NO # Menu Lock modes -# Values = NO, READONLY, NOMENUS +# Values = NO, READONLY, NOMENUS MENUS_LOCK = NO # USB options in the main image @@ -298,14 +298,14 @@ MENUS_LOCK = NO # MASSSTORAGE: The TX will appear as a drive USB = JOYSTICK -# Channel monitor display behavior +# Mixers monitor view added to Channels monitor one # Values = NO, YES -# YES - hide the fact that channel is inverted in limits tab -# and show inverted channel value with opposite sign -# NO - normal behavior, show real channel values -CHANNELS_MONITOR_INV_HIDE = NO +# YES - Adds mixers output view to Channels monitor screen, +# pressing [ENT] switches between views. +# NO - classic Channels monitor +MIXERS_MONITOR = NO -# Use newlib-nano +# Use newlib-nano # Values = NO, YES NANO = YES @@ -328,21 +328,21 @@ TRACE_AUDIO = NO # Enable double buffering for LCD. Only for TARANIS PLUS and 9XE targets. # Activating requires about 6kB of RAM, but it enables menus task to -# immediately start to compose a new LCD image while the current one is +# immediately start to compose a new LCD image while the current one is # being written to LCD by DMA. -# If this option is NO, then first function that affects LCD buffer is +# If this option is NO, then first function that affects LCD buffer is # delayed until DMA transfer is finished. # Values = NO, YES LCD_DUAL_BUFFER = NO -# Enable internal module PPM mode for Taranis -# Notice: enabling this only enable code in the driver, +# Enable internal module PPM mode for Taranis +# Notice: enabling this only enable code in the driver, # the menu selection is still not possible. # Values = NO, YES TARANIS_INTERNAL_PPM = NO # Enable disk IO simulation in simulator -# Simulator will use FatFs module and simulated IO layer that +# Simulator will use FatFs module and simulated IO layer that # uses "./sdcard.image" file as image of SD card. # This file must contain whole SD card from first to last sector # Values = NO, YES @@ -369,7 +369,7 @@ VERSION = 2.0.99 SRC = CPPSRC = INCDIRS = . translations -EXTRAINCDIRS = +EXTRAINCDIRS = LUADEP = DEBUG_TRACE_BUFFER = NO @@ -378,7 +378,7 @@ ifneq ($(PCB), $(filter $(PCB), STD 9X 9XR STD128 9X128 9XR128 9X2561 9XR2561 GR $(error Sorry, the PCB $(PCB) is not supported yet in OpenTX) endif -GVARS_VARIANT = +1 +GVARS_VARIANT = +1 FRSKY_VARIANT = +2 3POS_VARIANT = +4 MAVLINK_VARIANT = +8 @@ -391,7 +391,7 @@ GUIGENERALSRC = gui/$(GUIDIRECTORY)/menu_general.cpp gui/$(GUIDIRECTORY)/menu_ge BITMAPS = bitmaps/sticks.lbm -FONTS = $(patsubst %.png,%.lbm,$(wildcard fonts/std/*.png)) +FONTS = $(patsubst %.png,%.lbm,$(wildcard fonts/std/*.png)) ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) # 9x/9xr radio @@ -415,7 +415,7 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) CPPSRC += debug.cpp BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp - + ifeq ($(PCB), 9XR) FLAVOUR = 9xr CPPDEFS += -DPCB9XR @@ -423,24 +423,24 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) FLAVOUR = 9x CPPDEFS += -DPCB9X endif - + ifeq ($(TELEMETRY_MOD), 14051) CPPDEFS += -DTELEMETRY_MOD_14051 endif - + ifeq ($(AUDIO), YES) CPPDEFS += -DAUDIO CPPSRC += audio_avr.cpp else CPPDEFS += -DBUZZER - CPPSRC += buzzer.cpp + CPPSRC += buzzer.cpp endif - + ifeq ($(VOICE), YES) CPPDEFS += -DVOICE CPPSRC += targets/stock/voice.cpp endif - + ifeq ($(PWM_BACKLIGHT), YES) ifeq ($(VOICE), YES) $(error Sorry, PWM_BACKLIGHT doesnt work on stock board with VOICE mod) @@ -455,11 +455,11 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp endif - + ifeq ($(SP22), YES) CPPDEFS += -DSP22 endif - + ifeq ($(FAS_OFFSET), YES) CPPDEFS += -DFAS_OFFSET endif @@ -485,7 +485,7 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128)) CPPSRC += debug.cpp BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp - + ifeq ($(PCB), 9XR128) FLAVOUR = 9xr128 CPPDEFS += -DPCB9XR128 @@ -493,24 +493,24 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128)) FLAVOUR = 9x128 CPPDEFS += -DPCB9X128 endif - + ifeq ($(TELEMETRY_MOD), 14051) CPPDEFS += -DTELEMETRY_MOD_14051 - endif - + endif + ifeq ($(AUDIO), YES) CPPDEFS += -DAUDIO CPPSRC += audio_avr.cpp else CPPDEFS += -DBUZZER - CPPSRC += buzzer.cpp + CPPSRC += buzzer.cpp endif - + ifeq ($(VOICE), YES) CPPDEFS += -DVOICE CPPSRC += targets/stock/voice.cpp endif - + ifeq ($(PWM_BACKLIGHT), YES) ifeq ($(VOICE), YES) $(error Sorry, PWM_BACKLIGHT doesnt work on stock board with VOICE mod) @@ -525,7 +525,7 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128)) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp endif - + ifeq ($(SP22), YES) CPPDEFS += -DSP22 endif @@ -559,20 +559,20 @@ ifeq ($(PCB), $(filter $(PCB), 9X2561)) FLAVOUR = 9x2561 CPPDEFS += -DPCB9X2561 endif - + ifeq ($(AUDIO), YES) CPPDEFS += -DAUDIO CPPSRC += audio_avr.cpp else CPPDEFS += -DBUZZER - CPPSRC += buzzer.cpp + CPPSRC += buzzer.cpp endif - + ifeq ($(VOICE), YES) CPPDEFS += -DVOICE CPPSRC += targets/stock/voice.cpp endif - + ifeq ($(PWM_BACKLIGHT), YES) ifeq ($(VOICE), YES) $(error Sorry, PWM_BACKLIGHT doesnt work on stock board with VOICE mod) @@ -587,7 +587,7 @@ ifeq ($(PCB), $(filter $(PCB), 9X2561)) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp endif - + ifeq ($(SP22), YES) CPPDEFS += -DSP22 endif @@ -615,18 +615,18 @@ ifeq ($(PCB), GRUVIN9X) BOARDSRC = main_avr.cpp targets/gruvin9x/board_gruvin9x.cpp EXTRABOARDSRC = targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp - PULSESSRC = pulses/pulses_avr.cpp + PULSESSRC = pulses/pulses_avr.cpp CPPSRC += audio_avr.cpp haptic.cpp debug.cpp BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp - + ifeq ($(SDCARD), YES) CPPDEFS += -DRTCLOCK -DSDCARD - CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/gruvin9x/rtc_driver.cpp + CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/gruvin9x/rtc_driver.cpp GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/gruvin9x/diskio.cpp endif - + ifeq ($(BUZZER), YES) CPPDEFS += -DBUZZER CPPSRC += buzzer.cpp @@ -636,7 +636,7 @@ ifeq ($(PCB), GRUVIN9X) CPPDEFS += -DVOICE CPPSRC += targets/gruvin9x/somo14d.cpp endif - + # Enable extra rotary encoders (Gruvin9x board only) # Values = YES, NO ROTARY_ENCODERS = 2 @@ -659,7 +659,7 @@ ifeq ($(PCB), MEGA2560) INCDIRS += targets/mega2560 targets/stock FatFs FatFs/option BOARDSRC = main_avr.cpp targets/mega2560/board_mega2560.cpp EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp - PULSESSRC = pulses/pulses_avr.cpp + PULSESSRC = pulses/pulses_avr.cpp CPPSRC += audio_avr.cpp debug.cpp BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp @@ -667,21 +667,21 @@ ifeq ($(PCB), MEGA2560) ifeq ($(PCBREV), ST7565P) EXTRABOARDSRC = targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp else - EXTRABOARDSRC = targets/mega2560/lcd_driver_ST7565R.cpp targets/common_avr/telemetry_driver.cpp + EXTRABOARDSRC = targets/mega2560/lcd_driver_ST7565R.cpp targets/common_avr/telemetry_driver.cpp endif ifeq ($(SDCARD), YES) - EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/gruvin9x/diskio.cpp + EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/gruvin9x/diskio.cpp CPPDEFS += -DSDCARD -DRTCLOCK GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp - CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/gruvin9x/rtc_driver.cpp + CPPSRC += rtc.cpp sdcard.cpp logs.cpp targets/gruvin9x/rtc_driver.cpp endif - + ifeq ($(BUZZER), YES) CPPDEFS += -DBUZZER CPPSRC += buzzer.cpp endif - + ifeq ($(VOICE), YES) CPPDEFS += -DVOICE CPPSRC += targets/gruvin9x/somo14d.cpp @@ -707,7 +707,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) FLAVOUR = sky9x CPPDEFS += -DREVA LDSCRIPT = targets/sky9x/sam3s2c_flash.ld - CPPSRC += targets/sky9x/coproc_driver.cpp + CPPSRC += targets/sky9x/coproc_driver.cpp else ifeq ($(PCBREV), REVB) FLAVOUR = sky9x CPPDEFS += -DREVB -DCOPROCESSOR @@ -728,7 +728,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DDSM2 -DDSM2_PPM ifeq ($(PCB), SKY9X) CPPDEFS += -DROTARY_ENCODERS=1 - CPPSRC += targets/sky9x/rotenc_driver.cpp + CPPSRC += targets/sky9x/rotenc_driver.cpp endif ifeq ($(SPORT_FILE_LOG), YES) CPPDEFS += -DSPORT_FILE_LOG @@ -740,8 +740,8 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) SRC += targets/sky9x/core_cm3.c targets/sky9x/board_lowlevel.c targets/sky9x/crt.c targets/sky9x/vectors_sam3s.c SRC += CoOS/kernel/core.c CoOS/kernel/hook.c CoOS/kernel/task.c CoOS/kernel/event.c CoOS/kernel/time.c CoOS/kernel/timer.c CoOS/kernel/flag.c CoOS/kernel/mutex.c CoOS/kernel/serviceReq.c CoOS/portable/GCC/port.c CoOS/portable/arch.c SRC += targets/sky9x/usb/device/core/USBD_UDP.c targets/sky9x/usb/device/core/USBDDriver.c - SRC += targets/sky9x/usb/device/massstorage/MSDDriver.c targets/sky9x/usb/device/massstorage/MSDDStateMachine.c targets/sky9x/usb/device/massstorage/MSDLun.c targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.c targets/sky9x/usb/device/massstorage/SBCMethods.c - SRC += targets/sky9x/usb/common/core/USBEndpointDescriptor.c targets/sky9x/usb/common/core/USBGenericRequest.c targets/sky9x/usb/common/core/USBFeatureRequest.c targets/sky9x/usb/common/core/USBInterfaceRequest.c targets/sky9x/usb/common/core/USBGetDescriptorRequest.c targets/sky9x/usb/common/core/USBSetAddressRequest.c targets/sky9x/usb/common/core/USBSetConfigurationRequest.c targets/sky9x/usb/common/core/USBConfigurationDescriptor.c targets/sky9x/usb/common/core/USBGenericDescriptor.c + SRC += targets/sky9x/usb/device/massstorage/MSDDriver.c targets/sky9x/usb/device/massstorage/MSDDStateMachine.c targets/sky9x/usb/device/massstorage/MSDLun.c targets/sky9x/usb/device/massstorage/MSDDriverDescriptors.c targets/sky9x/usb/device/massstorage/SBCMethods.c + SRC += targets/sky9x/usb/common/core/USBEndpointDescriptor.c targets/sky9x/usb/common/core/USBGenericRequest.c targets/sky9x/usb/common/core/USBFeatureRequest.c targets/sky9x/usb/common/core/USBInterfaceRequest.c targets/sky9x/usb/common/core/USBGetDescriptorRequest.c targets/sky9x/usb/common/core/USBSetAddressRequest.c targets/sky9x/usb/common/core/USBSetConfigurationRequest.c targets/sky9x/usb/common/core/USBConfigurationDescriptor.c targets/sky9x/usb/common/core/USBGenericDescriptor.c SRC += targets/sky9x/MEDSdcard.c EEPROMSRC = eeprom_common.cpp eeprom_raw.cpp eeprom_conversions.cpp PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp pulses/dsm2_arm.cpp @@ -766,7 +766,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) endif ifeq ($(BLUETOOTH), YES) CPPDEFS += -DBLUETOOTH - CPPSRC += targets/sky9x/bluetooth.cpp + CPPSRC += targets/sky9x/bluetooth.cpp endif ifeq ($(DEBUG), YES) SRC += targets/sky9x/syscalls.c @@ -827,7 +827,7 @@ ifeq ($(PCB), TARANIS) CPPDEFS += -DTRACE_AUDIO endif ifeq ($(DEBUG_TRACE_BUFFER), YES) - CPPDEFS += -DDEBUG_TRACE_BUFFER + CPPDEFS += -DDEBUG_TRACE_BUFFER endif ifeq ($(TARANIS_INTERNAL_PPM), YES) CPPDEFS += -DTARANIS_INTERNAL_PPM @@ -854,11 +854,11 @@ ifeq ($(PCB), TARANIS) else EXTRAINCDIRS += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/include endif - EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc - EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/inc + EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc + EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/inc GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_hardware.cpp BOARDSRC = main_arm.cpp targets/taranis/board_taranis.cpp - EXTRABOARDSRC += targets/taranis/configure_pins.cpp targets/taranis/lcd_driver.cpp targets/taranis/flash_driver.cpp targets/taranis/aspi.c targets/taranis/i2c.c targets/taranis/delays.c + EXTRABOARDSRC += targets/taranis/configure_pins.cpp targets/taranis/lcd_driver.cpp targets/taranis/flash_driver.cpp targets/taranis/aspi.c targets/taranis/i2c.c targets/taranis/delays.c SRC += CoOS/kernel/core.c CoOS/kernel/hook.c CoOS/kernel/task.c CoOS/kernel/event.c CoOS/kernel/time.c CoOS/kernel/timer.c CoOS/kernel/flag.c CoOS/kernel/mutex.c CoOS/kernel/serviceReq.c CoOS/portable/GCC/port.c CoOS/portable/arch.c SRC += targets/taranis/pwr_driver.c targets/taranis/usb_driver.c EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp eeprom_conversions.cpp @@ -890,7 +890,7 @@ ifeq ($(PCB), TARANIS) SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_pwr.c SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_usart.c SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc_ride7/startup_stm32f2xx.s - endif + endif SRC += targets/taranis/usb_bsp.c targets/taranis/usbd_desc.c SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_core.c SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_dcd.c @@ -930,13 +930,13 @@ ifeq ($(PCB), TARANIS) LUASRC = lua/src/lapi.c lua/src/lcode.c lua/src/lctype.c lua/src/ldebug.c lua/src/ldo.c lua/src/ldump.c lua/src/lfunc.c lua/src/lgc.c lua/src/llex.c lua/src/lmem.c \ lua/src/lobject.c lua/src/lopcodes.c lua/src/lparser.c lua/src/lstate.c lua/src/lstring.c lua/src/ltable.c lua/src/lrotable.c lua/src/ltm.c lua/src/lundump.c lua/src/lvm.c lua/src/lzio.c \ lua/src/lbaselib.c lua/src/linit.c lua/src/lmathlib.c lua/src/lbitlib.c lua/src/loadlib.c lua/src/lauxlib.c lua/src/ltablib.c lua/src/lcorolib.c - SRC += $(LUASRC) + SRC += $(LUASRC) LUADEP = lua_exports.cpp ifeq ($(USE_BIN_ALLOCATOR), YES) CPPDEFS += -DUSE_BIN_ALLOCATOR CPPSRC += bin_allocator.cpp endif - endif + endif EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/taranis/diskio.cpp CPPSRC += sdcard.cpp logs.cpp rtc.cpp targets/taranis/rtc_driver.cpp GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_sdmanager.cpp gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp @@ -955,8 +955,8 @@ ifeq ($(PCB), TARANIS) CPPSRC += haptic.cpp CPPSRC += targets/taranis/haptic_driver.cpp endif - ifeq ($(CHANNELS_MONITOR_INV_HIDE), YES) - CPPDEFS += -DCHANNELS_MONITOR_INV_HIDE + ifeq ($(MIXERS_MONITOR), YES) + CPPDEFS += -DMIXERS_MONITOR endif ifeq ($(PCBREV), REV9E) CPPSRC += targets/taranis/rotenc_driver.cpp @@ -1001,7 +1001,7 @@ endif CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC) timers.cpp ifeq ($(GUI), YES) - GUISRC += gui/$(GUIDIRECTORY)/lcd.cpp gui/$(GUIDIRECTORY)/splash.cpp gui/$(GUIDIRECTORY)/fonts.cpp + GUISRC += gui/$(GUIDIRECTORY)/lcd.cpp gui/$(GUIDIRECTORY)/splash.cpp gui/$(GUIDIRECTORY)/fonts.cpp endif GUISRC += keys.cpp maths.cpp translations.cpp $(TTS_SRC) @@ -1097,13 +1097,13 @@ endif ifneq ($(FONT), STD) FONTDIR = $(shell sh -c "echo $(FONT) | tr '[:upper:]' '[:lower:]'") - FONTS += $(patsubst %.png,%.lbm,$(wildcard fonts/$(FONTDIR)/*.png)) + FONTS += $(patsubst %.png,%.lbm,$(wildcard fonts/$(FONTDIR)/*.png)) INCDIRS += fonts/$(FONTDIR) endif INCDIRS += gui INCDIRS += fonts/std - + ifeq ($(THR_TRACE), YES) CPPDEFS += -DTHRTRACE endif @@ -1127,11 +1127,11 @@ endif ifeq ($(MENUS_LOCK), READONLY) CPPDEFS += -DMENUS_LOCK=1 -endif +endif ifeq ($(MENUS_LOCK), NOMENUS) CPPDEFS += -DMENUS_LOCK=2 -endif +endif ifeq ($(CORRECT_NEGATIVE_VALUES), YES) CPPDEFS += -DCORRECT_NEGATIVE_SHIFTS @@ -1187,17 +1187,17 @@ ifeq ($(EXT), $(filter $(EXT), FRSKY FRSKY_SPORT TELEMETREZ)) else CPPSRC += telemetry/frsky.cpp telemetry/frsky_d.cpp endif - + CPPSRC += gui/$(GUIDIRECTORY)/view_telemetry.cpp - + ifeq ($(FRSKY_HUB), YES) CPPDEFS += -DFRSKY_HUB endif - + ifeq ($(WS_HOW_HIGH), YES) CPPDEFS += -DWS_HOW_HIGH endif - + ifeq ($(GAUGES), YES) CPPDEFS += -DGAUGES endif @@ -1266,10 +1266,10 @@ ifeq ($(HELI), YES) endif ifeq ($(TEMPLATES), YES) - ifneq ($(PCB), $(filter $(PCB), TARANIS)) + ifneq ($(PCB), $(filter $(PCB), TARANIS)) CPPDEFS += -DTEMPLATES CPPSRC += templates.cpp - GUIMODELSRC += gui/$(GUIDIRECTORY)/menu_model_templates.cpp + GUIMODELSRC += gui/$(GUIDIRECTORY)/menu_model_templates.cpp endif endif @@ -1348,7 +1348,7 @@ MSG_CLEANING = Cleaning project: # Add target processor to flags. CPPFLAGS += -DFLAVOUR=\"$(FLAVOUR)\" -ARMCPPFLAGS = -c -mcpu=$(MCU) -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=opentx.lst -DRUN_FROM_FLASH=1 -O$(OPT) $(CPPFLAGS) -fdata-sections -ffunction-sections $(INCFLAGS) $(EXTRAINCFLAGS) $(GENDEPFLAGS) +ARMCPPFLAGS = -c -mcpu=$(MCU) -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=opentx.lst -DRUN_FROM_FLASH=1 -O$(OPT) $(CPPFLAGS) -fdata-sections -ffunction-sections $(INCFLAGS) $(EXTRAINCFLAGS) $(GENDEPFLAGS) AVRCPPFLAGS = -mmcu=$(MCU) -I. -x c++ -O$(OPT) $(CPPFLAGS) $(INCFLAGS) $(EXTRAINCFLAGS) $(GENDEPFLAGS) -fwhole-program ifeq ($(ARCH), AVR) @@ -1369,7 +1369,7 @@ MAJ_VER = ${shell sh -c "grep \"MAJ_VERS\" opentx.h | cut -d\ -f3 | egrep -o \" MIN_VER = ${shell sh -c "grep \"MIN_VERS\" opentx.h | cut -d\ -f3"} .SECONDARY: - + # Default target. all: begin gccversion sizebefore build sizeafter end @@ -1404,7 +1404,7 @@ endif tra: translations/en.h translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h lbm: fonts bitmaps - + elf: $(TARGET).elf bin: $(TARGET).bin hex: $(TARGET).hex @@ -1435,32 +1435,32 @@ translations/cz.h: translations/cz.h.txt @echo "Create Czech language specific header files" $(TRANSLATE) translations/cz.h.txt translations/cz.h cz -translations/de.h: translations/de.h.txt +translations/de.h: translations/de.h.txt @echo @echo "Create German language specific header files" $(TRANSLATE) translations/de.h.txt translations/de.h de -translations/es.h: translations/es.h.txt +translations/es.h: translations/es.h.txt @echo @echo "Create Spanish language specific header files" $(TRANSLATE) translations/es.h.txt translations/es.h es -translations/fi.h: translations/fi.h.txt +translations/fi.h: translations/fi.h.txt @echo @echo "Create Finnish language specific header files" $(TRANSLATE) translations/fi.h.txt translations/fi.h fi -translations/fr.h: translations/fr.h.txt +translations/fr.h: translations/fr.h.txt @echo @echo "Create French language specific header files" $(TRANSLATE) translations/fr.h.txt translations/fr.h fr -translations/it.h: translations/it.h.txt +translations/it.h: translations/it.h.txt @echo @echo "Create Italian language specific header files" $(TRANSLATE) translations/it.h.txt translations/it.h it -translations/pl.h: translations/pl.h.txt +translations/pl.h: translations/pl.h.txt @echo @echo "Create Polish language specific header files" $(TRANSLATE) translations/pl.h.txt translations/pl.h pl @@ -1470,7 +1470,7 @@ translations/pt.h: translations/pt.h.txt @echo "Create Portugese language specific header files" $(TRANSLATE) translations/pt.h.txt translations/pt.h pt -translations/se.h: translations/se.h.txt +translations/se.h: translations/se.h.txt @echo @echo "Create Swedish language specific header files" $(TRANSLATE) translations/se.h.txt translations/se.h se @@ -1482,7 +1482,7 @@ fonts: $(FONTS) fonts/%.lbm: fonts/%.png $(IMG2LBM) $^ $@ $(LCDSIZE) - + fonts/font_tinsize.lbm: $(FONT2PNG) $(FONTNAME) 5 fonts/font_tinsize.png $(IMG2LBM) fonts/font_tinsize.png $@ $(LCDSIZE) 4bits @@ -1500,11 +1500,11 @@ fonts/font_dblsize.lbm: $(IMG2LBM) fonts/font_dblsize.png $@ $(LCDSIZE) 4bits .PHONY: bitmaps -bitmaps: $(BITMAPS) +bitmaps: $(BITMAPS) bitmaps/sticks.lbm: bitmaps/sticks.xbm $(IMG2LBM) $^ $@ $(LCDSIZE) 1bit 4 - + bitmaps/9X/%.lbm: bitmaps/9X/%.png $(IMG2LBM) $^ $@ $(LCDSIZE) 1bit @@ -1513,20 +1513,20 @@ bitmaps/Taranis/%.lbm: bitmaps/Taranis/%.png bitmaps/Taranis/mainmenu.png: ../util/taranisicons.py $(wildcard bitmaps/Taranis/std/*.png) @$(PYTHON) ../util/taranisicons.py - + ifeq ($(OS),Windows_NT) - PARSER = avr-cpp + PARSER = avr-cpp else PARSER = gcc -E -x c++ endif lua_exports.cpp: myeeprom.h ../util/luaexport.py - @echo "Generating a list of Lua exported constants in lua_exports.txt" + @echo "Generating a list of Lua exported constants in lua_exports.txt" @$(PARSER) -DPCBTARANIS -DCPUARM -DCPUSTM32 -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt @echo "Parsing and generating C Lua exports in lua_exports.cpp" @$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua_exports.cpp lua_fields.txt @rm lua_exports.txt - + # Eye candy. # AVR Studio 3.x does not check make's exit code but relies on # the following magic strings to be generated by the compile job. @@ -1616,11 +1616,11 @@ endif # Concatenate all sources files in one big file to optimize size allsrc.cpp: Makefile $(BOARDSRC) $(CPPSRC) $(EXTRABOARDSRC) - @rm -f allsrc.cpp + @rm -f allsrc.cpp for f in $(BOARDSRC) $(CPPSRC) $(EXTRABOARDSRC) ; do echo "# 1 \"$$f\"" >> allsrc.cpp; cat "$$f" >> allsrc.cpp; done allsimusrc.cpp: Makefile $(BOARDSRC) $(CPPSRC) - @rm -f allsimusrc.cpp + @rm -f allsimusrc.cpp for f in $(BOARDSRC) $(CPPSRC) ; do echo "# 1 \"$$f\"" >> allsimusrc.cpp; cat "$$f" >> allsimusrc.cpp; done remallsrc: @@ -1667,16 +1667,16 @@ clean_list : $(REMOVE) $(TARGET).lss $(REMOVE) $(TARGET).lst $(REMOVE) $(CLEAN_SRC:.c=.s) - $(REMOVE) `find . -name "*.o"` + $(REMOVE) `find . -name "*.o"` $(REMOVE) *.d $(REMOVE) *.lst $(REMOVE) allsrc.cpp $(REMOVE) allsimusrc.cpp $(REMOVE) stamp-opentx.h - $(REMOVE) *.lbm - $(REMOVE) bitmaps/*.lbm + $(REMOVE) *.lbm + $(REMOVE) bitmaps/*.lbm $(REMOVE) bitmaps/*/*.lbm - $(REMOVE) bitmaps/*/*/*.lbm + $(REMOVE) bitmaps/*/*/*.lbm $(REMOVE) fonts/*.lbm $(REMOVE) fonts/*/*.lbm $(REMOVE) lua_exports.txt lua_exports.cpp lua_fields.txt @@ -1715,7 +1715,7 @@ ifdef SECOND_WRITE_COMMAND $(SECOND_WRITE_COMMAND) endif -#### GOOGLE TESTS +#### GOOGLE TESTS GTEST_DIR = ../gtest-1.6.0 @@ -1761,5 +1761,5 @@ gtest_main.a : gtest-all.o gtest_main.o GTEST_TESTS_SRCS = $(shell find tests/ -type f -name '*.cpp') gtests: allsimusrc.cpp $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp *.h gtest_main.a - g++ -std=gnu++0x $(CPPFLAGS) allsimusrc.cpp $(LUASRC) $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp -I$(GTEST_DIR) ${INCFLAGS} -I$(GTEST_DIR)/include -o gtests -lpthread -MD -DSIMU -lQtCore -lQtGui gtest_main.a -fexceptions + g++ -std=gnu++0x $(CPPFLAGS) allsimusrc.cpp $(LUASRC) $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp -I$(GTEST_DIR) ${INCFLAGS} -I$(GTEST_DIR)/include -o gtests -lpthread -MD -DSIMU -lQtCore -lQtGui gtest_main.a -fexceptions diff --git a/radio/src/gui/Taranis/view_channels.cpp b/radio/src/gui/Taranis/view_channels.cpp index ef45fdb86..a27d76f6a 100755 --- a/radio/src/gui/Taranis/view_channels.cpp +++ b/radio/src/gui/Taranis/view_channels.cpp @@ -41,6 +41,9 @@ void menuChannelsView(uint8_t event) static bool longNames = false; bool newLongNames = false; static bool secondPage = false; +#ifdef MIXERS_MONITOR + static bool mixersView = false; +#endif uint8_t ch; switch(event) @@ -52,13 +55,23 @@ void menuChannelsView(uint8_t event) case EVT_KEY_FIRST(KEY_LEFT): secondPage = !secondPage; break; +#ifdef MIXERS_MONITOR + case EVT_KEY_FIRST(KEY_ENTER): + mixersView = !mixersView; + break; +#endif } - + if (secondPage) ch = 16; else ch = 0; +#ifdef MIXERS_MONITOR + if (mixersView) + lcd_putsCenter(0*FH, MIXERS_MONITOR); + else +#endif lcd_putsCenter(0*FH, CHANNELS_MONITOR); lcd_invert_line(0); @@ -73,13 +86,12 @@ void menuChannelsView(uint8_t event) // Channels for (uint8_t line=0; line<8; line++) { uint8_t y = 9+line*7; +#ifdef MIXERS_MONITOR + int32_t val = (mixersView) ? ex_chans[ch] : channelOutputs[ch]; +#else 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 + uint8_t ofs = (col ? 0 : 1); // Channel name if present, number if not uint8_t lenLabel = ZLEN(g_model.limitData[ch].name); @@ -106,7 +118,11 @@ void menuChannelsView(uint8_t event) // Gauge 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; +#endif 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; lcd_hline(x0, y+1, len); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index f0641d7ac..76852b30e 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -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_DATE[] PROGMEM = TR_DATE; 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_VIEW_TEXT[] PROGMEM = TR_VIEW_TEXT; const pm_char STR_FLASH_BOOTLOADER[] PROGMEM = TR_FLASH_BOOTLOADER; @@ -547,7 +548,7 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL; const pm_char STR_SCRIPT[] PROGMEM = TR_SCRIPT; const pm_char STR_INPUTS[] PROGMEM = TR_INPUTS; - const pm_char STR_OUTPUTS[] PROGMEM = TR_OUTPUTS; + const pm_char STR_OUTPUTS[] PROGMEM = TR_OUTPUTS; #endif #if MENUS_LOCK == 1 @@ -592,30 +593,30 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_ABOUT_OPENTX_3[] PROGMEM = TR_ABOUT_OPENTX_3; const pm_char STR_ABOUT_OPENTX_4[] PROGMEM = TR_ABOUT_OPENTX_4; const pm_char STR_ABOUT_OPENTX_5[] PROGMEM = TR_ABOUT_OPENTX_5; - + const pm_char STR_ABOUT_BERTRAND_1[] PROGMEM = TR_ABOUT_BERTRAND_1; const pm_char STR_ABOUT_BERTRAND_2[] PROGMEM = TR_ABOUT_BERTRAND_2; const pm_char STR_ABOUT_BERTRAND_3[] PROGMEM = TR_ABOUT_BERTRAND_3; - + const pm_char STR_ABOUT_MIKE_1[] PROGMEM = TR_ABOUT_MIKE_1; const pm_char STR_ABOUT_MIKE_2[] PROGMEM = TR_ABOUT_MIKE_2; const pm_char STR_ABOUT_MIKE_3[] PROGMEM = TR_ABOUT_MIKE_3; const pm_char STR_ABOUT_MIKE_4[] PROGMEM = TR_ABOUT_MIKE_4; - + const pm_char STR_ABOUT_ROMOLO_1[] PROGMEM = TR_ABOUT_ROMOLO_1; const pm_char STR_ABOUT_ROMOLO_2[] PROGMEM = TR_ABOUT_ROMOLO_2; const pm_char STR_ABOUT_ROMOLO_3[] PROGMEM = TR_ABOUT_ROMOLO_3; - + const pm_char STR_ABOUT_ANDRE_1[] PROGMEM = TR_ABOUT_ANDRE_1; const pm_char STR_ABOUT_ANDRE_2[] PROGMEM = TR_ABOUT_ANDRE_2; const pm_char STR_ABOUT_ANDRE_3[] PROGMEM = TR_ABOUT_ANDRE_3; - + const pm_char STR_ABOUT_ROB_1[] PROGMEM = TR_ABOUT_ROB_1; const pm_char STR_ABOUT_ROB_2[] PROGMEM = TR_ABOUT_ROB_2; - + const pm_char STR_ABOUT_MARTIN_1[] PROGMEM = TR_ABOUT_MARTIN_1; const pm_char STR_ABOUT_MARTIN_2[] PROGMEM = TR_ABOUT_MARTIN_2; - + const pm_char STR_ABOUT_KJELL_1[] PROGMEM = TR_ABOUT_KJELL_1; const pm_char STR_ABOUT_KJELL_2[] PROGMEM = TR_ABOUT_KJELL_2; const pm_char STR_ABOUT_KJELL_3[] PROGMEM = TR_ABOUT_KJELL_3; @@ -624,7 +625,7 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_ABOUT_HARDWARE_1[] PROGMEM = TR_ABOUT_HARDWARE_1; const pm_char STR_ABOUT_HARDWARE_2[] PROGMEM = TR_ABOUT_HARDWARE_2; const pm_char STR_ABOUT_HARDWARE_3[] PROGMEM = TR_ABOUT_HARDWARE_3; - + const pm_char STR_ABOUT_PARENTS_1[] PROGMEM = TR_ABOUT_PARENTS_1; const pm_char STR_ABOUT_PARENTS_2[] PROGMEM = TR_ABOUT_PARENTS_2; const pm_char STR_ABOUT_PARENTS_3[] PROGMEM = TR_ABOUT_PARENTS_3; diff --git a/radio/src/translations.h b/radio/src/translations.h index 0827e19b8..d0ac62278 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -295,7 +295,7 @@ extern const pm_char STR_OPEN9X[]; #define STR_MAVLINK_AC_MODES (STR_OPEN9X + OFS_MAVLINK_AC_MODES) #define STR_MAVLINK_AP_MODES (STR_OPEN9X + OFS_MAVLINK_AP_MODES) #endif - + // The 0-terminated-strings #define NO_INDENT(x) (x)+LEN_INDENT @@ -645,6 +645,7 @@ extern const pm_char STR_OWN[]; extern const pm_char STR_ROTARY_ENCODER[]; extern const pm_char STR_DATE[]; 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_VIEW_TEXT[]; extern const pm_char STR_FLASH_BOOTLOADER[]; @@ -748,7 +749,7 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_THROTTLE_LABEL[]; extern const pm_char STR_SCRIPT[]; extern const pm_char STR_INPUTS[]; - extern const pm_char STR_OUTPUTS[]; + extern const pm_char STR_OUTPUTS[]; #endif #if MENUS_LOCK == 1 @@ -793,30 +794,30 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_ABOUT_OPENTX_3[]; extern const pm_char STR_ABOUT_OPENTX_4[]; extern const pm_char STR_ABOUT_OPENTX_5[]; - + extern const pm_char STR_ABOUT_BERTRAND_1[]; extern const pm_char STR_ABOUT_BERTRAND_2[]; extern const pm_char STR_ABOUT_BERTRAND_3[]; - + extern const pm_char STR_ABOUT_MIKE_1[]; extern const pm_char STR_ABOUT_MIKE_2[]; extern const pm_char STR_ABOUT_MIKE_3[]; extern const pm_char STR_ABOUT_MIKE_4[]; - + extern const pm_char STR_ABOUT_ROMOLO_1[]; extern const pm_char STR_ABOUT_ROMOLO_2[]; extern const pm_char STR_ABOUT_ROMOLO_3[]; - + extern const pm_char STR_ABOUT_ANDRE_1[]; extern const pm_char STR_ABOUT_ANDRE_2[]; extern const pm_char STR_ABOUT_ANDRE_3[]; - + extern const pm_char STR_ABOUT_ROB_1[]; extern const pm_char STR_ABOUT_ROB_2[]; - + extern const pm_char STR_ABOUT_MARTIN_1[]; extern const pm_char STR_ABOUT_MARTIN_2[]; - + extern const pm_char STR_ABOUT_KJELL_1[]; extern const pm_char STR_ABOUT_KJELL_2[]; extern const pm_char STR_ABOUT_KJELL_3[]; @@ -825,7 +826,7 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_ABOUT_HARDWARE_1[]; extern const pm_char STR_ABOUT_HARDWARE_2[]; extern const pm_char STR_ABOUT_HARDWARE_3[]; - + extern const pm_char STR_ABOUT_PARENTS_1[]; extern const pm_char STR_ABOUT_PARENTS_2[]; extern const pm_char STR_ABOUT_PARENTS_3[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index c744a42e3..55b25c068 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -29,9 +29,9 @@ * * In order to make translations easier cz.h.txt is parsed and national * characters are replaced by bitmap codes. The result is cz.h. - * See translate.py in the util folder for the list of character codes + * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT cz.h - EDIT cz.h.txt INSTEAD !!!!!!! + * !!!!! DO NOT EDIT cz.h - EDIT cz.h.txt INSTEAD !!!!!!! */ /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\010") #define TR_COUNTRYCODES TR("US""JP""EU", "Amerika\0""Japonsko""Evropa\0 ") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "Vyp\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -322,7 +322,7 @@ #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -791,6 +791,7 @@ #define TR_DATE "Datum" #define TR_ROTARY_ENCODER "R.Encs" #define TR_CHANNELS_MONITOR "MONITOR KANÁLU" +#define TR_MIXERS_MONITOR "MIXERS MONITOR" #define TR_PATH_TOO_LONG "Cesta je moc dlouhá" #define TR_VIEW_TEXT "Zobrazit text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" @@ -912,7 +913,7 @@ #define TR_ABOUT_MIKE_2 "Specialista na kód," #define TR_ABOUT_MIKE_3 " a ovladače hardwaru." #define TR_ABOUT_MIKE_4 "" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Hlavní vývojář" #define TR_ABOUT_ROMOLO_3 "Companion" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index d791fc366..2ff47abad 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1,4 +1,4 @@ -/* German checked 17.08.2014 r029 opentx V2.09 Taranis, Th9, 9XR, 9XR-Pro +/* German checked 17.08.2014 r029 opentx V2.09 Taranis, Th9, 9XR, 9XR-Pro * Authors (alphabetical order) * - Bertrand Songis * - Bernet Andre @@ -25,10 +25,10 @@ * * In order to make translations easier de.h.txt is parsed and national * characters are replaced by bitmap codes. The result is de.h. - * - * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT de.h - EDIT de.h.txt INSTEAD !!!!!!! + * See translate.py in the util folder for the list of character codes + * + * !!!!! DO NOT EDIT de.h - EDIT de.h.txt INSTEAD !!!!!!! */ /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) @@ -82,7 +82,7 @@ #define LEN_UART3MODES "\015" #define TR_UART3MODES "AUS\0 ""S-Port Mirror""Telemetrie\0 ""SBUS Trainer\0""Debug\0" -#define LEN_POTTYPES "\017" +#define LEN_POTTYPES "\017" #define TR_POTTYPES "Kein\0 ""Poti mit Raste ""Stufen-Schalter""Poti ohne Raste\0" #define LEN_DATETIME "\005" @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "AUS\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -177,7 +177,7 @@ #if defined(PCBTARANIS) #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop - #define TR_CSWRANGE "Range" // Range = Bereichsabfrage von bis + #define TR_CSWRANGE "Range" // Range = Bereichsabfrage von bis #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #else #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator @@ -206,7 +206,7 @@ #define LEN_VFSWFUNC "\012" -#if defined(VARIO) +#if defined(VARIO) #define TR_VVARIO "Vario\0 " // nur 10 Zeichen String! #else #define TR_VVARIO "[Vario]\0 " @@ -230,7 +230,7 @@ #else #define TR_PLAY_TRACK "Sag Text\0 " #endif - #define TR_PLAY_BOTH "Sag Beide " + #define TR_PLAY_BOTH "Sag Beide " #define TR_PLAY_VALUE TR("Sag Wert\0 ", "Sag Wert ") #else #define TR_PLAY_TRACK "[Sag Text]" @@ -281,7 +281,7 @@ #define TR_SF_RESERVE "[Reserve]\0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_SCREENSHOT TR_SF_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_SCREENSHOT TR_SF_TEST #elif defined(PCBGRUVIN9X) #define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_TEST #else @@ -324,8 +324,8 @@ #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") - #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE #define TR_TELEM_TIME @@ -335,7 +335,7 @@ #define TR_A3_A4_MIN #endif -#define TR_ASPD_MAX TR("ASp+", "ASpd+") +#define TR_ASPD_MAX TR("ASp+", "ASpd+") #if defined(PCBTARANIS) #define TR_TELEM_RSSI_RX "RSSI\0" @@ -412,7 +412,7 @@ #define LEN_VTELEMSCREENTYPE "\007" #define TR_VTELEMSCREENTYPE "None\0 "":Werte\0"":Balken""Script\0" #else - #define LEN_VTELEMSCREENTYPE "\006" + #define LEN_VTELEMSCREENTYPE "\006" #define TR_VTELEMSCREENTYPE "Werte\0""Balken" #endif @@ -436,7 +436,7 @@ #define LEN_VSRCRAW "\004" #if defined(PCBTARANIS) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " //4 Potis S1,S2,Links,Rechts + #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " //4 Potis S1,S2,Links,Rechts #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 " #elif defined(EXTRA_3POS) #define TR_POTS_VSRCRAW "P1\0 ""P2\0 " @@ -562,8 +562,8 @@ #define TR_ELEVATOR "Elevator Source" #define TR_SWASHRING TR("Ring Begrenz","Ring Taumelscheibe") #define TR_ELEDIRECTION TR("Nick Richtung","Nick Servo Richtung") -#define TR_AILDIRECTION TR("Roll Richtung","Roll Servo Richtung") -#define TR_COLDIRECTION TR("Pitch Richtung","Pitch Servo Richtung") +#define TR_AILDIRECTION TR("Roll Richtung","Roll Servo Richtung") +#define TR_COLDIRECTION TR("Pitch Richtung","Pitch Servo Richtung") #define TR_MODE INDENT"Modus" #define TR_NOFREEEXPO "Expos voll!" #define TR_NOFREEMIXER "Mischer voll!" @@ -711,7 +711,7 @@ #define TR_MENUDEBUG "DEBUG" #define TR_RXNUM TR("RX-Nummer",INDENT"Empfänger-Nr.") #define TR_SYNCMENU "Sync [MENU]" -#define TR_LIMIT INDENT"Grenzen" +#define TR_LIMIT INDENT"Grenzen" #define TR_MINRSSI "Min. RSSI" #define TR_LATITUDE "Breite:" #define TR_LONGITUDE "Länge:" @@ -744,7 +744,7 @@ #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "SCHALTER" #define TR_KEYSTUCK "Key stuck" -#define TR_INVERT_THR TR("Gas umkehren?","Vollgas hinten?") // Th9x 9XR +#define TR_INVERT_THR TR("Gas umkehren?","Vollgas hinten?") // Th9x 9XR #define TR_SPEAKER_VOLUME INDENT "Lautstärke" #define TR_LCD "Bildschirm" #define TR_BRIGHTNESS INDENT "Helligkeit" @@ -775,7 +775,7 @@ #define TR_REMOVED " gelöscht" #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Formatieren" -#define TR_NA "N/V" //NV=Nicht Verfügbar Kurz-Meldung +#define TR_NA "N/V" //NV=Nicht Verfügbar Kurz-Meldung #define TR_HARDWARE "Hardware einstellen" #define TR_FORMATTING "Formatierung..." #define TR_TEMP_CALIB "Temp. abgl." @@ -795,6 +795,7 @@ #define TR_DATE "Datum:" #define TR_ROTARY_ENCODER "Drehgeber" #define TR_CHANNELS_MONITOR "Kanal-Monitor" +#define TR_MIXERS_MONITOR "MIXERS MONITOR" #define TR_PATH_TOO_LONG "Pfad zu Lang" #define TR_VIEW_TEXT "View Text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" @@ -823,7 +824,7 @@ #define TR_RESET_TELEMETRY "Reset Telemetrie" #define TR_STATISTICS "Statistik und Gas" #define TR_ABOUT_US "Die Programmierer" -#define TR_AND_SWITCH "UND Schalt" //UND mit weiterem Schaltern +#define TR_AND_SWITCH "UND Schalt" //UND mit weiterem Schaltern #define TR_SF "SF" //Spezial Funktionen engl. CF #define TR_GF "GF" #define TR_SPEAKER INDENT"Lautspr" @@ -855,7 +856,7 @@ #define TR_PT "Pt" #define TR_PTS "Pts" #define TR_SMOOTH "Runden" -#define TR_COPY_STICKS_TO_OFS "Kopie Stick to Servo-Mitte" +#define TR_COPY_STICKS_TO_OFS "Kopie Stick to Servo-Mitte" #define TR_COPY_TRIMS_TO_OFS "Kopie Trimm to Servo-Mitte" // "Trim to Subtrim" #define TR_PERSISTENT_MAH TR(INDENT"Spr. mAh",INDENT "Speichern mAh") //9XR-Pro #define TR_PREFLIGHT TR("---Vorflug-Checkliste--","----Vorflug-Checkliste----") @@ -916,7 +917,7 @@ #define TR_ABOUT_MIKE_2 "Code- und Treiber-Guru" #define TR_ABOUT_MIKE_3 "Wohl einer der Besten." #define TR_ABOUT_MIKE_4 "Sehr inspirierend." - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Companion9x-Hauptentwickler" #define TR_ABOUT_ROMOLO_3 "" @@ -953,7 +954,7 @@ #define TR_CHR_SHORT 's' // Taste short #define TR_CHR_LONG 'l' // Taste long -#define TR_CHR_TOGGLE 't' // Taste als togglefunktion = Ein Aus Ein +#define TR_CHR_TOGGLE 't' // Taste als togglefunktion = Ein Aus Ein #define TR_CHR_HOUR 'h' // Stunden #define TR_CHR_INPUT 'I' // Values between A-I will work diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 24000aa85..e4aa8fb74 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -36,13 +36,13 @@ * * In order to make translations easier en.h.txt is parsed and national * characters are replaced by bitmap codes. The result is en.h. - * See translate.py in the util folder for the list of character codes + * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT en.h - EDIT en.h.txt INSTEAD !!!!!!! + * !!!!! DO NOT EDIT en.h - EDIT en.h.txt INSTEAD !!!!!!! */ - - - + + + /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) * \n -newline @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -311,7 +311,7 @@ #else #define TR_FSW_RESET_TIMERS "Tmr1""Tmr2" #endif - + #define TR_VFSWRESET TR(TR_FSW_RESET_TIMERS "All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, TR_FSW_RESET_TIMERS "Flight\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") @@ -324,7 +324,7 @@ #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -358,8 +358,8 @@ #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" #define LENGTH_UNIT_METR "m\0 " -#define SPEED_UNIT_METR "kmh" - +#define SPEED_UNIT_METR "kmh" + #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") @@ -410,7 +410,7 @@ #define LEN_VTELEMSCREENTYPE "\006" #define TR_VTELEMSCREENTYPE "None\0 ""Nums\0 ""Bars\0 ""Script" #else - #define LEN_VTELEMSCREENTYPE "\004" + #define LEN_VTELEMSCREENTYPE "\004" #define TR_VTELEMSCREENTYPE "Nums""Bars" #endif @@ -835,7 +835,8 @@ #define TR_OWN "Own" #define TR_DATE "Date" #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_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" @@ -957,7 +958,7 @@ #define TR_ABOUT_MIKE_2 "Code and drivers guru" #define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") #define TR_ABOUT_MIKE_4 "Inspirational" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Companion co-author" #define TR_ABOUT_ROMOLO_3 "" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index a49df11ef..5e7358345 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -29,7 +29,7 @@ * In order to make translations easier es.h.txt is parsed and national * characters are replaced by bitmap codes. The result is es.h. * - * See translate.py in the util folder for the list of character codes + * See translate.py in the util folder for the list of character codes * * !!!!! DO NOT EDIT es.h - EDIT es.h.txt INSTEAD !!!!!!! */ @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "America""Japon\0 ""Europa\0") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -237,7 +237,7 @@ #define TR_PLAY_BOTH "[OirAmbos]" #define TR_PLAY_VALUE "[OirValor]" #endif - + #define TR_SF_BG_MUSIC "BgMusica\0 ""BgMusica||" #if defined(SDCARD) @@ -322,7 +322,7 @@ #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -788,6 +788,7 @@ #define TR_DATE "Fecha" #define TR_ROTARY_ENCODER "R.Encs" #define TR_CHANNELS_MONITOR "MONITOR CANALES" +#define TR_MIXERS_MONITOR "MIXERS MONITOR" #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" @@ -909,9 +910,9 @@ #define TR_ABOUT_MIKE_2 "Guru de codigo y drivers" #define TR_ABOUT_MIKE_3 "Seguramente uno de los" #define TR_ABOUT_MIKE_4 "mejores inspiradores" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Desarrollador principal" +#define TR_ABOUT_ROMOLO_2 "Desarrollador principal" #define TR_ABOUT_ROMOLO_3 "Companion9x" #define TR_ABOUT_ANDRE_1 "Andre Bernet" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 1cc1fda99..2dde80d73 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -28,10 +28,10 @@ * * In order to make translations easier fi.h.txt is parsed and national * characters are replaced by bitmap codes. The result is fi.h. - * - * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT fi.h - EDIT fi.h.txt INSTEAD !!!!!!! + * See translate.py in the util folder for the list of character codes + * + * !!!!! DO NOT EDIT fi.h - EDIT fi.h.txt INSTEAD !!!!!!! */ /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) @@ -40,17 +40,17 @@ * \001 to \034 -extended spacing (value * FW/2) * \0 -ends current string */ - - - - - - - - - - - + + + + + + + + + + + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "POI""PÄÄ" @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "Amerikk""Japani\0""Euroopp") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -322,7 +322,7 @@ #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -787,7 +787,8 @@ #define TR_OWN "Own" #define TR_DATE "Date" #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_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" @@ -909,7 +910,7 @@ #define TR_ABOUT_MIKE_2 "Code and drivers guru" #define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") #define TR_ABOUT_MIKE_4 "Inspirational" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Companion9x co-author" #define TR_ABOUT_ROMOLO_3 "" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 48479a461..9fe210b0a 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -25,10 +25,10 @@ * * In order to make translations easier fr.h.txt is parsed and national * characters are replaced by bitmap codes. The result is fr.h. - * - * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT fr.h - EDIT fr.h.txt INSTEAD !!!!!!! + * See translate.py in the util folder for the list of character codes + * + * !!!!! DO NOT EDIT fr.h - EDIT fr.h.txt INSTEAD !!!!!!! */ /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\006") #define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -322,7 +322,7 @@ #define TR_TELEM_TIME TR("Heur", "H:M\0 ") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("BtRx", "BatRx") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -351,7 +351,7 @@ #define TR_VTELEMCHNS "---\0 ""Batt\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Carbu""T1\0 ""T2\0 ""Vit\0 ""Dist\0""AltG\0""Elem\0""Velm\0""Vfas\0""Cour\0""Consm""Puiss""AccX\0""AccY\0""AccZ\0""Cap\0 ""VitV\0""VitA\0""dET\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Vit+\0""Dst+\0" TR_ASPD_MAX "Elem-""Els-\0""Vfas-""Curr+""Puis+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Accel""Temps" #else #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""VitA""dET\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+" TR_ASPD_MAX "Elm-""Els-""Vfs-""Cur+""Pui+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tmps" -#endif +#endif #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" @@ -788,6 +788,7 @@ #define TR_DATE "Date" #define TR_ROTARY_ENCODER "Enc.Rot." #define TR_CHANNELS_MONITOR "MONITEUR CANAUX" +#define TR_MIXERS_MONITOR "MONITEUR MIXAGES " #define TR_PATH_TOO_LONG "Chemin trop long" #define TR_VIEW_TEXT "Voir texte" #define TR_FLASH_BOOTLOADER "Flasher BootLoader" @@ -909,11 +910,11 @@ #define TR_ABOUT_MIKE_2 "Maître du code et des" #define TR_ABOUT_MIKE_3 "drivers" #define TR_ABOUT_MIKE_4 "" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Développeur principal de" #define TR_ABOUT_ROMOLO_3 "OpenTX Companion" - + #define TR_ABOUT_ANDRE_1 "André Bernet" #define TR_ABOUT_ANDRE_2 TR("Fonctionsé,\001usabilité,","Fonctionnalités, usabilité,") #define TR_ABOUT_ANDRE_3 TR("débogage,\001documentation","débogage, documentation") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 58719df10..9b012a128 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -28,10 +28,10 @@ * * In order to make translations easier it.h.txt is parsed and national * characters are replaced by bitmap codes. The result is it.h. - * - * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT it.h - EDIT it.h.txt INSTEAD !!!!!!! + * See translate.py in the util folder for the list of character codes + * + * !!!!! DO NOT EDIT it.h - EDIT it.h.txt INSTEAD !!!!!!! */ /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) @@ -54,50 +54,50 @@ // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "OFF""ON\0" - + #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" - + #define LEN_NCHANNELS "\004" #define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - + #define LEN_VBEEPMODE TR("\005", "\010") #define TR_VBEEPMODE TR("Silen""Avvis""Notst""Tutti","Silente ""Avvisi\0 ""No Tasti""Tutti\0 ") - + #define LEN_VBEEPLEN "\005" #define TR_VBEEPLEN "+Cort""Corta""Media""Lunga""+Lung" - + #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "No REaREb" - + #define LEN_VBLMODE TR("\005", "\006") #define TR_VBLMODE TR("OFF\0 ""Tasti""Stks\0""Tutti""ON\0 ", "Spenta""Tasti\0""Sticks""Tutti\0""Accesa") - + #define LEN_TRNMODE "\003" #define TR_TRNMODE "off"" +="" :=" - + #define LEN_TRNCHN "\003" #define TR_TRNCHN "ch1ch2ch3ch4" - + #define LEN_UART3MODES "\016" #define TR_UART3MODES "OFF\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""Debug\0" #define LEN_POTTYPES "\017" #define TR_POTTYPES "None\0 ""Pot. con centro""Inter. Multipos""Potenziometro\0 " - + #define LEN_DATETIME "\005" #define TR_DATETIME "DATA:""ORA :" - + #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" - + #define LEN_VPERSISTENT "\015" #define TR_VPERSISTENT "NO\0 ""Volo\0 ""Reset Manuale" #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europa\0") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -119,11 +119,11 @@ #if defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "DEMA123SD" -#elif defined(PCBSKY9X) +#elif defined(PCBSKY9X) #define TR_RETA123 "DEMA123a" -#elif defined(CPUM2560) +#elif defined(CPUM2560) #define TR_RETA123 "DEMA123ab" -#else +#else #define TR_RETA123 "DEMA123" #endif @@ -139,13 +139,13 @@ #if defined(DSM2) #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " -#elif defined(IRPROTOS) +#elif defined(IRPROTOS) #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" -#else - #define TR_DSM2 -#endif - -#if defined(IRPROTOS) +#else + #define TR_DSM2 +#endif + +#if defined(IRPROTOS) #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" #else #define TR_IRPROTOS @@ -161,16 +161,16 @@ #define LEN_POSNEG "\003" #define TR_POSNEG "POS""NEG" - + #define LEN_VCURVEFUNC "\003" #define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" - + #define LEN_VMLTPX "\005" #define TR_VMLTPX "Add. ""Molt.""Sost." - + #define LEN_VMLTPX2 "\002" #define TR_VMLTPX2 "+=""*="":=" - + #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "OFF""ON ""Dir""Ele""Mot""Ale" @@ -198,60 +198,60 @@ #endif #define LEN_VCSWFUNC "\005" -#if defined(CPUARM) +#if defined(CPUARM) #define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a~x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a" - + #define LEN_VTELPROTO "\007" #define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh" @@ -408,10 +408,10 @@ #define LEN_VTELEMSCREENTYPE "\006" #define TR_VTELEMSCREENTYPE "Valori""Barre " - + #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "HMS NMEA" - + #define LEN2_VTEMPLATES 13 #define LEN_VTEMPLATES "\015" #define TR_VTEMPLATES "Canc. Mixes\0 ""Semplice 4CH\0""Sticky-T-Cut\0""Coda-V \0""Elevoni\0 ""Delta\0 ""eCCPM\0 ""Setup Heli\0 ""Test Servo\0 " @@ -744,7 +744,7 @@ #define TR_CPU_TEMP "Temp CPU \016>" #define TR_CPU_CURRENT "Corrente\022>" #define TR_CPU_MAH "Consumo" -#define TR_COPROC "CoProc." +#define TR_COPROC "CoProc." #define TR_COPROC_TEMP "Temp. MB \016>" #define TR_CAPAWARNING INDENT "CapacitàLow" #define TR_TEMPWARNING INDENT "Temp. Alta" @@ -788,6 +788,7 @@ #define TR_DATE "Data" #define TR_ROTARY_ENCODER "R.Encs" #define TR_CHANNELS_MONITOR "MONITOR CANALI" +#define TR_MIXERS_MONITOR "MIXERS MONITOR" #define TR_PATH_TOO_LONG "Path troppo lungo" #define TR_VIEW_TEXT "Vedi testo" #define TR_FLASH_BOOTLOADER "Flash BootLoader" @@ -909,7 +910,7 @@ #define TR_ABOUT_MIKE_2 "Guru codice e driver" #define TR_ABOUT_MIKE_3 "esperto a basso livello" #define TR_ABOUT_MIKE_4 "Ispiratore" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Autore Companion9x" #define TR_ABOUT_ROMOLO_3 "" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 4c33c4877..e9287f27a 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -37,9 +37,9 @@ * * In order to make translations easier pl.h.txt is parsed and national * characters are replaced by bitmap codes. The result is pl.h. - * See translate.py in the util folder for the list of character codes + * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT pl.h - EDIT pl.h.txt INSTEAD !!!!!!! + * !!!!! DO NOT EDIT pl.h - EDIT pl.h.txt INSTEAD !!!!!!! * */ /* Formatting octal codes available in TR_ strings: @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "Ameryka""Japonia""Europa\0") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -263,7 +263,7 @@ #else #define TR_SF_TEST #endif - + #if defined(OVERRIDE_CHANNEL_FUNCTION) #define TR_SF_SAFETY "Bezp.\0 " #else @@ -322,7 +322,7 @@ #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -333,7 +333,7 @@ #define TR_A3_A4_MIN #endif -#define TR_ASPD_MAX TR("ASp+", "ASpd+") +#define TR_ASPD_MAX TR("ASp+", "ASpd+") #if defined(PCBTARANIS) #define TR_TELEM_RSSI_RX "RSSI\0" @@ -786,6 +786,7 @@ #define TR_DATE "Data" #define TR_ROTARY_ENCODER "R.Encs" #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_VIEW_TEXT "Pokaż tekst" #define TR_FLASH_BOOTLOADER "Flash BootLoader" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 8a36f97b5..b8bf1bba3 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -28,10 +28,10 @@ * * In order to make translations easier pt.h.txt is parsed and national * characters are replaced by bitmap codes. The result is pt.h. - * - * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT pt.h - EDIT pt.h.txt INSTEAD !!!!!!! + * See translate.py in the util folder for the list of character codes + * + * !!!!! DO NOT EDIT pt.h - EDIT pt.h.txt INSTEAD !!!!!!! */ /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -263,7 +263,7 @@ #else #define TR_SF_TEST #endif - + #if defined(OVERRIDE_CHANNEL_FUNCTION) #define TR_SF_SAFETY "Seguro\0 " #else @@ -322,7 +322,7 @@ #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -788,6 +788,7 @@ #define TR_DATE "Data" #define TR_ROTARY_ENCODER "R.Encs" #define TR_CHANNELS_MONITOR "CHANNELS MONITOR" +#define TR_MIXERS_MONITOR "MIXERS MONITOR" #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" @@ -909,7 +910,7 @@ #define TR_ABOUT_MIKE_2 "Code and drivers guru" #define TR_ABOUT_MIKE_3 "Arguably, one of the best" #define TR_ABOUT_MIKE_4 "Inspirational" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Companion9x main developer" #define TR_ABOUT_ROMOLO_3 "" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3ab61a6ae..27d2ad847 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -28,10 +28,10 @@ * * In order to make translations easier se.h.txt is parsed and national * characters are replaced by bitmap codes. The result is se.h. - * - * See translate.py in the util folder for the list of character codes * - * !!!!! DO NOT EDIT se.h - EDIT se.h.txt INSTEAD !!!!!!! + * See translate.py in the util folder for the list of character codes + * + * !!!!! DO NOT EDIT se.h - EDIT se.h.txt INSTEAD !!!!!!! */ /* Formatting octal codes available in TR_ strings: * \037\x -sets LCD x-coord (x value in octal) @@ -40,17 +40,17 @@ * \001 to \034 -extended spacing (value * FW/2) * \0 -ends current string */ - - - - - - - - - - - + + + + + + + + + + + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "Av ""På\0" @@ -97,7 +97,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0") -#define LEN_TARANIS_PROTOCOLS "\004" +#define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "Av\0 ""PPM\0""XJT\0""DSM2" #define LEN_XJT_PROTOCOLS "\004" @@ -245,7 +245,7 @@ #else #define TR_SDCLOGS "[SD Logg]\0" #endif - + #ifdef GVARS #define TR_ADJUST_GVAR "Justera\0 " #else @@ -322,7 +322,7 @@ #define TR_TELEM_TIME TR("Tid\0", "Tid\0 ") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("[NA]", "[NA]\0") - #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE @@ -684,7 +684,7 @@ #define TR_MENUINPUTS "INPUT" #define TR_MENULIMITS "SERVON" #elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... - #define TR_MENUINPUTS "SPAKAR" + #define TR_MENUINPUTS "SPAKAR" #define TR_MENULIMITS "SERVON" #else #define TR_MENUINPUTS TR("DR/EXPO","DUALRATES/EXPO") @@ -788,6 +788,7 @@ #define TR_DATE "Datum" #define TR_ROTARY_ENCODER "R.Enks" #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_VIEW_TEXT "Visa Text" #define TR_FLASH_BOOTLOADER "Skriv BootLoader" @@ -909,7 +910,7 @@ #define TR_ABOUT_MIKE_2 "Kod och drivrutins-guru" #define TR_ABOUT_MIKE_3 "Stor inspirationskälla" #define TR_ABOUT_MIKE_4 "" - + #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Chefsutvecklare av Companion9x" #define TR_ABOUT_ROMOLO_3 ""