diff --git a/BLACKLIST.txt b/BLACKLIST.txt deleted file mode 100644 index 59aa3651b..000000000 --- a/BLACKLIST.txt +++ /dev/null @@ -1,3 +0,0 @@ -3D Robotics -They sell the Iris+ with a modified version of OpenTX which doesn't fullfil the GPL requirements. -No donations, no thanks, we are just free staff for them... diff --git a/DONATIONS.txt b/DONATIONS.txt index cb0674da2..724bc123f 100644 --- a/DONATIONS.txt +++ b/DONATIONS.txt @@ -8,6 +8,7 @@ LitePilots David Ankers (OpenPilot) 3D Robotics +RC Studio (monthly) Mario Sette Felice Baratto @@ -401,7 +402,6 @@ Colin Rycroft Emanuel Stassar Michael Gregory Robert Russell -Gordon Stahl Felix Kaiser Joshua Bardwell Davd Goodall @@ -599,7 +599,6 @@ Julien Gérard Alexandre d'Alton Peter Mergaerts Jan Houwers -Gordon Stahl Christian Grandjean Roger Bergevin NorthSide @@ -802,4 +801,12 @@ Roger Keatley Sherman Lovell Hugh Caldwell JB Fisher Company - +Michels Bernhard +Pietro Rossin +Carsten Wache +Brock White +Steven Poretz +David Huelster +Gordon Stahl (monthly) +John Mathison +Richard Duczmal diff --git a/README.md b/README.md index 94e728aca..3b9107a98 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ##OpenTX 2.1 Branch -The ongoing development is not done in this branch. It is performed in the branch called next. +The ongoing development on 2.1.x is done in this branch. Refer to the opentx.wiki for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues. diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt index 604fb1c12..36765d48b 100644 --- a/companion/releasenotes.txt +++ b/companion/releasenotes.txt @@ -1,4 +1,5 @@

Version 2.1.2 /

+ diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 679b69ee4..e1d586e89 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -6,7 +6,7 @@ SET(C9X_VERSION_REVISION "2") SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX}) SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX}) -MESSAGE(STATUS OpenTX Companion ${C9X_VERSION}) +MESSAGE(STATUS "OpenTX Companion ${C9X_VERSION}") CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) diff --git a/companion/src/appdata.cpp b/companion/src/appdata.cpp index 187bd6cb8..e6e45029d 100644 --- a/companion/src/appdata.cpp +++ b/companion/src/appdata.cpp @@ -312,10 +312,10 @@ QString Profile::speaker() const { return _speaker; } QString Profile::stickPotCalib() const { return _stickPotCalib; } QString Profile::timeStamp() const { return _timeStamp; } QString Profile::trainerCalib() const { return _trainerCalib; } -int Profile::currentCalib() const { return _currentCalib; } +int Profile::txCurrentCalibration() const { return _txCurrentCalibration; } int Profile::gsStickMode() const { return _gsStickMode; } int Profile::ppmMultiplier() const { return _ppmMultiplier; } -int Profile::vBatCalib() const { return _vBatCalib; } +int Profile::txVoltageCalibration() const { return _txVoltageCalibration; } int Profile::vBatWarn() const { return _vBatWarn; } int Profile::vBatMin() const { return _vBatMin; } int Profile::vBatMax() const { return _vBatMax; } @@ -342,10 +342,10 @@ void Profile::speaker (const QString x) { store(x, _speaker, "Speake void Profile::stickPotCalib (const QString x) { store(x, _stickPotCalib, "StickPotCalib" ,"Profiles", QString("profile%1").arg(index));} void Profile::timeStamp (const QString x) { store(x, _timeStamp, "TimeStamp" ,"Profiles", QString("profile%1").arg(index));} void Profile::trainerCalib (const QString x) { store(x, _trainerCalib, "TrainerCalib" ,"Profiles", QString("profile%1").arg(index));} -void Profile::currentCalib (const int x) { store(x, _currentCalib, "currentCalib" ,"Profiles", QString("profile%1").arg(index));} +void Profile::txCurrentCalibration (const int x) { store(x, _txCurrentCalibration, "currentCalib","Profiles", QString("profile%1").arg(index));} void Profile::gsStickMode (const int x) { store(x, _gsStickMode, "GSStickMode" ,"Profiles", QString("profile%1").arg(index));} void Profile::ppmMultiplier (const int x) { store(x, _ppmMultiplier, "PPM_Multiplier" ,"Profiles", QString("profile%1").arg(index));} -void Profile::vBatCalib (const int x) { store(x, _vBatCalib, "VbatCalib" ,"Profiles", QString("profile%1").arg(index));} +void Profile::txVoltageCalibration (const int x) { store(x, _txVoltageCalibration, "VbatCalib","Profiles", QString("profile%1").arg(index));} void Profile::vBatWarn (const int x) { store(x, _vBatWarn, "vBatWarn" ,"Profiles", QString("profile%1").arg(index));} void Profile::vBatMin (const int x) { store(x, _vBatMin, "VbatMin" ,"Profiles", QString("profile%1").arg(index));} void Profile::vBatMax (const int x) { store(x, _vBatMax, "VbatMax" ,"Profiles", QString("profile%1").arg(index));} @@ -378,10 +378,10 @@ Profile& Profile::operator=(const Profile& rhs) speaker ( rhs.speaker() ); stickPotCalib( rhs.stickPotCalib() ); trainerCalib ( rhs.trainerCalib() ); - currentCalib ( rhs.currentCalib() ); + txCurrentCalibration ( rhs.txCurrentCalibration() ); gsStickMode ( rhs.gsStickMode() ); ppmMultiplier( rhs.ppmMultiplier() ); - vBatCalib ( rhs.vBatCalib() ); + txVoltageCalibration ( rhs.txVoltageCalibration() ); vBatWarn ( rhs.vBatWarn() ); vBatMin ( rhs.vBatMin() ); vBatMax ( rhs.vBatMax() ); @@ -424,10 +424,10 @@ void Profile::initFwVariables() _timeStamp = ""; _trainerCalib = ""; - _currentCalib = 0; + _txCurrentCalibration = 0; _gsStickMode = 0; _ppmMultiplier = 0; - _vBatCalib = 0; + _txVoltageCalibration = 0; _vBatWarn = 0; _vBatMin = 0; _vBatMax = 0; @@ -483,10 +483,10 @@ void Profile::flush() getset( _stickPotCalib, "StickPotCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); getset( _timeStamp, "TimeStamp" ,"" ,"Profiles", QString("profile%1").arg(index)); getset( _trainerCalib, "TrainerCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); - getset( _currentCalib, "currentCalib" ,0 ,"Profiles", QString("profile%1").arg(index)); + getset( _txCurrentCalibration, "currentCalib" ,0 ,"Profiles", QString("profile%1").arg(index)); getset( _gsStickMode, "GSStickMode" ,0 ,"Profiles", QString("profile%1").arg(index)); getset( _ppmMultiplier, "PPM_Multiplier" ,0 ,"Profiles", QString("profile%1").arg(index)); - getset( _vBatCalib, "VbatCalib" ,0 ,"Profiles", QString("profile%1").arg(index)); + getset( _txVoltageCalibration, "VbatCalib" ,0 ,"Profiles", QString("profile%1").arg(index)); getset( _vBatWarn, "vBatWarn" ,0 ,"Profiles", QString("profile%1").arg(index)); getset( _vBatMin, "VbatMin" ,0 ,"Profiles", QString("profile%1").arg(index)); getset( _vBatMax, "VbatMax" ,0 ,"Profiles", QString("profile%1").arg(index)); diff --git a/companion/src/appdata.h b/companion/src/appdata.h index abb2b7eab..d80dd115d 100644 --- a/companion/src/appdata.h +++ b/companion/src/appdata.h @@ -125,10 +125,10 @@ class Profile: protected CompStoreObj QString _stickPotCalib; QString _timeStamp; QString _trainerCalib; - int _currentCalib; + int _txCurrentCalibration; int _gsStickMode; int _ppmMultiplier; - int _vBatCalib; + int _txVoltageCalibration; int _vBatWarn; int _vBatMin; int _vBatMax; @@ -156,10 +156,10 @@ class Profile: protected CompStoreObj QString stickPotCalib() const; QString timeStamp() const; QString trainerCalib() const; - int currentCalib() const; + int txCurrentCalibration() const; int gsStickMode() const; int ppmMultiplier() const; - int vBatCalib() const; + int txVoltageCalibration() const; int vBatWarn() const; int vBatMin() const; int vBatMax() const; @@ -186,10 +186,10 @@ class Profile: protected CompStoreObj void stickPotCalib (const QString); void timeStamp (const QString); void trainerCalib (const QString); - void currentCalib (const int); + void txCurrentCalibration (const int); void gsStickMode (const int); void ppmMultiplier (const int); - void vBatCalib (const int); + void txVoltageCalibration (const int); void vBatWarn (const int); void vBatMin (const int); void vBatMax (const int); diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index c31939f85..907154c77 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -4,7 +4,6 @@ icon.png ../../CREDITS.txt ../../DONATIONS.txt - ../../BLACKLIST.txt ../releasenotes.txt images/9xdb.png images/9xdl.png diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp index 9d7e45fac..66c798817 100644 --- a/companion/src/contributorsdialog.cpp +++ b/companion/src/contributorsdialog.cpp @@ -63,12 +63,15 @@ ContributorsDialog::ContributorsDialog(QWidget * parent): " " + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "
" \ ""); +#if 0 QFile blacklist(":/BLACKLIST.txt"); if (blacklist.open(QIODevice::ReadOnly | QIODevice::Text)) { QStringList names; names << blacklist.readAll(); str.append(formatTable(tr("OpenTX Blacklist"), names, 1)); } +#endif + str.append(""); ui->textEditor->setHtml(str); ui->textEditor->scroll(0, 0); diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index dffee8535..14db5954c 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -897,7 +897,7 @@ QString CustomFunctionData::paramToString(const ModelData * model) const } else if ((func==FuncVolume)|| (func==FuncPlayValue)) { RawSource item(param); - return item.toString(); + return item.toString(model); } else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) { if ( GetCurrentFirmware()->getCapability(VoicesAsNumbers)) { @@ -1083,8 +1083,8 @@ GeneralSettings::GeneralSettings() } else { QString t_trainercalib=g.profile[g.id()].trainerCalib(); - int8_t t_vBatCalib=(int8_t)g.profile[g.id()].vBatCalib(); - int8_t t_currentCalib=(int8_t)g.profile[g.id()].currentCalib(); + int8_t t_txVoltageCalibration=(int8_t)g.profile[g.id()].txVoltageCalibration(); + int8_t t_txCurrentCalibration=(int8_t)g.profile[g.id()].txCurrentCalibration(); int8_t t_PPM_Multiplier=(int8_t)g.profile[g.id()].ppmMultiplier(); uint8_t t_stickMode=(uint8_t)g.profile[g.id()].gsStickMode(); uint8_t t_vBatWarn=(uint8_t)g.profile[g.id()].vBatWarn(); @@ -1118,8 +1118,8 @@ GeneralSettings::GeneralSettings() if (ok) trainer.calib[i]=byte16; } - currentCalib=t_currentCalib; - vBatCalib=t_vBatCalib; + txCurrentCalibration=t_txCurrentCalibration; + txVoltageCalibration=t_txVoltageCalibration; vBatWarn=t_vBatWarn; PPM_Multiplier=t_PPM_Multiplier; stickMode = t_stickMode; @@ -1383,16 +1383,16 @@ void ModelData::clear() moduleData[2].ppmDelay = 300; int board = GetEepromInterface()->getBoard(); if (IS_TARANIS(board)) { - moduleData[0].protocol=PXX_XJT_X16; - moduleData[1].protocol=OFF; + moduleData[0].protocol = PULSES_PXX_XJT_X16; + moduleData[1].protocol = PULSES_OFF; } else if (IS_SKY9X(board)) { - moduleData[0].protocol=PPM; - moduleData[1].protocol=PPM; + moduleData[0].protocol = PULSES_PPM; + moduleData[1].protocol = PULSES_PPM; } else { - moduleData[0].protocol=PPM; - moduleData[1].protocol=OFF; + moduleData[0].protocol = PULSES_PPM; + moduleData[1].protocol = PULSES_OFF; } for (int i=0; i= 216 ? 3 : 2)) : 3) #define MAX_SLIDERS(board) (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : 2) : 0) #define MAX_SWITCHES(board, version) (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 18 : 8) : 7) #define MAX_SWITCHES_POSITION(board, version) (IS_TARANIS_X9E(board) ? 18*3 : (IS_TARANIS(board) ? 8*3 : 9)) @@ -80,7 +80,7 @@ class SwitchesConversionTable: public ConversionTable { } if (IS_TARANIS(board) && version >= 216) { - for (int i=1; i<=MAX_POTS(board)*6; i++) { + for (int i=1; i<=MAX_POTS(board, version)*6; i++) { addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, -i), -val+offset); addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, i), val++); } @@ -212,8 +212,9 @@ class SourcesConversionTable: public ConversionTable { } if (IS_TARANIS(board) && version >= 216) { - for (int i=0; i<32; i++) + for (int i=0; i<32; i++) { addConversion(RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i), val++); + } for (int i=0; i<7; i++) { for (int j=0; j<6; j++) { addConversion(RawSource(SOURCE_TYPE_LUA_OUTPUT, i*16+j), val++); @@ -221,16 +222,18 @@ class SourcesConversionTable: public ConversionTable { } } - for (int i=0; iimportValue(v2, csw.val2); } else if (csw.func >= LS_FN_EQUAL && csw.func <= LS_FN_ELESS) { - sourcesConversionTable->importValue((uint8_t)v1, csw.val1); - sourcesConversionTable->importValue((uint8_t)v2, csw.val2); + if (IS_ARM(board)) { + sourcesConversionTable->importValue((uint32_t)v1, csw.val1); + sourcesConversionTable->importValue((uint32_t)v2, csw.val2); + } + else { + sourcesConversionTable->importValue((uint8_t)v1, csw.val1); + sourcesConversionTable->importValue((uint8_t)v2, csw.val2); + } if (IS_TARANIS(board) && version < 216) { RawSource val1(csw.val1); if (val1.type == SOURCE_TYPE_STICK && val1.index < NUM_STICKS) { @@ -1801,7 +1811,12 @@ class LogicalSwitchField: public TransformedField { } } else if (csw.func != LS_FN_OFF) { - sourcesConversionTable->importValue((uint8_t)v1, csw.val1); + if (IS_ARM(board)) { + sourcesConversionTable->importValue((uint32_t)v1, csw.val1); + } + else { + sourcesConversionTable->importValue((uint8_t)v1, csw.val1); + } if (IS_TARANIS(board) && version < 216) { RawSource val1(csw.val1); if (val1.type == SOURCE_TYPE_STICK && val1.index < NUM_STICKS) { @@ -2809,7 +2824,8 @@ class SensorField: public TransformedField { if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) { _id = sensor.id; _instance = sensor.instance; - _param = (sensor.ratio) + ((unsigned int)sensor.offset << 16); + _ratio = sensor.ratio; + _offset = sensor.offset; } else { _id = sensor.persistentValue; @@ -2820,7 +2836,7 @@ class SensorField: public TransformedField { _param = ((uint8_t)sensor.sources[0]) + ((uint8_t)sensor.sources[1] << 8) + ((uint8_t)sensor.sources[2] << 16) + ((uint8_t)sensor.sources[3] << 24); else if (sensor.formula == SensorData::TELEM_FORMULA_DIST) _param = (sensor.gps) + (sensor.alt << 8); - else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION) + else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION || sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE) _param = (sensor.amps); } } @@ -2830,8 +2846,8 @@ class SensorField: public TransformedField { if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) { sensor.id = _id; sensor.instance = _instance; - sensor.ratio = _param & 0xFFFF; - sensor.offset = (_param >> 16) & 0xFFFF; + sensor.ratio = _ratio; + sensor.offset = _offset; } else { sensor.persistentValue = _id; @@ -2843,7 +2859,7 @@ class SensorField: public TransformedField { sensor.sources[i] = _sources[i]; else if (sensor.formula == SensorData::TELEM_FORMULA_DIST) (sensor.gps = _sources[0], sensor.alt = _sources[1]); - else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION) + else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION || sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE) sensor.amps = _sources[0]; } eepromImportDebug() << QString("imported %1").arg(internalField.getName()); @@ -2857,6 +2873,10 @@ class SensorField: public TransformedField { union { unsigned int _param; uint8_t _sources[4]; + struct { + uint16_t _ratio; + int16_t _offset; + }; }; }; @@ -3148,7 +3168,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne if (IS_ARM(board) && version >= 217) { for (int i=0; i<8; i++) { - if (i < MAX_POTS(board)+MAX_SLIDERS(board)) + if (i < MAX_POTS(board, version)+MAX_SLIDERS(board)) internalField.Append(new BoolField<1>(modelData.potsWarningEnabled[i])); else internalField.Append(new SpareBitsField<1>()); @@ -3156,7 +3176,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne } else if (IS_ARM(board) && version >= 216) { for (int i=0; i<6; i++) { - if (i < MAX_POTS(board)+MAX_SLIDERS(board)) + if (i < MAX_POTS(board, version)+MAX_SLIDERS(board)) internalField.Append(new BoolField<1>(modelData.potsWarningEnabled[i])); else internalField.Append(new SpareBitsField<1>()); @@ -3165,7 +3185,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne } if (IS_ARM(board) && version >= 216) { - for (int i=0; i < MAX_POTS(board)+MAX_SLIDERS(board); i++) { + for (int i=0; i < MAX_POTS(board, version)+MAX_SLIDERS(board); i++) { internalField.Append(new SignedField<8>(modelData.potPosition[i])); } } @@ -3191,10 +3211,10 @@ void OpenTxModelData::beforeExport() // qDebug() << QString("before export model") << modelData.name; for (int module=0; module<3; module++) { - if (modelData.moduleData[module].protocol >= PXX_XJT_X16 && modelData.moduleData[module].protocol <= PXX_XJT_LR12) - subprotocols[module] = modelData.moduleData[module].protocol - PXX_XJT_X16; - else if (modelData.moduleData[module].protocol >= LP45 && modelData.moduleData[module].protocol <= DSMX) - subprotocols[module] = modelData.moduleData[module].protocol - LP45; + if (modelData.moduleData[module].protocol >= PULSES_PXX_XJT_X16 && modelData.moduleData[module].protocol <= PULSES_PXX_XJT_LR12) + subprotocols[module] = modelData.moduleData[module].protocol - PULSES_PXX_XJT_X16; + else if (modelData.moduleData[module].protocol >= PULSES_LP45 && modelData.moduleData[module].protocol <= PULSES_DSMX) + subprotocols[module] = modelData.moduleData[module].protocol - PULSES_LP45; else subprotocols[module] = (module==0 ? -1 : 0); } @@ -3224,15 +3244,15 @@ void OpenTxModelData::afterImport() } for (int module=0; module<3; module++) { - if (modelData.moduleData[module].protocol == PXX_XJT_X16 || modelData.moduleData[module].protocol == LP45) { + if (modelData.moduleData[module].protocol == PULSES_PXX_XJT_X16 || modelData.moduleData[module].protocol == PULSES_LP45) { if (subprotocols[module] >= 0) modelData.moduleData[module].protocol += subprotocols[module]; else - modelData.moduleData[module].protocol = OFF; + modelData.moduleData[module].protocol = PULSES_OFF; } } - if (IS_TARANIS(board) && version < 217 && modelData.moduleData[1].protocol != OFF) { + if (IS_TARANIS(board) && version < 217 && modelData.moduleData[1].protocol != PULSES_OFF) { modelData.moduleData[1].modelId = modelData.moduleData[0].modelId; } } @@ -3243,7 +3263,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo generalData(generalData), board(board), version(version), - inputsCount(NUM_STICKS+MAX_POTS(board)+MAX_SLIDERS(board)) + inputsCount(NUM_STICKS+MAX_POTS(board, version)+MAX_SLIDERS(board)) { eepromImportDebug() << QString("OpenTxGeneralData::OpenTxGeneralData(board: %1, version:%2, variant:%3)").arg(board).arg(version).arg(variant); @@ -3280,7 +3300,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo internalField.Append(new UnsignedField<8>(generalData.currModel)); internalField.Append(new UnsignedField<8>(generalData.contrast)); internalField.Append(new UnsignedField<8>(generalData.vBatWarn)); - internalField.Append(new SignedField<8>(generalData.vBatCalib)); + internalField.Append(new SignedField<8>(generalData.txVoltageCalibration)); internalField.Append(new SignedField<8>(generalData.backlightMode)); for (int i=0; i(generalData.backlightBright)); - internalField.Append(new SignedField<8>(generalData.currentCalib)); + internalField.Append(new SignedField<8>(generalData.txCurrentCalibration)); if (version >= 213) { internalField.Append(new SignedField<8>(generalData.temperatureWarn)); // TODO internalField.Append(new UnsignedField<8>(generalData.mAhWarn)); @@ -3407,7 +3427,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo internalField.Append(new UnsignedField<8>(generalData.hw_uartMode)); } for (int i=0; i<4; i++) { - if (i < MAX_POTS(board)) + if (i < MAX_POTS(board, version)) internalField.Append(new UnsignedField<2>(generalData.potConfig[i])); else internalField.Append(new SpareBitsField<2>()); @@ -3439,7 +3459,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo for (int i=0; i(generalData.stickName[i])); } - for (int i=0; i(generalData.potName[i])); } for (int i=0; igetCapability(Pots); - int8_t vBatCalib=(int8_t) g.profile[g.id()].vBatCalib(); - int8_t currentCalib=(int8_t) g.profile[g.id()].currentCalib(); + int8_t txVoltageCalibration=(int8_t) g.profile[g.id()].txVoltageCalibration(); + int8_t txCurrentCalibration=(int8_t) g.profile[g.id()].txCurrentCalibration(); int8_t PPM_Multiplier=(int8_t) g.profile[g.id()].ppmMultiplier(); if ((calib.length()==(NUM_STICKS+potsnum)*12) && (trainercalib.length()==16)) { @@ -204,8 +204,8 @@ bool FlashEEpromDialog::patchCalibration() radioData->generalSettings.trainer.calib[i] = byte16; } } - radioData->generalSettings.currentCalib = currentCalib; - radioData->generalSettings.vBatCalib = vBatCalib; + radioData->generalSettings.txCurrentCalibration = txCurrentCalibration; + radioData->generalSettings.txVoltageCalibration = txVoltageCalibration; radioData->generalSettings.PPM_Multiplier = PPM_Multiplier; return true; } diff --git a/companion/src/generaledit/calibration.cpp b/companion/src/generaledit/calibration.cpp index 94133171e..978a48910 100644 --- a/companion/src/generaledit/calibration.cpp +++ b/companion/src/generaledit/calibration.cpp @@ -159,6 +159,11 @@ CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSe ui->serialPortLabel->hide(); } + if (!IS_SKY9X(firmware->getBoard())) { + ui->txCurrentCalibration->hide(); + ui->txCurrentCalibrationLabel->hide(); + } + if (IS_TARANIS_X9E(firmware->getBoard())) { ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable); ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this); @@ -214,9 +219,9 @@ void CalibrationPanel::on_PPM4_editingFinished() } -void CalibrationPanel::on_CurrentCalib_SB_editingFinished() +void CalibrationPanel::on_txCurrentCalibration_editingFinished() { - generalSettings.currentCalib = ui->CurrentCalib_SB->value(); + generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value(); emit modified(); } @@ -228,8 +233,8 @@ void CalibrationPanel::on_bluetoothEnable_stateChanged(int) void CalibrationPanel::setValues() { - ui->battCalibDSB->setValue((double)generalSettings.vBatCalib/10); - ui->CurrentCalib_SB->setValue((double)generalSettings.currentCalib); + ui->txVoltageCalibration->setValue((double)generalSettings.txVoltageCalibration/10); + ui->txCurrentCalibration->setValue((double)generalSettings.txCurrentCalibration); ui->ana1Neg->setValue(generalSettings.calibSpanNeg[0]); ui->ana2Neg->setValue(generalSettings.calibSpanNeg[1]); @@ -265,9 +270,9 @@ void CalibrationPanel::setValues() ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10); } -void CalibrationPanel::on_battCalibDSB_editingFinished() +void CalibrationPanel::on_txVoltageCalibration_editingFinished() { - generalSettings.vBatCalib = ui->battCalibDSB->value()*10; + generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10; emit modified(); } diff --git a/companion/src/generaledit/calibration.h b/companion/src/generaledit/calibration.h index a15265b0c..ffb1524b7 100644 --- a/companion/src/generaledit/calibration.h +++ b/companion/src/generaledit/calibration.h @@ -21,14 +21,14 @@ class CalibrationPanel : public GeneralPanel // virtual void update(); private slots: - void on_battCalibDSB_editingFinished(); + void on_txVoltageCalibration_editingFinished(); void on_PPM1_editingFinished(); void on_PPM2_editingFinished(); void on_PPM3_editingFinished(); void on_PPM4_editingFinished(); void on_PPM_MultiplierDSB_editingFinished(); - void on_CurrentCalib_SB_editingFinished(); + void on_txCurrentCalibration_editingFinished(); void on_bluetoothEnable_stateChanged(int); void on_ana1Neg_editingFinished(); diff --git a/companion/src/generaledit/calibration.ui b/companion/src/generaledit/calibration.ui index 456a5251a..26ad4e2b6 100644 --- a/companion/src/generaledit/calibration.ui +++ b/companion/src/generaledit/calibration.ui @@ -7,7 +7,7 @@ 0 0 805 - 1269 + 1313 @@ -562,14 +562,14 @@ - + - Battery + Battery Offset - + @@ -674,7 +674,7 @@ - + -49 @@ -698,9 +698,9 @@ - + - Current + Current Offset diff --git a/companion/src/generaledit/generaledit.cpp b/companion/src/generaledit/generaledit.cpp index 8a040d661..127d87cf7 100644 --- a/companion/src/generaledit/generaledit.cpp +++ b/companion/src/generaledit/generaledit.cpp @@ -88,8 +88,8 @@ void GeneralEdit::on_calretrieve_PB_clicked() } else { QString trainercalib = g.profile[profile_id].trainerCalib(); - int8_t vBatCalib = (int8_t)g.profile[profile_id].vBatCalib(); - int8_t currentCalib = (int8_t)g.profile[profile_id].currentCalib(); + int8_t txVoltageCalibration = (int8_t)g.profile[profile_id].txVoltageCalibration(); + int8_t txCurrentCalibration = (int8_t)g.profile[profile_id].txCurrentCalibration(); int8_t PPM_Multiplier = (int8_t)g.profile[profile_id].ppmMultiplier(); uint8_t GSStickMode = (uint8_t)g.profile[profile_id].gsStickMode(); uint8_t vBatWarn = (uint8_t)g.profile[profile_id].vBatWarn(); @@ -123,8 +123,8 @@ void GeneralEdit::on_calretrieve_PB_clicked() if (ok) generalSettings.trainer.calib[i]=byte16; } - generalSettings.currentCalib=currentCalib; - generalSettings.vBatCalib=vBatCalib; + generalSettings.txCurrentCalibration=txCurrentCalibration; + generalSettings.txVoltageCalibration=txVoltageCalibration; generalSettings.vBatWarn=vBatWarn; if (GetCurrentFirmware()->getCapability(HasBatMeterRange)) { generalSettings.vBatMin = (int8_t) g.profile[profile_id].vBatMin(); @@ -225,8 +225,8 @@ void GeneralEdit::on_calstore_PB_clicked() calib.append(QString("%1").arg((uint16_t)generalSettings.trainer.calib[i], 4, 16, QChar('0'))); } g.profile[profile_id].trainerCalib( calib ); - g.profile[profile_id].vBatCalib( generalSettings.vBatCalib ); - g.profile[profile_id].currentCalib( generalSettings.currentCalib ); + g.profile[profile_id].txVoltageCalibration( generalSettings.txVoltageCalibration ); + g.profile[profile_id].txCurrentCalibration( generalSettings.txCurrentCalibration ); g.profile[profile_id].vBatWarn( generalSettings.vBatWarn ); if (GetCurrentFirmware()->getCapability(HasBatMeterRange)) { g.profile[profile_id].vBatMin( generalSettings.vBatMin ); diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index c165d69a0..1fa723f5f 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1118,8 +1118,8 @@ void MainWindow::createMenus() languageMenu->addAction(germanLangAct); languageMenu->addAction(finnishLangAct); languageMenu->addAction(frenchLangAct); -// languageMenu->addAction(hebrewLangAct); languageMenu->addAction(italianLangAct); +// languageMenu->addAction(hebrewLangAct); languageMenu->addAction(polishLangAct); // languageMenu->addAction(portugueseLangAct); languageMenu->addAction(spanishLangAct); @@ -1366,20 +1366,20 @@ void MainWindow::updateLanguageActions() frenchLangAct->setChecked(true); else if (langId=="it_IT") italianLangAct->setChecked(true); - else if (langId=="he_IL") - hebrewLangAct->setChecked(true); + // else if (langId=="he_IL") + // hebrewLangAct->setChecked(true); else if (langId=="pl_PL") polishLangAct->setChecked(true); - else if (langId=="pt_PT") - portugueseLangAct->setChecked(true); - else if (langId=="ru_RU") - russianLangAct->setChecked(true); + // else if (langId=="pt_PT") + // portugueseLangAct->setChecked(true); else if (langId=="es_ES") spanishLangAct->setChecked(true); else if (langId=="sv_SE") swedishLangAct->setChecked(true); - else if (langId=="nl_NL") - dutchLangAct->setChecked(true); + // else if (langId=="ru_RU") + // russianLangAct->setChecked(true); + // else if (langId=="nl_NL") + // dutchLangAct->setChecked(true); } void MainWindow::updateIconThemeActions() diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index 759375bc0..ba4b7c760 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -262,20 +262,22 @@ class MainWindow : public QMainWindow QAction *normalIconAct; QAction *bigIconAct; QAction *hugeIconAct; + QAction *sysLangAct; - QAction *englishLangAct; QAction *czechLangAct; QAction *germanLangAct; - QAction *frenchLangAct; + QAction *englishLangAct; QAction *finnishLangAct; + QAction *frenchLangAct; QAction *italianLangAct; - QAction *hebrewLangAct; + // QAction *hebrewLangAct; QAction *polishLangAct; + // QAction *portugueseLangAct; QAction *spanishLangAct; - QAction *portugueseLangAct; QAction *swedishLangAct; - QAction *russianLangAct; - QAction *dutchLangAct; + // QAction *russianLangAct; + // QAction *dutchLangAct; + QAction *openDocURLAct; }; diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp index 787bca608..33f325243 100644 --- a/companion/src/modeledit/mixes.cpp +++ b/companion/src/modeledit/mixes.cpp @@ -121,14 +121,14 @@ bool MixesPanel::AddMixerLine(int dest) QString MixesPanel::getMixerText(int dest, bool * new_ch) { QString str; - if (new_ch) *new_ch = 0; + bool newChannel = false; if (dest < 0) { str = modelPrinter.printMixerName(-dest); //highlight channel if needed if (-dest == (int)highlightedSource) { str = "" + str + ""; } - if (new_ch) *new_ch = 1; + newChannel = true; } else { MixData & mix = model->mixData[dest]; @@ -136,7 +136,7 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch) str = modelPrinter.printMixerName(mix.destCh); if ((dest == 0) || (model->mixData[dest-1].destCh != mix.destCh)) { - if (new_ch) *new_ch = 1; + newChannel = true; //highlight channel if needed if (mix.destCh == highlightedSource) { str = "" + str + ""; @@ -146,8 +146,9 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch) str.fill(' '); } - str += modelPrinter.printMixerLine(mix, highlightedSource); + str += modelPrinter.printMixerLine(mix, !newChannel, highlightedSource); } + if (new_ch) *new_ch = newChannel; return str.replace(" ", " "); } diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index f01bf6aca..1f6da6d82 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -167,8 +167,8 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module ui->label_module->setText(label); // The protocols available on this board - for (int i=0; iisAvailable((Protocol)i, moduleIdx)) { + for (int i=0; iisAvailable((PulsesProtocol)i, moduleIdx)) { ui->protocol->addItem(ModelPrinter::printModuleProtocol(i), (QVariant)i); if (i == module.protocol) ui->protocol->setCurrentIndex(ui->protocol->count()-1); } @@ -223,42 +223,42 @@ ModulePanel::~ModulePanel() void ModulePanel::update() { unsigned int mask = 0; - Protocol protocol = (Protocol)module.protocol; + PulsesProtocol protocol = (PulsesProtocol)module.protocol; unsigned int max_rx_num = 63; if (moduleIdx >= 0) { mask |= MASK_PROTOCOL; switch (protocol) { - case PXX_XJT_X16: - case PXX_XJT_D8: - case PXX_XJT_LR12: - case PXX_DJT: + case PULSES_PXX_XJT_X16: + case PULSES_PXX_XJT_D8: + case PULSES_PXX_XJT_LR12: + case PULSES_PXX_DJT: mask |= MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT; - if ((protocol==PXX_XJT_X16) || (protocol==PXX_XJT_LR12)) mask |= MASK_FAILSAFES | MASK_RX_NUMBER; + if ((protocol==PULSES_PXX_XJT_X16) || (protocol==PULSES_PXX_XJT_LR12)) mask |= MASK_FAILSAFES | MASK_RX_NUMBER; break; - case LP45: - case DSM2: - case DSMX: + case PULSES_LP45: + case PULSES_DSM2: + case PULSES_DSMX: mask |= MASK_CHANNELS_RANGE | MASK_RX_NUMBER; module.channelsCount = 6; max_rx_num = 20; break; - case PPM: + case PULSES_PPM: mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT; if (IS_9XRPRO(firmware->getBoard())) { mask |= MASK_OPEN_DRAIN; } break; - case OFF: + case PULSES_OFF: default: break; } } else if (IS_TARANIS(firmware->getBoard())) { switch(model->trainerMode) { - case MASTER_JACK: + case TRAINER_MASTER_JACK: break; - case SLAVE_JACK: + case TRAINER_SLAVE_JACK: mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT; break; default: @@ -266,7 +266,7 @@ void ModulePanel::update() break; } } - else if (model->trainerMode != MASTER_JACK) { + else if (model->trainerMode != TRAINER_MASTER_JACK) { mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT; } diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp index e715c679b..5ab8c1210 100644 --- a/companion/src/modeledit/telemetry.cpp +++ b/companion/src/modeledit/telemetry.cpp @@ -533,6 +533,7 @@ void TelemetrySensorPanel::update() bool cellsFieldsDisplayed = false; bool consFieldsDisplayed = false; bool ratioFieldsDisplayed = false; + bool totalizeFieldsDisplayed = false; bool sources12FieldsDisplayed = false; bool sources34FieldsDisplayed = false; @@ -556,6 +557,7 @@ void TelemetrySensorPanel::update() consFieldsDisplayed = (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION); sources12FieldsDisplayed = (sensor.formula <= SensorData::TELEM_FORMULA_MULTIPLY); sources34FieldsDisplayed = (sensor.formula < SensorData::TELEM_FORMULA_MULTIPLY); + totalizeFieldsDisplayed = (sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE); updateSourcesComboBox(ui->source1, true); updateSourcesComboBox(ui->source2, true); updateSourcesComboBox(ui->source3, true); @@ -595,15 +597,15 @@ void TelemetrySensorPanel::update() ui->offsetLabel->setVisible(ratioFieldsDisplayed && sensor.unit != SensorData::UNIT_RPMS); ui->multiplierLabel->setVisible(sensor.unit == SensorData::UNIT_RPMS); ui->offset->setVisible(ratioFieldsDisplayed); - ui->precLabel->setVisible(isConfigurable); + ui->precLabel->setVisible(isConfigurable && sensor.unit != SensorData::UNIT_FAHRENHEIT); ui->prec->setVisible(isConfigurable && sensor.unit != SensorData::UNIT_FAHRENHEIT); ui->unit->setVisible((sensor.type == SensorData::TELEM_TYPE_CALCULATED && (sensor.formula == SensorData::TELEM_FORMULA_DIST)) || isConfigurable); ui->gpsSensorLabel->setVisible(gpsFieldsDisplayed); ui->gpsSensor->setVisible(gpsFieldsDisplayed); ui->altSensorLabel->setVisible(gpsFieldsDisplayed); ui->altSensor->setVisible(gpsFieldsDisplayed); - ui->ampsSensorLabel->setVisible(consFieldsDisplayed); - ui->ampsSensor->setVisible(consFieldsDisplayed); + ui->ampsSensorLabel->setVisible(consFieldsDisplayed || totalizeFieldsDisplayed); + ui->ampsSensor->setVisible(consFieldsDisplayed || totalizeFieldsDisplayed); ui->cellsSensorLabel->setVisible(cellsFieldsDisplayed); ui->cellsSensor->setVisible(cellsFieldsDisplayed); ui->cellsIndex->setVisible(cellsFieldsDisplayed); @@ -749,7 +751,7 @@ TelemetryPanel::~TelemetryPanel() void TelemetryPanel::update() { if (IS_TARANIS(firmware->getBoard())) { - if (model->moduleData[0].protocol == OFF && model->moduleData[1].protocol == PPM) { + if (model->moduleData[0].protocol == PULSES_OFF && model->moduleData[1].protocol == PULSES_PPM) { ui->telemetryProtocol->setEnabled(true); } else { diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui index 0709dc70d..b365f7f1b 100644 --- a/companion/src/modeledit/telemetry.ui +++ b/companion/src/modeledit/telemetry.ui @@ -62,7 +62,16 @@ false - + + 4 + + + 4 + + + 4 + + 4 @@ -269,7 +278,16 @@ false - + + 4 + + + 4 + + + 4 + + 4 @@ -294,7 +312,16 @@ false - + + 4 + + + 4 + + + 4 + + 4 @@ -322,7 +349,16 @@ - + + 4 + + + 4 + + + 4 + + 4 @@ -571,7 +607,16 @@ - + + 4 + + + 4 + + + 4 + + 4 @@ -642,7 +687,16 @@ - + + 4 + + + 4 + + + 4 + + 4 @@ -893,7 +947,16 @@ false - + + 4 + + + 4 + + + 4 + + 4 diff --git a/companion/src/modeledit/telemetry_sensor.ui b/companion/src/modeledit/telemetry_sensor.ui index 29746fa7f..046aeb3eb 100644 --- a/companion/src/modeledit/telemetry_sensor.ui +++ b/companion/src/modeledit/telemetry_sensor.ui @@ -272,7 +272,7 @@ - Amps Sensor : + Sensor : @@ -366,82 +366,82 @@ - Voltage (V) + V - Current (A) + A - Current (mA) + mA - Speed (kts) + kt - Speed (m/s) + m/s - Speed (ft/s) + ft/s - Speed (km/h) + km/h - Speed (miles/h) + mph - Meters (m) + m - Feet (ft) + ft - Temp (°C) + °C - Temp (°F) + °F - Percentage (%) + % - Energy (mAh) + mAh - Power (W) + W - RF Power (dBm) + dBm @@ -451,22 +451,22 @@ - Acceleration (g) + g - Heading (°) + ° - Volume (mL) + mL - Volume (US fl.Oz.) + US fl.Oz. diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp index d091422cc..1cfbdf917 100644 --- a/companion/src/modelprinter.cpp +++ b/companion/src/modelprinter.cpp @@ -108,13 +108,13 @@ QString ModelPrinter::printModuleProtocol(unsigned int protocol) QString ModelPrinter::printModule(int idx) { const ModuleData & module = model.moduleData[idx]; - if (module.protocol == OFF) + if (module.protocol == PULSES_OFF) return printModuleProtocol(module.protocol); - else if (module.protocol == PPM) + else if (module.protocol == PULSES_PPM) return tr("%1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5)").arg(printModuleProtocol(module.protocol)).arg(module.channelsStart+1).arg(module.channelsStart+module.channelsCount).arg(module.ppmDelay).arg(module.polarityToString()); else { QString result = tr("%1, Channels(%2-%3)").arg(printModuleProtocol(module.protocol)).arg(module.channelsStart+1).arg(module.channelsStart+module.channelsCount); - if (module.protocol != PXX_XJT_D8) { + if (module.protocol != PULSES_PXX_XJT_D8) { result += " " + tr("Receiver number(%1)").arg(module.modelId); } return result; @@ -327,21 +327,25 @@ QString ModelPrinter::printMixerName(int curDest) return Qt::escape(str); } -QString ModelPrinter::printMixerLine(int idx, int highlightedSource) +QString ModelPrinter::printMixerLine(int idx, bool showMultiplex, int highlightedSource) { - return printMixerLine(model.mixData[idx], highlightedSource); + return printMixerLine(model.mixData[idx], highlightedSource, showMultiplex); } -QString ModelPrinter::printMixerLine(const MixData & mix, int highlightedSource) +QString ModelPrinter::printMixerLine(const MixData & mix, bool showMultiplex, int highlightedSource) { QString str = " "; - switch(mix.mltpx) { - case (1): str += "*"; break; - case (2): str += "R"; break; - default: str += " "; break; - }; - + if (showMultiplex) { + switch(mix.mltpx) { + case (1): str += "*="; break; + case (2): str += ":="; break; + default: str += "+="; break; + } + } + else { + str += "  "; + } // highlight source if needed QString source = Qt::escape(mix.srcRaw.toString(&model)); if ( (mix.srcRaw.type == SOURCE_TYPE_CH) && (mix.srcRaw.index+1 == (int)highlightedSource) ) { diff --git a/companion/src/modelprinter.h b/companion/src/modelprinter.h index 11a7b712c..b531509c7 100644 --- a/companion/src/modelprinter.h +++ b/companion/src/modelprinter.h @@ -50,8 +50,8 @@ class ModelPrinter: public QObject QString printInputLine(int idx); QString printInputLine(const ExpoData & ed); QString printMixerName(int curDest); - QString printMixerLine(int idx, int highlightedSource = 0); - QString printMixerLine(const MixData & md, int highlightedSource = 0); + QString printMixerLine(int idx, bool showMultiplex, int highlightedSource = 0); + QString printMixerLine(const MixData & md, bool showMultiplex, int highlightedSource = 0); QString printLogicalSwitchLine(int idx); QString printCustomFunctionLine(int idx); static QString printChannelName(int idx); diff --git a/companion/src/multimodelprinter.cpp b/companion/src/multimodelprinter.cpp index 4ff6b52dc..135a0cd4f 100644 --- a/companion/src/multimodelprinter.cpp +++ b/companion/src/multimodelprinter.cpp @@ -357,7 +357,7 @@ QString MultiModelPrinter::printMixers() for (int j=0; j 0) columns.append("
"); - COMPARE((j < model->mixes(i).size()) ? modelPrinter->printMixerLine(*model->mixes(i)[j]) : " "); + COMPARE((j < model->mixes(i).size()) ? modelPrinter->printMixerLine(*model->mixes(i)[j], (j>0)) : " "); } columns.append(""); } diff --git a/companion/src/translations/companion_cs.ts b/companion/src/translations/companion_cs.ts index a5b85e350..1e59e8ce8 100644 --- a/companion/src/translations/companion_cs.ts +++ b/companion/src/translations/companion_cs.ts @@ -4,27 +4,27 @@ AileronsPage - + No Ne - + Yes, controlled by a single channel Ano, ovládané jedním kanálem - + Yes, controlled by two channels Ano, ovládané dvěma kanály - + <br>First Aileron Channel: <br>První kanál křidélek: - + Second Aileron Channel: <br>Druhý kanál křidélek: @@ -32,27 +32,27 @@ AirbrakesPage - + No Ne - + Yes, controlled by a single channel Ano, ovládané jedním kanálem - + Yes, controlled by two channels Ano, ovládané dvěma kanály - + <br>First Airbrake Channel: <br>První kanál brzdících klapek: - + Second Airbrake Channel: <br>Druhý kanál brzdících klapek: @@ -74,7 +74,7 @@ - + Open Folder Vybrat složku @@ -330,7 +330,7 @@ Mode 4: - + Simulator Volume Gain Zisk hlasitosti simulátoru @@ -478,62 +478,62 @@ Může být jiná než verze firmwaru Nastavení simulátoru - + Simulator BackLight Barva podsvětlení Simu - + Enable Povolit - + Blue Modrá - + Green Zelená - + Red Červená - + Orange Oranžová - + Yellow Žlutá - + Joystick - + Calibrate Kalibrovat - + Simulator capture folder Složka pro snímky obrazovky Simu - + Only capture to clipboard Kopírovat pouze do schránky - + Remember simulator switch values Pamatovat si polohy přepínačů v simulátoru @@ -548,64 +548,64 @@ Může být jiná než verze firmwaru Vyberat složku pro snímky obrazovky simulátoru - - + + No joysticks found Joystick nenalezen - + EMPTY: No radio settings stored in profile PRÁZDNÉ: V profilu nejsou uložena žádná nastavení rádia - + AVAILABLE: Radio settings of unknown age DOSTUPNÉ: Nastavení rádia jsou neznámého stáří - + AVAILABLE: Radio settings stored %1 DOSTUPNÉ: Nastavení rádia jsou uložena %1 - + Select your library folder Vyberat složkus s logy - - + + Select your Models and Settings backup folder Zvolit složku pro automatické zálohy modelů a nastavení - + Select Google Earth executable Zvolit spustitelnou binárku aplikace Google Earth - + Select the folder replicating your SD structure Vyberat složku která představuje obsah SD karty rádia - + Not possible to remove profile Není možné odebrat profil - + The default profile can not be removed. Výchozí profil nemůže být odstraněn. - + Open Image to load Otevřít soubor s logem - + Images (%1) Obrázky (%1) @@ -806,9 +806,8 @@ Může být jiná než verze firmwaru Páka 4 - Battery - Baterie + Baterie @@ -831,9 +830,18 @@ Může být jiná než verze firmwaru - Current - Proud + Proud + + + + Battery Offset + + + + + Current Offset + @@ -1082,260 +1090,149 @@ Může být jiná než verze firmwaru Tisk do souboru - + No name Model nepojmenován - General Model Settings - Obecná nastavení modelu + Obecná nastavení modelu - - - Name - Název + Název - - EEprom Size - Velikost EEPROM + Velikost EEPROM - - Timer1 - Stopky1 + Stopky1 - - Timer2 - Stopky2 + Stopky2 - - Internal Radio System - Interní vysílací modul + Interní vysílací modul - - Radio System - Vysílací modul + Vysílací modul - - - - Protocol - Protokol + Protokol Pulse Polarity Polarita pulzů - - Throttle Trim - Trim volnoběhu plynu + Trim volnoběhu plynu - - Enabled - Povoleno + Povoleno - - Disabled - Zakázáno + Zakázáno Throttle Expo Expo plynu - - External Radio Module - Externí vysílací modul + Externí vysílací modul - - Extra Radio System - Extra modul + Extra modul - - Trainer port mode - Mód portu trenér + Mód portu trenér - - Trim Increment - Krok trimu + Krok trimu - - Center Beep - Zvuk ve středové poloze + Zvuk ve středové poloze - Flight modes Settings - Nastavení letových fází + Nastavení letových fází - - Fades - Přechody + Přechody - - Trims - Trimy + Trimy - - Switch - Spínač + Spínač - - - - Flight mode name - Název režimu + Název režimu - - IN - (+) + (+) - - OUT - (-) + (-) - - - - - - - - - - FM - LR + LR - - Gvars - GP + GP - - Rot. Enc. - Rot.Enkoder + Rot.Enkoder - Limits - Limity + Limity - - - - - Offset - Subtrim + Subtrim - - - - - - Min - - - - - - - - - Max - - - - - - Invert - Invertovat + Invertovat - - - - - - CH - - - - - - INV - - - - - NOR - --- + --- - Global Variables - Globální proměnné + Globální proměnné - - GV - GP + GP - Inputs - Vstupy(DR/Expo) + Vstupy(DR/Expo) Expo/Dr Settings @@ -1358,9 +1255,8 @@ Může být jiná než verze firmwaru ZAKÁZÁN - Mixers - Mixy + Mixy noTrim @@ -1379,9 +1275,8 @@ Může být jiná než verze firmwaru Varování - Curves - Křivky + Křivky 5 Point Curves @@ -1392,29 +1287,20 @@ Může být jiná než verze firmwaru bod %1 - - Curve - Křivka + Křivka 9 Point Curves 9ti bodové křivky - Logical Switches - Logické spínače + Logické spínače - - L - - - - Special Functions - Speciální funkce + Speciální funkce Function @@ -1433,114 +1319,52 @@ Může být jiná než verze firmwaru Povolit - - SF - - - - Telemetry Settings - Nastavení telemetrie + Nastavení telemetrie - - - Analog - - - - - Unit - Jednotky + Jednotky - - Scale - Měřítko + Měřítko - - - - - A%1 - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - - - Type - Typ + Typ - - - - Condition - Podmínka + Podmínka - - - - Value - Hodnota + Hodnota - - - RSSI Alarm - - - - - Custom Telemetry View - Vlastní zobrazení telemetrie + Vlastní zobrazení telemetrie - - Telemetry Bars - Telemetrické ukazatele + Telemetrické ukazatele - - Bar Number - Číslo ukazatele + Číslo ukazatele - - Source - Zdroj + Zdroj - + Print Document Vytisknout dokument - + Select PDF output file Vyberte cílový PDF soubor @@ -1548,7 +1372,7 @@ Může být jiná než verze firmwaru ConclusionPage - + OK, I understand. OK, rozuměl jsem. @@ -1587,12 +1411,16 @@ Může být jiná než verze firmwaru Thomasi Hustererovi (th9x) a také Erazovi Ravivovi(er9x a eePe) - - Thank you all !!! - Děkujeme vám všem !!! + + OpenTX Blacklist + - + Thank you all !!! + Děkujeme vám všem !!! + + + monthly @@ -1625,22 +1453,22 @@ Thomasi Hustererovi (th9x) a také Erazovi Ravivovi(er9x a eePe) CurveGroup - + Diff Diferenciace - + Expo Exponenciála - + Func Funkce - + Curve Křivka @@ -1903,22 +1731,22 @@ Thomasi Hustererovi (th9x) a také Erazovi Ravivovi(er9x a eePe) CyclicPage - + 90 - + 120 - + 120x - + 140 @@ -1934,12 +1762,12 @@ Thomasi Hustererovi (th9x) a také Erazovi Ravivovi(er9x a eePe) ElevonsPage - + <br>First Elevon Channel: <br>První kanál elevonů: - + Second Elevon Channel: <br>Druhý kanál elevonů: @@ -2312,45 +2140,41 @@ Pokud není použito, vstup je AKTIVNÍ stále. Upravit %1 - Rud - Směrovka + Směrovka - Ele - Výškovka + Výškovka - Thr - Plyn + Plyn - Ail - Křidélka + Křidélka FblPage - + Throttle Channel: Kanál plynu: - + Yaw Channel: Kanál bočení: - + Pitch Channel: Kanál klopení: - + Roll Channel: Kanál klonění: @@ -2409,27 +2233,27 @@ Může být jiná než verze firmwaru FlapsPage - + No Ne - + Yes, controlled by a single channel Ano, ovládané jedním kanálem - + Yes, controlled by two channels Ano, ovládané dvěma kanály - + <br>First Flap Channel: <br>První kanál klapek: - + Second Flap Channel: <br>Druhý kanál klapek: @@ -2683,8 +2507,8 @@ Může být jiná než verze firmwaru - - + + Warning Pozor @@ -2738,58 +2562,58 @@ Může být jiná než verze firmwaru Nelze načíst obrázek z knihovny - + Splash image not found Obrázek loga nebyl nalezen - + Cannot save customized firmware Nelze uložit upravený firmware - + Write Firmware to Radio Zapsat firmware do rádia - - + + Firmware check failed Kontrola firmwaru selhala - + Could not check firmware from radio Nelze ověřit firmware v rádiu - + New firmware is not compatible with the one currently installed! Nový firmware není kompatibilní s verzí instalovanou v rádiu! - + Conversion failed Převod selhal - + Cannot convert Models and Settings for use with this firmware, original data will be used Nemohu převést modely a nastavení pro použití s tímto firmwarem, budou použita původní data - + Restore failed Obnovení selhalo - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 Nelze obnovit modely a nastavení rádia. Data modelů a nastavení naleznete v %1 - + Flashing done Zápis firmware je dokončen @@ -2947,37 +2771,33 @@ Prosím, použijte program Zadig pro správnou instalaci ovladače. FlightModePanel - Rud - Směrovka + Směrovka - Ele - Výškovka + Výškovka - Thr - Plyn + Plyn - Ail - Křidélka + Křidélka - + Rotary Encoder %1 Otočný enkodér %1 - + GVAR%1 GP%1 - + Popup enabled Vyskakovací okno povoleno @@ -2996,17 +2816,17 @@ Prosím, použijte program Zadig pro správnou instalaci ovladače. FlightModesPanel - + Flight Mode %1 Letový režim %1 - + (%1) - + (default) (výchozí) @@ -3014,17 +2834,17 @@ Prosím, použijte program Zadig pro správnou instalaci ovladače. FlybarSelectionPage - + Has Flybar Má stabilizátor(Flybar) - + Flybarless Bez stabilizátoru (Flybarless) - + Flybar: Stabilizátor: @@ -4654,17 +4474,17 @@ Opravdu to takto chcete ? GyroPage - + No Ne - + Yes, controled by a switch Ano, ovládané spínačem - + Yes, controlled by a pot Ano, ovládané potenciomerem @@ -4753,22 +4573,22 @@ Opravdu to takto chcete ? HeliPage - + Throttle Channel: Kanál plynu: - + Yaw Channel: Kanál bočení: - + Pitch Channel: Kanál klopení: - + Roll Channel: Kanál klonění: @@ -5169,9 +4989,9 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded Soubor byl načten @@ -5181,51 +5001,51 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Chcete zobrazit předchozí upozornění i příště ? - + Checking for updates Kontroluji aktualizace - + Unable to check for updates. Nelze ověřit aktualizace. - - - + + + Save As Uložit jako - + Executable (*.exe) Spustitelný (*.exe) - + New release available Je dostupné nové vydání - - + + No updates available at this time. Žádné aktualizace nejsou nyní dostupné. - + Would you like to launch the installer? Chcete spustit instalátor? - - + + Error Chyba - + Error opening file %1: %2. Chyba při otevírání souboru %1: @@ -5240,7 +5060,7 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Firmware se zvolenými vlastnostmi nevejde do rádia - + Compilation server termporary failure, try later Server companion je dočasně nedostupný, zkuste to později @@ -5249,12 +5069,12 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Chcete zobrazit předchozí zprávu i příště ? - + A new release of Companion is available, please check the OpenTX website! Je dostupná nová verze Companion, prosím navštivte internetové stránky OpenTX! - + Not enough memory for all the selected firmware options Není dostatek paměti pro všechny zvolené vlastnosti firmwaru @@ -5263,17 +5083,17 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Dočasná chyba kompilačního serveru, zkuste to prosím později znovu - + Compilation server too busy, try later Server companion je zaneprázdněn, zkuste to později - + Unknown server failure, try later Neznámá chyba serveru, zkuste to později - + Do you want to write the firmware to the radio now ? Chcete zapsat firmware do rádia nyní? @@ -5286,26 +5106,26 @@ Verze %2 je dostupná. Chcete ho nyní stáhnout ? - - + + Yes Ano - - + + No Ne - - + + Release Notes Poznámky k vydání - - + + Do you want to download release %1 now ? Chcete nyní stáhnout vydání %1 ? @@ -5325,18 +5145,18 @@ Chcete ji stáhnout nyní ? Poznámky k vydání mohou obsahovat důležité informace. Chcete si je přečíst nyní ? - - + + File saved Soubor byl uložen - + Firmware updates Aktualizace firmwaru - + Current firmware does not provide release notes informations. K tomuto firmwaru nejsou poznámky k vydání. @@ -5371,12 +5191,12 @@ Chcete ji stáhnout nyní ? Zálohování selhalo - + A new version of Companion is available (version %1)<br>Would you like to download it? Je dostupná nová verze Companion (verze %1)<br>Chcete ji nyní stáhnout? - + Compilation server requires registration, please check OpenTX web site Kompilační server vyžaduje registraci, prosím navštivte internetové stránky OpenTX @@ -5405,22 +5225,22 @@ Do you want to download it now ? Chcete ji stáhnout nyní ? - + Ignore this release %1? Ignorovat tuto verzi %1? - + The selected language will be used the next time you start Companion. Zvolený jazyk bude použit při příštím spuštění Companion. - + The new theme will be loaded the next time you start Companion. Nové téma bude použito při příštím spuštění Companion. - + The icon size will be used the next time you start Companion. Zvolená velikost ikon bude použita při příštím spuštění Companion. @@ -5449,12 +5269,12 @@ Chcete ho přesto zapsat ? Zápis firmware selhal - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> Projekt OpenTX Companion vznikl oddělením z <a href='%1'>eePe</a> - + Load backup from file Načíst zálohu ze souboru @@ -5463,13 +5283,13 @@ Chcete ho přesto zapsat ? Je dostupná nová verze Companion, prosím navštivte internetové stránky OpenTX! - - + + Open Models and Settings file Otevřít soubor modelů a nastavení - + Read Models and Settings From Radio Načíst modely a nastavení z rádia @@ -5518,7 +5338,7 @@ Chcete ho přesto zapsat ? Nelze zálohovat stávající modely a nastavení z rádia. Zápis firmware byl přerušen - + Save Radio Backup to File Uložit zálohu rádia do souboru @@ -5527,12 +5347,12 @@ Chcete ho přesto zapsat ? Načíst zálohu rádia - + Read Radio Firmware to File Načíst firmware rádia do souboru - + OpenTX Home Page: <a href='%1'>%1</a> Internetová stránka OpenTX : <a href='%1'>%1</a> @@ -5541,7 +5361,7 @@ Chcete ho přesto zapsat ? Projekt OpenTX Companion vznikl oddělením z <a href='%2'>eePe</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Pokud vám byl tento program užitečný, podpořte jej <a href='%1'>darem</a> @@ -5550,57 +5370,57 @@ Chcete ho přesto zapsat ? Verze %1, %3 - + Copyright OpenTX Team - + About Companion O aplikaci Companion - + New Nový - + Open... Otevřít - + Save Uložit - + Save As... Uložit jako... - + Copy Model Kopírovat model - + Paste Model Vložit model - + Compare models Porovnat modely - + Exit the application Ukončit aplikaci - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -5613,7 +5433,7 @@ Chcete ho stáhnout nyní? Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se dozvíte o případných změnách, které mohou být pro vás důležité. - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -5630,8 +5450,8 @@ Chcete firmware stáhnout nyní? Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se dozvíte o případných změnách, které mohou být pro vás důležité. - - + + Synchronize SD Synchronizace SD @@ -5640,57 +5460,57 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do OpenTX Companion 2.1 - FW: %1 - Profil: %2 - + A monochrome black icon theme Černé mono téma - + A monochrome white icon theme Bílé mono téma - + A monochrome blue icon theme Modré mono téma - + Small Malá - + Use small toolbar icons Použít malé ikony nástrojové lišty - + Use normal size toolbar icons Použít normální velikost ikon nástrojové lišty - + Normal Normální - + Use big toolbar icons Použít velké ikony nástrojové lišty - + Big Velká - + Use huge toolbar icons Použít největší ikony nástrojové lišty - + Huge Největší @@ -5703,7 +5523,7 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Nový - + Create a new Models and Settings file Vytvořit nový soubor modelů a nastavení @@ -5716,8 +5536,8 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Uložit - - + + Save Models and Settings file Uložit soubor modelů a nastavení @@ -5726,17 +5546,17 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Uložit jako ... - + Exit Ukončit - + Cut Model Vyjmout model - + Cut current model to the clipboard Vyjmout aktuální model a uložit do schránky @@ -5745,7 +5565,7 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Kopírovat - + Copy current model to the clipboard Kopírovat aktuální model do schránky @@ -5754,413 +5574,413 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Vložit - + Paste model from clipboard Vložit obsah schránky na aktuální pozici - + Classical Klasik9x - + The classic companion9x icon theme Původní téma companion9x - + Yerico - + Yellow round honey sweet icon theme Žluté medové téma - + Monochrome Mono - + MonoWhite Mono-bílé - + MonoBlue Mono-modré - + System language Výchozí jazyk prostředí - + Use system language in menus Použít systémový jazyk - + Czech Čeština - + Use Czech in menus Aplikace v českém jazyce - + German - + Use German in menus - + English - + Use English in menus - + Finnish - + Use Finnish in menus - + French - + Use French in menus - + Italian - + Use Italian in menus - + Polish - + Use Polish in menus - + Spanish - + Use Spanish in menus - + Swedish - + Use Swedish in menus - + About... O aplikaci - + Print... Tisk - + Print current model Vytisknout zvolený model - + Simulate... Simulace - + Simulate current model Simulace vybraného modelu - + Alt+S - + Load Backup... Načíst zálohu... - + View Log File... Zobrazit Log - + Open and view log file Otevře a zobrazí soubor logu rádia - + Settings... Předvolby... - + Edit Settings Upravit nastavení předvoleb - + Download... Stáhnout - + Download firmware and voice files Stáhnout firmware a hlasové soubory - + Check for Updates... Zkontrolovat aktualizace - + Check OpenTX and Companion updates Zkontrolovat aktualizace OpenTX a Companion - + Companion Changes... Změny Companion - + Show Companion change log Zobrazí seznam změn jednotlivých vydání Companion - + Firmware Changes... Změny Firmwaru - + Show firmware change log Zobrazí seznam změn jednotlivých vydání Firmware - + Compare Models... Porovnat modely... - + Edit Radio Splash Image... Upravit úvodní logo rádia... - + Edit the splash image of your Radio Upravit úvodní grafické logo rádia - + List programmers... Seznam programátorů... - + Fuses... Pojistky mikrokontroléru... - - + + Read Firmware from Radio Načíst firmware z rádia - + Read firmware from Radio Načíst firmware z rádia - - + + Write Firmware to Radio Zapsat firmware do rádia - + Write firmware to Radio Zapsat firmware do rádia - + Add Radio Profile Nový profil rádia - + Create a new Radio Setting Profile Vytvořit nový profil nastavení rádia - + Manuals and other Documents Manuály a jiné dokumenty - + Open the OpenTX document page in a web browser Otevřít stránku s dokumenty OpenTX v prohlížeči - + Write Models and Settings To Radio Zapsat modely a nastavení do rádia - - + + Write Models and Settings to Radio Zapsat modely a nastavení do rádia - - - + + + Companion - - + + Read Models and Settings from Radio Načíst modely a nastavení z rádia - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + Configure Communications... Nastavení propojení - + Configure software for communicating with the Radio Nastavení softwaru pro komunikaci s rádiem - + Write Backup to Radio Zapsat zálohu do rádia - + Write Backup from file to Radio Zapsat zálohu ze souboru do rádia - + Backup Radio to File Zálohovat rádio do souboru - + Save a complete backup file of all settings and model data in the Radio Uložit kompletní zálohu modelů a nastavení rádia - + Contributors... Přispěvatelé - + A tribute to those who have contributed to OpenTX and Companion Hold těm, kteří přispěli k OpenTX a Companion - + SD card synchronization Syncronizace SD karty se složkou s daty - + Recent Files Nedávné soubory - + Recent Models+Settings Nedávné modely a nastavení - + Set Icon Theme Téma ikon - + Set Icon Size Velikost ikon - + Show the list of radio profiles Výběr profilů rádia - + Write Zápis - + New Radio Nové rádio @@ -6173,61 +5993,61 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Neplatný binární soubor modelů a nastavení %1 - + List available programmers Seznam použitelných programátorů - + Show fuses dialog Zobrazit dialog nastavení pojistek mikrokontroléru - + Show the application's About box O aplikaci Companion - + Set Menu Language Nastavení jazyka - - + + File Soubor - - + + Edit Úpravy - + Settings Nastavení - + Read/Write Čtení/Zápis - - + + Help Nápověda - - + + Radio Profile Profil rádia - + Show recent Models+Settings documents Nedávné dokumenty modelů a nastavení rádia @@ -6236,12 +6056,12 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Výběr profilů rádia - + Ready Připraven - + %2 @@ -6284,16 +6104,16 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do - - - - + + + + Error Chyba - + Unable to find file %1! Nemohu nalézt soubor %1! @@ -6301,7 +6121,7 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do - + Error opening file %1: %2. Chyba při otevírání souboru %1: @@ -6315,7 +6135,7 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do - + Error reading file %1: %2. Chyba při otevírání souboru %1: @@ -6361,7 +6181,7 @@ Doporučujeme prohlédnout poznámky k vydání, pomocí tlačítka níže se do Zapsat modely a nastavení do rádia - + Open backup Models and Settings file Otevřít zálohu modelů a nastavení rádia @@ -6407,7 +6227,7 @@ Chcete ho uložit? Firmware rádia je zastaralý, aktualizujte ho prosím! - + Invalid binary backup File %1 Neplatný binární soubor zálohy %1 @@ -6624,24 +6444,20 @@ p, li { white-space: pre-wrap; } - Rud - Směrovka + Směrovka - Ele - Výškovka + Výškovka - Thr - Plyn + Plyn - Ail - Křidélka + Křidélka @@ -6712,12 +6528,12 @@ p, li { white-space: pre-wrap; } Varování(%1) - + Not enough available mixers! Není k dispozici dostatek mixů! - + Delete Selected Mixes? Odstranit vybrané mixy? @@ -6806,12 +6622,12 @@ p, li { white-space: pre-wrap; } - + Clear Mixes? Vymazat mixy? - + Really clear all the mixes? Opravdu vymazat všechny mixy? @@ -6891,30 +6707,304 @@ p, li { white-space: pre-wrap; } Opravdu vymazat všechny křivky? + + ModelPrinter + + + %1 bytes + + + + + CH%1 + + + + + Exponential + Exponenciální + + + + Extra Fine + Extra jemný + + + + Fine + Jemný + + + + Medium + Střední + + + + Coarse + Hrubý + + + + Unknown + Neznámý + + + + Enabled + Povoleno + + + + Disabled + Zakázáno + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + Žák/Jack konektor + + + + Master/SBUS Module + Učitel/SBUS modul + + + + Master/CPPM Module + Učitel/CPPM modul + + + + Master/SBUS in battery compartment + Učitel/SBUS konektor v šachtě baterie + + + + Master/Jack + Učitel/Jack konektor + + + + Rudder + Směrovka + + + + Elevator + Výškovka + + + + Throttle + Plyn + + + + Aileron + Křidélka + + + + Name(%1) + + + + + %1:%2 + + + + + Persistent + + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + Vypnuto + + + + + + + FM%1 + LR%1 + + + + FM%1%2 + LR%1%2 + + + + FM%1+%2 + + + + + [I%1] + + + + + Input%1 + Vstup%1 + + + + + Weight + Váha + + + + + Switch + Spínač + + + + + NoTrim + Žádný trim + + + + No DR/Expo + Bez DR/Expo + + + + Offset + + + + + Delay + Zpoždění + + + + Slow + Zpomalení + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + Letové režimy(%1) + + + + Flight mode(%1) + Letový režim(%1) + + + + Edge(%1, [%2:%3]) + + + + + Sticky(%1, %2) + + + + + Timer(%1, %2) + + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + + + + + Standard + + + ModelSelectionPage - + Plane Letadlo - + Multirotor - + Helicopter Helikoptéra - + Model Name: Název modelu: - + Model Type: Typ modelu: @@ -6922,128 +7012,129 @@ p, li { white-space: pre-wrap; } ModelsListWidget - + + &Edit &Upravit - + &Restore from backup &Obnovit ze zálohy - + &Model Wizard &Průvodce nastavením modelu - + &Delete &Odstranit - + Delete - + &Copy &Kopírovat - + Ctrl+C - + &Cut &Vyjmout - + Ctrl+X - + &Paste &Vložit - + Ctrl+V - + D&uplicate &Duplikovat - + Ctrl+U - + &Use as default &Použít jako výchozí - + P&rint model Vy&tisknout model - + Ctrl+P - + &Simulate model &Simulovat model - + Alt+S - + General Settings Obecná nastavení - + Delete Selected Models? Odstranit vybrané modely? - - + + Cannot delete default model. Nelze odstranit výchozí model. - + Cannot cut default model. Nelze přesunout výchozí model. - + Do you want to overwrite radio general settings? Chcete přepsat obecná nastavení rádia? - + You are pasting on an not empty model, are you sure? Vkládáte do modelu který není prázdný, jste si jist? - + No free slot available, cannot duplicate Není už volný slot, nelze duplikovat @@ -7210,66 +7301,273 @@ p, li { white-space: pre-wrap; } ModulePanel - + Trainer Port Port Trenér - + Internal Radio System Interní vysílací modul - + External Radio Module Externí vysílací modul - - + + Radio System Vysílací modul - + Extra Radio System Extra modul - + Value Hodnota - + Hold Držet hodnotu - + No Pulse Žádné pulzy + + MultiModelPrinter + + + General Model Settings + Obecná nastavení modelu + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + Letové režimy + + + + + Flight mode + Letový režim + + + + Switch + Spínač + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + LR%1 + + + + + GV%1 + GP%1 + + + + RE%1 + + + + + Limits + Limity + + + + Channel + + + + + Name + Název + + + + + Offset + + + + + Min + + + + + Max + + + + + Invert + Invertovat + + + + Global Variables + Globální proměnné + + + + Inputs + Vstupy(DR/Expo) + + + + Mixers + Mixy + + + + CV%1 + + + + + Curves + Křivky + + + + L%1 + + + + + Logical Switches + Logické spínače + + + + SF%1 + + + + + Special Functions + Speciální funkce + + + + Telemetry Settings + Nastavení telemetrie + + + + Analogs + + + + + Unit + Jednotky + + + + Scale + + + + + A%1 + + + + + RSSI Alarms + + + MultirotorPage - + Throttle Channel: Kanál plynu: - + Yaw Channel: Kanál bočení: - + Pitch Channel: Kanál klopení: - + Roll Channel: Kanál klonění: @@ -7277,17 +7575,17 @@ p, li { white-space: pre-wrap; } OptionsPage - + Throttle Cut Zámek plynu (spínač THR) - + Throttle Timer Stopky na plynu - + Flight Timer Letové stopky @@ -7310,32 +7608,24 @@ p, li { white-space: pre-wrap; } Tisk do souboru - Setup for: - Nastavení: + Nastavení: - printed on: %1 - vytištěno: %1 + vytištěno: %1 - General Model Settings - Obecná nastavení modelu + Obecná nastavení modelu - - - - Name - Název + Název - EEprom Size - Velikost EEPROM + Velikost EEPROM Timer1 @@ -7346,116 +7636,92 @@ p, li { white-space: pre-wrap; } Stopky2 - - Protocol - Protokol + Protokol Pulse Polarity Polarita pulzů - Throttle Trim - Trim plynu + Trim plynu - Enabled - Povoleno + Povoleno - Disabled - Zakázáno + Zakázáno Throttle Expo Expo plynu - Trim Increment - Krok trimu + Krok trimu - Center Beep - Zvuk ve středové poloze + Zvuk ve středové poloze Flight modes Settings Nastavení letových fází - Fades - Přechody + Přechody - Trims - Trimy + Trimy - Gvars - GP + GP - Rot.Enc. - Rot.Enkoder + Rot.Enkoder - Switch - Spínač + Spínač - Flight mode name - Název režimu + Název režimu - IN - (+) + (+) - OUT - (-) + (-) - Rud - Směrovka + Směrovka - Ele - Výškovka + Výškovka - Thr - Plyn + Plyn - Ail - Křidélka + Křidélka - - - - - FM - LR + LR Expo/Dr Settings @@ -7466,9 +7732,8 @@ p, li { white-space: pre-wrap; } Váha - Flight modes - Letové režimy + Letové režimy Flight mode @@ -7479,29 +7744,16 @@ p, li { white-space: pre-wrap; } ZAKÁZÁN - Mixers - Mixy - - - - - - CH - + Mixy noTrim Žádný trim - - - - - Offset - Ofset + Ofset Delay(u%1:d%2) @@ -7516,83 +7768,44 @@ p, li { white-space: pre-wrap; } Varování - Limits - Limity + Limity - - - - - Min - - - - - - - - Max - - - - - - Invert - Invertovat + Invertovat - - - - INV - - - - - - NOR - --- + --- - Curves - Křivky + Křivky - - - Curve - Křivka + Křivka - pt %1 - bod %1 + bod %1 - Logical Switches - Logické spínače + Logické spínače - Global Variables - Globální proměnné + Globální proměnné - GV - GP + GP - Special Functions - Speciální funkce + Speciální funkce Function @@ -7607,68 +7820,36 @@ p, li { white-space: pre-wrap; } Opakování - - Telemetry Settings - Nastavení telemetrie + Nastavení telemetrie - - - Alarm 1 - - - - - - Alarm 2 - - - - - - Analog - - - - - Timer%1 - - - - Internal Radio System - Interní vysílací modul + Interní vysílací modul - Radio System - Vysílací modul + Vysílací modul - External Radio Module - Externí vysílací modul + Externí vysílací modul - Extra Radio System - Extra modul + Extra modul - Trainer port mode - Mód portu trenér + Mód portu trenér - Off - Vypnuto + Vypnuto - Inputs - Vstupy(DR/Expo) + Vstupy(DR/Expo) NoTrim @@ -7695,90 +7876,44 @@ p, li { white-space: pre-wrap; } Varování(%1) - - L - - - - Range - Rozsah + Rozsah - Alarms - Alarmy + Alarmy - Low Alarm - Nízký alarm + Nízký alarm - Critical Alarm - Kriticky alarm + Kriticky alarm - - RSSI - - - - Unit - Jednotky + Jednotky - Scale - Měřítko + Měřítko - - - - Type - Typ + Typ - - - - Condition - Podmínka + Podmínka - - - - Value - Hodnota + Hodnota - - - - A%1 - - - - - SF - - - - - RSSI Alarm - - - - Frsky serial protocol - Sériový protokol Frsky + Sériový protokol Frsky Units system @@ -7789,44 +7924,37 @@ p, li { white-space: pre-wrap; } Systém jednotek - - Blades - Počet listů vrtule + Počet listů vrtule - - Custom Telemetry View - Vlastní zobrazení telemetrie + Vlastní zobrazení telemetrie - Telemetry Bars - Telemetrické ukazatele + Telemetrické ukazatele - Bar Number - Číslo ukazatele + Číslo ukazatele - Source - Zdroj + Zdroj - + Print Document Vytisknout dokument - + Select PDF output file Vyberte cílový PDF soubor - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) soubor ODF (*.odt);;soubor PDF (*.pdf);;soubor HTML (*.htm *.html);;Všechny (*) @@ -7861,74 +7989,74 @@ p, li { white-space: pre-wrap; } QObject - + Rud Směrovka - + Ele Výškovka - + Thr Plyn - + Ail Křidélka - - + + P1 Potenciometr P1 - - + + P2 Potenciometr P2 - - + + P3 Potenciometr P3 - + S1 - + S2 - + LS - + RS @@ -8192,13 +8320,13 @@ p, li { white-space: pre-wrap; } - + ---- - - + + THR Plyn @@ -8242,44 +8370,44 @@ p, li { white-space: pre-wrap; } !Křivka(%1) - - + + Support for frsky telemetry mod Podpora frsky telemetrie tj. zobrazení telemetrických dat na displeji rádia (je potřeba upravit HW, bez této úpravy nebudou fungovat dva přepínače! a pochopitelně nebudou zobrazena žádná telem. data.) - - + + Support for jeti telemetry mod Podpora telemetrie JETI - - + + Support for receiving ardupilot data telemetrie - podpora pro příjem ardupilot dat - - + + Support for receiving NMEA data telemetrie - podpora pro příjem NMEA dat - + Support for telemetry easy board Podpora pro desku TelemetrEZ - - + + Support for MAVLINK devices Podpora pro zařízení s MAVLINK - + Rotary Encoder use in menus navigation Použít Rotary Encoder pro navigaci v menu @@ -8289,7 +8417,7 @@ a pochopitelně nebudou zobrazena žádná telem. data.) FAI je soutěžní mód (www.fai.org), zablokuje vario, zobrazení telemetrie a funkce hlasového hlášení. - + No OverrideCH functions available Funkce Zámek kanálu není dostupná @@ -8299,47 +8427,47 @@ FAI je soutěžní mód (www.fai.org), zablokuje vario, zobrazení telemetrie a FAI je soutěžní mód (www.fai.org), zablokuje vario, zobrazení telemetrie a funkce hlasového hlášení. - - - - - - + + + + + + Enable heli menu and cyclic mix support Funkce pro heli, nastavení typu mechaniky - - - - - - - - + + + + + + + + Enable TEMPLATES menu Přidá menu s jednoduchými šablonami modelu - - - - + + + + No splash screen Bez úvodního loga Firmware nebude obsahovat žádné logo, ani podporu pro něj. Toto se hodí pokud je potřeba ušetřit místo v paměti FLASH pro jiné funkce - - - - - - - - + + + + + + + + No flight modes Firmware nebude obsahovat podporu Letových Režimů @@ -8352,13 +8480,13 @@ Toto se hodí pokud je potřeba ušetřit místo v paměti FLASH pro jiné funkc V menu nastavení modelu automaticky nastavíte Zdroj jeho pohybem - + Support for Lua model scripts Podpora pro Lua skripty. -miniaplikace spustitelné z SD karty - + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) Firmware bez emulace Joisticku (USB bude v režimu Mass Storage (přístup k souborům na SD kartě) stejně jako v Bootloaderu) @@ -8367,105 +8495,107 @@ Toto se hodí pokud je potřeba ušetřit místo v paměti FLASH pro jiné funkc OpenTX pro FrSky Taranis Plus - + Use alternative SQT5 font Použít alternativní znakovou sadu písma (jiný font) - + (displaying only first 10 warnings) (zobrazeno pouze prvních 10 varování) - + Possibility to enable FAI MODE (no telemetry) at field Možnost povolit FAI MODE v menu rádia. FAI je soutěžní mód (www.fai.org), zablokuje vario, zobrazení telemetrie a funkce hlasového hlášení. - + FAI MODE (no telemetry) always enabled FAI MODE vždy aktivní (nelze vypnout v menu rádia) FAI je soutěžní mód (www.fai.org), zablokuje vario, zobrazení telemetrie a funkce hlasového hlášení. - + + + Support for a third timer - + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - + Support for PPM internal module hack - + ST7565P LCD or compatible - + ST7565R LCD or compatible - + ERC12864FSF LCD - + ST7920 LCD - + 9X board - + EEprom write progress bar Progresbar zobrazující zápis do EEPROM (tj. ukládání nastavení) - - + + No Winged Shadow How High support Bez podpory - Winged Shadow How High - - + + No vario support Bez podpory varia - - + + No GPS support Bez podpory GPS - - + + No gauges in the custom telemetry screen Bez grafických ukazatelů hodnoty na obrazovkách telemetrie - + Allow compensating for offset errors in FrSky FAS current sensors Povolit možnost kompenzace chyby ofsetu u Frsky FAS proudového senzoru, pokud je to potřeba - - + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) Přidá podporu pro revers os kniplů. To je nutné zejména pro osazení FrSky kniplů do 9X. @@ -8487,38 +8617,38 @@ To je nutné zejména pro osazení FrSky kniplů do 9X. OpenTX pro Gruvin9x desku / 9X - + Power management by soft-off circuitry - + 9XR-PRO - + FrSky Taranis - + FrSky Taranis Plus - + FrSky Taranis X9E - + Confirmation before radio shutdown - - + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views @@ -8527,7 +8657,7 @@ To je nutné zejména pro osazení FrSky kniplů do 9X. OpenTX pro Sky9x desku / 9X - + Haptic module installed Podpora pro vibrační modul @@ -8544,7 +8674,7 @@ To je nutné zejména pro osazení FrSky kniplů do 9X. OpenTX pro FrSky Taranis - + Disable HELI menu and cyclic mix support Odstranit funkce pro heli a nastavení typu mechaniky @@ -8554,27 +8684,27 @@ To je nutné zejména pro osazení FrSky kniplů do 9X. šablonami modelu - + Disable Global variables Odstranit Globální proměnné - - - - - - - - + + + + + + + + Disable curves menus Bez uživatelsky definovatelných křivek - - - - + + + + Support for radio modified with regular speaker Vylepšený zvukový výstup, funkční i s origo pípákem, @@ -8582,113 +8712,113 @@ ale doporučuje se provést instalaci reproduktoru - - - - - + + + + + Used if you have modified your radio with voice mode Hlasový výstup pro telemetrii, nutno zastavět hlasový modul - - - - - + + + + + Used if you have modified your radio with haptic mode Výstrahy pomocí vibračního motoru (je třeba osadit) - + Channel values displayed in us Hodnoty kanálů budou zobrazeny v us (mikrosekundy) místo procent - - - - - - - - + + + + + + + + In model setup menus automatically set source by moving the control Výběr spínače v mixu atd. se provádí jeho sepnutím - - - - - - - - + + + + + + + + In model setup menus automatically set switch by moving the control Výběr spínače v mixu atd. se provádí jeho sepnutím - - - - - - - - + + + + + + + + Battery graph Grafické znázornění stavu baterie - - - - + + + + Enable the throttle trace in Statistics Přidat Stopu Plynu (Throttle-trace) v panelu STATISTIKA - + M128 / 9X board - + 9XR - + 9XR with M128 chip - + Gruvin9x board / 9X - - + + Support of FrSky PXX protocol Podpora pro Frsky PXX protokol - - - - - + + + + + Support for DSM2 modules Podpora DSM2 modulů - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used Vaše rádio pravděpodobně nepoužívá správnou verzi firmware, @@ -8699,14 +8829,14 @@ velikost eeprom je 4096B, ale pouze prvních 2048B je použito OpenTX pro 9X desku - - - - - - - - + + + + + + + + PPM center adjustment in limits Možnost nastavovat střed serva šířkou pulzu @@ -8715,14 +8845,14 @@ velikost eeprom je 4096B, ale pouze prvních 2048B je použito Hodnoty PPM budou zobrazeny v us (mikrosekundy) - - - - - - - - + + + + + + + + Symetrical Limits Symetrické limity Přidá možnost volby mezi @@ -8733,20 +8863,20 @@ Přidá možnost volby mezi nastavené limity tedy nemusí být rovny hodnotě -100% a 100%, ale budou pouze maximem výchylky) - - - - - - + + + + + + Pots use in menus navigation Moznost zadávat hodnoty a pohybovat se v menu pomocí potenciometrů - - + + SmartieParts 2.2 Backlight support Podpora pro modul SmartieParts 2.2 (programátor/podsvícení) @@ -8758,11 +8888,11 @@ Není určeno pro starší verze Smartie Parts se provádí jeho sepnutím - - - - - + + + + + Enable resetting values by pressing up and down at the same time Rychlé nastavení hodnoty současným stiskem dvou tlačítek. (+) a (-) invertuje hodnotu @@ -8771,26 +8901,26 @@ se provádí jeho sepnutím (UP) a (DN) vastaví výchozí hodnotu - - - - - - - - + + + + + + + + No graphical check boxes and sliders Nahrazeni posuvníku a zatržítek (checkboxu) textem - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items Vypnout zvýraznění aktivních mixů/spínačů tučným písmem. Pokud není tato volby vybrána, @@ -8799,51 +8929,51 @@ zobrazovány tučným pismem. Neaktivní mixy/spínače budou zobrazeny normálním písmem - - - - - + + + + + EEprom write Progress bar Progresbar zobrazující zápis do EEPROM (tj. ukládání nastavení) - - - - - - + + + + + + Imperial units Imerialní jednotky pro telemetrii (stopy, palce, míle atd.) - + MEGA2560 board - + Sky9x board / 9X - - + + Bluetooth interface - - - - - - - - + + + + + + + + Global variables Aktivuje Globální Proměnné Jsou to proměnné, které lze použít pro konfiguraci místo některých pevných číselných hodnot. @@ -8852,44 +8982,41 @@ Jejich hodnoty naleznete u originální 9x desky v seznamu křivek. U ostatních Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Funkce - - + + Support for SD memory card Podpora paměťové karty SD - + Support for DSM2 modules using ppm instead of true serial Podpora DSM2 modulů s použitím PPM místo sériového protokolu - - + + Enable HELI menu and cyclic mix support Funkce pro heli, nastavení typu mechaniky - - + + Warning Varování - + EEPROM saved with these warnings: EEPROM uložena s těmito varováními: - - FM%1 FP%1 - LR%1 + LR%1 - Input%1 - Vstup%1 + Vstup%1 @@ -8972,29 +9099,20 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun Otočný enkodér :E - - %1:%2 - - - - , Persistent - Ukládat hodnoty + Ukládat hodnoty - , MinuteBeep - Oznamovat minuty + Oznamovat minuty - , CountDown(Beeps) - Odečítat (Zvuk) + Odečítat (Zvuk) - , CountDown(Voice) - Odečítat (Hlas) + Odečítat (Hlas) @@ -9016,7 +9134,7 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - + V @@ -9178,7 +9296,7 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - + S3 @@ -9483,7 +9601,6 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - [I%1] @@ -9734,7 +9851,6 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - Unknown Neznámý @@ -9852,130 +9968,118 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - DISABLED ZAKÁZÁN + + + INV + + + + + NOR + --- + Rotary Encoder Rotační enkodér - + !Flight mode %1 !Letový režim %1 - + Flight mode %1 Letový režim %1 - + Yellow Žlutá - + Orange Oranžová - + Red Červená - + Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (nepodporován) - + FrSky Sensor Hub FrSky Senzor Hub - + None Žádný - + Imperial Imperiální - + Metric Metrické - Extra Fine - Extra jemný + Extra jemný - Fine - Jemný + Jemný - Medium - Střední + Střední - Coarse - Hrubý + Hrubý - - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - - - - - : Channel start: %1, %2 Channels - - - - Slave/Jack - Žák/Jack konektor + Žák/Jack konektor - Master/SBUS Module - Učitel/SBUS modul + Učitel/SBUS modul - Master/CPPM Module - Učitel/CPPM modul + Učitel/CPPM modul - Master/SBUS in battery compartment - Učitel/SBUS konektor v šachtě baterie + Učitel/SBUS konektor v šachtě baterie - Master/Jack - Učitel/Jack konektor + Učitel/Jack konektor - Exponential - Exponenciální + Exponenciální Count Up @@ -9998,24 +10102,20 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun Letový režim(%1) - Rudder - Směrovka + Směrovka - Elevator - Výškovka + Výškovka - Throttle - Plyn + Plyn - Aileron - Křidélka + Křidélka @@ -10024,33 +10124,33 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - - + + --- - + Rud Trim Trim směrovky - + Ele Trim Trim výškovky - + Thr Trim Trim plynu - + Ail Trim Trim křidélek - + Rot Enc @@ -10061,8 +10161,6 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - - CH%1 @@ -10104,82 +10202,48 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - - Weight - Váha + Váha - - Switch - Spínač + Spínač - - NoTrim - Žádný trim + Žádný trim - No DR/Expo - Bez DR/Expo + Bez DR/Expo - - Offset - - - - Delay - Zpoždění + Zpoždění - Slow - Zpomalení + Zpomalení - Warn - Varování + Varování - Flight modes - Letové režimy + Letové režimy - Flight mode - Letový režim + Letový režim - - Edge(%1, [%2:%3]) - - - - - Sticky(%1, %2) - - - - - Timer(%1, %2) - - - - Duration (%1s) - Trvání (%1 s) + Trvání (%1 s) - Delay (%1s) - Zpoždění (%1s) + Zpoždění (%1s) All @@ -10241,12 +10305,12 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - + Own value Vlastní hodnota - + Flight mode %1 value Flight phase %1 value Hodnota režimu LR%1 @@ -10268,19 +10332,19 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun - + -GV%1 -GP%1 - + GV%1 GP%1 - + Simulator for this firmware is not yet available Simulátor pro tuto verzi firmware zatím není dostupný @@ -10291,38 +10355,38 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun Současné použití expa a křivek již není podporováno - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves V OpenTX je možné zadat pouze %1 bodů dohromady ve všech křivkách - + OpenTx only accepts %1 points in all curves V OpenTX je možné zadat pouze %1 bodů dohromady ve všech křivkách - - - - - + + + + + OpenTX on this board doesn't accept this function OpenTX nepodporuje tuto funkci na této zákl. desce - + OpenTX doesn't accept this telemetry protocol OpenTX nepodporuje tento protokol - - + + OpenTX doesn't accept this radio protocol OpenTX nepodporuje tento protokol @@ -10331,7 +10395,7 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun OpenTX nepodporuje tento protokol - + OpenTX doesn't allow this number of channels V OpenTX nelze použít tento počet kanálů @@ -10345,22 +10409,22 @@ Nastavení hodnoty se provádí přímo v seznamu proměnných, nebo pomocí Fun v th9x na této desce nelze použít rotační enkodéry - + Trim disabled Trim zakázán - + Own Trim Vlastní trim - + Use Trim from Flight mode %1 Použít trim z letového režimu %1 - + Use Trim from Flight mode %1 + Own Trim as an offset Použít hodnotu trimu z letového režimu %1 + vlastní trim jako ofset @@ -10394,12 +10458,12 @@ The OpenTX Team. Tým OpenTX. - + Positive Pozitivní - + Negative Negativní @@ -10409,46 +10473,52 @@ Tým OpenTX. GP - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -10534,17 +10604,17 @@ Tým OpenTX. RudderPage - + No Ne - + Yes Ano - + <br>Rudder Channel: <br>Kanál směrovky: @@ -10721,7 +10791,7 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. SimpleTailPage - + Elevator Channel: Kanál výškovky: @@ -10912,10 +10982,44 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Výstupy + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + Knihovna s logy - strana %1 z %2 + + + + Warning + Varování + + + + Invalid image in library %1 + Neplatné logo v knihovně %1 + + + + Information + + + + + No valid image found in library, check your settings + Nebylo nalezenožádné použitelné logo v knihovně, zkontrolujte nastavení + + StandardPage - + Channel %1 Kanál %1 @@ -10923,25 +11027,24 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -10950,35 +11053,40 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. TailPage - + Rudder Channel: Kanál směrovky: - + Elevator Channel: Kanál výškovky: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder Výškovka a směrovka - + Only Elevator Jen výškovka - + V-tail Ocas - V - + Tail Type: Typ ocasu: @@ -10986,22 +11094,22 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Telemetry - + A1 Telem. vstup A1 - + A2 Telem. vstup A2 - + RSSI - + Alarm 1 @@ -11010,71 +11118,71 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Kritický alarm - - + + ---- - - + + Yellow Žlutá - - + + Orange Oranžová - - + + Red Červená - + Alarm 2 - + Center Silent - + Altitude source Zdroj výšky - + Volts source Zdroj napětí - + Top Bar Hodnoty na horní liště - + Serial Protocol Sériový protokol - + Sensors Senzory - + Disable multi sensor handling - + Volt source Snímač napětí @@ -11095,7 +11203,7 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Imperiální - + Current source Snímač proudu @@ -11109,12 +11217,12 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Žádný - + None Žádný - + FrSky Sensor Hub FrSky Senzor Hub @@ -11127,12 +11235,12 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Jednotky - + Blades Počet listů vrtule - + Sink Max Klesání Max @@ -11141,27 +11249,27 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Vypnuto - + Climb Max Stoupání Max - + Sink Min Klesání Min - + Climb Min Stoupání Min - + Vario source Vario senzor - + Vario limits Rozsah varia @@ -11174,27 +11282,27 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Zobrazit výšku v nástrojové liště - + Altimetry - + mAh - + A - + Various Různé - + mAh count Počet mAh @@ -11203,12 +11311,12 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Nízký alarm - + FAS Offset Ofset FAS - + Persistent mAh Ukládat hodnoty @@ -11322,17 +11430,15 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. MiliAmpéry (mA) - Low Alarm - Nízký alarm + Nízký alarm - Critical Alarm - Kriticky alarm + Kriticky alarm - + Range Rozsah @@ -11349,22 +11455,22 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Hodnoty - + None Žádný - + Numbers Hodnoty - + Bars Ukazatele - + Script Skript @@ -11392,99 +11498,99 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. TelemetryPanel - + Telemetry screen %1 Stránka telemetrie %1 - + Low Alarm Nízký alarm - + Critical Alarm Kriticky alarm - + Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (nepodporován) + - - + A1 Telem. vstup A1 - + Alti - + FrSky S.PORT - + FrSky D - + FrSky D (cable) FrSky D (kabel) - + Alti+ - + VSpeed + - - + A2 Telem. vstup A2 - - + + A3 Telem. vstup A3 - - + + A4 Telem. vstup A4 - - + + FAS - + Cells - + --- @@ -11590,8 +11696,112 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. + Sensor : + + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. + + + Amps Sensor : - Senzor proudu : + Senzor proudu : @@ -11599,84 +11809,68 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Jednotky (-) - Voltage (V) - Napětí (V) + Napětí (V) - Current (A) - Proud (A) + Proud (A) - Current (mA) - Proud (mA) + Proud (mA) - Speed (kts) - Rychlost (kts) + Rychlost (kts) - Speed (m/s) - Rychlost (m/s) + Rychlost (m/s) - Speed (ft/s) - Rychlost (ft/s) + Rychlost (ft/s) - Speed (km/h) - Rychlost (km/h) + Rychlost (km/h) - Speed (miles/h) - Rychlost (míle/h) + Rychlost (míle/h) - Meters (m) - Vzdálenost (m) + Vzdálenost (m) - Feet (ft) - Vzdálenost (ft) + Vzdálenost (ft) - Temp (°C) - Teplota (°C) + Teplota (°C) - Temp (°F) - Teplota (°F) + Teplota (°F) - Percentage (%) - Procenta (%) + Procenta (%) - Energy (mAh) - Energie (mAh) + Energie (mAh) - Power (W) - Výkon (W) + Výkon (W) - RF Power (dBm) - RF výkon (dBm) + RF výkon (dBm) @@ -11684,24 +11878,20 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. Otáčky (ot/min) - Acceleration (g) - Zrychlení (g) + Zrychlení (g) - Heading (°) - Směr (°) + Směr (°) - Volume (mL) - Objem (ml) + Objem (ml) - Volume (US fl.Oz.) - Objem (US fl.Oz.) + Objem (US fl.Oz.) @@ -11761,22 +11951,22 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. TelemetrySensorPanel - + Lowest Nejnižší - + Cell %1 Článek %1 - + Highest Nejvyšší - + Delta @@ -11997,17 +12187,17 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. ThrottlePage - + Yes Ano - + No Ne - + <br>Throttle Channel: <br>Kanál plynu: @@ -12032,32 +12222,37 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. TimerPanel - + Silent Tichý - + Beeps Zvuk - + Voice Hlas - + + Haptic + Vibrovat + + + Not persistent Neukládat - + Persistent (flight) Trvalý (v rámci letu) - + Persistent (manual reset) Trvalý (reset ručně) @@ -12196,12 +12391,12 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. VTailPage - + First Tail Channel: První kanál: - + Second Tail Channel: Druhý kanál: @@ -12209,12 +12404,12 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. WingtypeSelectionPage - + Standard Wing Běžné křídlo - + Flying Wing / Deltawing Samokřídlo / Delta @@ -12504,37 +12699,37 @@ Funkce trimu bude opačná, stejně tak i varování polohy páky plynu. WizardPrinter - + Plane Letadlo - + Multicopter Multikoptéra - + Helicopter Helikoptéra - + Model Name: Název modelu: - + Model Type: Typ modelu: - + Options: Volby: - + Channel %1: Kanál %1: @@ -14765,40 +14960,6 @@ Mode 4: Vyberte cílový PDF soubor - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - Knihovna s logy - strana %1 z %2 - - - - Warning - Varování - - - - Invalid image in library %1 - Neplatné logo v knihovně %1 - - - - Information - - - - - No valid image found in library, check your settings - Nebylo nalezenožádné použitelné logo v knihovně, zkontrolujte nastavení - - taranisNotFoundDialog diff --git a/companion/src/translations/companion_de.ts b/companion/src/translations/companion_de.ts index dbb6241ed..d31e4d97c 100644 --- a/companion/src/translations/companion_de.ts +++ b/companion/src/translations/companion_de.ts @@ -4,27 +4,27 @@ AileronsPage - + No Nein - + Yes, controlled by a single channel Ja, mit einem Kanal - + Yes, controlled by two channels Ja, mit 2 Kanälen - + <br>First Aileron Channel: <br> Erster, rechter Querruder Kanal - + Second Aileron Channel: Zweiter, linker Querruder Kanal @@ -32,27 +32,27 @@ AirbrakesPage - + No Nein - + Yes, controlled by a single channel Ja, mit 1 Servo - + Yes, controlled by two channels Ja, mit 2 Servos - + <br>First Airbrake Channel: <br> Erster, rechter Airbrake Kanal - + Second Airbrake Channel: Zweiter, linker Airbrake Kanal @@ -74,7 +74,7 @@ - + Open Folder Verzeichnis öffnen @@ -330,7 +330,7 @@ Mode 4: - + Simulator Volume Gain Simulator Lautstärke einst. @@ -477,62 +477,62 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Simulator Einstellungen - + Simulator BackLight Simulator LCD Beleuchtung - + Enable Freigabe - + Blue Blau - + Green Grün - + Red Rot - + Orange Orange - + Yellow Gelb - + Joystick Joystick - + Calibrate Kalibrieren - + Simulator capture folder Simu Hardcopy Verzeichnis - + Only capture to clipboard Hardcopy nur in die Zwischenablage speichern - + Remember simulator switch values Schalterstellungen im Simulator merken @@ -547,64 +547,64 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Auswahl des Snapshot Verzeichnis - - + + No joysticks found Kein Joystick gefunden - + EMPTY: No radio settings stored in profile LEER: Keine Sender-Einstellungen im Profil gespeichert - + AVAILABLE: Radio settings of unknown age Verüfgbar: Sender-Einstellungen mit unklarem Alter - + AVAILABLE: Radio settings stored %1 Verfügbar: Sender-Einstellungen gespeichert %1 - + Select your library folder Auswahl des Bibliotheks-Verzeichnis - - + + Select your Models and Settings backup folder Auswahl der Modell-und Einstellungs-Verzeichnisse - + Select Google Earth executable Wähle Google Earth exe - + Select the folder replicating your SD structure - + Not possible to remove profile - + The default profile can not be removed. - + Open Image to load Öffne Bild zum laden - + Images (%1) Bilder (%1) @@ -805,9 +805,8 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Knüppel 4 - Battery - Sender-Akku + Sender-Akku @@ -830,9 +829,18 @@ Das kann auch unterschiedlich zur Firmwaresprache sein PPM 4 - Current - Strom + Strom + + + + Battery Offset + + + + + Current Offset + @@ -1081,265 +1089,161 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Druck in Datei - + No name Kein Namen - General Model Settings - Allgemeine Modell Einstellungen + Allgemeine Modell Einstellungen - - - Name - Name + Name - - EEprom Size - EEprom Größe + EEprom Größe - - Timer1 - Stoppuhr1 + Stoppuhr1 - - Timer2 - Stoppuhr2 + Stoppuhr2 - - Internal Radio System - Internes HF Modul + Internes HF Modul - - Radio System - Sender System + Sender System - - - - Protocol - Protokoll + Protokoll Pulse Polarity Pulspolarität - - Throttle Trim - Gast Leerlaufrim + Gast Leerlaufrim - - Enabled - Freigabe + Freigabe - - Disabled - Inaktiv + Inaktiv Throttle Expo Gas Expo - - External Radio Module - Externes HF Modul + Externes HF Modul - - - Extra Radio System - - - - - - Trainer port mode - - - - - Trim Increment - Trimmung Inkrement + Trimmung Inkrement - - Center Beep - Zentrier Pieps + Zentrier Pieps - Flight modes Settings - Flugphasen Einstellungen + Flugphasen Einstellungen - - Fades - Übergänge + Übergänge - - Trims - Trimmungen + Trimmungen - - Switch - Schalter + Schalter - - - - Flight mode name - Flugphasen Name + Flugphasen Name - - IN - IN + IN - - OUT - OUT + OUT - - - - - - - - - - FM - FM + FM - - Gvars - Gvars + Gvars - - Rot. Enc. - Drehgeber + Drehgeber - Limits - Grenzen + Grenzen - - - - - Offset - Offset + Offset - - - - - Min - Min + Min - - - - - Max - Max + Max - - - Invert - Invertieren + Invertieren - - - - - CH - CH + CH - - INV - INV + INV - - NOR - NOR + NOR - Global Variables - Globale Variablen + Globale Variablen - - GV - GV + GV - Inputs - Inputs + Inputs - L - L + L Expo/Dr Settings @@ -1362,9 +1266,8 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Gesperrt - Mixers - Mischer + Mischer noTrim @@ -1383,9 +1286,8 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Warnung - Curves - Kurven + Kurven L%1 @@ -1400,28 +1302,24 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Pkt %1 - - Curve - Kurve + Kurve 9 Point Curves 9 Punkt Kurve - Logical Switches - Logische Schalter + Logische Schalter LS LS - Special Functions - Spezial Funktionen + Spezial Funktionen Function @@ -1440,114 +1338,76 @@ Das kann auch unterschiedlich zur Firmwaresprache sein Freigabe - SF - SF + SF - Telemetry Settings - Telemetrie Einstellungen + Telemetrie Einstellungen - - Analog - Analog + Analog - - Unit - Einheit + Einheit - - Scale - Skalierung + Skalierung - - - - A%1 - A%1 + A%1 - - Alarm 1 - Alarm 1 + Alarm 1 - - Alarm 2 - Alarm 2 + Alarm 2 - - - - Type - Typ + Typ - - - - Condition - Bedingung + Bedingung - - - - Value - Wert + Wert - - RSSI Alarm - RSSI-Alarm + RSSI-Alarm - - Custom Telemetry View - Telemetrie Ansicht + Telemetrie Ansicht - - Telemetry Bars - Telemetrie Balken + Telemetrie Balken - - Bar Number - Balkennummer + Balkennummer - - Source - Quelle + Quelle - + Print Document Drucke Dokument - + Select PDF output file PDF Output Datei wählen @@ -1555,7 +1415,7 @@ Das kann auch unterschiedlich zur Firmwaresprache sein ConclusionPage - + OK, I understand. OK verstanden @@ -1593,12 +1453,16 @@ Das kann auch unterschiedlich zur Firmwaresprache sein - - Thank you all !!! - Besten Dank an alle! + + OpenTX Blacklist + - + Thank you all !!! + Besten Dank an alle! + + + monthly @@ -1631,22 +1495,22 @@ Das kann auch unterschiedlich zur Firmwaresprache sein CurveGroup - + Diff Diff - + Expo Expo - + Func Funktion - + Curve Kurve @@ -1913,22 +1777,22 @@ Das kann auch unterschiedlich zur Firmwaresprache sein CyclicPage - + 90 90 - + 120 120 - + 120x 120x - + 140 140 @@ -1944,12 +1808,12 @@ Das kann auch unterschiedlich zur Firmwaresprache sein ElevonsPage - + <br>First Elevon Channel: <br>Erster Rechter Höhenruder Kanal - + Second Elevon Channel: Zweiter Linker Höhenruder Kanal @@ -2360,24 +2224,20 @@ If blank then the input is considered to be "ON" all the time.Edit %1 - Rud - Sei + Sei - Ele - Höh + Höh - Thr - Gas + Gas - Ail - Quer + Quer @@ -2387,22 +2247,22 @@ If blank then the input is considered to be "ON" all the time.Gas Kanal - + Throttle Channel: Gas Kanal - + Yaw Channel: Yaw Heck Kanal - + Pitch Channel: Pitch Kanal - + Roll Channel: Roll Kanal @@ -2504,27 +2364,27 @@ May be different from firmware language FlapsPage - + No Nein - + Yes, controlled by a single channel Ja mit einem Kanal - + Yes, controlled by two channels Ja, mit 2 Kanälen - + <br>First Flap Channel: <br> Erster, rechter Flap Kanal - + Second Flap Channel: Zweiter, linker Flap Kanal @@ -2776,8 +2636,8 @@ May be different from firmware language - - + + Warning Warnung @@ -2831,58 +2691,58 @@ May be different from firmware language - + Splash image not found - + Cannot save customized firmware Kann benutzerspezifische Firmware nicht speichern - + Write Firmware to Radio Schreibe Firmware in den Sender - - + + Firmware check failed - + Could not check firmware from radio - + New firmware is not compatible with the one currently installed! - + Conversion failed Umwandlung gescheitert - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore failed Wiederherstellung gescheitert - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 - + Flashing done @@ -3057,37 +2917,33 @@ Please use ZADIG to properly install the driver. FlightModePanel - Rud - Sei + Sei - Ele - Höh + Höh - Thr - Gas + Gas - Ail - Que + Que - + Rotary Encoder %1 Drehgeber %1 - + GVAR%1 GVAR%1 - + Popup enabled Anzeige im Popupfenster freigeben @@ -3110,17 +2966,17 @@ Please use ZADIG to properly install the driver. FlightModesPanel - + Flight Mode %1 Flugphase %1 - + (%1) (%1) - + (default) (normal) @@ -3128,17 +2984,17 @@ Please use ZADIG to properly install the driver. FlybarSelectionPage - + Has Flybar Has Flybar - + Flybarless Flybarless - + Flybar: Flybar: @@ -4971,17 +4827,17 @@ Sind Sie sicher, dass sie das so wollen? GyroPage - + No Nein - + Yes, controled by a switch Ja, mit Schalter gesteuert - + Yes, controlled by a pot Ja, mit Poti gesteuert @@ -5078,22 +4934,22 @@ Sind Sie sicher, dass sie das so wollen? Gas Kanal - + Throttle Channel: Gas Kanal - + Yaw Channel: Yaw (Heck) Kanal - + Pitch Channel: Pitch Kanal - + Roll Channel: Roll Kanal @@ -5492,32 +5348,32 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded Datei geladen - - - + + + Save As Speichern unter - - + + No updates available at this time. Kein Update vorhanden. - + Unable to check for updates. Kann nicht auf Updates überprüfen. - + Executable (*.exe) Anwendung (*.exe) @@ -5526,17 +5382,17 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Eine neue Companionversion ist verfügbar, bitte auf die OpenTX Webseite schauen! - + Would you like to launch the installer? Möchtest Du das Installationsprogramm starten ? - + Compilation server requires registration, please check OpenTX web site Der Compiler-Server benötigt eine Registration, bitte auf der OpenTX-Webseite prüfen - + Do you want to write the firmware to the radio now ? Wollen sie die Firmware jetzt in den Sender schreiben @@ -5547,13 +5403,13 @@ Do you want to download it now ? Möchten Sie sie jetzt herunterladen? - - + + File saved Datei gespeichert - + Read Models and Settings From Radio Lese Modell und Einstellungen vom Sender @@ -5562,7 +5418,7 @@ Möchten Sie sie jetzt herunterladen? Schreibe SenderBackup von %1 in den Sender - + Save Radio Backup to File Speichere Sender Backup in Datei @@ -5571,7 +5427,7 @@ Möchten Sie sie jetzt herunterladen? Lese Sender Backup - + Read Radio Firmware to File Lese Sender Firmware in Datei @@ -5585,41 +5441,41 @@ Möchten Sie sie jetzt herunterladen? - + New release available Neuer Softwarestand verfügbar - - + + Error Fehler - + Error opening file %1: %2. Fehler beim Öffnen der Datei %1: %2. - + Compilation server termporary failure, try later Compiler Server hat einen temporärer Fehler , später nochmal versuchen - + A new version of Companion is available (version %1)<br>Would you like to download it? Eine neue Version von Companion ist verfügbar (version%1)<br>Wollen Sie die jetzt Donwloaden? - + A new release of Companion is available, please check the OpenTX website! Eine neue Version von Companion ist verfügbar, bitte auf der opentx webseite nachsehen! - + Not enough memory for all the selected firmware options Nicht genügend Speicher für all die ausgewählen Optionen @@ -5628,12 +5484,12 @@ Möchten Sie sie jetzt herunterladen? Compilation-Server hat einen temporären Fehler, Bitte später nochmal versuchen - + Compilation server too busy, try later Compilation-Server ist ausgelastet, Bitte später nochmal versuchen - + Unknown server failure, try later Unbekannter Server Fehler, Bitte später nochmal versuchen @@ -5646,31 +5502,31 @@ Version %2 ist verfügbar. Möchten Sie sie jetzt herunterladen? - - + + Yes Ja - - + + No Nein - - + + Release Notes Softwarestände - - + + Do you want to download release %1 now ? Wollen sie jetzt das Release %1 downloaden? - + The selected language will be used the next time you start Companion. Sprache beim Start von Companion auswählen @@ -5679,28 +5535,28 @@ Möchten Sie sie jetzt herunterladen? OK - + The new theme will be loaded the next time you start Companion. - + The icon size will be used the next time you start Companion. - - + + Open Models and Settings file Öffne Modelle und Einstellungs Datei - + Firmware updates Firmware updates - + Current firmware does not provide release notes informations. @@ -5759,17 +5615,17 @@ Möchten Sie sie jetzt herunterladen? Firmware schreiben fehlerhaft - + Load backup from file Lade Backup von Datei - + OpenTX Home Page: <a href='%1'>%1</a> OpenTX Home Page: <a href='%1'>%1</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> @@ -5778,17 +5634,17 @@ Möchten Sie sie jetzt herunterladen? Version %1, %3 - + About Companion Über Companion - + Compare models Vergleiche Modelle - + Exit the application Beendet die Anwendung @@ -5797,97 +5653,97 @@ Möchten Sie sie jetzt herunterladen? Wollen sie jetzt das Release %1 downloaden? {1 %2 ?} - + Ignore this release %1? - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> - + Copyright OpenTX Team - + New Neu - + Open... Öffnen - + Save Speichern - + Save As... Speichern als - + Copy Model Kopiere Modell - + A monochrome black icon theme - + A monochrome white icon theme - + A monochrome blue icon theme - + Small Klein - + Use small toolbar icons - + Use normal size toolbar icons - + Normal Normal - + Use big toolbar icons - + Big Groß - + Use huge toolbar icons - + Huge Riesig @@ -5900,7 +5756,7 @@ Möchten Sie sie jetzt herunterladen? Neue Modelle+Einstellungen - + Create a new Models and Settings file Erzeuge eine neue Modell-und Einstellungen-Datei @@ -5913,8 +5769,8 @@ Möchten Sie sie jetzt herunterladen? Speichere Modelle+Einstellungen... - - + + Save Models and Settings file Speichere Modell und Einstellungen in Datei @@ -5923,17 +5779,17 @@ Möchten Sie sie jetzt herunterladen? Speichere Modell+Einstellungen als... - + Exit Fertig - + Cut Model Ausschneiden Modell - + Cut current model to the clipboard Ausschneiden aktuelles Modell und in Zwischenablage @@ -5942,7 +5798,7 @@ Möchten Sie sie jetzt herunterladen? Kopiere Modell... - + Copy current model to the clipboard Kopiere Modell in die Zwischenablage @@ -5951,325 +5807,325 @@ Möchten Sie sie jetzt herunterladen? Einfügen Modell... - + Paste model from clipboard Einfügen Modell aus Zwischenablage - + Paste Model Einfüge Modell - + Classical Klassisch - + The classic companion9x icon theme - + Yerico Yerico - + Yellow round honey sweet icon theme - + Monochrome Monochrom - + MonoWhite Weiß - + MonoBlue Blau - + System language Systemsprache - + Use system language in menus Systemsprache in den Menüs - + Czech Czech - + Use Czech in menus Use Czech in menus - + German Deutch - + Use German in menus Deutsch für die Menüs - + English English - + Use English in menus Englisch für die Menüs - + Finnish Finish - + Use Finnish in menus - + French French - + Use French in menus - + Italian Italien - + Use Italian in menus - + Polish Polish - + Use Polish in menus Use Polish in menus - + Spanish Spanish - + Use Spanish in menus - + Swedish Swedish - + Use Swedish in menus - + About... Über - + Print... Drucken - + Print current model Drucke aktuelles Modell - + Simulate... Simulation... - + Simulate current model Simulation aktuelles Modell - + Alt+S Alt+S - + Load Backup... Lade Backup - + View Log File... Anzeige Log Datei... - + Open and view log file Öffne und zeige Log Datei an - + Settings... Einstellungen - + Edit Settings Editiere Einstellungen - + Download... Download... - + Download firmware and voice files Download Firmware und Sprechdateien - + Check for Updates... Prüfe auf Update - + Check OpenTX and Companion updates Prüfe Opentx und Companion auf Updates - + Companion Changes... Companion Änderungen... - + Show Companion change log - + Firmware Changes... Firmware Änderungen... - + Show firmware change log - + Compare Models... Vergleiche Modelle - + Edit Radio Splash Image... Editiere Sender Start Bild... - + Edit the splash image of your Radio Editiere das Starthbild für den Sender - + List programmers... Liste der Programmiergeräte... - + Fuses... Fuses - - + + Read Firmware from Radio Lese Firmware aus dem Sender - + Read firmware from Radio Lese Firmware aus dem Sender - - + + Write Firmware to Radio Schreibe Firmware in den Sender - + Write firmware to Radio Schreibe Firmware in den Sender - + Add Radio Profile Füge Senderprofil hinzu - + Create a new Radio Setting Profile Erstelle neues Sender Profil - + Manuals and other Documents Handbücher und andere Dokumente - + Open the OpenTX document page in a web browser - + Write Models and Settings To Radio Schreibe Modelle und Einstellungen in den Sender - - + + Write Models and Settings to Radio Schreibe Modelle und Einstellungen in den Sender - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -6278,7 +6134,7 @@ We recommend you view the release notes using the button below to learn about an - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -6289,91 +6145,91 @@ We recommend you view the release notes using the button below to learn about an - - - + + + Companion Companion - - + + Synchronize SD Synchronisiere mit SD-Karte - - + + Read Models and Settings from Radio Lese Modelle und Einstellungen aus dem Sender - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + Configure Communications... Konfiguriere Kommunikation - + Configure software for communicating with the Radio - + Write Backup to Radio Schreibe Backup in den Sender - + Write Backup from file to Radio Schreibe Backup aus Datei in den Sender - + Backup Radio to File Mach Backup von Sender in Datei - + Save a complete backup file of all settings and model data in the Radio - + Contributors... Vergleichen... - + A tribute to those who have contributed to OpenTX and Companion - + SD card synchronization - + Recent Files Kürzlich verw. Dateien - + Recent Models+Settings Kürzlich verwendete Modelle+Einstellungen - + Set Icon Theme Icon setzen - + Set Icon Size Icon Größen @@ -6392,47 +6248,47 @@ We recommend you view the release notes using the button below to learn about an Ungültige Modell-und Einstellungens Binärdatei %1 - + List available programmers Liste der möglichen Programmiergeräte - + Show fuses dialog Zeige Fuses Einstellungen - + Show the application's About box Zeige das Infofenster - + Set Menu Language Menüsprache einstellen - + Show recent Models+Settings documents - + Show the list of radio profiles Anzeige der Sender Profil-Liste - + Write Schreibe - + %2 %2 - + New Radio Neuer Sender @@ -6445,7 +6301,7 @@ We recommend you view the release notes using the button below to learn about an Fehler beim Lesen der Datei %1: %2. - + Checking for updates Überprüfe auf Updates @@ -6454,36 +6310,36 @@ We recommend you view the release notes using the button below to learn about an Diese Version ignorieren (r%1)? - - + + File Datei - - + + Edit Bearbeiten - + Settings Einstellungen - + Read/Write Lesen/Schreiben - - + + Help Hilfe - - + + Radio Profile Sender Profil @@ -6496,7 +6352,7 @@ We recommend you view the release notes using the button below to learn about an Zeige die Liste der Sender Profile - + Ready Fertig @@ -6519,10 +6375,10 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error Fehler @@ -6533,7 +6389,7 @@ We recommend you view the release notes using the button below to learn about an - + Unable to find file %1! Kann die Datei %1 nicht finden ! @@ -6570,7 +6426,7 @@ We recommend you view the release notes using the button below to learn about an Schreibe EEPROM in den Sender - + Open backup Models and Settings file Öffne Backup Modelle-und Einstellungs Datei @@ -6594,7 +6450,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. Fehler beim Öffnen der Datei %1: @@ -6602,7 +6458,7 @@ We recommend you view the release notes using the button below to learn about an - + Error reading file %1: %2. Fehler beim Lesen der Datei%1: @@ -6663,7 +6519,7 @@ Sollen die Änderungen gespeichert werden? Firmware im Flashspeicher ist überholt, bitte updaten! - + Invalid binary backup File %1 Ungültige Binär Backup Datei %1 @@ -6951,26 +6807,22 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 DEST -> CH%1 - Rud - Sei + Sei - Ele Höh - Höh + Höh - Thr Gas - Gas + Gas - Ail - Que + Que @@ -7041,12 +6893,12 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Warnung(%1) - + Not enough available mixers! Nicht genügend Mischer verfügbar! - + Delete Selected Mixes? Lösche ausgewählte Mischer? @@ -7135,12 +6987,12 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Ctrl+U - + Clear Mixes? Mischer löschen? - + Really clear all the mixes? Wirklich alle Mischer löschen ? @@ -7220,30 +7072,304 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Wirklich alle Kurven löschen ? + + ModelPrinter + + + %1 bytes + + + + + CH%1 + CH%1 + + + + Exponential + Exponential + + + + Extra Fine + Sehr fein + + + + Fine + Fein + + + + Medium + Mittel + + + + Coarse + Grob + + + + Unknown + Unbekannt + + + + Enabled + + + + + Disabled + Inaktiv + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + Schüler/Buchse + + + + Master/SBUS Module + + + + + Master/CPPM Module + Lehrer/CPPM Module + + + + Master/SBUS in battery compartment + + + + + Master/Jack + Lehrer/Buchse + + + + Rudder + Seitenruder + + + + Elevator + + + + + Throttle + Gas + + + + Aileron + + + + + Name(%1) + + + + + %1:%2 + %1:%2 + + + + Persistent + Dauerhaft + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + Aus + + + + + + + FM%1 + FM%1 + + + + FM%1%2 + FM%1%2 + + + + FM%1+%2 + + + + + [I%1] + [I%1] + + + + Input%1 + Input%1 + + + + + Weight + Gewichtung + + + + + Switch + Schalter + + + + + NoTrim + + + + + No DR/Expo + Kein DR/Expo + + + + Offset + Offset + + + + Delay + Verzögerung + + + + Slow + Langsam + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + Flugphasen(%1) + + + + Flight mode(%1) + Flugphase(%1) + + + + Edge(%1, [%2:%3]) + Puls(%1, [%2:%3]) + + + + Sticky(%1, %2) + SRFF(%1, %2) + + + + Timer(%1, %2) + Takt(%1, %2) + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + + + + + Standard + + + ModelSelectionPage - + Plane Flugmodell - + Multirotor Multicopter - + Helicopter Hubschrauber - + Model Name: Model Name: - + Model Type: Model Typ: @@ -7251,82 +7377,83 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 ModelsListWidget - + + &Edit &Editieren - + &Restore from backup Wiederherstellung aus dem Backup - + &Model Wizard &Modell Wizard - + &Delete &Löschen - + Delete Löschen - + &Copy &Kopieren - + Ctrl+C Ctrl+C - + &Cut &Ausschneiden - + Ctrl+X Ctrl+X - + &Paste Ein&fügen - + Ctrl+V Ctrl+V - + D&uplicate D&uplizieren - + Ctrl+U Ctrl+U - + &Use as default setze &Standard - + P&rint model Modell &drucken - + Ctrl+P Ctrl+P @@ -7335,49 +7462,49 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Alt+R - + Alt+S Alt+S - + &Simulate model &Simulation - + General Settings Sender Grundeinstellungen - + Delete Selected Models? Gewähltes Modell löschen ? - - + + Cannot delete default model. Kann das aktive Modell nicht löschen - + Cannot cut default model. Kann das aktive Modell nicht ausschneiden - + Do you want to overwrite radio general settings? Wollen sie wirklich die Sender Grundeinstellungen überschreiben? - + You are pasting on an not empty model, are you sure? You are pasting on an not empty model, are you sure ? Sie kopieren in ein nicht leeres Modell, fortfahren? - + No free slot available, cannot duplicate Kein freier Modellspeicherplatz, kann nicht kopieren @@ -7556,47 +7683,254 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 ModulePanel - + Trainer Port Trainer Port - + Internal Radio System Internes HF Modul - + External Radio Module Externes HF Modul - - + + Radio System Sender System - + Extra Radio System - + Value Wert - + Hold Halte Servopos. - + No Pulse keine Pulse + + MultiModelPrinter + + + General Model Settings + Allgemeine Modell Einstellungen + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + Flugphasen + + + + + Flight mode + + + + + Switch + Schalter + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + FM%1 + + + + + GV%1 + GV%1 + + + + RE%1 + + + + + Limits + Grenzen + + + + Channel + + + + + Name + Name + + + + + Offset + Offset + + + + Min + Min + + + + Max + Max + + + + Invert + Invertieren + + + + Global Variables + + + + + Inputs + Inputs + + + + Mixers + Mischer + + + + CV%1 + + + + + Curves + Kurven + + + + L%1 + L%1 + + + + Logical Switches + Logische Schalter + + + + SF%1 + SF%1 + + + + Special Functions + Spezial Funktionen + + + + Telemetry Settings + Telemetrie Einstellungen + + + + Analogs + + + + + Unit + Einheit + + + + Scale + + + + + A%1 + A%1 + + + + RSSI Alarms + + + MultirotorPage @@ -7604,22 +7938,22 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Gas Kanal - + Throttle Channel: Gas Kanal - + Yaw Channel: Yaw (Heck) Kanal - + Pitch Channel: Pitch Kanal - + Roll Channel: Roll Kanal @@ -7627,17 +7961,17 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 OptionsPage - + Throttle Cut Gas Freigabe Schalter - + Throttle Timer Gas Timer starten - + Flight Timer Flug Timer starten @@ -7660,32 +7994,24 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Druck in Datei - Setup for: - Einstellung für: + Einstellung für: - printed on: %1 - ausgedruckt am: %1 + ausgedruckt am: %1 - General Model Settings - Allgemeine Modell Einstellungen + Allgemeine Modell Einstellungen - - - - Name - Name + Name - EEprom Size - EEProm Größe + EEProm Größe Timer1 @@ -7696,116 +8022,92 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Stoppuhr2 - - Protocol - Protokoll + Protokoll Pulse Polarity Pulspolarität - Throttle Trim - Gas Leerlauftrim + Gas Leerlauftrim - Enabled - Aktiv + Aktiv - Disabled - Inaktiv + Inaktiv Throttle Expo Gas Expo - Trim Increment - Trim Inkrement + Trim Inkrement - Center Beep - Zentrierpieps + Zentrierpieps Flight modes Settings Flugphasen Einstellungen - Fades - Übergänge + Übergänge - Trims - Trimmer + Trimmer - Gvars - Gvars + Gvars - Rot.Enc. - Drehgeber + Drehgeber - Switch - Schalter + Schalter - Flight mode name - Flugphasen Namen + Flugphasen Namen - IN - IN + IN - OUT - OUT + OUT - Rud - Sei + Sei - Ele - Höh + Höh - Thr - Gas + Gas - Ail - Que + Que - - - - - FM - FM + FM Expo/Dr Settings @@ -7816,9 +8118,8 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Gewichtung - Flight modes - Flugphasen + Flugphasen Flight mode @@ -7829,29 +8130,20 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Gesperrt - Mixers - Mischer + Mischer - - - CH - CH + CH noTrim keinTrim - - - - - Offset - Offset + Offset Delay(u%1:d%2) @@ -7866,87 +8158,60 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Warnung - Limits - Grenzen + Grenzen - - - - Min - Min + Min - - - - Max - Max + Max - - - Invert - Invertieren + Invertieren - - - INV - INV + INV - - - NOR - NOR + NOR - Curves - Kurven + Kurven - - - Curve - Kurve + Kurve - pt %1 - Pkt %1 + Pkt %1 - Logical Switches - Logische Schalter + Logische Schalter LS LS - Global Variables - Globale Variablen + Globale Variablen - GV - GV + GV - Special Functions - Spezial Funktionen + Spezial Funktionen Function @@ -7961,68 +8226,40 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Wiederholen - - Telemetry Settings - Telemetrie Einstellungen + Telemetrie Einstellungen - - Alarm 1 - Alarm 1 + Alarm 1 - - Alarm 2 - Alarm 2 + Alarm 2 - - Analog - Analog + Analog - - Timer%1 - - - - Internal Radio System - Internes HF Modul + Internes HF Modul - Radio System - Sender System + Sender System - External Radio Module - Externes HF Modul + Externes HF Modul - - Extra Radio System - - - - - Trainer port mode - - - - Off - Aus + Aus - Inputs - Inputs + Inputs NoTrim @@ -8049,138 +8286,105 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Warnung(%1) - L - L + L SF%1 SF%1 - Range - Bereich + Bereich - Alarms - Alarme + Alarme - Low Alarm - Voralarm + Voralarm - Critical Alarm - Kritischer Alarm + Kritischer Alarm - RSSI - RSSI + RSSI - Unit - Einheit + Einheit - Scale - Skalierung + Skalierung - - - - Type - Typ + Typ - - - - Condition - Zustand + Zustand - - - - Value - Wert + Wert - - - A%1 - A%1 + A%1 - SF - SF + SF - RSSI Alarm - RSSI-Alarm + RSSI-Alarm - Frsky serial protocol - Frsky serielles Protokoll + Frsky serielles Protokoll System of units Maßeinheiten - - Blades - Rotorblätter + Rotorblätter - - Custom Telemetry View - Telemtrie Ansichten + Telemtrie Ansichten - Telemetry Bars - Telemetrie Balken + Telemetrie Balken - Bar Number - Balkennummer + Balkennummer - Source - Quelle + Quelle - + Print Document Drucke Dokument - + Select PDF output file PDF Output Datei wählen - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) @@ -8214,11 +8418,9 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 QObject - - FM%1 FP%1 - FM%1 + FM%1 @@ -8231,8 +8433,6 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - - CH%1 CH%1 @@ -8316,39 +8516,38 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Play Haptik - Input%1 - Input%1 + Input%1 - - + + --- --- - + Rud Trim Sei Trim - + Ele Trim Höh Trim - + Thr Trim Gas Trim - + Ail Trim Que Trim - + Rot Enc Dreh Geb @@ -8413,7 +8612,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + S3 S3 @@ -8715,7 +8914,6 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - [I%1] [I%1] @@ -8906,7 +9104,6 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - Unknown Unbekannt @@ -8917,91 +9114,70 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - DISABLED Gesperrt - - + + INV + INV + + + + NOR + NOR + + Weight - Gewichtung + Gewichtung - - Switch - Schalter + Schalter - - - NoTrim - - - - No DR/Expo - Kein DR/Expo + Kein DR/Expo - Offset - Offset + Offset - Delay - Verzögerung + Verzögerung - Slow - Langsam + Langsam - Warn - Warnung + Warnung - Flight modes - Flugphasen + Flugphasen - - Flight mode - - - - Edge(%1, [%2:%3]) - Puls(%1, [%2:%3]) + Puls(%1, [%2:%3]) - Sticky(%1, %2) - SRFF(%1, %2) + SRFF(%1, %2) - Timer(%1, %2) - Takt(%1, %2) - - - - Duration (%1s) - + Takt(%1, %2) Duration (%1s) Dauer (%1s) - Delay (%1s) - Verzögerung (%1s) + Verzögerung (%1s) @@ -9165,150 +9341,132 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + !Flight mode %1 !Flugphase %1 - + Flight mode %1 Flugphase %1 - + Flight mode %1 value Flugphase %1 Wert - + Yellow Gelb - + Orange Orange - + Red Rot - + Winged Shadow How High Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (nicht unterstützt) - + FrSky Sensor Hub FrSky Sensor Hub - + None Kein - + Imperial Imperial - + Metric Metrisch - Extra Fine - Sehr fein + Sehr fein - Fine - Fein + Fein - Medium - Mittel + Mittel - Coarse - Grob + Grob - %1:%2 - %1:%2 + %1:%2 - , Persistent - Dauerhaft + Dauerhaft - , MinuteBeep - MinutenBeep + MinutenBeep - , CountDown(Beeps) - CountDown(Beep) + CountDown(Beep) - , CountDown(Voice) - Count Down(Stimme) + Count Down(Stimme) - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - Kanal start: %1, %2 Kanäle, %3usec Verzög, Pulsepolarität %4 + Kanal start: %1, %2 Kanäle, %3usec Verzög, Pulsepolarität %4 - : Channel start: %1, %2 Channels - Kanal start: %1, %2 Kanäle + Kanal start: %1, %2 Kanäle - Slave/Jack - Schüler/Buchse + Schüler/Buchse - Master/SBUS Module - Lehrer/SBUS Module + Lehrer/SBUS Module - Master/CPPM Module - Lehrer/CPPM Module + Lehrer/CPPM Module - Master/SBUS in battery compartment - Lehrer/SBUS im Akkuschacht + Lehrer/SBUS im Akkuschacht - Master/Jack - Lehrer/Buchse + Lehrer/Buchse - Exponential - Exponential + Exponential Count Up @@ -9335,27 +9493,23 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Flugphase(%1) - Rudder - Seitenruder + Seitenruder - Elevator - Höhenruder + Höhenruder - Throttle - Gas + Gas - Aileron - Querruder + Querruder - + Own value Eigener Wert @@ -9381,14 +9535,14 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + -GV%1 -GV%1 - + GV%1 GV%1 @@ -9396,34 +9550,34 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + ---- ---- - - + + THR Gas - - + + P1 P1 - - + + P2 P2 - - + + P3 P3 @@ -9594,7 +9748,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + Rud Sei @@ -9605,19 +9759,19 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + Ele Höh - + Thr Gas - + Ail unsure Que @@ -9645,7 +9799,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + S1 S1 @@ -9656,7 +9810,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + V V @@ -9811,21 +9965,21 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + S2 S2 - + LS LS - + RS RS @@ -9995,42 +10149,42 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 X%1 - - + + Support for frsky telemetry mod Ünterstützt Frsky Telemetry Mod - - + + Support for jeti telemetry mod Ünterstützt Jeti Telemetry Mod - - + + Support for receiving ardupilot data - - + + Support for receiving NMEA data - + Support for telemetry easy board - - + + Support for MAVLINK devices - + Rotary Encoder use in menus navigation nutze den Drehgeber für Menü Navigation @@ -10039,243 +10193,245 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 FAI Mode immer freigegeben - - - - - - + + + + + + Enable heli menu and cyclic mix support Freigabe Helimenü und zykl. Mischer - - - - - - - - + + + + + + + + Enable TEMPLATES menu Freigabe Tamplaptes Menü - - - - + + + + No splash screen Kein Startbild - - - - - - - - + + + + + + + + Disable curves menus Kein Kurvenmenü - - - - + + + + Support for radio modified with regular speaker - - - - - + + + + + Used if you have modified your radio with voice mode - - - - - + + + + + Used if you have modified your radio with haptic mode - + Channel values displayed in us Kanalwerte Anzeige in us statt % - - - - - - - - + + + + + + + + In model setup menus automatically set source by moving the control - - - - - - - - + + + + + + + + In model setup menus automatically set switch by moving the control - + Use alternative SQT5 font Alternative SQT5 Schrift verw. - + (displaying only first 10 warnings) - + Possibility to enable FAI MODE (no telemetry) at field - + FAI MODE (no telemetry) always enabled - + + + Support for a third timer - + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - + Support for PPM internal module hack - + ST7565P LCD or compatible - + ST7565R LCD or compatible - + ERC12864FSF LCD - + ST7920 LCD - + 9X board - - - - + + + + Enable the throttle trace in Statistics - + EEprom write progress bar EEprom Schreib-Balken - - + + No Winged Shadow How High support - - + + No vario support Kein Vario - - + + No GPS support Kein GPS - - + + No gauges in the custom telemetry screen - + Allow compensating for offset errors in FrSky FAS current sensors - - + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) - + Power management by soft-off circuitry - + 9XR-PRO - + FrSky Taranis - + FrSky Taranis Plus - + FrSky Taranis X9E - + Confirmation before radio shutdown - - + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views @@ -10288,17 +10444,17 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 OpenTX für FrSky Taranis - + Haptic module installed Haptikmodul installiert - + Support for Lua model scripts Lua Model-Spriptsprache unterstützen - + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) @@ -10315,8 +10471,8 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 OpenTX für FrSky Taranis Revision 4A - - + + Support of FrSky PXX protocol Unterstützung von FrSky PXX Protokol @@ -10329,7 +10485,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Verwende die Taranis Knüppel in einem 9X/9XR Sender - + Disable HELI menu and cyclic mix support Kein Helimenü und zykl. Mischer @@ -10338,28 +10494,28 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Keine Templates Menüs - + Disable Global variables Keine Globale Variablen - - - - - + + + + + Support for DSM2 modules Ünterstützung für DSM2-Module - - - - - - - - + + + + + + + + PPM center adjustment in limits PPM Mitten-Einstellung bei Servo Limits @@ -10368,29 +10524,29 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 PPM Wert in us angezeigt statt in % - - - - - - - - + + + + + + + + Symetrical Limits Symmetrische Grenzen - - - - - - + + + + + + Pots use in menus navigation Potis als Menü Navigation benutzen - + No OverrideCH functions available @@ -10399,65 +10555,65 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 OpenTx für das 9X Board - - - - - - - - + + + + + + + + No flight modes Keine Flugphasen - - + + SmartieParts 2.2 Backlight support - - - - - + + + + + Enable resetting values by pressing up and down at the same time - - - - - - - - + + + + + + + + No graphical check boxes and sliders - - - - - - - - + + + + + + + + Battery graph Akku Ladezustand - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items @@ -10466,74 +10622,74 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 OpenTX für M128 / 9X Board - - - - - + + + + + EEprom write Progress bar EEprom Schreib-Balken - - - - - - + + + + + + Imperial units Zöllige Einheiten - + M128 / 9X board - + 9XR 9XR - + 9XR with M128 chip - + Gruvin9x board / 9X - + MEGA2560 board - + Sky9x board / 9X - - + + Bluetooth interface Bluetooth Schnittstelle - - - - - - - - + + + + + + + + Global variables Globale Variablen - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used @@ -10551,19 +10707,19 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 OpenTX für Gruvin9x Board / 9X - - + + Support for SD memory card Unterstützung für SD-Speicherkarte - + Support for DSM2 modules using ppm instead of true serial Unterstüzung für DSM2 Modul mit PPM-Signal anstatt echtem seriellem Signal - - + + Enable HELI menu and cyclic mix support Freigabe von Heli-Menüs und zyklischer Mischer Unterstützung @@ -10636,18 +10792,18 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 AUS - - + + Warning Warnung - + EEPROM saved with these warnings: EEPROM gespeichert mit diesen Warnungen: - + Simulator for this firmware is not yet available @@ -10657,38 +10813,38 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves OpenTX kann nur max %1 Punkte für alle Kurven - + OpenTx only accepts %1 points in all curves - - - - - + + + + + OpenTX on this board doesn't accept this function OpenTX unterstützt diese Funktion für diese Board nicht - + OpenTX doesn't accept this telemetry protocol - - + + OpenTX doesn't accept this radio protocol @@ -10697,27 +10853,27 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 Opentx unterstüzt dieses Protokol nicht - + OpenTX doesn't allow this number of channels Opentx kann nicht diese Anzahl von Kanälen - + Trim disabled Trim ausgeschaltet - + Own Trim Eigene Trim - + Use Trim from Flight mode %1 Trim von Flugphase %1 - + Use Trim from Flight mode %1 + Own Trim as an offset Trim von Flugphase %1 + Eigene Trim als Offset @@ -10749,25 +10905,31 @@ The OpenTX Team. - + Positive Positiv - + Negative Negativ - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! @@ -10777,33 +10939,33 @@ The OpenTX Team. GV - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -10884,17 +11046,17 @@ The OpenTX Team. RudderPage - + No Nein - + Yes Ja - + <br>Rudder Channel: <br> Seite Kanal: @@ -11088,7 +11250,7 @@ umgedreht und ist dann vorne SimpleTailPage - + Elevator Channel: Höhe Kanal: @@ -11372,10 +11534,44 @@ umgedreht und ist dann vorne SH + + SplashLibraryDialog + + + + ... + ... + + + + Splash Library - page %1 of %2 + Startbild Bibliothek - Seite %1 von %2 + + + + Warning + Warnung + + + + Invalid image in library %1 + ungültige Bilddatei in Bibliothek %1 + + + + Information + Information + + + + No valid image found in library, check your settings + keine gültige Bilddatei gefunden in Bibliothek, bitte Einstellungen prüfen + + StandardPage - + Channel %1 Kanal %1 @@ -11383,25 +11579,24 @@ umgedreht und ist dann vorne SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -11410,35 +11605,40 @@ umgedreht und ist dann vorne TailPage - + Rudder Channel: Seitenruder Kanal - + Elevator Channel: Höhenruder Kanal + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder Höhe und Seite - + Only Elevator Nur Höhe - + V-tail V Leitwerk - + Tail Type: Leitwerk Typ: @@ -11450,22 +11650,22 @@ umgedreht und ist dann vorne Form - + A1 A1 - + A2 A2 - + RSSI RSSI - + Alarm 1 Alarm 1 @@ -11474,31 +11674,31 @@ umgedreht und ist dann vorne Kritischer Alarm - - + + ---- ---- - - + + Yellow Gelb - - + + Orange Orange - - + + Red Rot - + Alarm 2 Alarm 2 @@ -11507,12 +11707,12 @@ umgedreht und ist dann vorne Zellen - + Serial Protocol Serielles Protokoll - + Volt source Spg Quelle @@ -11533,7 +11733,7 @@ umgedreht und ist dann vorne Imperial - + Current source Strom Quelle @@ -11551,12 +11751,12 @@ umgedreht und ist dann vorne FAS - + None Kein - + FrSky Sensor Hub FrSky Sensor Hub @@ -11569,7 +11769,7 @@ umgedreht und ist dann vorne Einheiten - + Blades Rotorblätter @@ -11590,7 +11790,7 @@ umgedreht und ist dann vorne Vario - + Sink Max Sink Max @@ -11599,32 +11799,32 @@ umgedreht und ist dann vorne Aus - + Climb Max Steig Max - + Sink Min Sink Min - + Climb Min Steig Min - + Center Silent - + Vario source Vario Quelle - + Vario limits Vario Grenzen @@ -11637,52 +11837,52 @@ umgedreht und ist dann vorne Höhenanzeige in der InfoZeile - + Altimetry Höhenanzeige - + Altitude source Höhe Quelle - + Volts source Spannung Quelle - + Top Bar obere Infozeile am Sender - + mAh mAh - + A A - + Various Verschiedenes - + Sensors Sensor - + Disable multi sensor handling - + mAh count mAh zählen @@ -11691,12 +11891,12 @@ umgedreht und ist dann vorne Voralarm - + FAS Offset FAS Offset - + Persistent mAh Speichern der mAh @@ -11814,17 +12014,15 @@ umgedreht und ist dann vorne mAmp (mA) - Low Alarm - Voralarm + Voralarm - Critical Alarm - Kritischer Alarm + Kritischer Alarm - + Range Bereich @@ -11845,22 +12043,22 @@ umgedreht und ist dann vorne Werte - + None Kein - + Numbers Nummern - + Bars Balken - + Script Script @@ -11888,27 +12086,27 @@ umgedreht und ist dann vorne TelemetryPanel - + Telemetry screen %1 Telemetrie Bild %1 - + Low Alarm Voralarm - + Critical Alarm Kritischer Alarm - + Winged Shadow How High Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (nicht unterstützt) @@ -11917,46 +12115,46 @@ umgedreht und ist dann vorne RxBatt + - - + A1 A1 - + Alti Höhe - + FrSky S.PORT FrSky S.PORT - + FrSky D FrSky D - + FrSky D (cable) FrSky D (Kabel) - + Alti+ Höhe+ - + VSpeed VSpeed + - - + A2 A2 @@ -11965,30 +12163,30 @@ umgedreht und ist dann vorne dTE - - + + A3 A3 - - + + A4 A4 - - + + FAS FAS - + Cells Zellen - + --- --- @@ -12094,8 +12292,112 @@ umgedreht und ist dann vorne + Sensor : + + + + + V + V + + + + A + A + + + + mA + mA + + + + kt + + + + + m/s + m/s + + + + ft/s + + + + + km/h + km/h + + + + mph + mph + + + + m + m + + + + ft + ft + + + + °C + °C + + + + °F + + + + + % + % + + + + mAh + mAh + + + + W + W + + + + dBm + + + + + g + g + + + + ° + ° + + + + mL + + + + + US fl.Oz. + + + Amps Sensor : - Strom Sensor + Strom Sensor @@ -12103,84 +12405,68 @@ umgedreht und ist dann vorne Roh (-) - Voltage (V) - Spannung (V) + Spannung (V) - Current (A) - Strom (A) + Strom (A) - Current (mA) - Strom (mA) + Strom (mA) - Speed (kts) - Geschw (kts) + Geschw (kts) - Speed (m/s) - Geschw (m/s + Geschw (m/s - Speed (ft/s) - Geschw (ft/s) + Geschw (ft/s) - Speed (km/h) - Geschw (km/h) + Geschw (km/h) - Speed (miles/h) - Geschw (miles/h) + Geschw (miles/h) - Meters (m) - Meter (m) + Meter (m) - Feet (ft) - Fuss (ft) + Fuss (ft) - Temp (°C) - Temp (°C) + Temp (°C) - Temp (°F) - Temp (°F) + Temp (°F) - Percentage (%) - Prozent (%) + Prozent (%) - Energy (mAh) - Verbrauh (mAh) + Verbrauh (mAh) - Power (W) - Leistung (W) + Leistung (W) - RF Power (dBm) - RF Power (dBm) + RF Power (dBm) @@ -12188,24 +12474,20 @@ umgedreht und ist dann vorne Drehz - Acceleration (g) - Beschleunigung (g) + Beschleunigung (g) - Heading (°) - Temp (°) + Temp (°) - Volume (mL) - Volumen (mL) + Volumen (mL) - Volume (US fl.Oz.) - Volumen (US fl.Oz.) + Volumen (US fl.Oz.) @@ -12265,22 +12547,22 @@ umgedreht und ist dann vorne TelemetrySensorPanel - + Lowest Niedrigster - + Cell %1 Zelle %1 - + Highest Höchster - + Delta Differenz @@ -12501,17 +12783,17 @@ umgedreht und ist dann vorne ThrottlePage - + Yes Ja - + No Nein - + <br>Throttle Channel: <br>Gas Kanal: @@ -12548,32 +12830,37 @@ umgedreht und ist dann vorne TimerPanel - + Silent Kein - + Beeps Pieps - + Voice Stimme - + + Haptic + Play Haptik + + + Not persistent Nicht dauerhaft - + Persistent (flight) Dauerhaft für Flug - + Persistent (manual reset) Dauerhaft (per Hand reset) @@ -12712,12 +12999,12 @@ umgedreht und ist dann vorne VTailPage - + First Tail Channel: Erster rRechter Leitwerk Kanal - + Second Tail Channel: Zweiter, linker Leitwerk Kanal @@ -12725,12 +13012,12 @@ umgedreht und ist dann vorne WingtypeSelectionPage - + Standard Wing Normaler Flügel - + Flying Wing / Deltawing Nurflügler / Deltaflügel @@ -13016,37 +13303,37 @@ umgedreht und ist dann vorne WizardPrinter - + Plane Flugmodell - + Multicopter Multikopter - + Helicopter Hubschrauber - + Model Name: Model Name: - + Model Type: Model Typ: - + Options: Optionen: - + Channel %1: Kanal %1: @@ -15536,40 +15823,6 @@ Die kann auch unterschiedlch zur Firmwaresprache sein PDF Output Datei wählen - - SplashLibraryDialog - - - - ... - ... - - - - Splash Library - page %1 of %2 - Startbild Bibliothek - Seite %1 von %2 - - - - Warning - Warnung - - - - Invalid image in library %1 - ungültige Bilddatei in Bibliothek %1 - - - - Information - Information - - - - No valid image found in library, check your settings - keine gültige Bilddatei gefunden in Bibliothek, bitte Einstellungen prüfen - - taranisNotFoundDialog diff --git a/companion/src/translations/companion_es.ts b/companion/src/translations/companion_es.ts index 092d19dc0..f391ccff9 100755 --- a/companion/src/translations/companion_es.ts +++ b/companion/src/translations/companion_es.ts @@ -4,27 +4,27 @@ AileronsPage - + No No - + Yes, controlled by a single channel Si, controlado por un único canal - + Yes, controlled by two channels Si, controlado por dos canales - + <br>First Aileron Channel: <br>Canal Primer Alerón: - + Second Aileron Channel: Canal Segundo Alerón: @@ -32,27 +32,27 @@ AirbrakesPage - + No No - + Yes, controlled by a single channel Si, controlado por un único canal - + Yes, controlled by two channels Si, controlado por dos canales - + <br>First Airbrake Channel: <br>Primer Canal Aerofreno: - + Second Airbrake Channel: Segundo Canal Aerofreno: @@ -74,7 +74,7 @@ - + Open Folder Abrir Carpeta @@ -326,7 +326,7 @@ Modo 4: - + Simulator Volume Gain @@ -464,62 +464,62 @@ Puede ser diferente del lenguaje del firmware Ajustes Simulador - + Simulator BackLight Luz de fondo del simulador - + Enable Activado - + Blue Azul - + Green Verde - + Red Rojo - + Orange Naranja - + Yellow Amarillo - + Joystick Joystick - + Calibrate Calibrar - + Simulator capture folder Carpeta de captura de simulador - + Only capture to clipboard Solo capturar a portapapeles - + Remember simulator switch values Recordar los valores de los switch en el simulador @@ -534,64 +534,64 @@ Puede ser diferente del lenguaje del firmware Selecciona tu carpeta de capturas - - + + No joysticks found No se han encopntrado joysticks - + EMPTY: No radio settings stored in profile VACIO: No se han guardado ajustes en el perfil de tu radio - + AVAILABLE: Radio settings of unknown age DISPONIBLE:Ajustes de radio de tiempo desconocido - + AVAILABLE: Radio settings stored %1 DISPONIBLE: Ajustes de radio guardados %1 - + Select your library folder Selecciona tu carpeta de una carpeta - - + + Select your Models and Settings backup folder Selecciona la carpeta de seguridad de tus modelos y ajustes - + Select Google Earth executable Selecciona el ejecutable de Google Earth - + Select the folder replicating your SD structure Selecciona la carpeta que replica la structura de tu tarjeta SD - + Not possible to remove profile No es posible eliminar el perfil - + The default profile can not be removed. El perfil prederterminado no se puede eliminar. - + Open Image to load Abrir imagen para cargar - + Images (%1) Imagenes (%1) @@ -773,9 +773,8 @@ Puede ser diferente del lenguaje del firmware - Battery - Bateria + Bateria @@ -798,9 +797,18 @@ Puede ser diferente del lenguaje del firmware PPM 4 - Current - Actual + Actual + + + + Battery Offset + + + + + Current Offset + @@ -1049,265 +1057,161 @@ Puede ser diferente del lenguaje del firmware Imprimir a archivo - + No name Sin nombre - General Model Settings - Ajustes generales del modelo + Ajustes generales del modelo - - - Name - Nombre + Nombre - - EEprom Size - Tamaño EEprom + Tamaño EEprom - - Timer1 - Temporizador1 + Temporizador1 - - Timer2 - Temporizador 2 + Temporizador 2 - - Internal Radio System - Sistema Interno de Radio + Sistema Interno de Radio - - Radio System - Sistema de Radio + Sistema de Radio - - - - Protocol - Protocolo + Protocolo Pulse Polarity Polaridad del pulso - - Throttle Trim - Trim Acelerador + Trim Acelerador - - Enabled - Activado + Activado - - Disabled - Desactivado + Desactivado Throttle Expo Expo Acelerador - - External Radio Module - Modulo externo de Radio + Modulo externo de Radio - - Extra Radio System - Extra Sistema de Radio + Extra Sistema de Radio - - - Trainer port mode - - - - - Trim Increment - Incremento Trim + Incremento Trim - - Center Beep - Centro Beep + Centro Beep - Flight modes Settings - Ajustes modos de vuelo + Ajustes modos de vuelo - - Fades - Fades + Fades - - Trims - Trims + Trims - - Switch - Switch + Switch - - - - Flight mode name - Nombre del modo de vuelo + Nombre del modo de vuelo - - IN - IN + IN - - OUT - OUT + OUT - - - - - - - - - - FM - FM + FM - - Gvars - Gvars + Gvars - - Rot. Enc. - Rot. Enc. + Rot. Enc. - Limits - Limites + Limites - - - - - Offset - Offset + Offset - - - - - Min - Min + Min - - - - - Max - Max + Max - - - Invert - Invertir + Invertir - - - - - CH - H + H - - INV - INV + INV - - NOR - NOR + NOR - Global Variables - Variables globales + Variables globales - - GV - GV + GV - Inputs - Entradas - - - - L - + Entradas Expo/Dr Settings @@ -1330,9 +1234,8 @@ Puede ser diferente del lenguaje del firmware Desactivado - Mixers - Mezclas + Mezclas noTrim @@ -1351,9 +1254,8 @@ Puede ser diferente del lenguaje del firmware Aviso - Curves - Curvas + Curvas 5 Point Curves @@ -1364,28 +1266,24 @@ Puede ser diferente del lenguaje del firmware pt %1 - - Curve - Curva + Curva 9 Point Curves Curvas de 9 puntos - Logical Switches - Switches lógicos + Switches lógicos LS LS - Special Functions - Funciones especiales + Funciones especiales Function @@ -1404,114 +1302,76 @@ Puede ser diferente del lenguaje del firmware Activado - SF - SF + SF - Telemetry Settings - Ajustes Telemetría + Ajustes Telemetría - - Analog - Analógico + Analógico - - Unit - Unidad + Unidad - - Scale - Escala + Escala - - - - A%1 - A%1 + A%1 - - Alarm 1 - Alarma 1 + Alarma 1 - - Alarm 2 - Alarma 2 + Alarma 2 - - - - Type - Tipo + Tipo - - - - Condition - Condición + Condición - - - - Value - Valor + Valor - - RSSI Alarm - Alarma RSSI + Alarma RSSI - - Custom Telemetry View - Vistas personalizadas de telemetría + Vistas personalizadas de telemetría - - Telemetry Bars - Barras Telemetría + Barras Telemetría - - Bar Number - Numero Barra + Numero Barra - - Source - Origen + Origen - + Print Document Imprimir documento - + Select PDF output file Seleccionar archivo de salida PDF @@ -1519,7 +1379,7 @@ Puede ser diferente del lenguaje del firmware ConclusionPage - + OK, I understand. OK, Entiendo. @@ -1557,12 +1417,16 @@ Puede ser diferente del lenguaje del firmware Los honores van a Rafal Tomczak (RadioClone), Thomas Husterer (th9x) y Erez Raviv (er9x y eePe) - - Thank you all !!! - ¡¡Gracias a todos!! + + OpenTX Blacklist + - + Thank you all !!! + ¡¡Gracias a todos!! + + + monthly @@ -1595,22 +1459,22 @@ Puede ser diferente del lenguaje del firmware CurveGroup - + Diff Diff - + Expo Expo - + Func Func - + Curve Curva @@ -1864,22 +1728,22 @@ Puede ser diferente del lenguaje del firmware CyclicPage - + 90 90 - + 120 120 - + 120x 120x - + 140 140 @@ -1895,12 +1759,12 @@ Puede ser diferente del lenguaje del firmware ElevonsPage - + <br>First Elevon Channel: <br>Primer canal de Elevon: - + Second Elevon Channel: Segundo canal de Elevon: @@ -2239,45 +2103,41 @@ Si está en blanco entonces las entradas son consideradas como ON todo el tiempo Editar %1 - Rud - Rud + Rud - Ele - Ele + Ele - Thr - Thr + Thr - Ail - Ail + Ail FblPage - + Throttle Channel: Canal de Acelerador: - + Yaw Channel: Canal de Yaw: - + Pitch Channel: Canal de pitch: - + Roll Channel: Canal de roll: @@ -2330,27 +2190,27 @@ Puede ser diferente del lenguaje del firmware FlapsPage - + No No - + Yes, controlled by a single channel Si, controlado por un único canal - + Yes, controlled by two channels Si, controlado por dos canales - + <br>First Flap Channel: <br>Canal del primer Flap: - + Second Flap Channel: Canal del segundo Flap: @@ -2604,8 +2464,8 @@ Puede ser diferente del lenguaje del firmware - - + + Warning @@ -2659,58 +2519,58 @@ Puede ser diferente del lenguaje del firmware La librería de imágen no puede ser cargada - + Splash image not found - + Cannot save customized firmware No se puede guardar el firmware personalizado - + Write Firmware to Radio Escribir Firmware a la Radio - - + + Firmware check failed - + Could not check firmware from radio - + New firmware is not compatible with the one currently installed! - + Conversion failed Coversion fallida - + Cannot convert Models and Settings for use with this firmware, original data will be used No se pueden convertir los Modelos y Ajustes para usar con este firmware, se usarán los datos originales - + Restore failed Restauración fallida - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 No se ha podido restaurar los Modelos y Ajustes a la Radio. Los datos de los modelos y ajustes se pueden encontrar en: %1 - + Flashing done @@ -2838,37 +2698,33 @@ Please use ZADIG to properly install the driver. FlightModePanel - Rud - Rud + Rud - Ele - Ele + Ele - Thr - Thr + Thr - Ail - Ail + Ail - + Rotary Encoder %1 Codificador Rotativo %1 - + GVAR%1 GVAR%1 - + Popup enabled Popup activado @@ -2876,17 +2732,17 @@ Please use ZADIG to properly install the driver. FlightModesPanel - + Flight Mode %1 Modo de vuelo%1 - + (%1) (%1) - + (default) (Predeterminado) @@ -2894,17 +2750,17 @@ Please use ZADIG to properly install the driver. FlybarSelectionPage - + Has Flybar Tiene Flybar - + Flybarless Flybarless - + Flybar: Flybar: @@ -4367,17 +4223,17 @@ Esta función no se puede desactivar en la radio. GyroPage - + No No - + Yes, controled by a switch Si, controlado por un switch - + Yes, controlled by a pot Si, controlado por un potenciómetro @@ -4466,22 +4322,22 @@ Esta función no se puede desactivar en la radio. HeliPage - + Throttle Channel: Canal de Acelerador: - + Yaw Channel: Canal de Yaw: - + Pitch Channel: Canal de pitch: - + Roll Channel: Canal de roll: @@ -4861,63 +4717,63 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded Archivo Cargado - - - + + + Save As Guardar Como - - + + No updates available at this time. No hay actualizaciones disponibles ahora. - + Unable to check for updates. Imposible comprobar actualizaciones. - + Checking for updates Comprobando actualizaciones - + Executable (*.exe) Ejecutable (*.exe) - + A new release of Companion is available, please check the OpenTX website! ¡Una nueva versión de Companion está disponible, por favor comprueba la web de OpenTX! - + Would you like to launch the installer? ¿Quieres ejecutar el instalador? - + Not enough memory for all the selected firmware options No hay memoria suficiente para todas las opciones de firmware seleccionadas - - + + File saved Archivo guardado - + Read Models and Settings From Radio Leer los Modelos y Ajustes de la Radio @@ -4962,7 +4818,7 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt No se puede realizar una copia de seguridad de los Modelos y Ajustes existentes desde la Radio. Proceso de escritura de firmware abortado - + Save Radio Backup to File Guardar Copia deSeguridad de la Radio a un Archivo @@ -4971,17 +4827,17 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Leer Copia de Seguridad de la Radio - + Read Radio Firmware to File Leer el Firmware de la Radio a un Archivo - + OpenTX Home Page: <a href='%1'>%1</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Si has encontrado este programa útl, por favor ayuda con una <a href='%1'>donación</a> @@ -4991,75 +4847,75 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt ¿Volver a mostrar el aviso previo de nuevo a comenzar? - + New release available Nueva versión disponible - - + + Error - + Error opening file %1: %2. Error abriendo el archivo %1: %2. - + Compilation server termporary failure, try later Fallo temporal en el servidor de compilación, intentalo mas tarde - + Compilation server too busy, try later Servidor de compilación demasiado ocupado, inténtalo mas tarde - + Unknown server failure, try later Fallo desconocido de servidor, inténtalo mas tarde - - + + Yes Si - - + + No - - + + Release Notes Notas de la Versión - - + + Do you want to download release %1 now ? ¿Quieres descargar la versión %1 ahora? - - + + Open Models and Settings file Abrir archivo de Modelos y Ajustes - + Firmware updates Actualizaciones de firmware - + Current firmware does not provide release notes informations. EL firmware actual no proporciona notas de la versión. @@ -5094,87 +4950,87 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Copia de seguridad fallida - + New Nuevo - + Open... Abrir... - + Save Guardar - + Save As... Guardar Como... - + Copy Model Copiar Modelo - + Paste Model Pegar Modelo - + Load backup from file Cargar copia de seguridad desde un archivo - + Compare models Comparar modelos - + Exit the application Salir de la aplicación - + List available programmers Lista de programadores disponibles - + Show fuses dialog - + Show the application's About box Mostrar la ventana de aplicación Acerca de - + Set Menu Language Menú Ajuste Lenguaje - + Show the list of radio profiles Mostrar la lsita de los perfiles de radio - + Write Escribir - + %2 %2 - + New Radio Nueva Radio @@ -5189,22 +5045,22 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt %2. - + A new version of Companion is available (version %1)<br>Would you like to download it? Una nueva versión de Companion está disponible (versión %1),<br>¿Te gustaría descargarla? - + Compilation server requires registration, please check OpenTX web site El servidor de compilación requiere registro, por favor comprueba la pagina web de OpenTX - + Do you want to write the firmware to the radio now ? ¿Te gustaría escribir el firmware a la radio ahora? - + The selected language will be used the next time you start Companion. El lenguaje seleccionado podrá ser usado la próxima vez que inicies Companion. @@ -5213,12 +5069,12 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt OK - + The new theme will be loaded the next time you start Companion. El nuevo tema será cargado la próxima vez que inicies Companion. - + The icon size will be used the next time you start Companion. El tamaño de los iconos será usado la próxima vez que inicies Companion. @@ -5243,62 +5099,62 @@ no se ha reconocido como un archivo valido de Modelo y Ajustes Escritura de firmware fallida - + About Companion Acerca de Companion - + A monochrome black icon theme Tema de icono monocromo negro - + A monochrome white icon theme Tema de icono monocromo blanco - + A monochrome blue icon theme Tema de icono monocromo azul - + Small Pequeño - + Use small toolbar icons Usar iconos pequeños en la barra de herramientas - + Use normal size toolbar icons Usar iconos normales en la barra de herramientas - + Normal - + Use big toolbar icons Usar iconos grandes en la barra de herramientas - + Big Grande - + Use huge toolbar icons Usar iconos extra grandes en la barra de herramientas - + Huge Extra Grande @@ -5327,7 +5183,7 @@ Do you want to download it now ? ¿Quieres descargarla ahora? - + Ignore this release %1? ¿Ignorar esta versión %1? @@ -5336,183 +5192,183 @@ Do you want to download it now ? Leer el Firmware desde la Radio - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> El proyecto OpenTX Companion se ha bifurcado originalmente desde <a href='%1'>eePe</a> - + Copyright OpenTX Team Derechos de autor del equipo OpenTX - + Create a new Models and Settings file Crear un nuevo archivo de Modelos y Ajustes - - + + Save Models and Settings file Guardar el archivo de Modelos y Ajustes - + Exit Salir - + Cut Model Cortar Modelo - + Cut current model to the clipboard Cortar el modelo actual al portapapeles - + Copy current model to the clipboard Copiar el modelo actual al portapapeles - + Paste model from clipboard Pegar modelo desde el portapapeles - + Classical Clasico - + The classic companion9x icon theme Tema de iconos clasicos de companion9x - + Yerico - + Yellow round honey sweet icon theme Tema de iconos amarillo miel redondo - + Monochrome Monocromo - + MonoWhite MonoBlanco - + MonoBlue MonoAzul - + System language Lenguaje del sistema - + Use system language in menus Usar elnguaje del sistema en los menús - + Czech Checo - + Use Czech in menus Usar Checo en los menús - + German Alemán - + Use German in menus Usar Alemán en los menús - + English Inglés - + Use English in menus Usar Inglés en los menús - + Finnish Finlandés - + Use Finnish in menus Usar Finlandés en los menús - + French Francés - + Use French in menus Usar Francés en los menús - + Italian Italiano - + Use Italian in menus Usar Italiano en los menús - + Polish Polaco - + Use Polish in menus Usar Polaco en los menús - + Swedish Sueco - + Use Swedish in menus Usar Sueco en los menús - + Spanish Español - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -5521,7 +5377,7 @@ We recommend you view the release notes using the button below to learn about an - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -5532,269 +5388,269 @@ We recommend you view the release notes using the button below to learn about an - - - + + + Companion Companion - - + + Synchronize SD - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + Use Spanish in menus Usar Español en los menús - + About... Acerca de... - + Print... Imprimir... - + Print current model Imprimir el modelo actual - + Simulate... Simular... - + Simulate current model Simular el modelo actual - + Alt+S - + Load Backup... Cargar Copia de Seguridad... - + View Log File... Ver Archivo de Registro... - + Open and view log file Abrir y ver el archivo de registro - + Settings... Ajustes... - + Edit Settings Editar Ajustes - + Download... Descargar... - + Download firmware and voice files Descargar los archivos de firmware y voces - + Check for Updates... Comprobar Actualizaciones... - + Check OpenTX and Companion updates Comprobar la actualizaciones de OpenTX y Companion - + Companion Changes... Cambios Companion... - + Show Companion change log Mostrar el registro de cambios de Companion - + Firmware Changes... Cambios de Firmware... - + Show firmware change log Mostrar el registro de cambios de firmware - + Compare Models... Comparar Modelos... - + Edit Radio Splash Image... Editar Imagen de Inicio de la Radio... - + Edit the splash image of your Radio Editar la imagen de inicio de tu radio - + List programmers... Lista de programadores... - + Fuses... - - + + Read Firmware from Radio Leer Firmware desde la Radio - + Read firmware from Radio Leer firmware desde la Radio - - + + Write Firmware to Radio Escribir Firmware a la Radio - + Write firmware to Radio Escribir firmware a la Radio - + Add Radio Profile Añadir perfil de Radio - + Create a new Radio Setting Profile Crear un nuevo Perfil de Ajuste de Radio - + Manuals and other Documents Manuales y otros Documentos - + Open the OpenTX document page in a web browser Abrir la página de documentación de OpenTX en un navegador - + Write Models and Settings To Radio Escribir Modelos y Ajustes a la Radio - - + + Write Models and Settings to Radio Escribir Modelos y Ajustes a la Radio - - + + Read Models and Settings from Radio Leer los Modelos y Ajustes de la Radio - + Configure Communications... Configurar Comunicaciones... - + Configure software for communicating with the Radio Configurar software para la comunicación con la Radio - + Write Backup to Radio Escribir Copia de Seguridad a la Radio - + Write Backup from file to Radio Escribir Copia de Seguridad desde un archivo a la Radio - + Backup Radio to File Copia de Seguridad de la Radio a un Archivo - + Save a complete backup file of all settings and model data in the Radio Guardar una copia de seguridad completa de todos los datos de ajustes y modelos en la Radio - + Contributors... Contribuidores... - + A tribute to those who have contributed to OpenTX and Companion Un tributo a aquellos que han contribuido en OpenTX y Companion - + SD card synchronization - + Recent Files Archivos Recientes - + Recent Models+Settings Recientes Modelos+Ajustes - + Set Icon Theme Selecciona el Tema de Iconos - + Set Icon Size Selecciona el Tamaño de Iconos @@ -5807,46 +5663,46 @@ We recommend you view the release notes using the button below to learn about an Archivo binario inválido de Modelos y Ajustes %1 - - + + File Archivo - - + + Edit Editar - + Settings Ajustes - + Read/Write Leer/Escribir - - + + Help Ayuda - - + + Radio Profile Perfil de Radio - + Show recent Models+Settings documents Mostrar los documentos recientes de Modelos +Ajustes - + Ready Listo @@ -5869,10 +5725,10 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error Error @@ -5883,13 +5739,13 @@ We recommend you view the release notes using the button below to learn about an - + Unable to find file %1! ¡No es posible encontrar el archivo %1! - + Error reading file %1: %2. Error leyendo el archivo %1: @@ -5904,7 +5760,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. Error abriendo el archivo %1: @@ -5948,7 +5804,7 @@ We recommend you view the release notes using the button below to learn about an Escribir EEPROM a la Radio - + Open backup Models and Settings file Abrir archivo de copia de seguridad de Modelos y Ajustes @@ -5989,7 +5845,7 @@ Do you want to save your changes? El firmware está obsoleto, ¡por favor actualízalo! - + Invalid binary backup File %1 Archivo binariode copia de seguridad inválido %1 @@ -6235,26 +6091,6 @@ p, li { white-space: pre-wrap; } DEST -> CH%1 DEST ->CH%1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - MixesPanel @@ -6312,12 +6148,12 @@ p, li { white-space: pre-wrap; } Aviso(%1) - + Not enough available mixers! ¡No hay suficientes mezclas disponibles! - + Delete Selected Mixes? ¿Borrar las mezclas seleccionadas? @@ -6402,12 +6238,12 @@ p, li { white-space: pre-wrap; } - + Clear Mixes? ¿Limpiar mezclas? - + Really clear all the mixes? ¿Seguro que quieres limpiar todas las mezclas? @@ -6483,30 +6319,304 @@ p, li { white-space: pre-wrap; } ¿Seguro que quieres limpiar todas las curvas? + + ModelPrinter + + + %1 bytes + + + + + CH%1 + + + + + Exponential + Exponencial + + + + Extra Fine + Extra Fino + + + + Fine + Fino + + + + Medium + Medio + + + + Coarse + Duro + + + + Unknown + Desconocido + + + + Enabled + Activado + + + + Disabled + Desactivado + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + + + + + Master/SBUS Module + + + + + Master/CPPM Module + + + + + Master/SBUS in battery compartment + + + + + Master/Jack + + + + + Rudder + Timón + + + + Elevator + Profundidad + + + + Throttle + Acelerador + + + + Aileron + Aleron + + + + Name(%1) + + + + + %1:%2 + %1:%2 + + + + Persistent + + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + Apagado + + + + + + + FM%1 + + + + + FM%1%2 + + + + + FM%1+%2 + + + + + [I%1] + + + + + Input%1 + Entrada%1 + + + + + Weight + + + + + + Switch + + + + + + NoTrim + + + + + No DR/Expo + + + + + Offset + Offset + + + + Delay + Retardo + + + + Slow + Lento + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + Modos de vuelo(%1) + + + + Flight mode(%1) + Modo de vuelo(%1) + + + + Edge(%1, [%2:%3]) + + + + + Sticky(%1, %2) + + + + + Timer(%1, %2) + Temporizador (%1, %2) + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + A medida + + + + Standard + Estandar + + ModelSelectionPage - + Plane Avión - + Multirotor - + Helicopter Helicóptero - + Model Name: Nombre Modelo: - + Model Type: Tipo Modelo: @@ -6514,129 +6624,130 @@ p, li { white-space: pre-wrap; } ModelsListWidget - + + &Edit &Editar - + &Restore from backup &Restaurar desde copia de seguridad - + &Model Wizard Asistente &Modelos - + &Delete &Borrar - + Delete Borrar - + &Copy &Copiar - + Ctrl+C Ctrl+C - + &Cut C&ortar - + Ctrl+X Ctrl+X - + &Paste &Pegar - + Ctrl+V Ctrl+V - + D&uplicate &Duplicar - + Ctrl+U - + &Use as default &Usar como valor predeterminado - + P&rint model Imp&rimir modelo - + Ctrl+P - + Alt+S - + &Simulate model &Simular modelo - + General Settings Ajustes Generales - + Delete Selected Models? ¿Borrar los modelos seleccionados? - - + + Cannot delete default model. No se puede borrar el modelo predeterminado. - + Cannot cut default model. No se puede cortar el valor predeterminado. - + Do you want to overwrite radio general settings? ¿Quieres sobreescribir los ajustes generales de la radio? - + You are pasting on an not empty model, are you sure? You are pasting on an not empty model, are you sure ? Estas pegando en un modelo que no está vacio, ¿estas seguro? - + No free slot available, cannot duplicate No hay ranuras disponibles, no se puede duplicar @@ -6795,66 +6906,273 @@ p, li { white-space: pre-wrap; } ModulePanel - + Trainer Port Puerto Entrenador - + Internal Radio System Sistema Interno de Radio - + External Radio Module Modulo externo de Radio - - + + Radio System Sistema de Radio - + Extra Radio System Extra Sistema de Radio - + Value Valor - + Hold Esperar - + No Pulse + + MultiModelPrinter + + + General Model Settings + + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + Modos de vuelo + + + + + Flight mode + Modo de vuelo + + + + Switch + + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + + + + + + GV%1 + + + + + RE%1 + + + + + Limits + Limites + + + + Channel + + + + + Name + Nombre + + + + + Offset + Offset + + + + Min + + + + + Max + + + + + Invert + Invertir + + + + Global Variables + Variables globales + + + + Inputs + Entradas + + + + Mixers + Mezclas + + + + CV%1 + + + + + Curves + Curvas + + + + L%1 + + + + + Logical Switches + + + + + SF%1 + SF%1 + + + + Special Functions + + + + + Telemetry Settings + Ajustes Telemetría + + + + Analogs + + + + + Unit + Unidad + + + + Scale + Escala + + + + A%1 + A%1 + + + + RSSI Alarms + + + MultirotorPage - + Throttle Channel: Canal Throttle: - + Yaw Channel: Canal Yaw: - + Pitch Channel: Canal Pitch: - + Roll Channel: Canal Roll: @@ -6862,17 +7180,17 @@ p, li { white-space: pre-wrap; } OptionsPage - + Throttle Cut Corte de Gas - + Throttle Timer Temporizador de Gas - + Flight Timer Temporizador de vuelo @@ -6895,32 +7213,24 @@ p, li { white-space: pre-wrap; } Imprimir a archivo - Setup for: - Configuración para: + Configuración para: - printed on: %1 - Impreso en: %1 + Impreso en: %1 - General Model Settings - Ajustes Generales de Modelo + Ajustes Generales de Modelo - - - - Name - Nombre + Nombre - EEprom Size - Tamaño EEprom + Tamaño EEprom Timer1 @@ -6931,161 +7241,80 @@ p, li { white-space: pre-wrap; } Temporizador 2 - Internal Radio System - Sistema Interno de Radio + Sistema Interno de Radio - Radio System - Sistema de Radio + Sistema de Radio - - Protocol - Protocolo + Protocolo Pulse Polarity Polaridad del pulso - Throttle Trim - Trim Acelerador + Trim Acelerador - Enabled - Activado + Activado - Disabled - Desactivado + Desactivado Throttle Expo Expo Acelerador - External Radio Module - Modulo externo de Radio + Modulo externo de Radio - Extra Radio System - Extra Sistema de Radio + Extra Sistema de Radio - - Trainer port mode - - - - Trim Increment - Incremento Trim + Incremento Trim - Center Beep - Centro Beep + Centro Beep - Flight modes - Modos de vuelo + Modos de vuelo - Fades - Fades + Fades - - Trims - - - - - Gvars - - - - - Rot.Enc. - - - - - Switch - - - - Flight mode name - Nombre del modo de vuelo + Nombre del modo de vuelo - - IN - - - - - OUT - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - - - - - FM - - - - Off - Apagado + Apagado - Inputs - Entradas + Entradas Weight Carga - Source - Origen + Origen NoTrim @@ -7096,9 +7325,8 @@ p, li { white-space: pre-wrap; } DESACTIVADO - Mixers - Mezclas + Mezclas Weight(%1) @@ -7117,104 +7345,32 @@ p, li { white-space: pre-wrap; } Aviso(%1) - Limits - Limites + Limites - - - - CH - - - - - - - - - Offset - - - - - - - - Min - - - - - - - - Max - - - - - - Invert - Invertir + Invertir - - - - INV - - - - - - - NOR - - - - Curves - Curvas + Curvas - - - Curve - Curva + Curva - - pt %1 - - - - Logical Switches - Switches Logicos + Switches Logicos - - L - - - - Global Variables - Variables globales + Variables globales - - GV - - - - Special Functions - Funciones Especiales + Funciones Especiales Function @@ -7229,149 +7385,97 @@ p, li { white-space: pre-wrap; } Repetir - - Timer%1 - - - - SF - SF + SF - - Telemetry Settings - Ajustes Telemetría + Ajustes Telemetría - - Analog - Analógico + Analógico - Range - Rango + Rango - - - - A%1 - - - - Alarms - Alarmas + Alarmas - Low Alarm - Alarma Baja + Alarma Baja - Critical Alarm - Alarma crítica + Alarma crítica - - RSSI - - - - - Blades - Palas + Palas - - Alarm 1 - Alarma 1 + Alarma 1 - - Alarm 2 - Alarma 2 + Alarma 2 - Unit - Unidad + Unidad - Scale - Escala + Escala - - - - Type - Tipo + Tipo - - - - Condition - Condición + Condición - - - - Value - Valor + Valor - RSSI Alarm - Alarma RSSI + Alarma RSSI - Frsky serial protocol - Puerto Serie Frsky + Puerto Serie Frsky - - Custom Telemetry View - Vista personalizada de telemetría + Vista personalizada de telemetría - Telemetry Bars - Barras Telemetría + Barras Telemetría - Bar Number - Numero Barra + Numero Barra - + Print Document Imprimir documento - + Select PDF output file Seleccionar archivo de salida PDF - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) Archivos ODF (*.odt);;Archivos PDF (*.pdf);;Archivos HTML(*.htm *.html);;Todos los Archivos (*) @@ -7405,16 +7509,8 @@ p, li { white-space: pre-wrap; } QObject - - - FM%1 - FP%1 - - - - Input%1 - Entrada%1 + Entrada%1 @@ -7423,8 +7519,6 @@ p, li { white-space: pre-wrap; } - - CH%1 @@ -7505,33 +7599,33 @@ p, li { white-space: pre-wrap; } - - + + --- - + Rud Trim - + Ele Trim - + Thr Trim - + Ail Trim - + Rot Enc @@ -7671,7 +7765,7 @@ p, li { white-space: pre-wrap; } - + S3 @@ -7976,7 +8070,6 @@ p, li { white-space: pre-wrap; } - [I%1] @@ -8227,7 +8320,6 @@ p, li { white-space: pre-wrap; } - Unknown Desconocido @@ -8298,10 +8390,19 @@ p, li { white-space: pre-wrap; } - DISABLED + + + INV + INV + + + + NOR + NOR + Edge @@ -8380,150 +8481,88 @@ p, li { white-space: pre-wrap; } Finlandés - + !Flight mode %1 !Modo de vuelo%1 - + Flight mode %1 Modo de vuelo%1 - + Flight mode %1 value Valor modo de vuelo%1 - + Yellow Amarillo - + Orange Naranja - + Red Rojo - + Winged Shadow How High - + Winged Shadow How High (not supported) - + FrSky Sensor Hub - + None Ninguno - + Imperial - + Metric Métrico - Extra Fine - Extra Fino + Extra Fino - Fine - Fino + Fino - Medium - Medio + Medio - Coarse - Duro + Duro - %1:%2 - %1:%2 + %1:%2 - - , Persistent - - - - - , MinuteBeep - - - - - , CountDown(Beeps) - - - - - , CountDown(Voice) - - - - - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - - - - - : Channel start: %1, %2 Channels - - - - - Slave/Jack - - - - - Master/SBUS Module - - - - - Master/CPPM Module - - - - - Master/SBUS in battery compartment - - - - - Master/Jack - - - - Exponential - Exponencial + Exponencial Count Up @@ -8546,24 +8585,20 @@ p, li { white-space: pre-wrap; } Modo de vuelo(%1) - Rudder - Timón + Timón - Elevator - Profundidad + Profundidad - Throttle - Acelerador + Acelerador - Aileron - Aleron + Aleron @@ -8580,82 +8615,40 @@ p, li { white-space: pre-wrap; } Temporizador 2 - - - Weight - - - - - - Switch - - - - - - NoTrim - - - - - No DR/Expo - - - - Offset - Offset + Offset - Delay - Retardo + Retardo - Slow - Lento + Lento - Warn - Aviso + Aviso - Flight modes - Modos de vuelo + Modos de vuelo - Flight mode - Modo de vuelo + Modo de vuelo - - Edge(%1, [%2:%3]) - - - - - Sticky(%1, %2) - - - - Timer(%1, %2) - Temporizador (%1, %2) + Temporizador (%1, %2) - Duration (%1s) - Duración (%1s) + Duración (%1s) - Delay (%1s) - Retardo (%1s) + Retardo (%1s) All @@ -8667,7 +8660,7 @@ p, li { white-space: pre-wrap; } Telemetría - + Own value Valor propio @@ -8688,7 +8681,7 @@ p, li { white-space: pre-wrap; } - + -GV%1 @@ -8696,28 +8689,28 @@ p, li { white-space: pre-wrap; } - + ---- - - + + P1 - - + + P2 - - + + P3 @@ -8728,7 +8721,7 @@ p, li { white-space: pre-wrap; } - + Rud @@ -8739,7 +8732,7 @@ p, li { white-space: pre-wrap; } - + V @@ -8831,19 +8824,19 @@ p, li { white-space: pre-wrap; } - + Ele - + Thr - + Ail @@ -9030,28 +9023,28 @@ p, li { white-space: pre-wrap; } - + S1 - + S2 - + LS - + RS @@ -9155,13 +9148,13 @@ p, li { white-space: pre-wrap; } - + GV%1 - - + + THR @@ -9180,42 +9173,42 @@ p, li { white-space: pre-wrap; } - - + + Support for frsky telemetry mod Mod de soporte para telemetría frsky - - + + Support for jeti telemetry mod Mod de soporte para tele,etría jeti - - + + Support for receiving ardupilot data Soporte para recepción de datos ardupilot - - + + Support for receiving NMEA data Soporte para recepción de datos NMEA - + Support for telemetry easy board Soporte para para placa sencilla de telemetría - - + + Support for MAVLINK devices Soporte para dispositivos MAVLINK - + Rotary Encoder use in menus navigation Uso de codificador rotativo en los menús de navegación @@ -9228,243 +9221,245 @@ p, li { white-space: pre-wrap; } MODO FAI siempre activado - - - - - - + + + + + + Enable heli menu and cyclic mix support Activar menú Heli y el soporte de mezcla de cíclico - - - - - - - - + + + + + + + + Enable TEMPLATES menu Activar menú PLANTILLAS - - - - + + + + No splash screen Sin pantalla de inicio - - - - - - - - + + + + + + + + Disable curves menus Desctivar el menú curvas - - - - + + + + Support for radio modified with regular speaker Soporte para radio modificada con altavoz normal - - - - - + + + + + Used if you have modified your radio with voice mode Usado si tienes modificada tu radio con modo voz - - - - - + + + + + Used if you have modified your radio with haptic mode Usado si tienes tu radio modificada con el modo haptic - + Channel values displayed in us Visualizar los valores de canal en us - - - - - - - - + + + + + + + + In model setup menus automatically set source by moving the control En el menú de ajuste de modelo se selecciona automáticamente el origen del control moviendolo - - - - - - - - + + + + + + + + In model setup menus automatically set switch by moving the control En el menú de ajuste de modelo se selecciona automáticamente el switch de control moviendolo - + Use alternative SQT5 font Usar fuente alternativa SQT5 - + (displaying only first 10 warnings) (visualizar solo los 10 primero avisos) - + Possibility to enable FAI MODE (no telemetry) at field - + FAI MODE (no telemetry) always enabled - + + + Support for a third timer - + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - + Support for PPM internal module hack - + ST7565P LCD or compatible - + ST7565R LCD or compatible - + ERC12864FSF LCD - + ST7920 LCD - + 9X board - - - - + + + + Enable the throttle trace in Statistics Activar el recorrido del acelerador en las Estadísticas - + EEprom write progress bar Barra de progreso de escritura EEPROM - - + + No Winged Shadow How High support - - + + No vario support No hay soporte de variómetro - - + + No GPS support No hay soporte para GPS - - + + No gauges in the custom telemetry screen No hay indicadores en la pantalla de telemetría personalizada - + Allow compensating for offset errors in FrSky FAS current sensors Permitir la compensación de los errores de offset en los sensores FrSky FAS actuales - - + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) Añadir soporte para invertir las entradas de sticks (ejem. neseraio para los gimbals FrSky) - + Power management by soft-off circuitry - + 9XR-PRO - + FrSky Taranis - + FrSky Taranis Plus - + FrSky Taranis X9E - + Confirmation before radio shutdown - - + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views @@ -9477,17 +9472,17 @@ p, li { white-space: pre-wrap; } OpenTX para FrSky Taranis - + Haptic module installed Módulo Haptic instalado - + Support for Lua model scripts Soporte para los modelos de scripts Lua - + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) @@ -9496,8 +9491,8 @@ p, li { white-space: pre-wrap; } OpenTX para FrSky Taranis Plus - - + + Support of FrSky PXX protocol Soporte para protocolo FrSky PXX @@ -9506,67 +9501,67 @@ p, li { white-space: pre-wrap; } OpenTX para placas Sky9x/9x - + Disable HELI menu and cyclic mix support Desactivar el menú de HELI y el soporte de mezcla de cíclico - + Disable Global variables Desactivar las variables Globales - - - - - + + + + + Support for DSM2 modules Soporte para los módulos DSM2 - - - - - - - - + + + + + + + + PPM center adjustment in limits Ajuste del centro PPM en los limites - - - - - - - - + + + + + + + + Symetrical Limits Límites simétricos - - - - - - + + + + + + Pots use in menus navigation Usar potenciómetros en los menús de navegación - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used Tu radio posiblemente usa un firmware incorrecto, el tamaño del eeprom es 4096 pero solo los primeros 2048 están usados - + No OverrideCH functions available No hay funciones OverrideCH disponibles @@ -9575,65 +9570,65 @@ el tamaño del eeprom es 4096 pero solo los primeros 2048 están usadosOpenTX para placa 9X - - - - - - - - + + + + + + + + No flight modes Sin modos de vuelo - - + + SmartieParts 2.2 Backlight support Soporte de retroiluminación para SmartieParts 2.2 - - - - - + + + + + Enable resetting values by pressing up and down at the same time Activar el reseteo de valores presionando up y down al mismo tiempo - - - - - - - - + + + + + + + + No graphical check boxes and sliders Sin casillas de verificación ni sliders gráficos - - - - - - - - + + + + + + + + Battery graph Gráfico batería - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items No usar la fuente negrita para destacar elementos activos @@ -9642,69 +9637,69 @@ el tamaño del eeprom es 4096 pero solo los primeros 2048 están usadosOpenTX para placa M128 / 9X - - - - - + + + + + EEprom write Progress bar Barra de progreso de escriture de EEprom - - - - - - + + + + + + Imperial units Unidades Imperiales - + M128 / 9X board - + 9XR - + 9XR with M128 chip - + Gruvin9x board / 9X - + MEGA2560 board - + Sky9x board / 9X - - + + Bluetooth interface Interfaz Bluetooth - - - - - - - - + + + + + + + + Global variables Variables globales @@ -9721,35 +9716,35 @@ el tamaño del eeprom es 4096 pero solo los primeros 2048 están usadosOpenTX para placas Gruvin9x / 9x - - + + Support for SD memory card Soporte para tarjetas de memoria SD - + Support for DSM2 modules using ppm instead of true serial Soporte para módulos DSM2 que usan PPM en lugar de true serial - - + + Enable HELI menu and cyclic mix support Activar menú HELI y el soporte de mezcla de cíclico - - + + Warning Aviso - + EEPROM saved with these warnings: EEPROM guardado con estos avisos: - + Simulator for this firmware is not yet available El simulador para este firmware ya no está disponible @@ -9759,63 +9754,63 @@ el tamaño del eeprom es 4096 pero solo los primeros 2048 están usadosth9x en esta placa no tiene Rotary Encoders - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves OpenTx solo aceta %1 puntos en todas las curvas - + OpenTx only accepts %1 points in all curves OpenTx solo aceta %1 puntos en todas las curvas - - - - - + + + + + OpenTX on this board doesn't accept this function OpenTX en esta placa no acepta esa función - + OpenTX doesn't accept this telemetry protocol OpenTX en esta placa no acepta este protocolo de telemetría - - + + OpenTX doesn't accept this radio protocol OpenTX en esta placa no acepta este protocolo de radio - + OpenTX doesn't allow this number of channels OpenTX en esta placa no acepta este número de canales - + Trim disabled Trim desactivado - + Own Trim Trim propio - + Use Trim from Flight mode %1 Usar Trim para el modo de vuelo %1 - + Use Trim from Flight mode %1 + Own Trim as an offset Usar Trim para el modo de vuelo %1 + Trim propio com un compensador @@ -9849,25 +9844,31 @@ The OpenTX Team. El equipo OpenTX. - + Positive Positivo - + Negative Negativo - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! @@ -9877,33 +9878,33 @@ El equipo OpenTX. GV - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -9989,17 +9990,17 @@ El equipo OpenTX. RudderPage - + No - + Yes Si - + <br>Rudder Channel: <br>Canal del timón (Rudder): @@ -10171,7 +10172,7 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t SimpleTailPage - + Elevator Channel: Canal Profundidad (Elevator): @@ -10346,10 +10347,44 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t Salidas + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + LIbreria de pantallas de inicio - página %1 de %2 + + + + Warning + Aviso + + + + Invalid image in library %1 + Imagen inválida en la librería %1 + + + + Information + Información + + + + No valid image found in library, check your settings + No se ha encontrado una imagen válida en la librería, comprueba tus ajustes + + StandardPage - + Channel %1 Canal %1 @@ -10357,25 +10392,24 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -10384,35 +10418,40 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t TailPage - + Rudder Channel: <br>Canal del timón (Rudder): - + Elevator Channel: Canal Profundidad (Elevator): + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder Profundidad y timón - + Only Elevator Solo profundidad - + V-tail Cola-V - + Tail Type: Tipo de cola: @@ -10420,96 +10459,96 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t Telemetry - + A1 - + A2 - + RSSI - + Alarm 1 Alarma 1 - - + + ---- - - + + Yellow Amarillo - - + + Orange Naranja - - + + Red Rojo - + Alarm 2 Alarma 2 - + Center Silent - + Altitude source - + Volts source - + Top Bar - + Serial Protocol Protocolo Serie - + Sensors - + Disable multi sensor handling - + Volt source Fuente Voltaje - + Current source Fuente Actual @@ -10519,22 +10558,22 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t Protocolo - + None Ninguno - + FrSky Sensor Hub - + Blades Palas - + Sink Max Descenso Máximo @@ -10543,27 +10582,27 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t Apagado - + Climb Max Máximo Ascenso - + Sink Min Descenso Mínimo - + Climb Min Mínimo Ascenso - + Vario source Fuente Variómetro - + Vario limits Límites Variómetro @@ -10576,37 +10615,37 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t Mostrar la altitud en una barra - + Altimetry Altímetro - + mAh - + A - + Various Varios - + mAh count Valor mAh - + FAS Offset - + Persistent mAh mAh Constantes @@ -10720,17 +10759,15 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t miliAmperios (mA) - Low Alarm - Alarma Baja + Alarma Baja - Critical Alarm - Alarma crítica + Alarma crítica - + Range Rango @@ -10747,22 +10784,22 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t Números - + None Ninguno - + Numbers - + Bars Barras - + Script @@ -10790,99 +10827,99 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t TelemetryPanel - + FrSky S.PORT - + FrSky D - + FrSky D (cable) - + Telemetry screen %1 Pantalla telemetría %1 - + Low Alarm Alarma Baja - + Critical Alarm Alarma crítica - + Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (no soportado) - + Alti - + Alti+ - + VSpeed + - - + A1 + - - + A2 - - + + A3 - - + + A4 - - + + FAS - + Cells - + --- @@ -10988,7 +11025,107 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t - Amps Sensor : + Sensor : + + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. @@ -10996,111 +11133,11 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t Raw (-) - - - Voltage (V) - - - - - Current (A) - - - - - Current (mA) - - - - - Speed (kts) - - - - - Speed (m/s) - - - - - Speed (ft/s) - - - - - Speed (km/h) - - - - - Speed (miles/h) - - - - - Meters (m) - - - - - Feet (ft) - - - - - Temp (°C) - - - - - Temp (°F) - - - - - Percentage (%) - - - - - Energy (mAh) - - - - - Power (W) - - - - - RF Power (dBm) - - RPM - - - Acceleration (g) - - - - - Heading (°) - - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - - Precision @@ -11159,22 +11196,22 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t TelemetrySensorPanel - + Lowest - + Cell %1 - + Highest - + Delta @@ -11395,17 +11432,17 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t ThrottlePage - + Yes Si - + No No - + <br>Throttle Channel: <br>Canal de Acelerador: @@ -11426,32 +11463,37 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t TimerPanel - + Silent Silencio - + Beeps - + Voice Voz - + + Haptic + Reproducir Haptic + + + Not persistent No persistente - + Persistent (flight) Persistente (vuelo) - + Persistent (manual reset) Persistente (reset manual) @@ -11590,12 +11632,12 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t VTailPage - + First Tail Channel: Primer Canal de cola: - + Second Tail Channel: Segundo Canal de cola: @@ -11603,12 +11645,12 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t WingtypeSelectionPage - + Standard Wing Ala estandar - + Flying Wing / Deltawing Ala volante/Ala delta @@ -11890,37 +11932,37 @@ Si está marcado el acelerador será invertido. El ralentí será delante, el t WizardPrinter - + Plane Avión - + Multicopter Multicóptero - + Helicopter Helicóptero - + Model Name: Nombre Modelo: - + Model Type: Tipo Modelo: - + Options: Opciones: - + Channel %1: Canal %1: @@ -13213,38 +13255,4 @@ Puede ser diferente del lenguaje del firmware Ivertir Pixeles - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - LIbreria de pantallas de inicio - página %1 de %2 - - - - Warning - Aviso - - - - Invalid image in library %1 - Imagen inválida en la librería %1 - - - - Information - Información - - - - No valid image found in library, check your settings - No se ha encontrado una imagen válida en la librería, comprueba tus ajustes - - diff --git a/companion/src/translations/companion_fi.ts b/companion/src/translations/companion_fi.ts index 3d06ecad7..39332b9fd 100644 --- a/companion/src/translations/companion_fi.ts +++ b/companion/src/translations/companion_fi.ts @@ -4,27 +4,27 @@ AileronsPage - + No Ei - + Yes, controlled by a single channel Kyllä, ohjataan yhdellä kanavalla - + Yes, controlled by two channels Kyllä, ohjataan kahdella kanavalla - + <br>First Aileron Channel: <br>1. siiveke kanava: - + Second Aileron Channel: 2. siiveke kanava: @@ -32,27 +32,27 @@ AirbrakesPage - + No Ei - + Yes, controlled by a single channel Kyllä, ohjataan yhdellä kanavalla - + Yes, controlled by two channels Kyllä, ohjataan kahdella kanavalla - + <br>First Airbrake Channel: <br>1. lentojarru kanava: - + Second Airbrake Channel: 2. lentojarru kanava: @@ -74,7 +74,7 @@ - + Open Folder Avaa kansio @@ -338,7 +338,7 @@ Tila 4: - + Simulator Volume Gain @@ -477,62 +477,62 @@ Voi olla eri kun firmwaren kieli Simulaattorin asetukset - + Simulator BackLight Simulaattorin taustavalo - + Enable Päälle - + Blue Sininen - + Green Vihreä - + Red - + Orange - + Yellow - + Joystick Joystick - + Calibrate Kalibroi - + Simulator capture folder Simulaattorin tiedostojen kansio - + Only capture to clipboard Kaappaa leikepöydälle - + Remember simulator switch values Muista simulaattorin kytkimien asennot @@ -547,64 +547,64 @@ Voi olla eri kun firmwaren kieli Valitse kansioi kuville - - + + No joysticks found Joystickia ei löydy - + EMPTY: No radio settings stored in profile TYHJÄ: Ei radion asetuksia tallennettu profiiliin - + AVAILABLE: Radio settings of unknown age TARJOLLA: Radion asetukset, voi olla vanhoja - + AVAILABLE: Radio settings stored %1 TARJOLLA: Radion asetukset %1 - + Select your library folder Valitse kansio kirjastolle - - + + Select your Models and Settings backup folder Valitse kansio mallien ja asetusten varmuuskopioille - + Select Google Earth executable Valitse Google Earth tiedosto - + Select the folder replicating your SD structure Valitse kansio mihin "monistetaan" SD muistikortin kansio - + Not possible to remove profile Profiilia ei voida poistaa - + The default profile can not be removed. Nykyistä profiilia ei voida poistaa. - + Open Image to load Avaa kuva latausta varten - + Images (%1) Kuvia (%1) @@ -805,9 +805,8 @@ Voi olla eri kun firmwaren kieli Tikku 4 - Battery - Akku + Akku @@ -830,9 +829,18 @@ Voi olla eri kun firmwaren kieli PPM 4 - Current - Virta + Virta + + + + Battery Offset + + + + + Current Offset + @@ -1097,265 +1105,161 @@ Voi olla eri kun firmwaren kieli Tulosta tiedostoon - + No name Ei nimeä - General Model Settings - Yleiset mallin asetukset + Yleiset mallin asetukset - - - Name - Nimi + Nimi - - EEprom Size - EEpromin koko + EEpromin koko - - Timer1 - Ajastin 1 + Ajastin 1 - - Timer2 - Ajastin 2 + Ajastin 2 - - Internal Radio System - Sisäinen radio systeemi + Sisäinen radio systeemi - - Radio System - Radio systeemi + Radio systeemi - - - - Protocol - Protokolla + Protokolla Pulse Polarity Pulssin napaisuus - - Throttle Trim - Kaasu trimmi + Kaasu trimmi - - Enabled - Päälle + Päälle - - Disabled - Pois + Pois Throttle Expo Kaasu expo - - External Radio Module - Ulkoinen radio systeemi + Ulkoinen radio systeemi - - Extra Radio System - Extra Radio järjestelmä + Extra Radio järjestelmä - - - Trainer port mode - - - - - - Trim Increment - - - - - Center Beep - Keski piippaus + Keski piippaus - Flight modes Settings - Lentotilan asetukset + Lentotilan asetukset - - Fades - Liut + Liut - - Trims - Trimmit + Trimmit - - Switch - Kytkin + Kytkin - - - - Flight mode name - Lentotilan nimi + Lentotilan nimi - - IN - SIS + SIS - - OUT - ULO + ULO - - - - - - - - - - FM - FM + FM - - Gvars - Gvarit + Gvarit - - Rot. Enc. - Rot.Enc. + Rot.Enc. - Limits - Rajat + Rajat - - - - - Offset - Tasoitus + Tasoitus - - - - - Min - Min + Min - - - - - Max - Max + Max - - - Invert - Käänteinen + Käänteinen - - - - - CH - ch + ch - - INV - KÄÄNT + KÄÄNT - - NOR - NOR + NOR - Global Variables - Globaalit muuttujat + Globaalit muuttujat - - GV - GV + GV - Inputs - Tulot + Tulot - L - L + L Expo/Dr Settings @@ -1378,9 +1282,8 @@ Voi olla eri kun firmwaren kieli Pois - Mixers - Mikserit + Mikserit noTrim @@ -1391,9 +1294,8 @@ Voi olla eri kun firmwaren kieli Viive(u%1:d%2) - Curves - Käyrät + Käyrät L%1 @@ -1404,24 +1306,20 @@ Voi olla eri kun firmwaren kieli pt %1 - - Curve - Käyrä + Käyrä - Logical Switches - Loogiset kytkimet + Loogiset kytkimet LS LS - Special Functions - Spesiaali toiminnot + Spesiaali toiminnot Function @@ -1440,114 +1338,68 @@ Voi olla eri kun firmwaren kieli Päälle - SF - SF + SF - Telemetry Settings - Telemetria asetukset + Telemetria asetukset - - Analog - Analoginen + Analoginen - - Unit - Yksikkö + Yksikkö - - Scale - Skaala + Skaala - - - - A%1 - A%1 + A%1 - - Alarm 1 - Varoitus 1 + Varoitus 1 - - - Alarm 2 - - - - - - - Type - Tyyppi + Tyyppi - - - - - Condition - - - - - - - Value - Arvo + Arvo - - RSSI Alarm - RSSI hälytys + RSSI hälytys - - Custom Telemetry View - Oma telemetria näkymä + Oma telemetria näkymä - - Telemetry Bars - Telemetria palkein + Telemetria palkein - - Bar Number - Palkkien määrä + Palkkien määrä - - Source - Lähde + Lähde - + Print Document Tulosta dokumentti - + Select PDF output file Valitse PDF tiedosto @@ -1555,7 +1407,7 @@ Voi olla eri kun firmwaren kieli ConclusionPage - + OK, I understand. OK, Ymmärrän. @@ -1593,12 +1445,16 @@ Voi olla eri kun firmwaren kieli Kiitokset: Rafal Tomczak(RadioClone), Thomas Husterer (th9x) sekä Eriz Raviv (er9x ja eePe) - - Thank you all !!! - Kiitokset kaikille !!! + + OpenTX Blacklist + - + Thank you all !!! + Kiitokset kaikille !!! + + + monthly @@ -1631,22 +1487,22 @@ Voi olla eri kun firmwaren kieli CurveGroup - + Diff Ero - + Expo Expo - + Func Toiminto - + Curve Käyrä @@ -1916,22 +1772,22 @@ Voi olla eri kun firmwaren kieli CyclicPage - + 90 90 - + 120 120 - + 120x 120x - + 140 140 @@ -2006,12 +1862,12 @@ Voi olla eri kun firmwaren kieli ElevonsPage - + <br>First Elevon Channel: <br>1. korkeusper kanava: - + Second Elevon Channel: 2. korkeusper kanava: @@ -2424,24 +2280,16 @@ Jos on tyhjä, katsotaan tulon olen ON tilassa kokoajan. Muuta %1 - Rud - PER + PER - Ele - KOR + KOR - - Thr - - - - Ail - SII + SII @@ -2451,22 +2299,22 @@ Jos on tyhjä, katsotaan tulon olen ON tilassa kokoajan. Kaasu kanava: - + Throttle Channel: Kaasun kanava: - + Yaw Channel: Yaw kanava: - + Pitch Channel: Pitch kanava: - + Roll Channel: Roll kanava: @@ -2565,27 +2413,27 @@ Voi olla eri kun firmwaren kieli FlapsPage - + No Ei - + Yes, controlled by a single channel Kyllä, ohjataan yhdellä kanavalla - + Yes, controlled by two channels Kyllä, ohjataan kahdella kanavalla - + <br>First Flap Channel: <br>1. laippojen kanava: - + Second Flap Channel: 2. laippojen kanava: @@ -2838,8 +2686,8 @@ Voi olla eri kun firmwaren kieli - - + + Warning Varoitus @@ -2893,58 +2741,58 @@ Voi olla eri kun firmwaren kieli Kuvaa ei voi ladata - + Splash image not found - + Cannot save customized firmware Muutettua firmwarea ei voi tallentaa - + Write Firmware to Radio Kirjoita firmware lähettimeen - - + + Firmware check failed - + Could not check firmware from radio - + New firmware is not compatible with the one currently installed! - + Conversion failed Muutos virheellinen - + Cannot convert Models and Settings for use with this firmware, original data will be used Ei voida muuttaa malli ja asetus tietoja käymään uuteen firmwareen, alkuperäiset tiedot otetaan käyttöön - + Restore failed Palautus epäonnistui - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 Ei voi palauttaa malli ja asetus tietoja lähettimestä. Mallit ja asetukset löytyy tiedostosta: %1 - + Flashing done @@ -3120,37 +2968,33 @@ Please use ZADIG to properly install the driver. FlightModePanel - Rud - PER + PER - Ele - KOR + KOR - Thr - KAA + KAA - Ail - SII + SII - + Rotary Encoder %1 ??Rotary Encoder?? %1 - + GVAR%1 GVAR%1 - + Popup enabled Popupit sallittu @@ -3173,17 +3017,17 @@ Please use ZADIG to properly install the driver. FlightModesPanel - + Flight Mode %1 Lentotila %1 - + (%1) (%1) - + (default) (oletus) @@ -3191,17 +3035,17 @@ Please use ZADIG to properly install the driver. FlybarSelectionPage - + Has Flybar ON flybar - + Flybarless EI flybar - + Flybar: Flybar: @@ -5292,17 +5136,17 @@ Oletko varma ? GyroPage - + No Ei - + Yes, controled by a switch Kyllä, ohjataan kytkimellä - + Yes, controlled by a pot Kyllä, ohjataan potikalla @@ -5399,22 +5243,22 @@ Oletko varma ? Kaasu kanava: - + Throttle Channel: Kaasu kanava: - + Yaw Channel: Yaw kanava: - + Pitch Channel: Pitch kanava: - + Roll Channel: Roll kanava: @@ -5825,9 +5669,9 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded Tiedosto ladattu @@ -5841,34 +5685,34 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Näytä edellinen viesti uudelleen kun radio käynnistetään ? - + Checking for updates Tarkistetaan päivityksiä - + Unable to check for updates. Ei voi tarkistaa päivityksiä. - + A new version of Companion is available (version %1)<br>Would you like to download it? Uusi versio Companionista on saatavilla (versio %1)<br>Haluatko ladata sen nyt ? - - - + + + Save As Tallenna nimellä - + Executable (*.exe) Suoritettava (*.exe) - + New release available Uusi julkaisu saatavilla @@ -5877,24 +5721,24 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Uusi versio Companionista on saatavilla. Käy OpenTX sivuilla katsomassa lisää! - - + + No updates available at this time. Ei päivityksiä saatavilla tälläkertaa. - + Would you like to launch the installer? Haluatko suorittaa asennus ohjelman? - - + + Error Virhe - + Error opening file %1: %2. Virhe avattaessa tiedostoa %1: @@ -5909,17 +5753,17 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Kääntäjä palvelin tilapäisesti pois käytöstä, yritä kohta uudelleen - + Compilation server too busy, try later Kääntäjä palvelin liian kiireinen, yritä kohta uudelleen - + Compilation server requires registration, please check OpenTX web site Kääntäjä palvelin tarvii rekisteröitymisen, käy OpenTX sivuilla katsomassa lisää - + Unknown server failure, try later Tuntematon palvelin virhe, yritä kohta uudelleen @@ -5928,7 +5772,7 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Firmware ei enää mahdu lähettimen muistiin, näillä asetus määrillä - + Compilation server termporary failure, try later Companion palvelin tilapäisesti tiltissä, yritä kohta uudelleen @@ -5945,26 +5789,26 @@ Versio %2 firmwaresta on saatavilla. Haluatko ladata sen nyt ? - - + + Yes Kyllä - - + + No Ei - - + + Release Notes Julkaisuun liittyviä dokuja - - + + Do you want to download release %1 now ? Haluatko ladata julkaisun %1 nyt ? @@ -5983,7 +5827,7 @@ Haluatko ladata sen nyt ? Julkaisu dokut sisältää erittäin tärkeää tietoa. Haluatko lukea ne nyt ? - + The selected language will be used the next time you start Companion. Valittu kieli otetaan käyttöön Companionissa kun se käynnistettään seuraavan kerran. @@ -5992,12 +5836,12 @@ Haluatko ladata sen nyt ? Ok - + The new theme will be loaded the next time you start Companion. Uusi teema otetaan käyttöön Companionissa kun se käynnistettään seuraavan kerran. - + The icon size will be used the next time you start Companion. Uusi ikonienkoko otetaan käyttöön Companionissa kun se käynnistettään seuraavan kerran. @@ -6006,18 +5850,18 @@ Haluatko ladata sen nyt ? Avaa - - + + File saved Tiedosto tallennettu - + Firmware updates Firmware päivityksiä - + Current firmware does not provide release notes informations. Nykyinen firmware ei sisällä julkaisu dokuja. @@ -6136,7 +5980,7 @@ Kirjoita se silti lähettimeen ? Lue lähettimen firmware tiedostoksi - + OpenTX Home Page: <a href='%1'>%1</a> OpenTX Kotisivut: <a href='%1'>%1</a> @@ -6145,7 +5989,7 @@ Kirjoita se silti lähettimeen ? OpenTX Companion projektin on aloittanut alunperin: <a href='%2'>eePe</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Jos meinaat että tämä ohjelma on hyvä. Teeppä hyvä teko ja: <a href='%1'>Lahjoita</a> @@ -6158,7 +6002,7 @@ Kirjoita se silti lähettimeen ? Kopiosuoja - + About Companion Tietoja Companionista @@ -6167,7 +6011,7 @@ Kirjoita se silti lähettimeen ? OpenTX Companion -FW: %1 -Profiili: %2 - + New Uusi @@ -6176,7 +6020,7 @@ Kirjoita se silti lähettimeen ? Luo uusi tiedosto - + Open... Avaa... @@ -6193,17 +6037,17 @@ Kirjoita se silti lähettimeen ? Tallenna doku levylle - + Save As... Tallenna nimellä... - + Exit Poistu - + Exit the application Poistu ohjelmasta @@ -6232,7 +6076,7 @@ Kirjoita se silti lähettimeen ? Liitä leikepöydän tiedot nykyiseen valintaan - + Classical Klassinen @@ -6253,7 +6097,7 @@ Kirjoita se silti lähettimeen ? Firmware ei enää mahdu lähettimen muistiin, näillä asetus määrillä - + Do you want to write the firmware to the radio now ? Haluatko kirjoittaa firmwaren lähettimen muistiin ? @@ -6278,18 +6122,18 @@ Do you want to download it now ? Haluatko ladata sen nyt ? - + Ignore this release %1? Ohita tämä versio (r%1)? - - + + Open Models and Settings file Avaa mallit ja asetukset - + Read Models and Settings From Radio Lue mallit ja asetukset lähettimestä @@ -6338,7 +6182,7 @@ Haluatko ladata sen nyt ? Ei voi varmuuskopioida nykyisiä malli ja asetuksia lähettimestä. Firmwaren kirjoitus prosessi keskeytetään - + Save Radio Backup to File Tallenna lähettimen varmuuskopio tiedostoon @@ -6347,7 +6191,7 @@ Haluatko ladata sen nyt ? Lue lähettimen varmuuskopio - + Read Radio Firmware to File Lue firmware tiedostosta @@ -6356,7 +6200,7 @@ Haluatko ladata sen nyt ? Uudet mallit ja asetukset - + Create a new Models and Settings file Luo uusi mallit ja asetukset tiedosto @@ -6369,8 +6213,8 @@ Haluatko ladata sen nyt ? Tallenna mallit ja asutket... - - + + Save Models and Settings file Tallenna mallit ja asetukset tiedostoon @@ -6379,12 +6223,12 @@ Haluatko ladata sen nyt ? Tallenna mallit ja asetukset nimellä... - + Cut Model Leikkaa malli - + Cut current model to the clipboard Leikka nykyinen malli leikepöydälle @@ -6393,7 +6237,7 @@ Haluatko ladata sen nyt ? Kopio malli... - + Copy current model to the clipboard Kopio nykyinen malli leikepöydälle @@ -6402,197 +6246,197 @@ Haluatko ladata sen nyt ? Liitä malli... - + Paste model from clipboard Liitä nykyinen malli leikepöydälle - + Paste Model Liitä malli - + The classic companion9x icon theme Klassiset Companion iconit teema - + Yerico Yerico - + Yellow round honey sweet icon theme Hunajan keltaiset ikonit teema - + Monochrome Yksivärinen - + A monochrome black icon theme Yksivärisen teeman musta ikoni tyyli - + MonoWhite Simppeli valkoinen - + A monochrome white icon theme Yksivärisen teeman valkoinen ikoni tyyli - + MonoBlue Simppeli sininen - + A monochrome blue icon theme Yksivärisen teeman sininen ikoni tyyli - + Small Pieni - + Use small toolbar icons Käytä pieniä ikoneita työkalupalkissa - + Normal Normaali - + Use normal size toolbar icons Käytä normaaleita ikoneita työkalupalkissa - + Big Iso - + Use big toolbar icons Käytä isoja ikoneita työkalupalkissa - + Huge Valtava - + Use huge toolbar icons Käytä valtavia ikoneita työkalupalkissa - + System language Järjestelmän kieli - + Use system language in menus Käytä järjestelmän kieltä valikoihin - + Czech Tsekki - + Use Czech in menus Käytä tsekki valikoita - + German Saksa - + Use German in menus Käytä saksa valikoita - + English Englanti - + Use English in menus Käytä englanti valikoita - + Finnish Suomi - + Use Finnish in menus Käytä suomi valikoita - + French Ranska - + Use French in menus Käytä ranska valikoita - + Italian Italia - + Use Italian in menus Käytä italia valikoita - + Spanish Espanja - + Use Spanish in menus - + Alt+S Alt+S - + SD card synchronization - + Show the list of radio profiles - + New Radio Uusi Radio @@ -6605,12 +6449,12 @@ Haluatko ladata sen nyt ? Käytä heprea valikoita - + Polish Puola - + Use Polish in menus Käytä puola valikoita @@ -6623,12 +6467,12 @@ Haluatko ladata sen nyt ? Käytä portugali valikoita - + Swedish Ruotsi - + Use Swedish in menus Käytä ruotsi valikoita @@ -6649,125 +6493,125 @@ Haluatko ladata sen nyt ? Käytä tanskai valikoita - + About... Tietoja... - + Print... Tulosta... - + Simulate... Simuloi... - + Simulate current model Simuloi nykyinen malli - + Load Backup... Lataa varmuuskopio... - + View Log File... Näytä logi tiedosto... - + Open and view log file Avaa ja näytä logi tiedosto - + Settings... Asetukset... - + Download... Ladattu... - + Check for Updates... Tarkistetaan päivityksiä... - + Companion Changes... Companionin muutokset... - + Show Companion change log Näytä Companionin muutos logi - + Firmware Changes... Firmwaren muutokset... - + Show firmware change log Näytä firmwaren muutos logi - + Compare Models... Vertaa malleja... - + Edit Radio Splash Image... Muuta lähettimen alkuruutu kuvaa... - + Edit the splash image of your Radio Muuta alkuruutua omaan lähettimeen - - + + Read Firmware from Radio Lue firmware lähettimestä - + Read firmware from Radio Lue firmware lähettimestä - - + + Write Firmware to Radio Kirjoita firmware lähettimeen - + Write firmware to Radio Kirjoita firmware lähettimeen - + Write Models and Settings To Radio Kirjoita mallit ja asetukset lähettimeen - - + + Write Models and Settings to Radio Kirjoita mallit ja asetukset lähettimeen - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -6776,7 +6620,7 @@ We recommend you view the release notes using the button below to learn about an - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -6787,107 +6631,107 @@ We recommend you view the release notes using the button below to learn about an - - + + Synchronize SD - - + + Read Models and Settings from Radio Lue mallit ja asetukset lähettimestä - + Configure Communications... Määrittele yhteydet... - + Configure software for communicating with the Radio Asetetaan ohjelma joka lukee ja kirjoittaa tiedot lähettimeen - + Write Backup to Radio Kirjoita varmuuskiop lähettimeen - + Write Backup from file to Radio Kirjoita varmuuskopio tiedosto lähettimeen - + Backup Radio to File Varmuuskopio lähetin tiedostoon - + Save a complete backup file of all settings and model data in the Radio Tallenna täydellinen varmuuskopio kaikista malleista ja asetuksista lähettimeen - + Contributors... Avustajat... - + Recent Models+Settings Viimeisimmät mallit ja asetukset - - + + Radio Profile Radio profiili - + A new release of Companion is available, please check the OpenTX website! Uusi versio Companionista on saatavilla. Käy OpenTX sivuilla katsomassa lisää! - + Not enough memory for all the selected firmware options Ei tarpeeksi vapaata muistia valituille toiminnoille - - - + + + Companion Companion - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> OpenTX Companion projektin on aloittanut alunperin: <a href='%1'>eePe</a> {1'?} - + Copyright OpenTX Team Tekijänoikeus: OpenTX tiimi - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + Save Tallenna - + Copy Model Kopio malli - + Show recent Models+Settings documents Näytä lista viimeaikaisista mallit ja asetukset dokuista @@ -6896,7 +6740,7 @@ We recommend you view the release notes using the button below to learn about an Näytä lista viimeaikaisista radion asetus profiileista - + %2 %2 @@ -6905,7 +6749,7 @@ We recommend you view the release notes using the button below to learn about an Tietoja - + Show the application's About box Näytä sovelluksen tietoja ikkuna @@ -6914,7 +6758,7 @@ We recommend you view the release notes using the button below to learn about an Tulosta - + Print current model Tulosta nykyinen malli @@ -6931,7 +6775,7 @@ We recommend you view the release notes using the button below to learn about an Lataa varmuuskopio... - + Load backup from file Lataa varmuuskipio tiedostosta @@ -6948,7 +6792,7 @@ We recommend you view the release notes using the button below to learn about an Asetukset... - + Edit Settings Muuta asetuksia @@ -6957,7 +6801,7 @@ We recommend you view the release notes using the button below to learn about an Ladatut... - + Download firmware and voice files Lataa firmware ja ääni tiedostot @@ -6966,7 +6810,7 @@ We recommend you view the release notes using the button below to learn about an Tarkistetaan päivityksiä... - + Check OpenTX and Companion updates Tarkista OpenTX ja Companion päivitykset @@ -6991,7 +6835,7 @@ We recommend you view the release notes using the button below to learn about an Vertaa... - + Compare models Vertaa malleja @@ -7008,22 +6852,22 @@ We recommend you view the release notes using the button below to learn about an Lista ohjelmointilaitteista - + List available programmers Lista vapaista ohjelmointilaitteista - + List programmers... Lista ohjelmointilaitteista... - + Fuses... Sulakkeet... - + Show fuses dialog Näytä sulake dialogi @@ -7048,22 +6892,22 @@ We recommend you view the release notes using the button below to learn about an Uusi profiili - + Create a new Radio Setting Profile Luo uusi radio asetus profiili - + Add Radio Profile Lisää lähettimen profiili - + Manuals and other Documents Manuaalit ja muut dokut - + Open the OpenTX document page in a web browser Avaa OpenTX dokut webbi selaimen sivulle @@ -7104,55 +6948,55 @@ We recommend you view the release notes using the button below to learn about an Avustajat - + A tribute to those who have contributed to OpenTX and Companion Hatunnosto niille jotka on tukenut OpenTX ja Companion projektia - + Recent Files Viimeisimmät tiedostot - + Set Menu Language Aseta valikon kieli - + Set Icon Theme Aseta ikonien teema - + Set Icon Size Aseta ikonien koko - - + + File Tiedosto - - + + Edit Muuta - + Settings Asetukset - + Read/Write Lue/Kirjoita - - + + Help Apu @@ -7173,12 +7017,12 @@ We recommend you view the release notes using the button below to learn about an Näytä lista viimeaikaisista radion asetus profiileista - + Write Kirjoita - + Ready Valmis @@ -7246,16 +7090,16 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error Virhe - + Unable to find file %1! Ei löydy tiedostoa %1! @@ -7263,7 +7107,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. Virhe avattaessa tiedostoa %1: @@ -7277,7 +7121,7 @@ We recommend you view the release notes using the button below to learn about an - + Error reading file %1: %2. Virhe luettaessa tiedostoa %1: @@ -7343,7 +7187,7 @@ Haluatko tallentaa muutokset ? Kirjoita EEPROM lähettimeen - + Open backup Models and Settings file Avaa varmuuskopio mallit ja asetukset @@ -7384,7 +7228,7 @@ Haluatko tallentaa muutokset ? Avaa - + Invalid binary backup File %1 Väärää tietoa varmuuskopio tiedostossa %1 @@ -7659,24 +7503,20 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. KOHD -> CH%1 - Rud - PER + PER - Ele - KOR + KOR - Thr - KAA + KAA - Ail - SII + SII @@ -7755,12 +7595,12 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Välys(%1) - + Not enough available mixers! Ei enempää vapaita miksereitä! - + Delete Selected Mixes? Poista valitut mikserit? @@ -7849,12 +7689,12 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Ctrl+U - + Clear Mixes? Tyhjennä mikserit? - + Really clear all the mixes? Varmasti tyhjennä kaikki mikserit? @@ -7942,30 +7782,304 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Telemetria + + ModelPrinter + + + %1 bytes + + + + + CH%1 + CH%1 + + + + Exponential + Expo + + + + Extra Fine + Eri hieno + + + + Fine + Hieno + + + + Medium + Keski + + + + Coarse + Karkea + + + + Unknown + Tuntematon + + + + Enabled + Päälle + + + + Disabled + Pois + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + + + + + Master/SBUS Module + + + + + Master/CPPM Module + + + + + Master/SBUS in battery compartment + + + + + Master/Jack + + + + + Rudder + Sivuperäsin + + + + Elevator + Korkeusperäsin + + + + Throttle + Kaasu + + + + Aileron + Siivekkeet + + + + Name(%1) + + + + + %1:%2 + %1s {1:%2?} + + + + Persistent + Yhtämittainen + + + + MinuteBeep + Minutti piippaus + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + Pois + + + + + + + FM%1 + FM%1 + + + + FM%1%2 + FM%1%2 + + + + FM%1+%2 + + + + + [I%1] + [I%1] + + + + Input%1 + Tulo%1 + + + + + Weight + Paino + + + + + Switch + Kytkin + + + + + NoTrim + Ei trimmiä + + + + No DR/Expo + Ei DR / Expoja + + + + Offset + Tasoitus + + + + Delay + Viive + + + + Slow + Hidas + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + Lentotilat(%1) + + + + Flight mode(%1) + Lentotila(%1) + + + + Edge(%1, [%2:%3]) + reuna(%1, [%2:%3]) + + + + Sticky(%1, %2) + Jähmeä(%1, %2) + + + + Timer(%1, %2) + Ajastin(%1, %2) + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + Omat + + + + Standard + Vakio + + ModelSelectionPage - + Plane Lentokone - + Multirotor Moniroottori / autogiro - + Helicopter Helikopteri - + Model Name: Mallin nimi: - + Model Type: Mallin tyyppi: @@ -7973,82 +8087,83 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. ModelsListWidget - + + &Edit &Muuta - + &Restore from backup &Palauta varmuuskopiosta - + &Model Wizard &Malli apuri - + &Delete &Poista - + Delete Poista - + &Copy &Kopio - + Ctrl+C Ctrl+C - + &Cut &Leikkaa - + Ctrl+X Ctrl+X - + &Paste &Liitä - + Ctrl+V Ctrl+V - + D&uplicate Jäl&jennä - + Ctrl+U Ctrl+U - + &Use as default &Käytä perus asetuksena - + P&rint model Tu&losta malli - + Ctrl+P Ctrl+P @@ -8057,38 +8172,38 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Alt+R - + &Simulate model &Simuloi malli - + Alt+S Alt+S - + General Settings Yleiset asetukset - + Delete Selected Models? Poista valitut mallit? - - + + Cannot delete default model. Valittuna ollutta mallia ei voida poistaa. - + Cannot cut default model. Valittua mallia ei voi leikata. - + Do you want to overwrite radio general settings? Haluatko päällekirjoittaa radion yleiset asetukset ? @@ -8097,12 +8212,12 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Haluatko päällekirjoittaa TX:n yleiset asetukset ? - + You are pasting on an not empty model, are you sure? Yrität liittää tietoja ei tyhjän mallin tietoihin, haluatko varmasti jatkaa ? - + No free slot available, cannot duplicate Ei vapaata tilaa, ei voida monistaa @@ -8289,47 +8404,254 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Opetus ulostulo - + Trainer Port Trainerin portti - + Internal Radio System Sisäinen radio systeemi - + External Radio Module Ulkoinen radio systeemi - - + + Radio System Radio systeemi - + Extra Radio System Extra Radio järjestelmä - + Value Arvo - + Hold Pidä - + No Pulse + + MultiModelPrinter + + + General Model Settings + Yleiset mallin asetukset + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + Lento tilat + + + + + Flight mode + Lento tila + + + + Switch + Kytkin + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + FM%1 + + + + + GV%1 + GV%1 + + + + RE%1 + + + + + Limits + Rajat + + + + Channel + + + + + Name + Nimi + + + + + Offset + Tasoitus + + + + Min + Min + + + + Max + Max + + + + Invert + Käänteinen + + + + Global Variables + Globaalit muuttujat + + + + Inputs + Tulot + + + + Mixers + Mikserit + + + + CV%1 + + + + + Curves + Käyrät + + + + L%1 + L%1 + + + + Logical Switches + Loogiset kytkimet + + + + SF%1 + SF%1 + + + + Special Functions + Spesiaali toiminnot + + + + Telemetry Settings + Telemetria asetukset + + + + Analogs + + + + + Unit + Yksikkö + + + + Scale + Skaala + + + + A%1 + A%1 + + + + RSSI Alarms + + + MultirotorPage @@ -8337,22 +8659,22 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Kaasu kanava: - + Throttle Channel: Kaasun kanava: - + Yaw Channel: Yaw kanava: - + Pitch Channel: Pitch kanava: - + Roll Channel: Roll kanava: @@ -8360,17 +8682,17 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. OptionsPage - + Throttle Cut Kaasu pakko pois - + Throttle Timer Kaasu ajastin - + Flight Timer Lento ajastin @@ -8393,32 +8715,24 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Tulosta tiedostoon - Setup for: - Asetukset: + Asetukset: - printed on: %1 - Tulostettu: %1 + Tulostettu: %1 - General Model Settings - Yleiset mallin asetukset + Yleiset mallin asetukset - - - - Name - Nimi + Nimi - EEprom Size - EEpromin koko + EEpromin koko Timer1 @@ -8429,116 +8743,92 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Ajastin 2 - - Protocol - Protokolla + Protokolla Pulse Polarity Pulssin napaisuus - Throttle Trim - Kaasu trimmi + Kaasu trimmi - Enabled - Päälle + Päälle - Disabled - Pois + Pois Throttle Expo Kaasu expo - Trim Increment - Trimmin säätö + Trimmin säätö - Center Beep - Keski piippaus + Keski piippaus Flight modes Settings Lentotilan asetukset - Fades - Liut + Liut - Trims - Trimmit + Trimmit - Gvars - Gvarit + Gvarit - Rot.Enc. - Rot.Enc. + Rot.Enc. - Switch - Kytkin + Kytkin - Flight mode name - Lentotilan nimi + Lentotilan nimi - IN - SIS + SIS - OUT - ULO + ULO - Rud - PER + PER - Ele - KOR + KOR - Thr - KAA + KAA - Ail - SII + SII - - - - - FM - FM + FM Expo/Dr Settings @@ -8549,9 +8839,8 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Paino - Flight modes - Lento tilat + Lento tilat Flight mode @@ -8562,29 +8851,20 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Pois - Mixers - Mikserit + Mikserit - - - CH - ch + ch noTrim Ei trimmiä - - - - - Offset - Tasoitus + Tasoitus Delay(u%1:d%2) @@ -8599,87 +8879,60 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Välys - Limits - Rajat + Rajat - - - - Min - Min + Min - - - - Max - Max + Max - - - Invert - Käänteinen + Käänteinen - - - INV - KÄÄNT + KÄÄNT - - - NOR - NOR + NOR - Curves - Käyrät + Käyrät - - - Curve - Käyrä + Käyrä - pt %1 - pt %1 + pt %1 - Logical Switches - Loogiset kytkimet + Loogiset kytkimet LS LS - Global Variables - Globaalit muuttujat + Globaalit muuttujat - GV - GV + GV - Special Functions - Spesiaali toiminnot + Spesiaali toiminnot Function @@ -8694,68 +8947,44 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Toista - - Telemetry Settings - Telemetria asetukset + Telemetria asetukset - - Alarm 1 - Varoitus 1 + Varoitus 1 - - Alarm 2 - Varoitus 2 + Varoitus 2 - - Analog - Analoginen + Analoginen - - Timer%1 - - - - Internal Radio System - Sisäinen radio systeemi + Sisäinen radio systeemi - Radio System - Radio systeemi + Radio systeemi - External Radio Module - Ulkoinen radio systeemi + Ulkoinen radio systeemi - Extra Radio System - Extra Radio järjestelmä + Extra Radio järjestelmä - - Trainer port mode - - - - Off - Pois + Pois - Inputs - Tulot + Tulot NoTrim @@ -8782,138 +9011,105 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Välys(%1) - L - L + L SF%1 SF%1 - Range - Matka + Matka - Alarms - Hälytykset + Hälytykset - Low Alarm - Ala hälytys + Ala hälytys - Critical Alarm - Kriittinen hälytys + Kriittinen hälytys - RSSI - RSSI + RSSI - Unit - Yksikkö + Yksikkö - Scale - Skaala + Skaala - - - - Type - Tyyppi + Tyyppi - - - - Condition - Tila + Tila - - - - Value - Arvo + Arvo - - - A%1 - A%1 + A%1 - SF - SF + SF - RSSI Alarm - RSSI hälytys + RSSI hälytys - Frsky serial protocol - FrSky sarja protokolla + FrSky sarja protokolla System of units Systeemin yksiköt - - Blades - Prop lavat + Prop lavat - - Custom Telemetry View - Oma telemetria näkymä + Oma telemetria näkymä - Telemetry Bars - Telemetria palkein + Telemetria palkein - Bar Number - Palkkien määrä + Palkkien määrä - Source - Lähde + Lähde - + Print Document Tulosta dokumentti - + Select PDF output file Valitse PDF tiedosto - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) ODF tiedosto (*.odt);;PDF tiedosto (*.pdf);;HTML-tiedosto (*.htm *.html);;Kaikki tiedostot (*) @@ -8963,74 +9159,74 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - + Rud PER - + Ele KOR - + Thr KAA - + Ail SII - - + + P1 P1 - - + + P2 P2 - - + + P3 P3 - + S1 S1 - + S2 S2 - + LS LS - + RS RS @@ -9418,7 +9614,7 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - + ---- ---- @@ -9451,13 +9647,13 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - + GV%1 GV%1 - + S3 S3 @@ -9754,7 +9950,6 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - [I%1] [I%1] @@ -9957,10 +10152,19 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - DISABLED Pois + + + INV + KÄÄNT + + + + NOR + NOR + ABS ABS @@ -10029,8 +10233,8 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - - + + --- --- @@ -10140,7 +10344,6 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - Unknown Tuntematon @@ -10206,7 +10409,7 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. - + V V @@ -10374,82 +10577,60 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. Ajastin 3 - - Weight - Paino + Paino - - Switch - Kytkin + Kytkin - - NoTrim - Ei trimmiä + Ei trimmiä - No DR/Expo - Ei DR / Expoja + Ei DR / Expoja - Offset - Tasoitus + Tasoitus - Delay - Viive + Viive - Slow - Hidas + Hidas - - Warn - - - - Flight modes - Lento tilat + Lento tilat - Flight mode - Lento tila + Lento tila - Edge(%1, [%2:%3]) - reuna(%1, [%2:%3]) + reuna(%1, [%2:%3]) - Sticky(%1, %2) - Jähmeä(%1, %2) + Jähmeä(%1, %2) - Timer(%1, %2) - Ajastin(%1, %2) + Ajastin(%1, %2) - Duration (%1s) - Kesto (%1 sek) + Kesto (%1 sek) - Delay (%1s) - Viive (%1 sek) + Viive (%1 sek) @@ -10602,38 +10783,38 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. OpenTX vastaanottaa vain %1 pistettä kaikkiin käyriin - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves OpenTX vastaanottaa vain %1 pistettä kaikkiin käyriin - + OpenTx only accepts %1 points in all curves OpenTX vastaanottaa vain %1 pistettä kaikkiin käyriin - - - - - + + + + + OpenTX on this board doesn't accept this function OpenTX ja tämä funktio ei onnistu tässä radiossa - + OpenTX doesn't accept this telemetry protocol OpenTX ei hyväksy tätä telemetria protokollaa - - + + OpenTX doesn't accept this radio protocol OpenTX ei hyväksy tätä radio protokollaa @@ -10642,75 +10823,75 @@ Jos tyhjä mikserin katsotaan olevan "ON" kokoajan. OpenTX ei hyväksy tätä protokollaa - + OpenTX doesn't allow this number of channels OpenTX ei hyväksy näin montaa kanavaa - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used Sinun radio käyttää luultavasta väärää firmwarea, eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä - - + + Warning Varoitus - + EEPROM saved with these warnings: EEPROM tallennettiin seuraavin varoituksin: - - + + Support for frsky telemetry mod Tuki FrSky telemetria moduulille - + Support for telemetry easy board Tuki telemetrialle ( easy board ) - - + + Support for jeti telemetry mod Tuki Jeti telemetria moduulille - - + + Support for receiving ardupilot data Tuki vastaanottaa ardupilot dataa - - + + Support for receiving NMEA data Tuki vastaanottaa NMEA dataa - - + + Support for MAVLINK devices Tuki MAVLINK laitteille - + Rotary Encoder use in menus navigation Rotary encoder käyttö valikon navigoinnissa - - - - - - + + + + + + Pots use in menus navigation Potikoiden käyttö valikko navigoinnissa @@ -10719,7 +10900,7 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Mahdollisuus valita FAI TILA käyttöön kentällä - + No OverrideCH functions available Ei ohituskanava funkitoita saatavissa @@ -10732,103 +10913,103 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä OpenTX 9X radioille - - - - - - + + + + + + Enable heli menu and cyclic mix support HELI valikko päälle ,cyclic mix tuella - - - - - - - - + + + + + + + + Enable TEMPLATES menu Mallit valikko käyttöön - - - - + + + + No splash screen Ei alkuruutua - - - - - - - - + + + + + + + + No flight modes Ei lentotiloja - - - - - - - - + + + + + + + + Disable curves menus Käyrät valikko pois - - - - + + + + Support for radio modified with regular speaker Tuki radioille johon viritetty normaali kaiutin - - - - - + + + + + Used if you have modified your radio with voice mode Käytetään jos radioon on viritetty ääni moduuli - - - - - + + + + + Used if you have modified your radio with haptic mode Käytetään jos radioon on viritetty värinä moduuli - - - - - + + + + + Support for DSM2 modules Tuki DSM2 moduleille - - - - - - - - + + + + + + + + PPM center adjustment in limits PPM keskitys arvojen mukaan @@ -10837,32 +11018,32 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä PPM arvot näytetään" us" tyyppisesti - - - - - - - - + + + + + + + + Global variables Globaalit muuttujat - - - - - - - - + + + + + + + + Symetrical Limits Symmetriset rajat - - + + SmartieParts 2.2 Backlight support "Smartie parts 2.2" taustavalo tuki @@ -10875,234 +11056,236 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Mallien valikossa kytkimet valitaan automaattisesti kun jotain siirretään - + Channel values displayed in us Kavanien arvot näytetään us mallissa - - - - - - - - + + + + + + + + In model setup menus automatically set source by moving the control Mallien asetukset asetetaan automaattisesti kun ohjaimia käänellään - - - - - - - - + + + + + + + + In model setup menus automatically set switch by moving the control Mallien asetukset asetetaan automaattisesti kun nappeja käänellään - - - - - + + + + + Enable resetting values by pressing up and down at the same time Asetuksien poisto: Paina ylös ja alas samanaikaisesti - - - - - - - - + + + + + + + + No graphical check boxes and sliders Ei graaffisia valintalaatikoita ja liukuja - - - - - - - - + + + + + + + + Battery graph Akun grafiikka - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items Älä käytä lihavointua fonttia korostamaan aktiivisia asioita - + Use alternative SQT5 font Käytä vaihtoehtoista SQT5 fonttia - + (displaying only first 10 warnings) (näytetään vain ensimmäiset10 varoitusta) - + Possibility to enable FAI MODE (no telemetry) at field - + FAI MODE (no telemetry) always enabled - + + + Support for a third timer - + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - + Support for PPM internal module hack - + ST7565P LCD or compatible - + ST7565R LCD or compatible - + ERC12864FSF LCD - + ST7920 LCD - + 9X board - - - - + + + + Enable the throttle trace in Statistics Salli kaasun seuranta statistiikassa - + EEprom write progress bar EEprom tallennus palkki - - - - - - + + + + + + Imperial units Imperiaali yksiköt - - + + No Winged Shadow How High support erikoistoiminto korkea (ei tuettu) - - + + No vario support Ei vario tukea - - + + No GPS support Ei GPS tukea - - + + No gauges in the custom telemetry screen Ei mittareita "omassa" telemetria ruudussa - + Allow compensating for offset errors in FrSky FAS current sensors Salli virheiden kompensoiti FrSkyn FAS virta sensorille - - + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) Lisää tuki käänteisille tikkujen tuloille ( esim taraniksen gimbaalit) - + M128 / 9X board - + 9XR 9XR - + 9XR with M128 chip - + Gruvin9x board / 9X - + MEGA2560 board - + Sky9x board / 9X - + FrSky Taranis Plus - + FrSky Taranis X9E @@ -11111,11 +11294,11 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä OpenTX M128 / 9X radiolle - - - - - + + + + + EEprom write Progress bar EEprom tallennus palkki @@ -11132,35 +11315,35 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä OpenTX -> Gruvin9x / 9X - - + + Support for SD memory card Tuki SD Muistikortille - - + + Support of FrSky PXX protocol Tuli FrSky PXX protokollalle - + Confirmation before radio shutdown - + Support for DSM2 modules using ppm instead of true serial Tuki DSM2 moduuleille käyttäen PPM, eikä oikeaa sarjaliikennettä - + Power management by soft-off circuitry - - + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views @@ -11169,33 +11352,33 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä OpenTX -> Sky9x / 9X - - + + Enable HELI menu and cyclic mix support HELI valikko päälle ,cyclic mix tuella - + 9XR-PRO - + FrSky Taranis - + Haptic module installed Värinä moduli asennettu - + Support for Lua model scripts Tuki LUA mallien skripteille - + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) @@ -11208,8 +11391,8 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Käytä FrSky Taranis tikkuja 9X / 9XR - - + + Bluetooth interface Bluetooth liintäntä @@ -11222,7 +11405,7 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä OpenTX -> Taranis - + Disable HELI menu and cyclic mix support HELI valikko pois ,myös cyclic mix tuki @@ -11231,7 +11414,7 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Mallit valikko pois käytöstä - + Disable Global variables Globaalit muuttujat pois päältä @@ -11245,38 +11428,35 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä th9x radiossa ei ole Rot Enc - - FM%1 - FM%1 + FM%1 - Input%1 - Tulo%1 + Tulo%1 - + Rud Trim PER trim - + Ele Trim KOR trim - + Thr Trim KAA trim - + Ail Trim SII trim - + Rot Enc Rot Enc @@ -11331,8 +11511,8 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Ruotsi - - + + THR KAA @@ -11342,8 +11522,6 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä - - CH%1 CH%1 @@ -11378,22 +11556,22 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä RotEnc E - + !Flight mode %1 !Lento tila %1 - + Flight mode %1 Lento tila %1 - + Own value Oma arvo - + Flight mode %1 value Lento tila %1 arvo @@ -11414,7 +11592,7 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä - + -GV%1 -GV%1 @@ -11424,135 +11602,73 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Suomi - + Yellow Keltainen - + Orange Oranssi - + Red Punainen - + Winged Shadow How High erikoistoiminto korkea - + Winged Shadow How High (not supported) erikoistoiminto korkea (ei tuettu) - + FrSky Sensor Hub FrSky:n hubi - + None Ei mitään - + Imperial Imperiaali - + Metric Metrit - Extra Fine - Eri hieno + Eri hieno - Fine - Hieno + Hieno - Medium - Keski + Keski - Coarse - Karkea + Karkea - %1:%2 - %1s {1:%2?} + %1s {1:%2?} - - , Persistent - - - - - , MinuteBeep - - - - - , CountDown(Beeps) - - - - - , CountDown(Voice) - - - - - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - - - - - : Channel start: %1, %2 Channels - - - - - Slave/Jack - - - - - Master/SBUS Module - - - - - Master/CPPM Module - - - - - Master/SBUS in battery compartment - - - - - Master/Jack - - - - Exponential - Expo + Expo Count Up @@ -11579,27 +11695,23 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Lentotila(%1) - Rudder - Sivuperäsin + Sivuperäsin - Elevator - Korkeusperäsin + Korkeusperäsin - Throttle - Kaasu + Kaasu - Aileron - Siivekkeet + Siivekkeet - + Simulator for this firmware is not yet available Tämän firmwaren simulointi ei ole vielä mahdollista @@ -11644,22 +11756,22 @@ eepromin koko on 4096, mutta vain ensimmäiset 2048 on käytössä Rotary encoderi - + Trim disabled Trimmi pois - + Own Trim Oma trimmi - + Use Trim from Flight mode %1 Käytä trimmiä lentotilaan %1 - + Use Trim from Flight mode %1 + Own Trim as an offset Käytä trimmiä lentotilaan %1 + Oma trimmi asetuksena @@ -11690,25 +11802,31 @@ The OpenTX Team. OpenTX Tiimi. - + Positive Positiivinen - + Negative Negatiivinen - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! @@ -11718,33 +11836,33 @@ OpenTX Tiimi. GV - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -11829,17 +11947,17 @@ OpenTX Tiimi. RudderPage - + No Ei - + Yes Kyllä - + <br>Rudder Channel: <br>Peräsin kanava: @@ -12038,7 +12156,7 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, SimpleTailPage - + Elevator Channel: Korkeusper kanava: @@ -12321,10 +12439,44 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, SH + + SplashLibraryDialog + + + + ... + ... + + + + Splash Library - page %1 of %2 + Kuvakirjasto - sivu %1 tai %2 + + + + Warning + Varoitus + + + + Invalid image in library %1 + Väärä kuva kirjastossa %1 + + + + Information + Info + + + + No valid image found in library, check your settings + Yhtään kuvaa ei löydy kuva kirjastosta, tarkista asetukset + + StandardPage - + Channel %1 Kanava %1 @@ -12332,25 +12484,24 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -12359,35 +12510,40 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, TailPage - + Rudder Channel: Peräsin kanava: - + Elevator Channel: Korkeusper kanava: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder Korkeusper ja peräsin - + Only Elevator Vain korkeusper - + V-tail V-Peräsin - + Tail Type: Perän tyyppi: @@ -12399,22 +12555,22 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Telemetria - + A1 A1 - + A2 A2 - + RSSI RSSI - + Alarm 1 Varoitus 1 @@ -12427,31 +12583,31 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, A3 - - + + ---- ---- - - + + Yellow Kelt - - + + Orange Orans - - + + Red Puna - + Alarm 2 Varoitus 2 @@ -12460,12 +12616,12 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, CELS - + Serial Protocol Sarja protokolla - + Volt source Voltti lähde @@ -12478,7 +12634,7 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Imperiaali - + Current source Virran lähde @@ -12496,12 +12652,12 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, FAS - + None Ei mitään - + FrSky Sensor Hub FrSky:n hubi @@ -12526,7 +12682,7 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Asteikko - + Blades Prop lavat @@ -12547,7 +12703,7 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Alti+ - + Sink Max Maksimi vajoama @@ -12556,32 +12712,32 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Pois - + Climb Max Maksimi nousu - + Sink Min Minimi vajoama - + Climb Min Minimi nousu - + Center Silent - + Vario source Variom lähde - + Vario limits Varionm asetukset @@ -12594,62 +12750,62 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Näytä korkeus työkalupalkissa - + Altimetry Korkeusmittaus - + Altitude source - + Volts source - + Top Bar - + mAh mAh - + A A - + Various Useat - + Sensors - + Disable multi sensor handling - + mAh count mAh laskuri - + FAS Offset FAS asetus - + Persistent mAh Yhtm. mAh @@ -12771,17 +12927,15 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, mAmp (mA) - Low Alarm - Ala hälytys + Ala hälytys - Critical Alarm - Kriittinen hälytys + Kriittinen hälytys - + Range Matka @@ -12802,22 +12956,22 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Numerot - + None Ei mitään - + Numbers - + Bars Palkit - + Script @@ -12845,71 +12999,71 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, TelemetryPanel - + FrSky S.PORT FrSky S.PORT - + FrSky D FrSky D - + FrSky D (cable) FrSky D (kaapeli) - + Telemetry screen %1 Telemetria ruutu %1 - + Low Alarm Ala hälytys - + Critical Alarm Kriittinen hälytys - + Winged Shadow How High erikoistoiminto korkea - + Winged Shadow How High (not supported) erikoistoiminto korkea (ei tuettu) - + Alti Kork - + Alti+ Kork+ - + VSpeed Vnopeus + - - + A1 A1 + - - + A2 A2 @@ -12918,30 +13072,30 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, dTE - - + + A3 A3 - - + + A4 A4 - - + + FAS FAS - + Cells Kennoja - + --- --- @@ -13047,7 +13201,107 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, - Amps Sensor : + Sensor : + + + + + V + V + + + + A + A + + + + mA + + + + + kt + + + + + m/s + m/s + + + + ft/s + + + + + km/h + km/h + + + + mph + mph + + + + m + metri + + + + ft + jalka + + + + °C + °C + + + + °F + + + + + % + % + + + + mAh + mAh + + + + W + W + + + + dBm + + + + + g + g + + + + ° + ° + + + + mL + + + + + US fl.Oz. @@ -13055,111 +13309,11 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Raw (-) Raaka ( - ) - - - Voltage (V) - - - - - Current (A) - - - - - Current (mA) - - - - - Speed (kts) - - - - - Speed (m/s) - - - - - Speed (ft/s) - - - - - Speed (km/h) - - - - - Speed (miles/h) - - - - - Meters (m) - - - - - Feet (ft) - - - - - Temp (°C) - - - - - Temp (°F) - - - - - Percentage (%) - - - - - Energy (mAh) - - - - - Power (W) - - - - - RF Power (dBm) - - RPM - - - Acceleration (g) - - - - - Heading (°) - - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - - Precision @@ -13218,22 +13372,22 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, TelemetrySensorPanel - + Lowest - + Cell %1 - + Highest - + Delta @@ -13454,17 +13608,17 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, ThrottlePage - + Yes Kyllä - + No Ei - + <br>Throttle Channel: <br>Kaasu kanava: @@ -13509,32 +13663,37 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, Ei mitään - + Silent Äänetön - + Beeps Piipit - + Voice Ääni - + + Haptic + Toista värinä + + + Not persistent Ei yhtämittainen - + Persistent (flight) Jatkuva (lento) - + Persistent (manual reset) Jatkuva (manuaalinen nollaus) @@ -13677,12 +13836,12 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, VTailPage - + First Tail Channel: 1. V-per kanava: - + Second Tail Channel: 2. V-per kanava: @@ -13690,12 +13849,12 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, WingtypeSelectionPage - + Standard Wing Normaali siipi - + Flying Wing / Deltawing Lentävä siipi / Delta siipi @@ -13997,37 +14156,37 @@ Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, WizardPrinter - + Plane Lentokone - + Multicopter Multikopteri - + Helicopter Helikopteri - + Model Name: Mallin nimi: - + Model Type: Mallin tyyppi: - + Options: Valinnat: - + Channel %1: Kanava %1: @@ -17160,40 +17319,6 @@ Voi olla eri kun firmwaren kieli Simuloi - - SplashLibraryDialog - - - - ... - ... - - - - Splash Library - page %1 of %2 - Kuvakirjasto - sivu %1 tai %2 - - - - Warning - Varoitus - - - - Invalid image in library %1 - Väärä kuva kirjastossa %1 - - - - Information - Info - - - - No valid image found in library, check your settings - Yhtään kuvaa ei löydy kuva kirjastosta, tarkista asetukset - - taranisNotFoundDialog diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index deef09041..4fa9f64f5 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -4,27 +4,27 @@ AileronsPage - + No Non - + Yes, controlled by a single channel Oui, contrôlés par une seule voie - + Yes, controlled by two channels Oui, contrôlés par 2 voies - + <br>First Aileron Channel: <br>Première voie d'ailerons: - + Second Aileron Channel: Deuxième voie d'ailerons: @@ -32,27 +32,27 @@ AirbrakesPage - + No Non - + Yes, controlled by a single channel Oui, contrôlés par une seule voie - + Yes, controlled by two channels Oui, contrôlés par 2 voies - + <br>First Airbrake Channel: <br>Première voie de volets: - + Second Airbrake Channel: Deuxième voie de volets: @@ -74,7 +74,7 @@ - + Open Folder Ouvrir le répertoire @@ -330,7 +330,7 @@ Manche Droit: Profondeur, Direction Utlilser les nightly builds de Companion - + Simulator Volume Gain Gain de volume du simulateur @@ -468,62 +468,62 @@ Peut être différente de la langue du firmware Paramètres du simulateur - + Simulator BackLight Rétroéclairage du simulateur - + Enable Actif - + Blue Bleu - + Green Vert - + Red Rouge - + Orange Orange - + Yellow Jaune - + Joystick Joystick - + Calibrate Calibrer - + Simulator capture folder Dossier des captures d'écran - + Only capture to clipboard Capturer dans le presse-papiers uniquement - + Remember simulator switch values Mémoriser les positions des inters du simulateur @@ -538,64 +538,64 @@ Peut être différente de la langue du firmware Sélectionner le dossier où stocker les captures d'écran - - + + No joysticks found Aucun joystick trouvé - + EMPTY: No radio settings stored in profile VIDE: Aucune donnée stockée dans le profil - + AVAILABLE: Radio settings of unknown age DISPONIBLE: Réglages enregistrés à une date inconnue - + AVAILABLE: Radio settings stored %1 DISPONIBLE: Réglages enregistrés le %1 - + Select your library folder Sélectionner le dossier de bibliothèque - - + + Select your Models and Settings backup folder Sélectionner le dossier dans lequel une sauvegarde des réglages et modèles sera placée automatiquement lors de chaque opération - + Select Google Earth executable Sélectionner l'emplacement de l'exécutable Google Earth - + Select the folder replicating your SD structure Sélectionner un dossier contenant une copie des dossiers de la carte SD - + Not possible to remove profile Impossible de supprimer le profil - + The default profile can not be removed. Le profil par défaut ne peut être supprimé. - + Open Image to load Ouvrir l'image à charger - + Images (%1) Images (%1) @@ -796,9 +796,8 @@ Extra long : bips extra longs. Manche 4 - Battery - Batterie + Batterie @@ -821,9 +820,18 @@ Extra long : bips extra longs. PPM 4 - Current - Courant + Courant + + + + Battery Offset + Correction tension batterie + + + + Current Offset + Correction mesure courant @@ -1072,265 +1080,165 @@ Extra long : bips extra longs. Imprimer vers un fichier - + No name Sans titre - General Model Settings - Paramètres généraux + Paramètres généraux - - - Name - Nom + Nom - - EEprom Size - Taille d'EEPROM + Taille d'EEPROM - - Timer1 - Chrono1 + Chrono1 - - Timer2 - Chrono2 + Chrono2 - - Internal Radio System - Module HF interne + Module HF interne - - Radio System - Module HF + Module HF - - - - Protocol - Protocole + Protocole Pulse Polarity Polarité - - Throttle Trim - Trim de gaz + Trim de gaz - - Enabled - Actif + Actif - - Disabled - Inactif + Inactif Throttle Expo Expo de gaz - - External Radio Module - Module HF externe + Module HF externe - - Extra Radio System - Module HF supplémentaire + Module HF supplémentaire - - Trainer port mode - Mode du port écolage + Mode du port écolage - - Trim Increment - Pas des trims + Pas des trims - - Center Beep - Bip de centrage + Bip de centrage - Flight modes Settings - Paramètres de phases de vol + Paramètres de phases de vol - - Fades - Fondus + Fondus - - Trims - Trims + Trims - - Switch - Interrupteur + Interrupteur - - - - Flight mode name - Nom de la phase de vol + Nom de la phase de vol - - IN - Entrée + Entrée - - OUT - Sortie + Sortie - - - - - - - - - - FM - PV + PV - - Gvars - Variables globales + Variables globales - - Rot. Enc. - Enc. Rot. + Enc. Rot. - Limits - Débattements + Débattements - - - - - Offset - Décalage + Décalage - - - - - Min - Min + Min - - - - - Max - Max + Max - - - Invert - Inversé + Inversé - - - - - CH - VOIE + VOIE - - INV - Inversion + Inversion - - NOR - Normal + Normal - Global Variables - Variables globales + Variables globales - - GV - VG + VG - Inputs - Entrées - - - - L - + Entrées Expo/Dr Settings @@ -1353,9 +1261,8 @@ Extra long : bips extra longs. DESACTIVE - Mixers - Mixages + Mixages noTrim @@ -1374,9 +1281,8 @@ Extra long : bips extra longs. Avertissement - Curves - Courbes + Courbes 5 Point Curves @@ -1387,28 +1293,24 @@ Extra long : bips extra longs. point %1 - - Curve - Courbe + Courbe 9 Point Curves Courbes à 9 points - Logical Switches - Inters logiques + Inters logiques LS IL - Special Functions - Fonctions spéciales + Fonctions spéciales Function @@ -1427,114 +1329,76 @@ Extra long : bips extra longs. Actif - SF - FS + FS - Telemetry Settings - Paramètres de télémesure + Paramètres de télémesure - - Analog - Analogique + Analogique - - Unit - Unité + Unité - - Scale - Echelle + Echelle - - - - A%1 - A%1 + A%1 - - Alarm 1 - Alarme 1 + Alarme 1 - - Alarm 2 - Alarme 2 + Alarme 2 - - - - Type - Type + Type - - - - Condition - Condition + Condition - - - - Value - Valeur + Valeur - - RSSI Alarm - Alarme RSSI + Alarme RSSI - - Custom Telemetry View - Vue Télémesure personnalisée + Vue Télémesure personnalisée - - Telemetry Bars - Barres de télémesure + Barres de télémesure - - Bar Number - Barre no + Barre no - - Source - Source + Source - + Print Document Imprimer le document - + Select PDF output file Choisir le fichier PDF de sortie @@ -1542,7 +1406,7 @@ Extra long : bips extra longs. ConclusionPage - + OK, I understand. OK, compris! @@ -1580,12 +1444,16 @@ Extra long : bips extra longs. Les honneurs vont à Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe) - - Thank you all !!! - Merci à tous !!! + + OpenTX Blacklist + - + Thank you all !!! + Merci à tous !!! + + + monthly don mensuel @@ -1618,22 +1486,22 @@ Extra long : bips extra longs. CurveGroup - + Diff - + Expo - + Func Fonc - + Curve Courbe @@ -1887,22 +1755,22 @@ Extra long : bips extra longs. CyclicPage - + 90 - + 120 - + 120x - + 140 @@ -1918,12 +1786,12 @@ Extra long : bips extra longs. ElevonsPage - + <br>First Elevon Channel: <br>Première voie d'élevons: - + Second Elevon Channel: Deuxième voie d'élevons: @@ -2262,45 +2130,41 @@ Si vide, la ligne est toujours active. Editer %1 - Rud - Dir + Dir - Ele - Prf + Prf - Thr - Gaz + Gaz - Ail - Ail + Ail FblPage - + Throttle Channel: Voie des gaz: - + Yaw Channel: Voie du lacet: - + Pitch Channel: Voie du tangage: - + Roll Channel: Voie du roulis: @@ -2353,27 +2217,27 @@ Peut être différente de la langue du firmware FlapsPage - + No Non - + Yes, controlled by a single channel Oui, contrôlés par une seule voie - + Yes, controlled by two channels Oui, contrôlés par 2 voies - + <br>First Flap Channel: <br>Première voie de volets: - + Second Flap Channel: Deuxième voie de volets: @@ -2627,8 +2491,8 @@ Peut être différente de la langue du firmware - - + + Warning Avertissement @@ -2682,58 +2546,58 @@ Peut être différente de la langue du firmware L'image n'a pu être chargée depuis la bibliothèque - + Splash image not found Ecran d'accueil sélectionné introuvable - + Cannot save customized firmware Impossible d'enregistrer le firmware personnalisé - + Write Firmware to Radio Transférer le firmware à la radio - - + + Firmware check failed La vérification a échoué - + Could not check firmware from radio Impossible de vérifier le firmware de la radio - + New firmware is not compatible with the one currently installed! Le nouveau firmware ne correspond pas à l'ancien! Vérifier le type de radio - + Conversion failed La conversion a échoué - + Cannot convert Models and Settings for use with this firmware, original data will be used Impossible de convertir les réglages et modèles pour ce firmware, les données originales vont être utilisées - + Restore failed Erreur lors de la restauration - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 Impossible de restaurer les réglages et modèles sur la radio. Le fichier peut être récupéré ici: %1 - + Flashing done Terminé! @@ -2891,37 +2755,33 @@ Veuillez utiliser Zadig pour installer le pilote. FlightModePanel - Rud - Dir + Dir - Ele - Prf + Prf - Thr - Gaz + Gaz - Ail - Ail + Ail - + Rotary Encoder %1 Encodeur rotatif %1 - + GVAR%1 VG%1 - + Popup enabled Indication activée @@ -2940,17 +2800,17 @@ Veuillez utiliser Zadig pour installer le pilote. FlightModesPanel - + Flight Mode %1 Phase de vol %1 - + (%1) - + (default) (par défaut) @@ -2958,17 +2818,17 @@ Veuillez utiliser Zadig pour installer le pilote. FlybarSelectionPage - + Has Flybar Avec barre de Bell - + Flybarless Sans barre de Bell - + Flybar: Barre de Bell: @@ -4653,17 +4513,17 @@ Are you sure ? GyroPage - + No Non - + Yes, controled by a switch Oui, contrôlé par un inter - + Yes, controlled by a pot Oui, contrôlé par un potentiomètre @@ -4752,22 +4612,22 @@ Are you sure ? HeliPage - + Throttle Channel: Voie des gaz: - + Yaw Channel: Voie du lacet: - + Pitch Channel: Voie du tangage: - + Roll Channel: Voie du roulis: @@ -5160,14 +5020,14 @@ Les colonnes contenant l'altitude "GAlt" et la vitesse "GSpd MainWindow - - + + Edit Edition - - + + File Fichier @@ -5177,25 +5037,25 @@ Les colonnes contenant l'altitude "GAlt" et la vitesse "GSpd Afficher les alertes précédentes lors du prochain démarrage ? - + New release available Nouvelle version disponible - - + + Error Erreur - + Error opening file %1: %2. Erreur à l'ouverture du fichier %1: %2. - + Compilation server termporary failure, try later Erreur temporaire du serveur de compilation, veuillez réessayer plus tard @@ -5208,41 +5068,41 @@ Les colonnes contenant l'altitude "GAlt" et la vitesse "GSpd Erreur temporaire du serveur de compilation, veuillez réessayer plus tard - + Compilation server too busy, try later Serveur de compilation trop occupé, veuillez réessayer plus tard - + Unknown server failure, try later Erreur inconnue du serveur de compilation, veuillez réessayer plus tard - + Do you want to write the firmware to the radio now ? Voulez vous transférer le firmware à la radio maintenant? - - + + Yes Oui - - + + No Non - - + + Release Notes Notes de version - - + + Do you want to download release %1 now ? Voulez-vous télécharger la version %1 maintenant? @@ -5251,12 +5111,12 @@ Les colonnes contenant l'altitude "GAlt" et la vitesse "GSpd Les notes de version contiennent des informations très importantes. Voulez-vous les voir maintenant? - + Firmware updates Mises à jour de firmware - + Current firmware does not provide release notes informations. Le firmware actuel ne contient pas de notes de version. @@ -5291,27 +5151,27 @@ Les colonnes contenant l'altitude "GAlt" et la vitesse "GSpd Erreur lors de la sauvegarde - + Load backup from file Charger une sauvegarde à partir du fichier - + Compare models Comparer les modèles - + Show fuses dialog Afficher les réglages des fusibles - + A monochrome black icon theme Thème avec icônes monochromes noires - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -5324,7 +5184,7 @@ Voulez-vous la télécharger maintenant ? Nous recommandons de lire attentivement les notes de version à l'aide du bouton ci-dessous, celles-ci peuvent contenir des infos importantes concernant les changements effectués depuis la version précéente. - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -5341,8 +5201,8 @@ Voulez vous la télécharger maintenant ? Nous recommandons de lire attentivement les notes de version à l'aide du bouton ci-dessous, celles-ci peuvent contenir des infos importantes concernant les changements effectués depuis la version précéente. - - + + Synchronize SD Synchroniser la carte SD @@ -5351,288 +5211,288 @@ Nous recommandons de lire attentivement les notes de version à l'aide du b OpenTX Companion 2.1 - FW: %1 - Profil: %2 - + New Nouveau - + Open... Ouvrir... - + Copy Model Copier le modèle - + A monochrome white icon theme Thème avec icônes monochromes blanches - + A monochrome blue icon theme Thème avec icônes monochromes bleues - + Small Petites - + Use small toolbar icons Petites icônes de barre d'outils - + Use normal size toolbar icons Icônes de barre d'outils normales - + Normal Normales - + Use big toolbar icons Grosses icônes de barre d'outils - + Big Grandes - + Use huge toolbar icons Immenses icônes de barre d'outils - + Huge Immenses - + Czech Tchèque - + Use Czech in menus Menus en Tchèque - + German Allemand - + Use German in menus Menus en Allemand - + English Anglais - + Use English in menus Menus en Anglais - + French Français - + Use French in menus Menus en Français - + Italian Italien - + Use Italian in menus Menus en Italien - + Polish Polonais - + Use Polish in menus Menus en Polonais - + Swedish Suédois - + Use Swedish in menus Menus en Suédois - + List programmers... Lister les programmateurs... - + Fuses... Fusibles... - - + + Read Firmware from Radio Lire le firmware de la radio - + Read firmware from Radio Lire le firmware de la radio - - + + Write Firmware to Radio Transférer le firmware à la radio - + Write firmware to Radio Transférer le firmware à la radio - + Add Radio Profile Ajouter un profil de radio - + Create a new Radio Setting Profile Créér un nouveau profil de radio - + Manuals and other Documents Manuels et documents - + Open the OpenTX document page in a web browser Ouvre la page de documentation d'OpenTX dans un navigateur - + Write Models and Settings To Radio Transférer les réglages et modèles à la radio - - + + Write Models and Settings to Radio Transférer les réglages et modèles à la radio - - - + + + Companion - - + + Read Models and Settings from Radio Lire les réglages et modèles depuis la radio - + OpenTX Companion %1 - Radio: %2 - Profile: %3 OpenTX Companion %1 - Radio: %2 - Profil: %3 - + Configure Communications... Configurer les communications... - + Configure software for communicating with the Radio Configurer le programme gérant les communications avec la radio - + Write Backup to Radio Transférer une sauvegarde à la radio - + Write Backup from file to Radio Transférer une sauvegarde à la radio - + Backup Radio to File Sauvegarder la radio - + Save a complete backup file of all settings and model data in the Radio Créer une copie de sauvegarde de tous les réglages et modèles de la radio - + Contributors... Contributeurs... - + A tribute to those who have contributed to OpenTX and Companion Remerciements à tout ceux qui ont contribué à OpenTX et Companion - + SD card synchronization Synchronisation de la carte SD - + Recent Files Fichiers récents - + Recent Models+Settings Fichiers de réglages et modèles récents - + Set Icon Theme Choisir le thème d'icônes - + Set Icon Size Choisir la taille des icônes - + Write Ecrire @@ -5647,17 +5507,17 @@ Nous recommandons de lire attentivement les notes de version à l'aide du b %2. - + A new version of Companion is available (version %1)<br>Would you like to download it? Une nouvelle version de Companion est disponible (version %1)<br>Voulez-vous la télécharger? - + Compilation server requires registration, please check OpenTX web site Le serveur de compilation requiert l'enregistrement, veuillez vous référer au site web d'OpenTX - + OpenTX Home Page: <a href='%1'>%1</a> Page d'accueil d'OpenTX: <a href='%1'>%1</a> @@ -5666,57 +5526,57 @@ Nous recommandons de lire attentivement les notes de version à l'aide du b Le projet OpenTX Companion a été créé à partir d'<a href='%2'>eePe</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Si vous trouvez ce programme utile, merci de le supporter par une <a href='%1'>donation</a> - + Show the list of radio profiles Voir la liste des profils de radio - + Ready Prêt - + Show the application's About box Afficher la fenêtre "A propos" de l'application - - - + + + File loaded Fichier chargé - + A new release of Companion is available, please check the OpenTX website! Une nouvelle version de Companion est disponible, veuillez vous référer au site web d'OpenTX! - + Not enough memory for all the selected firmware options Pas assez de mémoire disponible pour toutes les options sélectionnées - - + + Open Models and Settings file Ouvrir un fichier de réglages et modèles - - + + File saved Fichier sauvegardé - + Read Models and Settings From Radio Lire les réglages et modèles depuis la radio @@ -5769,7 +5629,7 @@ Do you want to download it now ? Voulez vous la télécharger maintenant ? - + Ignore this release %1? Ignorer la version %1? @@ -5794,7 +5654,7 @@ Voulez vous la télécharger maintenant ? Impossible de sauvegarder les réglages et modèles depuis la radio. Le processus est annulé - + Save Radio Backup to File Sauvegarder la radio @@ -5803,17 +5663,17 @@ Voulez vous la télécharger maintenant ? Lire une sauvegarde - + Read Radio Firmware to File Sauvegarder le firmware de la radio - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> Le projet OpenTX Companion a été créé à partir d'<a href='%1'>eePe</a> - + Copyright OpenTX Team @@ -5822,266 +5682,266 @@ Voulez vous la télécharger maintenant ? OpenTX Companion - FW: %1 - Profil: %2 - + Create a new Models and Settings file Créer un nouveau fichier de réglages et modèles - - + + Save Models and Settings file Enregistrer le fichier de réglages et modèles - + Save Enregistrer - + Save As... Enregistrer sous... - + Exit the application Quitter l'application - + Exit Quitter - + Cut Model Couper le modèle - + Cut current model to the clipboard Couper le modèle courant dans le presse-papier - + Copy current model to the clipboard Copier le modèle courant dans le presse-papier - + Paste model from clipboard Coller le modèle depuis le presse-papier - + Paste Model Coller le modèle - + Classical Classique - + The classic companion9x icon theme Thème d'icônes classique de Companion - + Yerico - + Yellow round honey sweet icon theme Thème d'icônes rondes jaunes - + Monochrome - + MonoWhite - + MonoBlue - + System language Langue du système - + Use system language in menus Utiliser la langue système dans les menus - + Finnish Finlandais - + Use Finnish in menus Menus en Finlandais - + Spanish Espagnol - + Use Spanish in menus Menus en espagnol - + About... A propos... - + Print... Imprimer... - + Print current model Imprimer le modèle courant - + Simulate... Simuler... - + Simulate current model Simuler le modèle courant - + Alt+S - + Load Backup... Ouvrir la sauvegarde... - + View Log File... Ouvrir un log... - + Open and view log file Ouvrir et visualiser un log - + Settings... Préférences... - + Edit Settings Modifier les réglages - + Download... Télécharger... - + Download firmware and voice files Télécharger firmware et fichiers son - + Check for Updates... Vérifier les mises à jour... - + Check OpenTX and Companion updates Vérifier les mises à jour d'OpenTX et Companion - + Companion Changes... Changements de Companion... - + Show Companion change log Voir l'historique des changements de Companion - + Firmware Changes... Changements du firmware... - + Show firmware change log Voir l'historique des changements du firmware - + Compare Models... Comparer 2 modèles... - + Edit Radio Splash Image... Modifier l'écran d'accueil de la radio... - + Edit the splash image of your Radio Modifier l'écran d'accueil de la radio - + List available programmers Lister les programmateurs supportés - - - + + + Save As Enregistrer Sous - + Executable (*.exe) Exécutable (*.exe) - - + + No updates available at this time. Aucune mise à jour disponible. - + Unable to check for updates. Impossible de rechercher des mises à jour. - + Would you like to launch the installer? Voulez-vous lancer l'installation ? @@ -6096,13 +5956,13 @@ Voulez vous la télécharger maintenant ? Ignorer cette version (r%1)? - - + + Help Aide - + Checking for updates Recherche de mises à jour @@ -6115,17 +5975,17 @@ La version %2 est disponible. Voulez-vous la télécharger maintenant ? - + The selected language will be used the next time you start Companion. La langue sélectionnée sera utilisée lors du prochain lancement de Companion. - + The new theme will be loaded the next time you start Companion. Le nouveau thème sera utilisé lors du prochain lancement de Companion. - + The icon size will be used the next time you start Companion. La nouvelle taille d'icônes sera utilisée lors du prochain lancement de Companion. @@ -6150,43 +6010,43 @@ Ecrire quand même? L'écriture du firmware a échoué - + About Companion A propos de Companion - + Set Menu Language Choisir la langue des menus - + Settings Réglages - + Read/Write Transfert - - + + Radio Profile Profil de radio - + Show recent Models+Settings documents Voir les fichiers récents - + %2 - + New Radio Nouvelle radio @@ -6217,10 +6077,10 @@ Ecrire quand même? - - - - + + + + Error Erreur @@ -6236,7 +6096,7 @@ Ecrire quand même? - + Unable to find file %1! Fichier %1 introuvable! @@ -6268,7 +6128,7 @@ Ecrire quand même? - + Error reading file %1: %2. Fichier %1 corrompu: @@ -6278,7 +6138,7 @@ Ecrire quand même? - + Error opening file %1: %2. Erreur à l'ouverture du fichier %1: @@ -6322,7 +6182,7 @@ Ecrire quand même? Transférer l'EEPROM à la radio - + Open backup Models and Settings file Ouvrir la sauvegarde de réglages et modèles @@ -6343,7 +6203,7 @@ Ecrire quand même? Le firmware de la radio est obsolète, veuillez mettre à jour! - + Invalid binary backup File %1 Fichier de sauvegarde %1 invalide @@ -6566,25 +6426,21 @@ p, li { white-space: pre-wrap; } DEST -> VOIE%1 - Rud - Dir + Dir - Ele - Prf + Prf - Thr - Gaz + Gaz - Ail Ale - Ail + Ail @@ -6670,12 +6526,12 @@ p, li { white-space: pre-wrap; } Alerte(%1) - + Not enough available mixers! Plus de mixages disponibles ! - + Delete Selected Mixes? Supprimer mixages sélectionnés ? @@ -6760,12 +6616,12 @@ p, li { white-space: pre-wrap; } - + Clear Mixes? Effacer tous les mixages ? - + Really clear all the mixes? Êtes-vous sûr de vraiment vouloir effacer tous les mixages ? @@ -6841,30 +6697,304 @@ p, li { white-space: pre-wrap; } Télémesure + + ModelPrinter + + + %1 bytes + %1 octets + + + + CH%1 + VOIE%1 + + + + Exponential + Exponentiel + + + + Extra Fine + Extra fin + + + + Fine + Fin + + + + Medium + Moyen + + + + Coarse + Grossier + + + + Unknown + Inconnu + + + + Enabled + Actif + + + + Disabled + Inactif + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + %1, canaux(%2-%3), impulsion(%4usec), polarité(%5) + + + + %1, Channels(%2-%3) + %1, canaux(%2-%3) + + + + Receiver number(%1) + No. de récepteur(%1) + + + + Slave/Jack + Elève/Jack + + + + Master/SBUS Module + Maître/SBUS module + + + + Master/CPPM Module + Maître/CPPM Module + + + + Master/SBUS in battery compartment + Maître/SBUS compartiment batterie + + + + Master/Jack + Maître/Jack + + + + Rudder + Dérive + + + + Elevator + Profondeur + + + + Throttle + Gaz + + + + Aileron + Ailerons + + + + Name(%1) + Nom(%1) + + + + %1:%2 + + + + + Persistent + Persistant + + + + MinuteBeep + Bip minutes + + + + CountDown(Beeps) + Cpte à rebours(bips) + + + + CountDown(Voice) + Cpte à rebours(voix) + + + + CountDown(Haptic) + Cpte à rebours(vibreur) + + + + Off + + + + + + + + FM%1 + PV%1 + + + + FM%1%2 + PV%1%2 + + + + FM%1+%2 + PV%1+%2 + + + + [I%1] + [E%1] + + + + Input%1 + Entrée%1 + + + + + Weight + Ratio + + + + + Switch + Inter + + + + + NoTrim + Pas de trim + + + + No DR/Expo + Pas d'expo/DR + + + + Offset + Décalage + + + + Delay + Délai + + + + Slow + Ralenti + + + + Warn(%1) + Alerte(%1) + + + + Disabled in all flight modes + Désactivé pour toutes les phases de vol + + + + Flight modes(%1) + Phases de vol(%1) + + + + Flight mode(%1) + Phase de vol(%1) + + + + Edge(%1, [%2:%3]) + Flanc(%1, [%2:%3]) + + + + Sticky(%1, %2) + Bistable(%1, %2) + + + + Timer(%1, %2) + + + + + Duration(%1s) + Durée(%1s) + + + + Delay(%1s) + Délai(%1s) + + + + Custom + Prédéfini + + + + Standard + + + ModelSelectionPage - + Plane Avion - + Multirotor - + Helicopter Hélicoptère - + Model Name: Nom du modèle: - + Model Type: Type de modèle: @@ -6872,129 +7002,130 @@ p, li { white-space: pre-wrap; } ModelsListWidget - + + &Edit Éditio&n - + &Restore from backup &Restaurer à partir d'une sauvegarde - + &Model Wizard &Assistant de configuration - + &Delete &Supprimer - + Delete Supprimer - + &Copy &Copier - + Ctrl+C - + &Cut C&ouper - + Ctrl+X - + &Paste Co&ller - + Ctrl+V - + D&uplicate D&upliquer - + Ctrl+U - + &Use as default &Choisir comme modèle par défaut - + P&rint model Im&primer les données du modèle - + Ctrl+P - + Alt+S - + &Simulate model &Simuler le modèle sélectionné - + General Settings Paramètres généraux - + Delete Selected Models? Supprimer les modèles sélectionnés ? - - + + Cannot delete default model. Le modèle actif ne peut être supprimé. - + Cannot cut default model. Le modèle actif ne peut être coupé. - + Do you want to overwrite radio general settings? Voulez-vous vraiment écraser les paramètres généraux? - + You are pasting on an not empty model, are you sure? You are pasting on an not empty model, are you sure ? Vous allez écraser un modèle, êtes vous sûr ? - + No free slot available, cannot duplicate Pas d'emplacement libre, impossible de dupliquer @@ -7153,66 +7284,273 @@ p, li { white-space: pre-wrap; } ModulePanel - + Trainer Port Port écolage - + Internal Radio System Module HF interne - + External Radio Module Module HF externe - - + + Radio System Module HF - + Extra Radio System Module HF supplémentaire - + Value Valeur - + Hold Maintien - + No Pulse Pas d'impulsion + + MultiModelPrinter + + + General Model Settings + Paramètres généraux + + + + Name: + Nom: + + + + EEprom Size: + Taille d'EEPROM: + + + + Timer%1: + Chrono%1: + + + + Module%1: + + + + + Module: + + + + + Trainer port: + Port écolage: + + + + Throttle Trim: + Trim gaz: + + + + Trim Increment: + Pas des trims: + + + + Center Beep: + Bip de centrage + + + + Flight modes + Phases de vol + + + + + Flight mode + Phase de vol + + + + Switch + Inter + + + + Fade IN + Fondu en entrée + + + + Fade OUT + Fondu en sortie + + + + + FM%1 + PV%1 + + + + + GV%1 + VG%1 + + + + RE%1 + + + + + Limits + Limites + + + + Channel + Canal + + + + Name + Nom + + + + + Offset + Décalage + + + + Min + Min + + + + Max + Max + + + + Invert + Inversé + + + + Global Variables + Variables globales + + + + Inputs + Entrées + + + + Mixers + Mixages + + + + CV%1 + CB%1 + + + + Curves + Courbes + + + + L%1 + + + + + Logical Switches + Inters logiques + + + + SF%1 + FS%1 + + + + Special Functions + Fonctions spéciales + + + + Telemetry Settings + Paramètres de télémesure + + + + Analogs + Entrées ana. + + + + Unit + Unité + + + + Scale + Echelle + + + + A%1 + + + + + RSSI Alarms + Alarmes RSSI + + MultirotorPage - + Throttle Channel: Voie des gaz: - + Yaw Channel: Voie du lacet: - + Pitch Channel: Voie du tangage: - + Roll Channel: Voie du roulis: @@ -7220,17 +7558,17 @@ p, li { white-space: pre-wrap; } OptionsPage - + Throttle Cut Coupure de gaz - + Throttle Timer Chrono de gaz - + Flight Timer Chrono de vol @@ -7253,32 +7591,24 @@ p, li { white-space: pre-wrap; } Imprimer vers un fichier - Setup for: - Configuration pour: + Configuration pour: - printed on: %1 - Imprimé le : %1 + Imprimé le : %1 - General Model Settings - Paramètres généraux + Paramètres généraux - - - - Name - Nom + Nom - EEprom Size - Taille d'EEPROM + Taille d'EEPROM Timer1 @@ -7289,116 +7619,92 @@ p, li { white-space: pre-wrap; } Chrono2 - - Protocol - Protocole + Protocole Pulse Polarity Polarité - Throttle Trim - Trim de gaz + Trim de gaz - Enabled - Actif + Actif - Disabled - Inactif + Inactif Throttle Expo Expo de gaz - Trim Increment - Pas des trims + Pas des trims - Center Beep - Bip de centrage + Bip de centrage Flight modes Settings Paramètres de phases de vol - Fades - Fondus + Fondus - Trims - Trims + Trims - Gvars - Variables globales + Variables globales - Rot.Enc. - Enc. Rot. + Enc. Rot. - Switch - Interrupteur + Interrupteur - Flight mode name - Nom de la phase de vol + Nom de la phase de vol - IN - Entrée + Entrée - OUT - Sortie + Sortie - Rud - Dir + Dir - Ele - Prf + Prf - Thr - Gaz + Gaz - Ail - Ail + Ail - - - - - FM - PV + PV Expo/Dr Settings @@ -7409,9 +7715,8 @@ p, li { white-space: pre-wrap; } Ratio - Flight modes - Phases de vol + Phases de vol Flight mode @@ -7422,29 +7727,20 @@ p, li { white-space: pre-wrap; } DESACTIVE - Mixers - Mixages + Mixages - - - CH - VOIE + VOIE noTrim Pas de trim - - - - - Offset - Décalage + Décalage Delay(u%1:d%2) @@ -7459,87 +7755,60 @@ p, li { white-space: pre-wrap; } Avertissement - Limits - Débattements + Débattements - - - - Min - Min + Min - - - - Max - Max + Max - - - Invert - Inversé + Inversé - - - INV - Inversion + Inversion - - - NOR - Normal + Normal - Curves - Courbes + Courbes - - - Curve - Courbe + Courbe - pt %1 - point %1 + point %1 - Logical Switches - Inters logiques + Inters logiques LS IL - Global Variables - Variables globales + Variables globales - GV - VG + VG - Special Functions - Fonctions spéciales + Fonctions spéciales Function @@ -7554,68 +7823,48 @@ p, li { white-space: pre-wrap; } Répétition - - Telemetry Settings - Paramètres de télémesure + Paramètres de télémesure - - Alarm 1 - Alarme 1 + Alarme 1 - - Alarm 2 - Alarme 2 + Alarme 2 - - Analog - Analogique + Analogique - Timer%1 - Chrono%1 + Chrono%1 - Internal Radio System - Module HF interne + Module HF interne - Radio System - Module HF + Module HF - External Radio Module - Module HF externe + Module HF externe - Extra Radio System - Module HF supplémentaire + Module HF supplémentaire - Trainer port mode - Mode du port écolage + Mode du port écolage - - Off - - - - Inputs - Entrées + Entrées NoTrim @@ -7641,139 +7890,98 @@ p, li { white-space: pre-wrap; } Warn(%1) Alerte(%1) - - - L - - SF%1 FS%1 - Range - Plage + Plage - Alarms - Alarmes + Alarmes - Low Alarm - Alarme basse + Alarme basse - Critical Alarm - Alarme critique + Alarme critique - - RSSI - - - - Unit - Unité + Unité - Scale - Echelle + Echelle - - - - Type - Type + Type - - - - Condition - Condition + Condition - - - - Value - Valeur + Valeur - - - A%1 - A%1 + A%1 - SF - FS + FS - RSSI Alarm - Alarme RSSI + Alarme RSSI - Frsky serial protocol - Protocole Série FrSky + Protocole Série FrSky Units system Système d'unités - - Blades - Pales + Pales - - Custom Telemetry View - Vue Télémesure personnalisée + Vue Télémesure personnalisée - Telemetry Bars - Barres de télémesure + Barres de télémesure - Bar Number - Barre no + Barre no - Source - Source + Source - + Print Document Imprimer le document - + Select PDF output file Choisir le fichier PDF de sortie - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) Fichiers ODF (*.odt);; Fichiers PDF (*.pdf);;Fichiers HTML (*.htm *.html);;Tous les fichiers (*) @@ -7807,16 +8015,13 @@ p, li { white-space: pre-wrap; } QObject - - FM%1 FP%1 - PV%1 + PV%1 - Input%1 - Entrée %1 + Entrée %1 @@ -7825,8 +8030,6 @@ p, li { white-space: pre-wrap; } - - CH%1 VOIE%1 @@ -7911,7 +8114,7 @@ p, li { white-space: pre-wrap; } - + S3 @@ -8213,7 +8416,6 @@ p, li { white-space: pre-wrap; } - [I%1] [E%1] @@ -8404,7 +8606,6 @@ p, li { white-space: pre-wrap; } - Unknown Inconnu @@ -8415,10 +8616,19 @@ p, li { white-space: pre-wrap; } - DISABLED DESACTIVE + + + INV + + + + + NOR + + STAY(%1, [%2:%3]) FLANC(%1, [%2:%3]) @@ -8468,33 +8678,33 @@ p, li { white-space: pre-wrap; } - - + + --- - + Rud Trim Trim Dir - + Ele Trim Trim Prf - + Thr Trim Trim Gaz - + Ail Trim Trim Ail - + Rot Enc Enc. rot. @@ -8554,82 +8764,60 @@ p, li { white-space: pre-wrap; } Jouer les 2 - - Weight - Ratio + Ratio - - Switch - Interrupteur + Interrupteur - - NoTrim - Pas de trim + Pas de trim - No DR/Expo - Pas d'expo/DR + Pas d'expo/DR - Offset - Décalage + Décalage - Delay - Délai + Délai - Slow - Ralenti + Ralenti - Warn - Avertissement + Avertissement - Flight modes - Phases de vol + Phases de vol - Flight mode - Phase de vol + Phase de vol - Edge(%1, [%2:%3]) - Flanc(%1, [%2:%3]) + Flanc(%1, [%2:%3]) - Sticky(%1, %2) - Bistable(%1, %2) + Bistable(%1, %2) - - Timer(%1, %2) - - - - Duration (%1s) - Durée (%1s) + Durée (%1s) - Delay (%1s) - Délai (%1s) + Délai (%1s) @@ -8736,22 +8924,22 @@ p, li { white-space: pre-wrap; } Vol - + !Flight mode %1 !Phase de vol %1 - + Flight mode %1 Phase de vol %1 - + Own value Valeur indépendante - + Flight mode %1 value Flight phase %1 value Valeur de la phase de vol %1 @@ -8773,7 +8961,7 @@ p, li { white-space: pre-wrap; } - + -GV%1 -VG%1 @@ -8793,135 +8981,113 @@ p, li { white-space: pre-wrap; } Finlandais - + Yellow Jaune - + Orange Orange - + Red Rouge - + Winged Shadow How High Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (non supporté) - + FrSky Sensor Hub Sensor Hub FrSky - + None Aucun - + Imperial Impérial - + Metric Métrique - Extra Fine - Extra fin + Extra fin - Fine - Fin + Fin - Medium - Moyen + Moyen - Coarse - Grossier + Grossier - - %1:%2 - - - - , Persistent - , persistant + , persistant - , MinuteBeep - , bip minute + , bip minute - , CountDown(Beeps) - , compte à rebours (bips) + , compte à rebours (bips) - , CountDown(Voice) - , compte à rebours (voix) + , compte à rebours (voix) - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - : Canal de départ: %1, "2 canaux, délai %3us, polarité %4 + : Canal de départ: %1, "2 canaux, délai %3us, polarité %4 - : Channel start: %1, %2 Channels - : Canal de départ: %1, "2 canaux + : Canal de départ: %1, "2 canaux - Slave/Jack - Elève/Jack + Elève/Jack - Master/SBUS Module - Maître/SBUS module + Maître/SBUS module - Master/CPPM Module - Maître/CPPM module + Maître/CPPM module - Master/SBUS in battery compartment - Maître/SBUS compartiment batterie + Maître/SBUS compartiment batterie - Master/Jack - Maître/Jack + Maître/Jack - Exponential - Exponentiel + Exponentiel Count Up @@ -8944,29 +9110,25 @@ p, li { white-space: pre-wrap; } Phase de vol(%1) - Rudder - Direction + Direction - Elevator - Profondeur + Profondeur - Throttle - Gaz + Gaz - Aileron - Ailerons + Ailerons - + GV%1 VG%1 @@ -8974,13 +9136,13 @@ p, li { white-space: pre-wrap; } - + ---- - - + + THR Gaz @@ -8997,8 +9159,8 @@ p, li { white-space: pre-wrap; } - - + + P1 @@ -9009,7 +9171,7 @@ p, li { white-space: pre-wrap; } - + V @@ -9101,15 +9263,15 @@ p, li { white-space: pre-wrap; } - - + + P2 - - + + P3 @@ -9265,25 +9427,25 @@ p, li { white-space: pre-wrap; } - + Rud Dir - + Ele Prf - + Thr Gaz - + Ail Ail @@ -9310,7 +9472,7 @@ p, li { white-space: pre-wrap; } - + S1 @@ -9372,21 +9534,21 @@ p, li { white-space: pre-wrap; } - + S2 - + LS - + RS @@ -9567,42 +9729,42 @@ p, li { white-space: pre-wrap; } - - + + Support for frsky telemetry mod Support de la télémétrie FrSky - - + + Support for jeti telemetry mod Support de la télémétrie JETI - - + + Support for receiving ardupilot data Support de la télémétrie ARDUPILOT - - + + Support for receiving NMEA data Support de la télémétrie NMEA - + Support for telemetry easy board Support de la carte TelemetrEZ - - + + Support for MAVLINK devices Support du protocole MAVLINK - + Rotary Encoder use in menus navigation Utiliser un encodeur rotatif pour la navigation @@ -9615,195 +9777,197 @@ p, li { white-space: pre-wrap; } Mode FAI toujours actif - - - - - - + + + + + + Enable heli menu and cyclic mix support Activer le menu hélico et les mixages CCPM - - - - - - - - + + + + + + + + Enable TEMPLATES menu Inclure les gabarits - - - - + + + + No splash screen Pas d'écran de démarrage - - - - - - - - + + + + + + + + Disable curves menus Désactiver le menu des courbes - - - - + + + + Support for radio modified with regular speaker Haut-parleur au lieu du buzzer d'origine - - - - - + + + + + Used if you have modified your radio with voice mode Support du module vocal - - - - - + + + + + Used if you have modified your radio with haptic mode Support du vibreur - + Channel values displayed in us Positions de voies affichées en us - - - - - - - - + + + + + + + + Battery graph Graphique de batterie - + Use alternative SQT5 font Utiliser la police alternative SQT5 - + (displaying only first 10 warnings) (les 10 premiers avertissements sont affichés) - + Possibility to enable FAI MODE (no telemetry) at field Possibilité d'activer le mode FAI (télémétrie désactivée) sur le terrain - + FAI MODE (no telemetry) always enabled Mode FAI (télémétrie désactivée) toujours actif - + + + Support for a third timer Support d'un 3e chrono - + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 Supprime les protocoles RF D8 et LR12 qui ne sont plus utilisable légalementen Europe sur les radios vendues après le 1er janvier 2015 - + Support for PPM internal module hack Support du remplacement du module interne par un module PPM - + ST7565P LCD or compatible ST7565P LCD ou compatible - + ST7565R LCD or compatible ST7565R LCD ou compatible - + ERC12864FSF LCD LCD ERC12864FSF - + ST7920 LCD LCD ST7920 - + 9X board FlySky /Turnigy 9x - - - - + + + + Enable the throttle trace in Statistics Activer l'historique du manche des gaz dans les statistiques - + EEprom write progress bar Barre de progression pour l'écriture de l'EEPROM - - + + No Winged Shadow How High support Supprimer le support du variomètre Winged Shadow How High - - + + No vario support Supprimer la fonction variomètre audio - - + + No GPS support Supprimer le support du GPS - - + + No gauges in the custom telemetry screen Supprimer l'affichage des valeurs de télémesure par barres - + Allow compensating for offset errors in FrSky FAS current sensors Permettre la compensation d'un décalage des capteurs de courant FASxx FrSky - - + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) Ajoute le support de l'inversion des manches (nécessaire pour l'utilisation de manches FrSky) @@ -9812,38 +9976,38 @@ p, li { white-space: pre-wrap; } OpenTX pour carte MEGA2560 - + Power management by soft-off circuitry Gestion alim. par software - + 9XR-PRO - + FrSky Taranis - + FrSky Taranis Plus - + FrSky Taranis X9E - + Confirmation before radio shutdown Confirmation à l'arrêt - - + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views Ajoute une vue de la sortie des mixeurs au moniteur de canaux, ENT pour passer d'une vue à l'autre @@ -9860,17 +10024,17 @@ p, li { white-space: pre-wrap; } Valuers affichées en us - + Haptic module installed Module vibreur installé - + Support for Lua model scripts Support des scripts Lua - + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) Pas d'émulation de joystick dans le firmware (accès mémoire uniquement) @@ -9887,8 +10051,8 @@ p, li { white-space: pre-wrap; } OpenTX pour FrSky Taranis Rev4a - - + + Support of FrSky PXX protocol Support du protocole PXX FrSky @@ -9902,7 +10066,7 @@ p, li { white-space: pre-wrap; } OpenTX pour FrSky Taranis - + Disable HELI menu and cyclic mix support Supprimer le menu HELICO et les mixages cycliques @@ -9911,62 +10075,62 @@ p, li { white-space: pre-wrap; } Supprimer le menu des gabarits - + Disable Global variables Supprimer le support des variables globales - - - - - + + + + + Support for DSM2 modules Support du protocole DSM2 - - - - - - - - + + + + + + + + PPM center adjustment in limits Neutres PPM ajustables - - - - - - - - + + + + + + + + Symetrical Limits Limites symétriques - - - - - - + + + + + + Pots use in menus navigation Support de la navigation dans les menus avec les POTS - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used Il semblerait que votre radio utilise le mauvais firmware. La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont utilisés. Pensez à charger la version pour m128. - + No OverrideCH functions available Désactive la fonction spéciale "Remplace CHx" @@ -9975,53 +10139,53 @@ La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont ut OpenTX pour 9X - - - - - - - - + + + + + + + + No flight modes Pas de phases de vol - - + + SmartieParts 2.2 Backlight support Support du rétroéclairage pour la carte SmartieParts 2.2 - - - - - + + + + + Enable resetting values by pressing up and down at the same time Permet la remise à zéro des valeurs en pressant haut-bas en même temps, valeur min avec gauche/bas, valeur max avec haut/droite, inversion avec gauche/droite - - - - - - - - + + + + + + + + No graphical check boxes and sliders Pas de cases à cocher et de curseurs graphiques - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items Ne pas mettre les lignes actives en gras @@ -10030,93 +10194,93 @@ La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont ut OpenTX pour 9X avec m128 - - - - - + + + + + EEprom write Progress bar Barre de progression affichée lors des écritures EEPROM - - - - - - + + + + + + Imperial units Unités Impériales - + M128 / 9X board 9x avec M128 - + 9XR - + 9XR with M128 chip 9XR avec M128 - + Gruvin9x board / 9X 9x avec carte Gruvin9x - + MEGA2560 board Carte M2560 perso - + Sky9x board / 9X 9x avec carte Sky9X - - + + Bluetooth interface Interface Bluetooth - - - - - - - - + + + + + + + + Global variables Variables globales - - - - - - - - + + + + + + + + In model setup menus automatically set source by moving the control Sélectionner les sources des mixeurs en bougeant le contrôle désiré - - - - - - - - + + + + + + + + In model setup menus automatically set switch by moving the control Sélectionner les interrupteurs en bougeant le contrôle désiré @@ -10133,13 +10297,13 @@ La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont ut OpenTX pour carte Gruvin9x - - + + Support for SD memory card Support de la carte SD - + Support for DSM2 modules using ppm instead of true serial Support pour les modules DSM2 par le signal PPM @@ -10148,8 +10312,8 @@ La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont ut OpenTX pour carte Sky9x - - + + Enable HELI menu and cyclic mix support Activer le menu hélico et les mixages CCPM @@ -10194,18 +10358,18 @@ La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont ut L'utilisation simultanée de l'expo et d'une courbe n'est plus possible - - + + Warning Avertissement - + EEPROM saved with these warnings: EEPROM enregistrée avec les avertissements suivants: - + Simulator for this firmware is not yet available Le simulateur n'est pas encore disponible pour ce firmware @@ -10215,38 +10379,38 @@ La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont ut th9x ne supporte pas d'encodeurs rotatifs sur cette carte - + Source %1 cannot be exported on this board! La source %1 n'est pas supportée sur cette plateforme! - + OpenTX only accepts %1 points in all curves OpenTX n'accepte que %1 points au maximum entre toutes les courbes - + OpenTx only accepts %1 points in all curves OpenTX n'accepte que %1 points au maximum entre toutes les courbes - - - - - + + + + + OpenTX on this board doesn't accept this function OpenTX ne supporte pas cette fonction sur cette carte - + OpenTX doesn't accept this telemetry protocol OpenTX ne supporte pas ce protocole de télémesure - - + + OpenTX doesn't accept this radio protocol OpenTX ne supporte pas ce protocole radio @@ -10255,27 +10419,27 @@ La taille de l'EEPROM est de 4096, mais seulement les 2048 premiers sont ut OpenTX ne supporte pas ce protocole - + OpenTX doesn't allow this number of channels OpenTX ne supporte pas ce nombre de voies - + Trim disabled Trim désactivé - + Own Trim Valeur indépendante - + Use Trim from Flight mode %1 Utiliser le trim de la phase de vol %1 - + Use Trim from Flight mode %1 + Own Trim as an offset Utiliser le trim de la phase de vol %1 + une valeur indépendante additionnée @@ -10309,25 +10473,31 @@ The OpenTX Team. L'équipe OpenTX. - + Negative Négative - + Positive - + + + - Synchronization error Erreur de synchronisation - + + No SD directory configured! + Aucun dossier SD configuré! + + + No Radio connected! Aucune radio connectée! @@ -10337,33 +10507,33 @@ L'équipe OpenTX. VG - + -%1 + - The directory '%1' doesn't exist! Le répertoire %1 n'existe pas! - + Create '%1' failed Impossible de créer %1 - + Copy '%1' to '%2' failed La copie de %1 vers %2 a échoué - + Open '%1' failed L'ouverture de %1 a échoué - + Write '%1' failed L'écriture de %1 a échoué @@ -10449,17 +10619,17 @@ L'équipe OpenTX. RudderPage - + No Non - + Yes Oui - + <br>Rudder Channel: <br>Voie de dérive: @@ -10635,7 +10805,7 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo SimpleTailPage - + Elevator Channel: Voie de profondeur: @@ -10810,10 +10980,44 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Sorties + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + Bibliothèque de splash - page %1 sur %2 + + + + Warning + Avertissement + + + + Invalid image in library %1 + Image invalide dans la bibliothèque %1 + + + + Information + + + + + No valid image found in library, check your settings + Aucune image valide trouvée dans la bibliothèque, vérifiez vos paramètres + + StandardPage - + Channel %1 Voie %1 @@ -10821,25 +11025,29 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo SyncProcess - + + %1/%2 files + Fichier %1/%2 + + + Create directory %1 Création du répertoire %1 - + Copy %1 to %2 Copie de %1 vers %2 - Read %1 - Lecture de %1 + Lecture de %1 - + Write %1 Ecriture de %1 @@ -10848,35 +11056,40 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo TailPage - + Rudder Channel: Voie de dérive: - + Elevator Channel: Voie de profondeur: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + Plus qu'un canal disponible! Vous devriez peut-être configurer ce modèle sans l'assistant. + TailSelectionPage - + Elevator and Rudder Profondeur et dérive - + Only Elevator Profondeur uniquement - + V-tail Empennage en V - + Tail Type: Type d'empennage: @@ -10884,22 +11097,22 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Telemetry - + A1 - + A2 - + RSSI - + Alarm 1 Alarme 1 @@ -10912,31 +11125,31 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Alarme critique - - + + ---- ---- - - + + Yellow Jaune - - + + Orange Orange - - + + Red Rouge - + Alarm 2 Alarme 2 @@ -10945,12 +11158,12 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo ELEM - + Serial Protocol Protocole Série - + Volt source Source de mesure de tension @@ -10963,7 +11176,7 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Impérial - + Current source Source de mesure de courant @@ -10981,12 +11194,12 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo FAS - + None Aucun - + FrSky Sensor Hub Sensor Hub FrSky @@ -10995,7 +11208,7 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Unités - + Blades Pales @@ -11012,7 +11225,7 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Vario - + Sink Max Chute max @@ -11021,32 +11234,32 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Désactivé - + Climb Max Montée max - + Sink Min Chute min - + Climb Min Montée min - + Center Silent Neutre silencieux - + Vario source Source vario - + Vario limits Limites vario @@ -11059,52 +11272,52 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Affichage de l'altitude dans la barre de notifs - + Altimetry Altitude - + Altitude source Source de l'altitude - + Volts source Source de la tension - + Top Bar - Barre de titre de l'céran d'accueil + Barre de titre de l'écran d'accueil - + mAh - + A - + Various Divers - + Sensors Capteurs - + Disable multi sensor handling Désactiver la gestion des capteurs multiples - + mAh count Valeur enregistrée @@ -11113,12 +11326,12 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Alarme basse - + FAS Offset Décalage FAS - + Persistent mAh Mémorisation des mAh @@ -11232,17 +11445,15 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Courant (mA) - Low Alarm - Alarme basse + Alarme basse - Critical Alarm - Alarme critique + Alarme critique - + Range Plage @@ -11259,22 +11470,22 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Valeurs - + None Aucun - + Numbers Chiffres - + Bars Barres - + Script @@ -11302,71 +11513,71 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo TelemetryPanel - + FrSky S.PORT - + FrSky D - + FrSky D (cable) FrSky D (câble) - + Telemetry screen %1 Ecran de télémesure %1 - + Low Alarm Alarme basse - + Critical Alarm Alarme critique - + Winged Shadow How High Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (non supporté) - + Alti Alti - + Alti+ Alti+ - + VSpeed Vitesse V + - - + A1 + - - + A2 @@ -11375,30 +11586,30 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Batt. Rx - - + + A3 - - + + A4 - - + + FAS - + Cells Velm - + --- @@ -11504,8 +11715,112 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo + Sensor : + Capteur: + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. + + + Amps Sensor : - Capteur de courant: + Capteur de courant: @@ -11513,84 +11828,68 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Chiffres bruts (-) - Voltage (V) - Tension (V) + Tension (V) - Current (A) - Courant (A) + Courant (A) - Current (mA) - Courant (mA) + Courant (mA) - Speed (kts) - Vitesse (kt) + Vitesse (kt) - Speed (m/s) - Vitesse (m/s) + Vitesse (m/s) - Speed (ft/s) - Vitesse (ft/s) + Vitesse (ft/s) - Speed (km/h) - Vitesse (km/h) + Vitesse (km/h) - Speed (miles/h) - Vitesse (mph) + Vitesse (mph) - Meters (m) - Distance (m) + Distance (m) - Feet (ft) - Distance (ft) + Distance (ft) - Temp (°C) - Température (°C) + Température (°C) - Temp (°F) - Température (°F) + Température (°F) - Percentage (%) - Pourcentage (%) + Pourcentage (%) - Energy (mAh) - Energie (mAh) + Energie (mAh) - Power (W) - Puissance (W) + Puissance (W) - RF Power (dBm) - Niveau RF (dB) + Niveau RF (dB) @@ -11598,24 +11897,12 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo Tours/minute - Acceleration (g) - Accélération (g) + Accélération (g) - Heading (°) - Cap (°) - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - + Cap (°) @@ -11675,22 +11962,22 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo TelemetrySensorPanel - + Lowest Min. - + Cell %1 Elém. %1 - + Highest Max. - + Delta @@ -11911,17 +12198,17 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo ThrottlePage - + Yes Oui - + No Non - + <br>Throttle Channel: <br>Voie des gaz: @@ -11946,32 +12233,37 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo TimerPanel - + Silent Aucun - + Beeps Bips - + Voice Voix - + + Haptic + Vibreur + + + Not persistent Non persistant - + Persistent (flight) Persistant (vol) - + Persistent (manual reset) Persistant (RAZ manuelle) @@ -12110,12 +12402,12 @@ Extra long : bips extra longs. VTailPage - + First Tail Channel: Première voie d'empennage: - + Second Tail Channel: Deuxième voie d'empennage: @@ -12123,12 +12415,12 @@ Extra long : bips extra longs. WingtypeSelectionPage - + Standard Wing Aile standard - + Flying Wing / Deltawing Aile delta @@ -12418,37 +12710,37 @@ Extra long : bips extra longs. WizardPrinter - + Plane Avion - + Multicopter Multicoptère - + Helicopter Hélicoptère - + Model Name: Nom du modèle: - + Model Type: Type de modèle: - + Options: - + Channel %1: Voie %1: @@ -14014,40 +14306,6 @@ Indique l'affectation voie / numéro de voie par défaut utilisée lors de Télécharger - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - Bibliothèque de splash - page %1 sur %2 - - - - Warning - Avertissement - - - - Invalid image in library %1 - Image invalide dans la bibliothèque %1 - - - - Information - - - - - No valid image found in library, check your settings - Aucune image valide trouvée dans la bibliothèque, vérifiez vos paramètres - - taranisNotFoundDialog diff --git a/companion/src/translations/companion_he.ts b/companion/src/translations/companion_he.ts index 08f897059..1a9e7e18b 100644 --- a/companion/src/translations/companion_he.ts +++ b/companion/src/translations/companion_he.ts @@ -4,27 +4,27 @@ AileronsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Aileron Channel: - + Second Aileron Channel: @@ -32,27 +32,27 @@ AirbrakesPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Airbrake Channel: - + Second Airbrake Channel: @@ -74,7 +74,7 @@ - + Open Folder @@ -308,7 +308,7 @@ Mode 4: - + Simulator Volume Gain @@ -445,62 +445,62 @@ May be different from firmware language - + Simulator BackLight - + Enable - + Blue - + Green - + Red - + Orange - + Yellow - + Joystick - + Calibrate - + Simulator capture folder - + Only capture to clipboard - + Remember simulator switch values @@ -515,64 +515,64 @@ May be different from firmware language - - + + No joysticks found - + EMPTY: No radio settings stored in profile - + AVAILABLE: Radio settings of unknown age - + AVAILABLE: Radio settings stored %1 - + Select your library folder - - + + Select your Models and Settings backup folder - + Select Google Earth executable - + Select the folder replicating your SD structure - + Not possible to remove profile - + The default profile can not be removed. - + Open Image to load - + Images (%1) @@ -747,11 +747,6 @@ May be different from firmware language Stick 4 - - - Battery - - v @@ -772,9 +767,14 @@ May be different from firmware language PPM 4 + + + Battery Offset + + - Current + Current Offset @@ -1024,393 +1024,17 @@ May be different from firmware language - + No name - - General Model Settings - - - - - - - Name - - - - - - EEprom Size - - - - - - Timer1 - - - - - - Timer2 - - - - - - Internal Radio System - - - - - - Radio System - - - - - - - - Protocol - - - - - - External Radio Module - - - - - - Extra Radio System - - - - - - Trainer port mode - - - - - - Throttle Trim - - - - - - Enabled - - - - - - Disabled - - - - - - Trim Increment - - - - - - Center Beep - - - - - Flight modes Settings - - - - - - Fades - - - - - - Trims - - - - - - Switch - - - - - - - - Flight mode name - - - - - - IN - - - - - - OUT - - - - - - - - - - - - - - FM - - - - - - Gvars - - - - - - Rot. Enc. - - - - - Limits - - - - - - - - - Offset - - - - - - - - - Min - - - - - - - - - Max - - - - - - - Invert - - - - - - - - - CH - - - - - - INV - - - - - - NOR - - - - - Global Variables - - - - - - GV - - - - - Inputs - - - - - Mixers - - - - - Curves - - - - - - Curve - - - - - Logical Switches - - - - - L - - - - - Special Functions - - - - - SF - - - - - Telemetry Settings - - - - - - Analog - - - - - - Unit - - - - - - Scale - - - - - - - - A%1 - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - - RSSI Alarm - - - - - - Custom Telemetry View - - - - - - Telemetry Bars - - - - - - Bar Number - - - - - - Source - - - - + Print Document - + Select PDF output file @@ -1418,7 +1042,7 @@ May be different from firmware language ConclusionPage - + OK, I understand. @@ -1456,12 +1080,12 @@ May be different from firmware language - - Thank you all !!! + + OpenTX Blacklist - + monthly @@ -1494,22 +1118,22 @@ May be different from firmware language CurveGroup - + Diff - + Expo - + Func - + Curve @@ -1759,22 +1383,22 @@ May be different from firmware language CyclicPage - + 90 - + 120 - + 120x - + 140 @@ -1790,12 +1414,12 @@ May be different from firmware language ElevonsPage - + <br>First Elevon Channel: - + Second Elevon Channel: @@ -2132,46 +1756,26 @@ If blank then the input is considered to be "ON" all the time.Edit %1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - FblPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -2223,27 +1827,27 @@ May be different from firmware language FlapsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Flap Channel: - + Second Flap Channel: @@ -2493,8 +2097,8 @@ May be different from firmware language - - + + Warning @@ -2548,58 +2152,58 @@ May be different from firmware language - + Splash image not found - + Cannot save customized firmware - + Write Firmware to Radio - - + + Firmware check failed - + Could not check firmware from radio - + New firmware is not compatible with the one currently installed! - + Conversion failed - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore failed - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 - + Flashing done @@ -2721,37 +2325,17 @@ Please use ZADIG to properly install the driver. FlightModePanel - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - + Rotary Encoder %1 - + GVAR%1 - + Popup enabled @@ -2759,17 +2343,17 @@ Please use ZADIG to properly install the driver. FlightModesPanel - + Flight Mode %1 - + (%1) - + (default) @@ -2777,17 +2361,17 @@ Please use ZADIG to properly install the driver. FlybarSelectionPage - + Has Flybar - + Flybarless - + Flybar: @@ -3730,17 +3314,17 @@ Are you sure ? GyroPage - + No - + Yes, controled by a switch - + Yes, controlled by a pot @@ -3821,22 +3405,22 @@ Are you sure ? HeliPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -4207,83 +3791,83 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded - - - + + + Save As - - + + No updates available at this time. - + Unable to check for updates. - + Checking for updates - + Executable (*.exe) - + A new release of Companion is available, please check the OpenTX website! - + Would you like to launch the installer? - + Not enough memory for all the selected firmware options - - + + File saved - + Read Models and Settings From Radio - + Save Radio Backup to File - + Read Radio Firmware to File - + OpenTX Home Page: <a href='%1'>%1</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> @@ -4293,39 +3877,39 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt - + New release available - - + + Error - + Error opening file %1: %2. - + Compilation server termporary failure, try later - + Compilation server too busy, try later - + Unknown server failure, try later - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -4334,31 +3918,31 @@ We recommend you view the release notes using the button below to learn about an - - + + Yes - - + + No - - + + Release Notes - - + + Do you want to download release %1 now ? - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -4369,685 +3953,685 @@ We recommend you view the release notes using the button below to learn about an - - - + + + Companion - - + + Open Models and Settings file - - + + Synchronize SD - + Firmware updates - + Current firmware does not provide release notes informations. - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + New - + Open... - + Save - + Save As... - + Copy Model - + Paste Model - + Load backup from file - + Compare models - + Exit the application - + List available programmers - + Show fuses dialog - + Show the application's About box - + Set Menu Language - + Show the list of radio profiles - + Write - + %2 - + New Radio - + A new version of Companion is available (version %1)<br>Would you like to download it? - + Compilation server requires registration, please check OpenTX web site - + Do you want to write the firmware to the radio now ? - + The selected language will be used the next time you start Companion. - + The new theme will be loaded the next time you start Companion. - + The icon size will be used the next time you start Companion. - + About Companion - + A monochrome black icon theme - + A monochrome white icon theme - + A monochrome blue icon theme - + Small - + Use small toolbar icons - + Use normal size toolbar icons - + Normal - + Use big toolbar icons - + Big - + Use huge toolbar icons - + Huge - + Ignore this release %1? - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> - + Copyright OpenTX Team - + Create a new Models and Settings file - - + + Save Models and Settings file - + Exit - + Cut Model - + Cut current model to the clipboard - + Copy current model to the clipboard - + Paste model from clipboard - + Classical - + The classic companion9x icon theme - + Yerico - + Yellow round honey sweet icon theme - + Monochrome - + MonoWhite - + MonoBlue - + System language - + Use system language in menus - + Czech - + Use Czech in menus - + German - + Use German in menus - + English - + Use English in menus - + Finnish - + Use Finnish in menus - + French - + Use French in menus - + Italian - + Use Italian in menus - + Polish - + Use Polish in menus - + Spanish - + Use Spanish in menus - + Swedish - + Use Swedish in menus - + About... - + Print... - + Print current model - + Simulate... - + Simulate current model - + Alt+S - + Load Backup... - + View Log File... - + Open and view log file - + Settings... - + Edit Settings - + Download... - + Download firmware and voice files - + Check for Updates... - + Check OpenTX and Companion updates - + Companion Changes... - + Show Companion change log - + Firmware Changes... - + Show firmware change log - + Compare Models... - + Edit Radio Splash Image... - + Edit the splash image of your Radio - + List programmers... - + Fuses... - - + + Read Firmware from Radio - + Read firmware from Radio - - + + Write Firmware to Radio - + Write firmware to Radio - + Add Radio Profile - + Create a new Radio Setting Profile - + Manuals and other Documents - + Open the OpenTX document page in a web browser - + Write Models and Settings To Radio - - + + Write Models and Settings to Radio - - + + Read Models and Settings from Radio - + Configure Communications... - + Configure software for communicating with the Radio - + Write Backup to Radio - + Write Backup from file to Radio - + Backup Radio to File - + Save a complete backup file of all settings and model data in the Radio - + Contributors... - + A tribute to those who have contributed to OpenTX and Companion - + SD card synchronization - + Recent Files - + Recent Models+Settings - + Set Icon Theme - + Set Icon Size - - + + File - - + + Edit - + Settings - + Read/Write - - + + Help - - + + Radio Profile - + Show recent Models+Settings documents - + Ready @@ -5070,10 +4654,10 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error @@ -5084,13 +4668,13 @@ We recommend you view the release notes using the button below to learn about an - + Unable to find file %1! - + Error reading file %1: %2. @@ -5104,7 +4688,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. @@ -5138,7 +4722,7 @@ We recommend you view the release notes using the button below to learn about an - + Open backup Models and Settings file @@ -5154,7 +4738,7 @@ Do you want to save your changes? - + Invalid binary backup File %1 @@ -5366,26 +4950,6 @@ This determines how mixer values are added. DEST -> CH%1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - MixesPanel @@ -5419,12 +4983,12 @@ This determines how mixer values are added. - + Not enough available mixers! - + Delete Selected Mixes? @@ -5509,12 +5073,12 @@ This determines how mixer values are added. - + Clear Mixes? - + Really clear all the mixes? @@ -5582,30 +5146,304 @@ This determines how mixer values are added. + + ModelPrinter + + + %1 bytes + + + + + CH%1 + + + + + Exponential + + + + + Extra Fine + + + + + Fine + + + + + Medium + + + + + Coarse + + + + + Unknown + + + + + Enabled + + + + + Disabled + + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + + + + + Master/SBUS Module + + + + + Master/CPPM Module + + + + + Master/SBUS in battery compartment + + + + + Master/Jack + + + + + Rudder + + + + + Elevator + + + + + Throttle + + + + + Aileron + + + + + Name(%1) + + + + + %1:%2 + + + + + Persistent + + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + + + + + + + + FM%1 + + + + + FM%1%2 + + + + + FM%1+%2 + + + + + [I%1] + + + + + Input%1 + + + + + + Weight + + + + + + Switch + + + + + + NoTrim + + + + + No DR/Expo + + + + + Offset + + + + + Delay + + + + + Slow + + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + + + + + Flight mode(%1) + + + + + Edge(%1, [%2:%3]) + + + + + Sticky(%1, %2) + + + + + Timer(%1, %2) + + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + + + + + Standard + + + ModelSelectionPage - + Plane - + Multirotor - + Helicopter - + Model Name: - + Model Type: @@ -5613,129 +5451,130 @@ This determines how mixer values are added. ModelsListWidget - + + &Edit - + &Restore from backup - + &Model Wizard - + &Delete - + Delete - + &Copy - + Ctrl+C - + &Cut - + Ctrl+X - + &Paste - + Ctrl+V - + D&uplicate - + Ctrl+U - + &Use as default - + P&rint model - + Ctrl+P - + Alt+S - + &Simulate model - + General Settings - + Delete Selected Models? - - + + Cannot delete default model. - + Cannot cut default model. - + Do you want to overwrite radio general settings? - + You are pasting on an not empty model, are you sure? You are pasting on an not empty model, are you sure ? - + No free slot available, cannot duplicate @@ -5886,66 +5725,273 @@ This determines how mixer values are added. ModulePanel - + Trainer Port - + Internal Radio System - + External Radio Module - - + + Radio System - + Extra Radio System - + Value - + Hold - + No Pulse + + MultiModelPrinter + + + General Model Settings + + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + + + + + + Flight mode + + + + + Switch + + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + + + + + + GV%1 + + + + + RE%1 + + + + + Limits + + + + + Channel + + + + + Name + + + + + + Offset + + + + + Min + + + + + Max + + + + + Invert + + + + + Global Variables + + + + + Inputs + + + + + Mixers + + + + + CV%1 + + + + + Curves + + + + + L%1 + + + + + Logical Switches + + + + + SF%1 + + + + + Special Functions + + + + + Telemetry Settings + + + + + Analogs + + + + + Unit + + + + + Scale + + + + + A%1 + + + + + RSSI Alarms + + + MultirotorPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -5953,17 +5999,17 @@ This determines how mixer values are added. OptionsPage - + Throttle Cut - + Throttle Timer - + Flight Timer @@ -5986,427 +6032,17 @@ This determines how mixer values are added. - - Setup for: - - - - - printed on: %1 - - - - - General Model Settings - - - - - - - - Name - - - - - EEprom Size - - - - - Internal Radio System - - - - - Radio System - - - - - - Protocol - - - - - Throttle Trim - - - - - Enabled - - - - - Disabled - - - - - External Radio Module - - - - - Timer%1 - - - - - Extra Radio System - - - - - Trainer port mode - - - - - Trim Increment - - - - - Center Beep - - - - - Flight modes - - - - - Fades - - - - - Trims - - - - - Gvars - - - - - Rot.Enc. - - - - - Switch - - - - - Flight mode name - - - - - IN - - - - - OUT - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - - - - - FM - - - - - Off - - - - - Inputs - - - - - Source - - - - - Mixers - - - - - Limits - - - - - - - CH - - - - - - - - - Offset - - - - - - - - Min - - - - - - - - Max - - - - - - - Invert - - - - - - - INV - - - - - - - NOR - - - - - Curves - - - - - - - Curve - - - - - pt %1 - - - - - Logical Switches - - - - - L - - - - - Global Variables - - - - - GV - - - - - Special Functions - - - - - SF - - - - - - Telemetry Settings - - - - - - Analog - - - - - Range - - - - - - - A%1 - - - - - Alarms - - - - - Low Alarm - - - - - Critical Alarm - - - - - RSSI - - - - - - Blades - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - Unit - - - - - Scale - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - RSSI Alarm - - - - - Frsky serial protocol - - - - - - Custom Telemetry View - - - - - Telemetry Bars - - - - - Bar Number - - - - + Print Document - + Select PDF output file - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) @@ -6439,18 +6075,6 @@ This determines how mixer values are added. QObject - - - - FM%1 - FP%1 - - - - - Input%1 - - Polish @@ -6458,8 +6082,6 @@ This determines how mixer values are added. - - CH%1 @@ -6540,33 +6162,33 @@ This determines how mixer values are added. - - + + --- - + Rud Trim - + Ele Trim - + Thr Trim - + Ail Trim - + Rot Enc @@ -6702,7 +6324,7 @@ This determines how mixer values are added. - + S3 @@ -7007,7 +6629,6 @@ This determines how mixer values are added. - [I%1] @@ -7258,7 +6879,6 @@ This determines how mixer values are added. - Unknown @@ -7329,10 +6949,19 @@ This determines how mixer values are added. - DISABLED + + + INV + + + + + NOR + + Edge @@ -7411,171 +7040,65 @@ This determines how mixer values are added. - + !Flight mode %1 - + Flight mode %1 - + Flight mode %1 value - + Yellow - + Orange - + Red - + Winged Shadow How High - + Winged Shadow How High (not supported) - + FrSky Sensor Hub - + None - + Imperial - + Metric - - - Extra Fine - - - - - Fine - - - - - Medium - - - - - Coarse - - - - - %1:%2 - - - - - , Persistent - - - - - , MinuteBeep - - - - - , CountDown(Beeps) - - - - - , CountDown(Voice) - - - - - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - - - - - : Channel start: %1, %2 Channels - - - - - Slave/Jack - - - - - Master/SBUS Module - - - - - Master/CPPM Module - - - - - Master/SBUS in battery compartment - - - - - Master/Jack - - - - - Exponential - - - - - Rudder - - - - - Elevator - - - - - Throttle - - - - - Aileron - - @@ -7590,91 +7113,13 @@ This determines how mixer values are added. Timer2 - - - - Weight - - - - - - Switch - - - - - - NoTrim - - - - - No DR/Expo - - - - - Offset - - - - - Delay - - - - - Slow - - - - - Warn - - - - - Flight modes - - - - - Flight mode - - - - - Edge(%1, [%2:%3]) - - - - - Sticky(%1, %2) - - - - - Timer(%1, %2) - - - - - Duration (%1s) - - - - - Delay (%1s) - - Telemetry - + Own value @@ -7695,7 +7140,7 @@ This determines how mixer values are added. - + -GV%1 @@ -7703,28 +7148,28 @@ This determines how mixer values are added. - + ---- - - + + P1 - - + + P2 - - + + P3 @@ -7735,7 +7180,7 @@ This determines how mixer values are added. - + Rud @@ -7746,7 +7191,7 @@ This determines how mixer values are added. - + V @@ -7838,19 +7283,19 @@ This determines how mixer values are added. - + Ele - + Thr - + Ail @@ -8037,28 +7482,28 @@ This determines how mixer values are added. - + S1 - + S2 - + LS - + RS @@ -8162,13 +7607,13 @@ This determines how mixer values are added. - + GV%1 - - + + THR @@ -8187,336 +7632,43 @@ This determines how mixer values are added. - - + + Support for frsky telemetry mod - - + + Support for jeti telemetry mod - - + + Support for receiving ardupilot data - - + + Support for receiving NMEA data - + Support for telemetry easy board - - + + Support for MAVLINK devices - - - Rotary Encoder use in menus navigation - - - - - - - - - - Enable heli menu and cyclic mix support - - - - - - - - - - - - Enable TEMPLATES menu - - - - - - - - No splash screen - - - - - - - - - - - - Disable curves menus - - - - - - - - Support for radio modified with regular speaker - - - - - - - Used if you have modified your radio with voice mode - - - - - - - - - Used if you have modified your radio with haptic mode - - - - - Channel values displayed in us - - - - - - - - - - - - In model setup menus automatically set source by moving the control - - - - - - - - - - - - In model setup menus automatically set switch by moving the control - - - - - Use alternative SQT5 font - - - - - (displaying only first 10 warnings) - - - - - Possibility to enable FAI MODE (no telemetry) at field - - - - - FAI MODE (no telemetry) always enabled - - - - - Support for a third timer - - - - - Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - - - - - Support for PPM internal module hack - - - - - ST7565P LCD or compatible - - - - - ST7565R LCD or compatible - - - - - ERC12864FSF LCD - - - - - ST7920 LCD - - - - - 9X board - - - - - - - - Enable the throttle trace in Statistics - - - - - EEprom write progress bar - - - - - - No Winged Shadow How High support - - - - - - No vario support - - - - - - No GPS support - - - - - - No gauges in the custom telemetry screen - - - - - Allow compensating for offset errors in FrSky FAS current sensors - - - - - - Add support for reversing stick inputs (e.g. needed for FrSky gimbals) - - - - - Power management by soft-off circuitry - - - - - 9XR-PRO - - - - - FrSky Taranis - - - - - FrSky Taranis Plus - - - - - FrSky Taranis X9E - - - - - Confirmation before radio shutdown - - - - - - Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views - - - - - Haptic module installed - - - - - Support for Lua model scripts - - - - - No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) - - - - - - Support of FrSky PXX protocol - - - - - Disable HELI menu and cyclic mix support - - - - - Disable Global variables - - - - - - - - - Support for DSM2 modules - - - - - - - - - - - - PPM center adjustment in limits + Rotary Encoder use in menus navigation @@ -8524,194 +7676,489 @@ This determines how mixer values are added. - - - - - Symetrical Limits + + + Enable heli menu and cyclic mix support - + + - - - - Pots use in menus navigation - - - - - Your radio probably uses a wrong firmware, - eeprom size is 4096 but only the first 2048 are used - - - - - No OverrideCH functions available - - - - - - - - - - - - No flight modes + + + + + Enable TEMPLATES menu - SmartieParts 2.2 Backlight support + + + No splash screen + + + + + + + + + + + + Disable curves menus - - - - Enable resetting values by pressing up and down at the same time + + + Support for radio modified with regular speaker - - - - - - - No graphical check boxes and sliders + + + + Used if you have modified your radio with voice mode - - - - - - + + + + Used if you have modified your radio with haptic mode + + + + + Channel values displayed in us + + + + + + + + + + + + In model setup menus automatically set source by moving the control + + + + + + + + + + + + In model setup menus automatically set switch by moving the control + + + + + Use alternative SQT5 font + + + + + (displaying only first 10 warnings) + + + + + Possibility to enable FAI MODE (no telemetry) at field + + + + + FAI MODE (no telemetry) always enabled + + + + + + + Support for a third timer + + + + + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 + + + + + Support for PPM internal module hack + + + + + ST7565P LCD or compatible + + + + + ST7565R LCD or compatible + + + + + ERC12864FSF LCD + + + + + ST7920 LCD + + + + + 9X board + + + + + + + + Enable the throttle trace in Statistics + + + + + EEprom write progress bar + + + + + + No Winged Shadow How High support + + + + + + No vario support + + + + + + No GPS support + + + + + + No gauges in the custom telemetry screen + + + + + Allow compensating for offset errors in FrSky FAS current sensors + + + + + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) + + + + + Power management by soft-off circuitry + + + + + 9XR-PRO + + + + + FrSky Taranis + + + + + FrSky Taranis Plus + + + + + FrSky Taranis X9E + + + + + Confirmation before radio shutdown + + + + + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views + + + + + Haptic module installed + + + + + Support for Lua model scripts + + + + + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) + + + + + + Support of FrSky PXX protocol + + + + + Disable HELI menu and cyclic mix support + + + + + Disable Global variables + + + + + + + + + Support for DSM2 modules + + + + + + + + + + + + PPM center adjustment in limits + + + + + + + + + + + + Symetrical Limits + + + + + + + + + + Pots use in menus navigation + + + + + Your radio probably uses a wrong firmware, + eeprom size is 4096 but only the first 2048 are used + + + + + No OverrideCH functions available + + + + + + + + + + + + No flight modes + + + + + + SmartieParts 2.2 Backlight support + + + + + + + + + Enable resetting values by pressing up and down at the same time + + + + + + + + + + + + No graphical check boxes and sliders + + + + + + + + + + + Battery graph - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items - - - - - + + + + + EEprom write Progress bar + + + + + + + + Imperial units + + + + + M128 / 9X board + + + + + 9XR + + + + + 9XR with M128 chip + + + + + Gruvin9x board / 9X + + + + + MEGA2560 board + + + + + Sky9x board / 9X + + + + + + Bluetooth interface + + - - - - - Imperial units - - - - - M128 / 9X board - - - - - 9XR - - - - - 9XR with M128 chip - - - - - Gruvin9x board / 9X - - - - - MEGA2560 board - - - - - Sky9x board / 9X - - - - - - Bluetooth interface - - - - - - - - - - - + + + + + + Global variables - - + + Support for SD memory card - + Support for DSM2 modules using ppm instead of true serial - - + + Enable HELI menu and cyclic mix support - - + + Warning - + EEPROM saved with these warnings: - + Simulator for this firmware is not yet available @@ -8721,63 +8168,63 @@ This determines how mixer values are added. - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves - + OpenTx only accepts %1 points in all curves - - - - - + + + + + OpenTX on this board doesn't accept this function - + OpenTX doesn't accept this telemetry protocol - - + + OpenTX doesn't accept this radio protocol - + OpenTX doesn't allow this number of channels - + Trim disabled - + Own Trim - + Use Trim from Flight mode %1 - + Use Trim from Flight mode %1 + Own Trim as an offset @@ -8809,15 +8256,21 @@ The OpenTX Team. - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! @@ -8827,33 +8280,33 @@ The OpenTX Team. - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -8887,12 +8340,12 @@ The OpenTX Team. - + Positive - + Negative @@ -8944,17 +8397,17 @@ The OpenTX Team. RudderPage - + No - + Yes - + <br>Rudder Channel: @@ -9123,7 +8576,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SimpleTailPage - + Elevator Channel: @@ -9298,10 +8751,44 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + + + + + Warning + + + + + Invalid image in library %1 + + + + + Information + + + + + No valid image found in library, check your settings + + + StandardPage - + Channel %1 @@ -9309,25 +8796,24 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -9336,35 +8822,40 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TailPage - + Rudder Channel: - + Elevator Channel: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder - + Only Elevator - + V-tail - + Tail Type: @@ -9372,96 +8863,96 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Telemetry - + A1 - + A2 - + RSSI - + Alarm 1 - - + + ---- - - + + Yellow - - + + Orange - - + + Red - + Alarm 2 - + Center Silent - + Altitude source - + Volts source - + Top Bar - + Serial Protocol - + Sensors - + Disable multi sensor handling - + Volt source - + Current source @@ -9471,82 +8962,82 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - + None - + FrSky Sensor Hub - + Blades - + Sink Max - + Climb Max - + Sink Min - + Climb Min - + Vario source - + Vario limits - + Altimetry - + mAh - + A - + Various - + mAh count - + FAS Offset - + Persistent mAh @@ -9660,17 +9151,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - - Low Alarm - - - - - Critical Alarm - - - - + Range @@ -9683,22 +9164,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - + None - + Numbers - + Bars - + Script @@ -9726,99 +9207,99 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetryPanel - + FrSky S.PORT - + FrSky D - + FrSky D (cable) - + Telemetry screen %1 - + Low Alarm - + Critical Alarm - + Winged Shadow How High - + Winged Shadow How High (not supported) - + Alti - + Alti+ - + VSpeed + - - + A1 + - - + A2 - - + + A3 - - + + A4 - - + + FAS - + Cells - + --- @@ -9924,7 +9405,107 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - Amps Sensor : + Sensor : + + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. @@ -9932,111 +9513,11 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Raw (-) - - - Voltage (V) - - - - - Current (A) - - - - - Current (mA) - - - - - Speed (kts) - - - - - Speed (m/s) - - - - - Speed (ft/s) - - - - - Speed (km/h) - - - - - Speed (miles/h) - - - - - Meters (m) - - - - - Feet (ft) - - - - - Temp (°C) - - - - - Temp (°F) - - - - - Percentage (%) - - - - - Energy (mAh) - - - - - Power (W) - - - - - RF Power (dBm) - - RPM - - - Acceleration (g) - - - - - Heading (°) - - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - - Precision @@ -10091,22 +9572,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetrySensorPanel - + Lowest - + Cell %1 - + Highest - + Delta @@ -10327,17 +9808,17 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi ThrottlePage - + Yes - + No - + <br>Throttle Channel: @@ -10358,32 +9839,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TimerPanel - + Silent - + Beeps - + Voice - - Not persistent - - - - - Persistent (flight) + + Haptic + Not persistent + + + + + Persistent (flight) + + + + Persistent (manual reset) @@ -10516,12 +10002,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi VTailPage - + First Tail Channel: - + Second Tail Channel: @@ -10529,12 +10015,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WingtypeSelectionPage - + Standard Wing - + Flying Wing / Deltawing @@ -10816,37 +10302,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WizardPrinter - + Plane - + Multicopter - + Helicopter - + Model Name: - + Model Type: - + Options: - + Channel %1: @@ -11553,38 +11039,4 @@ Press cancel to abort joystick calibration - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - - - - - Warning - - - - - Invalid image in library %1 - - - - - Information - - - - - No valid image found in library, check your settings - - - diff --git a/companion/src/translations/companion_it.ts b/companion/src/translations/companion_it.ts index 6d3f6ffa2..8b40d6c4b 100644 --- a/companion/src/translations/companion_it.ts +++ b/companion/src/translations/companion_it.ts @@ -4,27 +4,27 @@ AileronsPage - + No No - + Yes, controlled by a single channel Si, controllato da un singolo canale - + Yes, controlled by two channels Si, controllati da due canali - + <br>First Aileron Channel: <br>Canale del primo alettone: - + Second Aileron Channel: Canale del secondo alettone: @@ -32,27 +32,27 @@ AirbrakesPage - + No No - + Yes, controlled by a single channel Si, controllato da un singolo canale - + Yes, controlled by two channels Si, controllati da due canali - + <br>First Airbrake Channel: Canale del primo diruttore: - + Second Airbrake Channel: Canale del secondo diruttore: @@ -74,7 +74,7 @@ - + Open Folder Apri Cartella @@ -326,7 +326,7 @@ Mode 4: - + Simulator Volume Gain Guadagno Volume Simulatore @@ -464,62 +464,62 @@ Può essere differente dalla lingua del firmware Impostazioni simulatore - + Simulator BackLight Colore Retroilluminazione - + Enable Abilita - + Blue Blu - + Green Verde - + Red Rosso - + Orange Arancione - + Yellow Giallo - + Joystick Joystick - + Calibrate Calibrazione - + Simulator capture folder Cartella per cattura schermate - + Only capture to clipboard Usa solo gli appunti per la cattura degli schermi - + Remember simulator switch values Ricorda la posizione degli switches nel simulatore @@ -534,64 +534,64 @@ Può essere differente dalla lingua del firmware Selezionare la cartella per le schermate del simulatore - - + + No joysticks found Nessun joystick trovato - + EMPTY: No radio settings stored in profile VUOTO: Nessuna impostazione radio nel profilo - + AVAILABLE: Radio settings of unknown age DISPONIBILE: Impostazioni di data sconosciuta - + AVAILABLE: Radio settings stored %1 DISPONIBILE: Impostazioni memorizzate %1 - + Select your library folder Selezionare la cartella degli sfondi - - + + Select your Models and Settings backup folder Selezionare la cartella per i backup - + Select Google Earth executable Trova l'eseguibile di Google Earth - + Select the folder replicating your SD structure Selezionare la cartella contenente la struttura della scheda SD - + Not possible to remove profile Non è possibile rimuover il profilo - + The default profile can not be removed. Il profilo predefinito non può essere rimosso. - + Open Image to load Apri l'immagine da caricare - + Images (%1) Immagini (%1) @@ -773,9 +773,8 @@ Può essere differente dalla lingua del firmware Stick 4 - Battery - Batteria + Batteria @@ -798,9 +797,18 @@ Può essere differente dalla lingua del firmware PPM 4 - Current - Corrente + Corrente + + + + Battery Offset + + + + + Current Offset + @@ -1049,252 +1057,157 @@ Può essere differente dalla lingua del firmware Stampa su file - + No name Modello senza nome - General Model Settings - Impostazioni generali del modello + Impostazioni generali del modello - - - Name - Nome + Nome - - EEprom Size - Dimensione in EEprom + Dimensione in EEprom - - Timer1 - Temporizzatore 1 + Temporizzatore 1 - - Timer2 - Temporizzatore 2 + Temporizzatore 2 - - Internal Radio System - Sistema Radio interno + Sistema Radio interno - - Radio System - Sistema Radio + Sistema Radio - - - - Protocol - Protocollo + Protocollo - - External Radio Module - Modulo radio Esterno + Modulo radio Esterno - - Extra Radio System - Sistema radio esteso + Sistema radio esteso - - Trainer port mode - Modalità porta Maestro/Allievo + Modalità porta Maestro/Allievo - - Throttle Trim - Trim Motore + Trim Motore - - Enabled - Abilitato + Abilitato - - Disabled - Disabilitato + Disabilitato - - Trim Increment - Incremento del Trim + Incremento del Trim - - Center Beep - Avviso centraggio + Avviso centraggio - Flight modes Settings - Impostazioni Fasi di Volo + Impostazioni Fasi di Volo - - Fades - Transizioni + Transizioni - - Trims - Trims + Trims - - Switch - Interruttore + Interruttore - - - - Flight mode name - Nome fase di volo + Nome fase di volo - - IN - Ingr. + Ingr. - - OUT - Usc. + Usc. - - - - - - - - - - FM - FV + FV - - Gvars - Var Glob + Var Glob - - Rot. Enc. - Enc. Rot. + Enc. Rot. - Limits - Limiti + Limiti - - - - - Offset - Spostamento + Spostamento - - - - - Min - Min + Min - - - - - Max - Max + Max - - - Invert - Inversione + Inversione - - - - - CH - CH + CH - - INV - INV + INV - - NOR - NOR + NOR - Global Variables - Variabili Globali + Variabili Globali - - GV - VG + VG - Inputs - Ingressi + Ingressi Expo/Dr Settings @@ -1317,9 +1230,8 @@ Può essere differente dalla lingua del firmware DISABILITATO - Mixers - Miscelazioni + Miscelazioni noTrim @@ -1338,34 +1250,28 @@ Può essere differente dalla lingua del firmware Avviso - Curves - Curve + Curve L%1 L%1 - - Curve - Curva + Curva - Logical Switches - Interruttori logici + Interruttori logici - L - L + L - Special Functions - Funzioni speciali + Funzioni speciali Function @@ -1384,114 +1290,76 @@ Può essere differente dalla lingua del firmware Abilita - SF - SF + SF - Telemetry Settings - Impostazioni telemetria + Impostazioni telemetria - - Analog - Analogico + Analogico - - Unit - Unità + Unità - - Scale - Campo di misura + Campo di misura - - - - A%1 - A%1 + A%1 - - Alarm 1 - Allarme 1 + Allarme 1 - - Alarm 2 - Allarme 2 + Allarme 2 - - - - Type - Tipo + Tipo - - - - Condition - Condizione + Condizione - - - - Value - Valore + Valore - - RSSI Alarm - Allarmi RSSI + Allarmi RSSI - - Custom Telemetry View - Schermata personalizzata dati telemetrici + Schermata personalizzata dati telemetrici - - Telemetry Bars - Barre Telemetria + Barre Telemetria - - Bar Number - Numero Barra + Numero Barra - - Source - Sorgente + Sorgente - + Print Document Stampa documento - + Select PDF output file Scegliere il nome del file PDF @@ -1499,7 +1367,7 @@ Può essere differente dalla lingua del firmware ConclusionPage - + OK, I understand. Va bene, ho capito. @@ -1537,12 +1405,16 @@ Può essere differente dalla lingua del firmware Un sentito ringraziamento è dovuto a Rafal Tomczak (RadioClone), Thomas Husterer (th9x) e Erez Raviv (er9x e eePe) - - Thank you all !!! - Grazie a tutti !!! + + OpenTX Blacklist + - + Thank you all !!! + Grazie a tutti !!! + + + monthly @@ -1575,22 +1447,22 @@ Può essere differente dalla lingua del firmware CurveGroup - + Diff Diff - + Expo Espo - + Func Funz - + Curve Curva @@ -1840,22 +1712,22 @@ Può essere differente dalla lingua del firmware CyclicPage - + 90 90 - + 120 120 - + 120x 120x - + 140 140 @@ -1871,12 +1743,12 @@ Può essere differente dalla lingua del firmware ElevonsPage - + <br>First Elevon Channel: <br>Canale primo Elevone: - + Second Elevon Channel: Canale secondo Elevone: @@ -2215,47 +2087,43 @@ Se vuoto verrà sempre considerata "Attiva". Modifica %1 - Rud - Dir + Dir - Ele - Ele + Ele - Thr - Mot + Mot - Ail - Ale + Ale FblPage - + Throttle Channel: Canale motore: - + Yaw Channel: TODO Canale imbardata: - + Pitch Channel: TODO Canale Beccheggio: - + Roll Channel: TODO Canale Rollio: @@ -2309,27 +2177,27 @@ Può essere differente dalla lingua del firmware FlapsPage - + No No - + Yes, controlled by a single channel Si, controllato da un singolo canale - + Yes, controlled by two channels Si, controllati da due canali - + <br>First Flap Channel: <br>Canale primo Flap: - + Second Flap Channel: Canale secondo Flap: @@ -2587,8 +2455,8 @@ Può essere differente dalla lingua del firmware - - + + Warning Avviso @@ -2642,58 +2510,58 @@ Può essere differente dalla lingua del firmware L'immagine della libreria non può essere caricata - + Splash image not found Immagine di avvio non trovata - + Cannot save customized firmware Errore durante la scrittura del firmware personalizzato - + Write Firmware to Radio Scrivi Firmware sulla Radio - - + + Firmware check failed Controllo firmware fallito - + Could not check firmware from radio Non posso controllare il firmware dallaradio - + New firmware is not compatible with the one currently installed! Il nuovo firmware non è compatibile con quello attualmente installato! - + Conversion failed Conversione fallita - + Cannot convert Models and Settings for use with this firmware, original data will be used Non posso convertire le impostazioni per questo firmware, verranno usate le impostazioni originali - + Restore failed Ripristino fallito - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 Non è possibile ripristinare Modelli e impostazioni sulla radio. Il file di Modelli e impostazioni può essere trovato in: %1 - + Flashing done Scrittura effettuata @@ -2823,37 +2691,33 @@ Usate ZADIG per installare correttamente il driver. FlightModePanel - Rud - Dir + Dir - Ele - Ele + Ele - Thr - Mot + Mot - Ail - Ale + Ale - + Rotary Encoder %1 Encoder rotativo %1 - + GVAR%1 VAR.GLOB%1 - + Popup enabled Popup abilitato @@ -2861,17 +2725,17 @@ Usate ZADIG per installare correttamente il driver. FlightModesPanel - + Flight Mode %1 Fase di volo %1 - + (%1) (%1) - + (default) (Predefinita) @@ -2879,17 +2743,17 @@ Usate ZADIG per installare correttamente il driver. FlybarSelectionPage - + Has Flybar Con Flybar - + Flybarless Senza Flybar - + Flybar: Flybar: @@ -3927,17 +3791,17 @@ Siete sicuri ? GyroPage - + No No - + Yes, controled by a switch Si, controllato da un interruttore - + Yes, controlled by a pot Si, controllato da un potenziometro @@ -4026,22 +3890,22 @@ Siete sicuri ? HeliPage - + Throttle Channel: Canale motore: - + Yaw Channel: Canale imbardata: - + Pitch Channel: Canale Beccheggio: - + Roll Channel: Canale Rollio: @@ -4433,9 +4297,9 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded Documento caricato @@ -4445,134 +4309,134 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt Mostrare il precedente avviso all'avvio ? - + Checking for updates Controllo aggiornamenti in corso - + Unable to check for updates. Impossibile controllare gli aggiornamenti. - - - + + + Save As Salva come - + Executable (*.exe) Eseguibili (*.exe) - + New release available Nuova versione disponibile - - + + No updates available at this time. Nessun aggiornamento disponibile. - + Would you like to launch the installer? Desiderate eseguire l'aggiornamento ? - + Error opening file %1: %2. Errore durante l'apertura del file %1: %2. - + Compilation server termporary failure, try later Guasto temporaneo del server di compilazione, riprovate più tardi - + Compilation server too busy, try later Il server di compilazione è occupato, provate più tardi - + Unknown server failure, try later Errore del server sconosciuto, provare più tardi - + Do you want to write the firmware to the radio now ? Volete scrivere il firmware sulla radio? - - + + File saved Documento salvato - - + + Error Errore - - + + Yes Si - - + + No No - - + + Release Notes Note di aggiornamento - - + + Do you want to download release %1 now ? Volete scaricare la versione %1 adesso ? - - + + Open Models and Settings file Apri modelli e file impostazioni - + Firmware updates Aggiornamenti firmware - + Current firmware does not provide release notes informations. Il firmware selezionato non fornisce note di aggiornamento. - + The selected language will be used the next time you start Companion. Il linguaggio selezionato sarà usato al prossimo riavvio di Companion. - + A new release of Companion is available, please check the OpenTX website! Una nuova versione di Companion è disponibile, visitate il sito Web di OpenTx! - + Not enough memory for all the selected firmware options Memoria insufficente per tutte le opzioni firmware selezionate @@ -4581,117 +4445,117 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt OK - + The new theme will be loaded the next time you start Companion. Il nuovo tema sarà caricato al prossimo riavvio di Companion. - + The icon size will be used the next time you start Companion. La dimensione delle icone sarà usata al prossimo riavvio di Companion. - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + New Nuovo - + Open... Apri... - + Save Salva - + Save As... Salva come... - + Copy Model Copia Modello - + Paste Model Incolla Modello - + A monochrome black icon theme Tema icone monocromatico nero - + A monochrome white icon theme Tema icone monocromatico bianco - + A monochrome blue icon theme tema icone monocromatico blu - + Small Piccole - + Use small toolbar icons Usa icone piccole barra strumenti - + Use normal size toolbar icons Usa icone normali nell barra strumenti - + Normal Normali - + Use big toolbar icons Usa icone grandi barra strumenti - + Big Grandi - + Use huge toolbar icons Usa icone giganti barra strumenti - + Huge Giganti - + Ignore this release %1? Ignorare questa versione %1? - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> Il progetto OpenTx-Companion è originariamente derivato da <a href='%1'>eePe</a> - + Copyright OpenTX Team Copyright OpenTX Team @@ -4700,492 +4564,492 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt OpenTx Companion 2.1 - FW: %1 - Profilo: %2 - + Create a new Models and Settings file Crea nuovo modello e file di impostazioni - - + + Save Models and Settings file Salva Modello e file impostazioni - + Exit Esci - + Cut Model Taglia Modello - + Cut current model to the clipboard Taglia e inserisci modello nella clipboard - + Copy current model to the clipboard Copia modello nella clipboard - + Paste model from clipboard Incolla Modello dalla clipboard - + Classical Classica - + The classic companion9x icon theme Tema classico icone Companion - + Yerico Yerico - + Yellow round honey sweet icon theme Tema di icone giallo dolce miele rotondo - + Monochrome Monocromatico - + MonoWhite Monocolore Bianco - + MonoBlue Monocolore Blu - + System language Lingua di sistema - + Use system language in menus Usa la lingua di sistema - + Czech Ceco - + Use Czech in menus Usa il Ceco nei menu - + German Tedesco - + Use German in menus Usa il Tedesco nei menu - + English Inglese - + Use English in menus Usa l'inglese nei menu - + Finnish Finlandese - + Use Finnish in menus Usa il Fillandese nei menu - + French Francese - + Use French in menus Usa il Francese nei menu - + Italian Italiano - + Use Italian in menus Usa l'Italiano nei menu - + Polish Polacco - + Use Polish in menus Usa il polacco nei menu - + Spanish Spagnolo - + Use Spanish in menus UtUsa lo spagnolo nei menu - + Swedish Svedese - + Use Swedish in menus Usa lo svedese nei menu - + About... Informa su... - + Print... Stampa... - + Print current model Stampa il modello corrente - + Simulate... Simula... - + Simulate current model Simula il modello corrente - + Alt+S Alt+S - + Load Backup... Carica salvataggio... - + View Log File... Visualizza file di Log... - + Open and view log file Apri e visualizza file di log - + Settings... Impostazioni... - + Edit Settings Edita Impostazioni - + Download... Scarica... - + Download firmware and voice files Scarica Firmware e file voce - + Check for Updates... Controllo aggiornamenti... - + Check OpenTX and Companion updates Controllo degli aggiornamenti di openTx e Companion - + Companion Changes... Cambiamenti in Companion... - + Show Companion change log Mostra i cambiamenti in Companion - + Firmware Changes... Cambiamenti nel Firmware... - + Show firmware change log Mostra i cambiamenti nel Firmware - + Compare Models... Confronta due modelli... - + Edit Radio Splash Image... Edita immagine Splah della radio... - + Edit the splash image of your Radio Edita immagine splash della tua radio - + List programmers... Lista programmatori... - + Fuses... Fuses... - - + + Read Firmware from Radio Leggi il Firmware dalla Radio - + Read firmware from Radio Leggi firmware dalla Radio - - + + Write Firmware to Radio Scrivi Firmware sulla Radio - + Write firmware to Radio Scrivi firmware sulla Radio - + Add Radio Profile Aggiungi profilo Radio - + Create a new Radio Setting Profile Crea un nuovo profilo Radio - + Manuals and other Documents Manuali e altri documenti - + Open the OpenTX document page in a web browser Apri la pagina documenti di OpenTx in un browser web - + Write Models and Settings To Radio Scrivi modello e impostazioni sulla Radio - - + + Write Models and Settings to Radio Scrivi Modeli e Impostazioni sulla Radio - - + + Read Models and Settings from Radio Leggi Modelli e Impostazioni dalla Radio - + Configure Communications... Configura Comunicazioni... - + Configure software for communicating with the Radio Configura il software per comunicare con la Radio - + Write Backup to Radio Scrivi salvataggio sulla Radio - + Write Backup from file to Radio Scrivi salvataggio dal file sulla Radio - + Backup Radio to File Salvataggio Radio su File - + Save a complete backup file of all settings and model data in the Radio Salvataggio completo di Impostazioni e Modelli nella Radio - + Contributors... Contributori.... - + A tribute to those who have contributed to OpenTX and Companion Un ringraziamento a tutti coloro che hanno contribuito a OpenTx e Companion - + Recent Files File recenti - + Recent Models+Settings Modelli e Impostazioni recenti - + Set Menu Language Inposta Menu Lingua - + Load backup from file Carica salvataggio da file - + Read Models and Settings From Radio Leggi Modelli e impostazioni dalla Radio - + Save Radio Backup to File Salvataggio Radio su file - + Read Radio Firmware to File Leggi firmware radio su File - + OpenTX Home Page: <a href='%1'>%1</a> OpenTX Home Page: <a href='%1'>%1</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Se avete trovato utile questo programma prego supportatelo con <a href='%1'>una donazione</a> - + Compare models Confronta due modelli - + Exit the application Esci dall'applicazione - + Show the list of radio profiles Mostra la lista dei profili radio - + Write Scrivi - + A new version of Companion is available (version %1)<br>Would you like to download it? Una nuova versione di Companion è disponibile (versione %1)<br> Vuoi scaricarla? - + Compilation server requires registration, please check OpenTX web site Server di compilazione richiede la registrazione, prego controllare sul sito web di OpenTx - + About Companion Informazioni su Companion - + List available programmers Lista dei programmatori supportati - + Show fuses dialog Mostra finestra di dialogo Fuses - + Show the application's About box Mostra la finestra Informazioni Su - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -5198,7 +5062,7 @@ Volete scaricarla adesso ? Vi raccomandiamo di leggere le note di rilascio sottostanti per vedere se ci siano cambiamenti che possano essere ritenuti da Voi rilevanti. - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -5215,84 +5079,84 @@ Do you want to download it now? We recommend you view the release notes using the button below to learn about any changes that may be important to you. - - - + + + Companion Companion - - + + Synchronize SD Sincronizza SD - + SD card synchronization Sincronizzazione scheda SD - + Set Icon Theme Scegliere il tema di icone - + Set Icon Size Impostazione dimensione icone - - + + File Documento - - + + Edit Modifica - + Settings Impostazioni - + Read/Write Leggi/Scrivi - - + + Help Aiuto - - + + Radio Profile Profilo Radio - + Show recent Models+Settings documents Mostra modell e impostazioni recenti - + Ready Pronto - + %2 %2 - + New Radio Nuova radio @@ -5330,16 +5194,16 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error Errore - + Unable to find file %1! Impossibile trovare il file %1! @@ -5347,7 +5211,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. Errore durante l'apertura del file %1: @@ -5361,7 +5225,7 @@ We recommend you view the release notes using the button below to learn about an - + Error reading file %1: %2. Error durante la lettura del file %1: @@ -5399,12 +5263,12 @@ We recommend you view the release notes using the button below to learn about an %2. - + Open backup Models and Settings file Apri salvataggio modelli e impostazioni - + Invalid binary backup File %1 File di backup binario non valido %1 @@ -5633,24 +5497,20 @@ Determina come il valore viene aggiunto alla miscelazione. DEST -> CH%1 - Rud - Dir + Dir - Ele - Ele + Ele - Thr - Mot + Mot - Ail - Ale + Ale @@ -5717,12 +5577,12 @@ Determina come il valore viene aggiunto alla miscelazione. Avviso(%1) - + Not enough available mixers! Non ci sono più miscelazioni disponibili! - + Delete Selected Mixes? Cancellare le miscelazioni selezionate ? @@ -5807,12 +5667,12 @@ Determina come il valore viene aggiunto alla miscelazione. Ctrl+U - + Clear Mixes? Cancellare le miscelazioni ? - + Really clear all the mixes? Sicuri di voler cancellare le miscelazioni ? @@ -5884,30 +5744,304 @@ Determina come il valore viene aggiunto alla miscelazione. Telemetria + + ModelPrinter + + + %1 bytes + + + + + CH%1 + CH%1 + + + + Exponential + Esponenziale + + + + Extra Fine + Extra Fine + + + + Fine + Fine + + + + Medium + Medio + + + + Coarse + Ampio + + + + Unknown + Sconosciuto + + + + Enabled + Abilitato + + + + Disabled + Disabilitato + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + Allievo/(Presa) + + + + Master/SBUS Module + Maestro/Modulo SBUS + + + + Master/CPPM Module + Maestro/Modulo CPPM + + + + Master/SBUS in battery compartment + Maestro/SBUS nel compartimento batteria + + + + Master/Jack + Maestro/(presa) + + + + Rudder + Direzionale + + + + Elevator + Elevatore + + + + Throttle + Motore + + + + Aileron + Alettoni + + + + Name(%1) + + + + + %1:%2 + %1:%2 + + + + Persistent + Persistente + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + + + + + + + + FM%1 + FV %1 + + + + FM%1%2 + FV %1%2 + + + + FM%1+%2 + + + + + [I%1] + [I%1] + + + + Input%1 + Ingresso%1 + + + + + Weight + Peso + + + + + Switch + + + + + + NoTrim + NoTrim + + + + No DR/Expo + No DR/Espo + + + + Offset + Spostamento + + + + Delay + Ritardo + + + + Slow + Rallentamento + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + Fasi di volo(%1) + + + + Flight mode(%1) + Fase di volo(%1) + + + + Edge(%1, [%2:%3]) + Soglia(%1, [%2:%3]) + + + + Sticky(%1, %2) + Bloccato(%1, %2) + + + + Timer(%1, %2) + Temporizzatore(%1, %2) + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + Personalizzato + + + + Standard + Standard + + ModelSelectionPage - + Plane Aereo - + Multirotor Multirotore - + Helicopter Elicottero - + Model Name: Nome Modello: - + Model Type: Tipo di modello: @@ -5915,128 +6049,129 @@ Determina come il valore viene aggiunto alla miscelazione. ModelsListWidget - + + &Edit &Modifica - + &Restore from backup &Ripristina da backup - + &Model Wizard &Assistente di configurazione - + &Delete &Elimina - + Delete Elimina - + &Copy &Copia - + Ctrl+C Ctrl+C - + &Cut &Taglia - + Ctrl+X Ctrl+X - + &Paste &Incolla - + Ctrl+V Ctrl+V - + D&uplicate D&uplica - + Ctrl+U Ctrl+U - + &Use as default &Predefinito - + P&rint model S&tampa modello - + Ctrl+P Ctrl+P - + Alt+S Alt+S - + &Simulate model Sim&ula modello - + General Settings Impostazioni generali radio - + Delete Selected Models? Cancellare i modelli selezionati ? - - + + Cannot delete default model. Non posso cancellare il modello predefinito. - + Cannot cut default model. Non posso tagliare il modello predefinito. - + Do you want to overwrite radio general settings? Vuoi sovrascrivere le impostazioni generali della radio? - + You are pasting on an not empty model, are you sure? State copiando su un modello non vuoto, siete sicuri ? - + No free slot available, cannot duplicate Nussun spazio di memoria libero, non posso duplicare @@ -6187,66 +6322,273 @@ Determina come il valore viene aggiunto alla miscelazione. ModulePanel - + Trainer Port Porta Allievo - + Internal Radio System Sistema Radio interno - + External Radio Module Modulo radio Esterno - - + + Radio System Sistema Radio - + Extra Radio System Sistema radio esteso - + Value Valore - + Hold Mantieni - + No Pulse No impulsi + + MultiModelPrinter + + + General Model Settings + Impostazioni generali del modello + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + Fasi di volo + + + + + Flight mode + Fase di volo + + + + Switch + + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + FV %1 + + + + + GV%1 + VG%1 + + + + RE%1 + + + + + Limits + Limiti + + + + Channel + + + + + Name + Nome + + + + + Offset + Spostamento + + + + Min + Min + + + + Max + Max + + + + Invert + + + + + Global Variables + Variabili Globali + + + + Inputs + Ingressi + + + + Mixers + Miscelazioni + + + + CV%1 + + + + + Curves + Curve + + + + L%1 + L%1 + + + + Logical Switches + Interruttori logici + + + + SF%1 + FS%1 + + + + Special Functions + Funzioni speciali + + + + Telemetry Settings + Impostazioni telemetria + + + + Analogs + + + + + Unit + Unità + + + + Scale + Campo di misura + + + + A%1 + A%1 + + + + RSSI Alarms + + + MultirotorPage - + Throttle Channel: Canale Motore: - + Yaw Channel: Canale Imbardata: - + Pitch Channel: Canale Beccheggio: - + Roll Channel: Canale Rollio: @@ -6254,17 +6596,17 @@ Determina come il valore viene aggiunto alla miscelazione. OptionsPage - + Throttle Cut Blocco motore - + Throttle Timer Temporizzatore motore - + Flight Timer Temporizzatore volo @@ -6287,32 +6629,24 @@ Determina come il valore viene aggiunto alla miscelazione. Stampa su file - Setup for: - Impostazioni per: + Impostazioni per: - printed on: %1 - stampato il: %1 + stampato il: %1 - General Model Settings - Impostazioni generali del modello + Impostazioni generali del modello - - - - Name - Nome + Nome - EEprom Size - Dimensione in EEprom + Dimensione in EEprom Timer1 @@ -6323,158 +6657,120 @@ Determina come il valore viene aggiunto alla miscelazione. Temporizzatore 2 - Internal Radio System - Sistema Radio interno + Sistema Radio interno - Radio System - Sistema Radio + Sistema Radio - - Protocol - Protocollo + Protocollo - Throttle Trim - Trim Motore + Trim Motore - Enabled - Abilitato + Abilitato - Disabled - Disabilitato + Disabilitato - External Radio Module - Modulo radio Esterno + Modulo radio Esterno - - Timer%1 - - - - Extra Radio System - Sistema radio esteso + Sistema radio esteso - Trainer port mode - Modalità porta Maestro/Allievo + Modalità porta Maestro/Allievo - Trim Increment - Incremento del Trim + Incremento del Trim - Center Beep - Avviso centraggio + Avviso centraggio - Flight modes - Fasi di volo + Fasi di volo - Fades - Transizioni + Transizioni - Trims - Trims + Trims - Gvars - Var Glob + Var Glob - Rot.Enc. - Enc. Rot. + Enc. Rot. - Switch - Int. + Int. - Flight mode name - Nome fase di volo + Nome fase di volo - IN - Ingr. + Ingr. - OUT - Usc. + Usc. - Rud - Dir + Dir - Ele - Ele + Ele - Thr - Mot + Mot - Ail - Ale + Ale - - - - - FM - FV + FV - Off - Spento + Spento - Inputs - Ingressi + Ingressi Weight Peso - Source - Sorgente + Sorgente NoTrim @@ -6485,9 +6781,8 @@ Determina come il valore viene aggiunto alla miscelazione. DISABILITATO - Mixers - Miscelazioni + Miscelazioni Weight(%1) @@ -6518,104 +6813,68 @@ Determina come il valore viene aggiunto alla miscelazione. Avviso(%1) - Limits - Limiti + Limiti - - - CH - CH + CH - - - - - Offset - Spostamento + Spostamento - - - - Min - Min + Min - - - - Max - Max + Max - - - Invert - Inversione + Inversione - - - INV - INV + INV - - - NOR - NOR + NOR - Curves - Curve + Curve - - - Curve - Curva + Curva - pt %1 - pt %1 + pt %1 - Logical Switches - Interruttori logici + Interruttori logici - L - L + L - Global Variables - Variabili Globali + Variabili Globali - GV - VG + VG - Special Functions - Funzioni speciali + Funzioni speciali Function @@ -6634,144 +6893,105 @@ Determina come il valore viene aggiunto alla miscelazione. FS%1 - SF - SF + SF - - Telemetry Settings - Impostazioni telemetria + Impostazioni telemetria - - Analog - Analogico + Analogico - Range - Intervallo + Intervallo - - - A%1 - A%1 + A%1 - Alarms - Allarmi + Allarmi - Low Alarm - Allarme basso + Allarme basso - Critical Alarm - Allarme critico + Allarme critico - RSSI - RSSI + RSSI - - Blades - Pale dell'elica + Pale dell'elica - - Alarm 1 - Allarme 1 + Allarme 1 - - Alarm 2 - Allarme 2 + Allarme 2 - Unit - Unità + Unità - Scale - Campo di misura + Campo di misura - - - - Type - Tipo + Tipo - - - - Condition - Condizione + Condizione - - - - Value - Valore + Valore - RSSI Alarm - Allarmi RSSI + Allarmi RSSI - Frsky serial protocol - Protocollo seriale FrSky + Protocollo seriale FrSky - - Custom Telemetry View - Schermata personalizzata dati telemetrici + Schermata personalizzata dati telemetrici - Telemetry Bars - Barre Telemetria + Barre Telemetria - Bar Number - Barra Numero + Barra Numero - + Print Document Stampa documento - + Select PDF output file Scegliere il nome del file PDF - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) Documenti ODF (*.odt);;Documenti PDF (*.pdf);;Documenti HTML (*.htm *.html);;Tutti i documenti (*) @@ -6805,15 +7025,12 @@ Determina come il valore viene aggiunto alla miscelazione. QObject - - FM%1 - FV %1 + FV %1 - Input%1 - Ingresso%1 + Ingresso%1 @@ -6822,8 +7039,6 @@ Determina come il valore viene aggiunto alla miscelazione. - - CH%1 CH%1 @@ -6949,7 +7164,7 @@ Determina come il valore viene aggiunto alla miscelazione. - + S3 S3 @@ -7247,7 +7462,6 @@ Determina come il valore viene aggiunto alla miscelazione. - [I%1] [I%1] @@ -7438,7 +7652,6 @@ Determina come il valore viene aggiunto alla miscelazione. - Unknown Sconosciuto @@ -7484,10 +7697,19 @@ Determina come il valore viene aggiunto alla miscelazione. - DISABLED DISABILITATO + + + INV + INV + + + + NOR + NOR + Play Value @@ -7495,33 +7717,33 @@ Determina come il valore viene aggiunto alla miscelazione. - - + + --- --- - + Rud Trim Trim Dir - + Ele Trim Trim Ele - + Thr Trim Trim Mot - + Ail Trim Trim Ale - + Rot Enc Enc Rot @@ -7585,82 +7807,60 @@ Determina come il valore viene aggiunto alla miscelazione. Suana Entrambi - - Weight - Peso + Peso - - - Switch - - - - - NoTrim - NoTrim + NoTrim - No DR/Expo - No DR/Espo + No DR/Espo - Offset - Spostamento + Spostamento - Delay - Ritardo + Ritardo - Slow - Rallentamento + Rallentamento - Warn - Avviso + Avviso - Flight modes - Fasi di volo + Fasi di volo - Flight mode - Fase di volo + Fase di volo - Edge(%1, [%2:%3]) - Soglia(%1, [%2:%3]) + Soglia(%1, [%2:%3]) - Sticky(%1, %2) - Bloccato(%1, %2) + Bloccato(%1, %2) - Timer(%1, %2) - Temporizzatore(%1, %2) + Temporizzatore(%1, %2) - Duration (%1s) - Durata (%1s) + Durata (%1s) - Delay (%1s) - Ritardo (%1s) + Ritardo (%1s) @@ -7745,22 +7945,22 @@ Determina come il valore viene aggiunto alla miscelazione. - + !Flight mode %1 !Fase di volo %1 - + Flight mode %1 Fase di volo %1 - + Own value Legato alla fase - + Flight mode %1 value Valore Fase di Volo %1 @@ -7781,7 +7981,7 @@ Determina come il valore viene aggiunto alla miscelazione. - + -GV%1 -VG%1 @@ -7801,135 +8001,117 @@ Determina come il valore viene aggiunto alla miscelazione. Finlandese - + Yellow Giallo - + Orange Arancione - + Red Rosso - + Winged Shadow How High Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (non supportato) - + FrSky Sensor Hub FrSky Sensor Hub - + None Nessuno - + Imperial Imperiale - + Metric Sistema Metrico - Extra Fine - Extra Fine + Extra Fine - Fine - Fine + Fine - Medium - Medio + Medio - Coarse - Ampio + Ampio - %1:%2 - %1:%2 + %1:%2 - , Persistent - , Persistente + , Persistente - , MinuteBeep - , Avviso Minuto + , Avviso Minuto - , CountDown(Beeps) - , Conto alla rovescia(Suono) + , Conto alla rovescia(Suono) - , CountDown(Voice) - , Conto alla rovescia(Voce) + , Conto alla rovescia(Voce) - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - : Canale iniziale: %1, %2 Canali, %3usec Delay, Polarità impulso %4 + : Canale iniziale: %1, %2 Canali, %3usec Delay, Polarità impulso %4 - : Channel start: %1, %2 Channels - : Canale iniziale: %1, %2 Canali + : Canale iniziale: %1, %2 Canali - Slave/Jack - Allievo/(Presa) + Allievo/(Presa) - Master/SBUS Module - Maestro/Modulo SBUS + Maestro/Modulo SBUS - Master/CPPM Module - Maestro/Modulo CPPM + Maestro/Modulo CPPM - Master/SBUS in battery compartment - Maestro/SBUS nel compartimento batteria + Maestro/SBUS nel compartimento batteria - Master/Jack - Maestro/(presa) + Maestro/(presa) - Exponential - Esponenziale + Esponenziale Flight modes(%1) @@ -7940,29 +8122,25 @@ Determina come il valore viene aggiunto alla miscelazione. Fase di volo(%1) - Rudder - Direzionale + Direzionale - Elevator - Elevatore + Elevatore - Throttle - Motore + Motore - Aileron - Alettoni + Alettoni - + GV%1 VG%1 @@ -7970,34 +8148,34 @@ Determina come il valore viene aggiunto alla miscelazione. - + ---- ---- - - + + THR MOT - - + + P1 P1 - - + + P2 P2 - - + + P3 P3 @@ -8057,25 +8235,25 @@ Determina come il valore viene aggiunto alla miscelazione. - + Rud - + Ele - + Thr - + Ail @@ -8120,209 +8298,209 @@ Determina come il valore viene aggiunto alla miscelazione. L'uso simultaneo degli esponenziali e delle curve non è più supportato - + Source %1 cannot be exported on this board! La sorgente %1 non può essere esportata su questa radio! - + OpenTX only accepts %1 points in all curves OpenTX accetta solamente %1 punti in tutte le curve - + OpenTx only accepts %1 points in all curves OpenTx accetta solamente %1 punti in tutte le curve - - - - - + + + + + OpenTX on this board doesn't accept this function OpenTX in questa piattaforma non accetta la funzione - + OpenTX doesn't accept this telemetry protocol OpenTX non accetta questo protocollo di telemetria - - + + OpenTX doesn't accept this radio protocol OpenTX non accetta questo protocollo di trasmissione - + OpenTX doesn't allow this number of channels OpenTX non consente questo numero di canali - - + + Support for frsky telemetry mod Supporto per la modifica per la telemetria FrSky - - + + Support for jeti telemetry mod Supporto per la modifica per la telemetria Jeti - - + + Support for receiving ardupilot data Supporto per la modifica per la ricezione dati ardupilot - - + + Support for receiving NMEA data Supporto per la modifica per la ricezione dati NMEA - + Support for telemetry easy board Supporto per la scheda Telemetrez - - + + Support for MAVLINK devices Supporto per dispositivi MAVLINK - + Rotary Encoder use in menus navigation Utilizzo dell'encoder rotativo nella navigazione dei menù - + (displaying only first 10 warnings) (elenco dei primi 10 avvisi) - - - - - - + + + + + + Enable heli menu and cyclic mix support Abilita supporto menù elicotteri e miscelazione ciclico - - - - - - - - + + + + + + + + Enable TEMPLATES menu Abilita menù dei MODELLI - - - - + + + + No splash screen Disabilita schermata di avvio - - - - - - - - + + + + + + + + No flight modes Disabilita supporto fasi di volo - - - - - - - - + + + + + + + + Disable curves menus Disabilita il menu delle curve - - - - + + + + Support for radio modified with regular speaker Supporto per modifica con altoparlante - - - - - + + + + + Used if you have modified your radio with voice mode Utilizzato per la gestione del modulo audio - - - - - + + + + + Used if you have modified your radio with haptic mode Abilita supporto vibrazione - + Channel values displayed in us Posizione canali visualizzata in us - - + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) Aggiungi il supporto per l'inversione degli stick (Ad es. necessario per l'utilizzo degli stick FrSky) - + M128 / 9X board - + 9XR - + 9XR with M128 chip - + Gruvin9x board / 9X - + MEGA2560 board - + Power management by soft-off circuitry Gestione dell'alimentazione mediante pulsante soft-off @@ -8331,17 +8509,17 @@ Determina come il valore viene aggiunto alla miscelazione. OpenTX per 9XR-PRO - + Haptic module installed Modulo vibrazione installato - + Support for Lua model scripts Supporto degli script LUA - + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) Nessuna emulazione joystick nel FW (solo memoria di massa come nel Bootloader) @@ -8354,131 +8532,133 @@ Determina come il valore viene aggiunto alla miscelazione. OpenTx per FrSky Taranis Plus - - - - - - - - + + + + + + + + Battery graph Grafico della batteria - + Use alternative SQT5 font Usa font alternativo SQT5 (Leggermente quadrato) - + No OverrideCH functions available Nessuna funzione di forzatura CH disponibile - + Possibility to enable FAI MODE (no telemetry) at field Impostazione della modalità FAI (no telemetria) da radio - + FAI MODE (no telemetry) always enabled Modalità FAI (no telemetria) sempre attiva - + + + Support for a third timer - + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - + Support for PPM internal module hack - + ST7565P LCD or compatible Display LCD ST7565R o compatibile - + ERC12864FSF LCD - + ST7920 LCD - + 9X board - - - - + + + + Enable the throttle trace in Statistics Abilita il grafico utilizzo motore nelle statistiche - + EEprom write progress bar Barra di avanzamento durante la scrittura della eeprom - - + + No Winged Shadow How High support Disabilita supporto Winged Shadow How High - - + + No vario support Nessun Variometro - - + + No GPS support Disabilita supporto GPS - - + + No gauges in the custom telemetry screen Disabilita schermate telemetriche a barre - + Allow compensating for offset errors in FrSky FAS current sensors Abilita compensazione per errore offset in sensore di corrente FAS FrSky - + 9XR-PRO - + FrSky Taranis - + FrSky Taranis Plus - + FrSky Taranis X9E @@ -8487,12 +8667,12 @@ Determina come il valore viene aggiunto alla miscelazione. OpenTX per scheda MEGA2560 - + Confirmation before radio shutdown - + ST7565R LCD or compatible Display LCD ST7565R o compatibile @@ -8501,8 +8681,8 @@ Determina come il valore viene aggiunto alla miscelazione. Utilizzato se il modulo audio è disponibile - - + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views Aggiungi la vista delle uscite dei mixer alla schermata Monitor Canali, premendo [ENT] si intervallano le viste @@ -8515,66 +8695,66 @@ Determina come il valore viene aggiunto alla miscelazione. OpenTx per FrSky Taranis X9E - - + + Support of FrSky PXX protocol Supporto del protocollo PXX FrSky - + Disable HELI menu and cyclic mix support Disabilita il menù HELI e le funzioni del piatto ciclico - + Disable Global variables Disabilita variabili globali - - - - - + + + + + Support for DSM2 modules Supporto per moduli DSM2 - - - - - - - - + + + + + + + + PPM center adjustment in limits Regolazione del centro PPM nel menù limiti - - - - - - - - + + + + + + + + Symetrical Limits Limiti Simmetrici - - - - - - + + + + + + Pots use in menus navigation Utilizzo dei potenziometri per la navigazione nei menù - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used La tua radio probabilmente sta utilizzando un firmware sbagliato, @@ -8585,41 +8765,41 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati OpenTX for scheda 9X - - + + SmartieParts 2.2 Backlight support Abilita il supporto per la scheda SmartiePart versione 2.2 - - - - - + + + + + Enable resetting values by pressing up and down at the same time Abilita l'azzeramento di un valore mediante pressione contemporanea di tasti - - - - - - - - + + + + + + + + No graphical check boxes and sliders Disabilita grafica per caselle di spunta e cursori - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items Non utilizzare font in grassetto per evidenziare le voci attive @@ -8628,68 +8808,68 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati OpenTx per Board M128 / 9X - - - - - + + + + + EEprom write Progress bar Barra di avanzamento durante la scrittura della eeprom - - - - - - + + + + + + Imperial units Unità Imperiali nella telemetria - + Sky9x board / 9X - - + + Bluetooth interface Interfaccia bluetooth - - - - - - - - + + + + + + + + Global variables Variabili Globali - - - - - - - - + + + + + + + + In model setup menus automatically set source by moving the control Nel menu settaggio modelli selezionare automaticamente la sorgente muovendo il controllo - - - - - - - - + + + + + + + + In model setup menus automatically set switch by moving the control Nel menu settaggio modelli selezionare automaticamente l'interruttore muovendo il controllo @@ -8706,13 +8886,13 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati OpenTX per board Gruvin 9x / 9x - - + + Support for SD memory card Supporto memorie SD - + Support for DSM2 modules using ppm instead of true serial Supporto per moduli DSM2 usando il ppm invece della seriale @@ -8721,8 +8901,8 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati OpenTX per scheda Sky9x / 9X - - + + Enable HELI menu and cyclic mix support Abilita il menù HELI e le funzioni del piatto ciclico @@ -8749,7 +8929,7 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati - + S1 @@ -8760,7 +8940,7 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati - + V @@ -8888,21 +9068,21 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati - + S2 - + LS - + RS @@ -9182,18 +9362,18 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati - - + + Warning Avviso - + EEPROM saved with these warnings: EEPROM salvata con questi avvisi: - + Simulator for this firmware is not yet available Il simulatore per questo firmware non è ancora disponibile @@ -9203,22 +9383,22 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati th9x non ha gli Encoder Rotativi - + Trim disabled Trim disabilitato - + Own Trim Trim proprio - + Use Trim from Flight mode %1 Usa Trim della Fase di volo %1 - + Use Trim from Flight mode %1 + Own Trim as an offset Usa Trim della Fase di volo %1 + Trim proprio come offset @@ -9252,15 +9432,21 @@ The OpenTX Team. Il Team di OpenTX. - + + + - Synchronization error Errore di sincronizzazione - + + No SD directory configured! + + + + No Radio connected! Radio non connessa! @@ -9270,33 +9456,33 @@ Il Team di OpenTX. VG - + -%1 + - The directory '%1' doesn't exist! la cartella '%1' non esiste! - + Create '%1' failed Creazione di '%1' fallita - + Copy '%1' to '%2' failed Copia di '%1' in '%2' fallita - + Open '%1' failed Apertura di '%1' fallita - + Write '%1' failed Scrittura di '%1' fallita @@ -9331,12 +9517,12 @@ Il Team di OpenTX. Non posso cancellare il file temporaneo: %1 - + Positive Positivo - + Negative Negativo @@ -9388,17 +9574,17 @@ Il Team di OpenTX. RudderPage - + No No - + Yes Si - + <br>Rudder Channel: <br>Canale Direzionale: @@ -9570,7 +9756,7 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà SimpleTailPage - + Elevator Channel: Canale dell'Elevatore: @@ -9745,10 +9931,44 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà Uscite + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + Libreria sfondi - pagina %1 di %2 + + + + Warning + Avviso + + + + Invalid image in library %1 + Immagine corrotta nella libreria %1 + + + + Information + Informazione + + + + No valid image found in library, check your settings + Nessuna immagine trovata nella libreria, controllate le impostazioni + + StandardPage - + Channel %1 Canale %1 @@ -9756,25 +9976,29 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà SyncProcess - + + %1/%2 files + + + + Create directory %1 Crea directory %1 - + Copy %1 to %2 Copia %1 su %2 - Read %1 - Leggi %1 + Leggi %1 - + Write %1 Scrivi %1 @@ -9783,35 +10007,40 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà TailPage - + Rudder Channel: Canale Direzionale: - + Elevator Channel: Canale Elevatore: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder Elevatore e Deriva - + Only Elevator Solo Elevatore - + V-tail Coda a V - + Tail Type: Tipo di coda: @@ -9819,96 +10048,96 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà Telemetry - + A1 A1 - + A2 A2 - + RSSI RSSI - + Alarm 1 Allarme 1 - - + + ---- ---- - - + + Yellow Giallo - - + + Orange Arancione - - + + Red Rosso - + Alarm 2 Allarme 2 - + Center Silent - + Altitude source Misura dell'altitudine - + Volts source Misura della tensione - + Top Bar Barra superiore - + Serial Protocol Protocollo seriale - + Sensors Sensori - + Disable multi sensor handling - + Volt source Misura della tensione - + Current source Misura della corrente @@ -9918,82 +10147,82 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà Protocollo - + None Nessuno - + FrSky Sensor Hub FrSky Sensor Hub - + Blades Pale dell'elica - + Sink Max Max Discesa - + Climb Max Max Salita - + Sink Min Min Discesa - + Climb Min Min Salita - + Vario source Sorgente per il Vario - + Vario limits Limiti per il Vario - + Altimetry Altimetro - + mAh mAh - + A A - + Various Varie - + mAh count Conteggio mAh - + FAS Offset Offset FAS - + Persistent mAh mAh persistenti @@ -10107,17 +10336,15 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà Corrente (mA) - Low Alarm - Allarme basso + Allarme basso - Critical Alarm - Allarme critico + Allarme critico - + Range Intervallo @@ -10130,22 +10357,22 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà Tipo schermo personalizzato - + None Nessuno - + Numbers Numeri - + Bars Barre - + Script Script @@ -10173,99 +10400,99 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà TelemetryPanel - + FrSky S.PORT FrSky S.PORT - + FrSky D FrSky D - + FrSky D (cable) FrSky D (su cavo) - + Telemetry screen %1 Schermo telemetria %1 - + Low Alarm Allarme basso - + Critical Alarm Allarme critico - + Winged Shadow How High Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (non supportato) - + Alti - + Alti+ - + VSpeed + - - + A1 A1 + - - + A2 A2 - - + + A3 A3 - - + + A4 A4 - - + + FAS FAS - + Cells Celle - + --- --- @@ -10371,8 +10598,112 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà + Sensor : + + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. + + + Amps Sensor : - Sensore corrente : + Sensore corrente : @@ -10380,84 +10711,60 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà Grezza (-) - Voltage (V) - Voltaggio (V) + Voltaggio (V) - Current (A) - Corrente (A) + Corrente (A) - Current (mA) - Corrente (mA) + Corrente (mA) - Speed (kts) - Velocità (kts) + Velocità (kts) - Speed (m/s) - Velocità (m/s) + Velocità (m/s) - Speed (ft/s) - Velocità (ft/s) + Velocità (ft/s) - Speed (km/h) - Velocità (km/h) + Velocità (km/h) - Speed (miles/h) - Velocità (miglia/h) + Velocità (miglia/h) - Meters (m) - Metri (m) + Metri (m) - Feet (ft) - Piedi (ft) - - - - Temp (°C) - - - - - Temp (°F) - + Piedi (ft) - Percentage (%) - Percentuale (%) + Percentuale (%) - Energy (mAh) - Energia (mAh) + Energia (mAh) - Power (W) - Potenza (W) + Potenza (W) - RF Power (dBm) - Potenza RF (dBm) + Potenza RF (dBm) @@ -10465,24 +10772,12 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà - Acceleration (g) - Accelerazione (g) + Accelerazione (g) - Heading (°) - Rotta (°) - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - + Rotta (°) @@ -10542,22 +10837,22 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà TelemetrySensorPanel - + Lowest Minore - + Cell %1 Cella %1 - + Highest Maggiore - + Delta Diff @@ -10778,17 +11073,17 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà ThrottlePage - + Yes Si - + No No - + <br>Throttle Channel: <br>Canale Motore: @@ -10809,32 +11104,37 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà TimerPanel - + Silent Silenzioso - + Beeps Suoni - + Voice Voce - + + Haptic + Vibrazione + + + Not persistent Non persistente - + Persistent (flight) Persistente (volo) - + Persistent (manual reset) Persistente (reset manuale) @@ -10973,12 +11273,12 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà VTailPage - + First Tail Channel: Canale primo servo di coda: - + Second Tail Channel: Canale secondo servo di coda: @@ -10986,12 +11286,12 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà WingtypeSelectionPage - + Standard Wing Ali normali - + Flying Wing / Deltawing Tuttala / Ala a Delta @@ -11273,37 +11573,37 @@ Se l'opzione selezionata lo stick motore verrà rovesciato. Il minimo sarà WizardPrinter - + Plane Aereo - + Multicopter Multirotore - + Helicopter Elicottero - + Model Name: Nome Modello: - + Model Type: Tipo Modello: - + Options: Opzioni: - + Channel %1: Canale %1: @@ -12154,38 +12454,4 @@ Premere annulla per cancellare l'operazione Colore Retroilluminazione - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - Libreria sfondi - pagina %1 di %2 - - - - Warning - Avviso - - - - Invalid image in library %1 - Immagine corrotta nella libreria %1 - - - - Information - Informazione - - - - No valid image found in library, check your settings - Nessuna immagine trovata nella libreria, controllate le impostazioni - - diff --git a/companion/src/translations/companion_nl.ts b/companion/src/translations/companion_nl.ts index 456c30eb7..0231d9c80 100644 --- a/companion/src/translations/companion_nl.ts +++ b/companion/src/translations/companion_nl.ts @@ -4,27 +4,27 @@ AileronsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Aileron Channel: - + Second Aileron Channel: @@ -32,27 +32,27 @@ AirbrakesPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Airbrake Channel: - + Second Airbrake Channel: @@ -74,7 +74,7 @@ - + Open Folder @@ -308,7 +308,7 @@ Mode 4: - + Simulator Volume Gain @@ -445,62 +445,62 @@ May be different from firmware language - + Simulator BackLight - + Enable - + Blue - + Green - + Red - + Orange - + Yellow - + Joystick - + Calibrate - + Simulator capture folder - + Only capture to clipboard - + Remember simulator switch values @@ -515,64 +515,64 @@ May be different from firmware language - - + + No joysticks found - + EMPTY: No radio settings stored in profile - + AVAILABLE: Radio settings of unknown age - + AVAILABLE: Radio settings stored %1 - + Select your library folder - - + + Select your Models and Settings backup folder - + Select Google Earth executable - + Select the folder replicating your SD structure - + Not possible to remove profile - + The default profile can not be removed. - + Open Image to load - + Images (%1) @@ -747,11 +747,6 @@ May be different from firmware language Stick 4 - - - Battery - - v @@ -772,9 +767,14 @@ May be different from firmware language PPM 4 + + + Battery Offset + + - Current + Current Offset @@ -1024,393 +1024,17 @@ May be different from firmware language - + No name - - General Model Settings - - - - - - - Name - - - - - - EEprom Size - - - - - - Timer1 - - - - - - Timer2 - - - - - - Internal Radio System - - - - - - Radio System - - - - - - - - Protocol - - - - - - External Radio Module - - - - - - Extra Radio System - - - - - - Trainer port mode - - - - - - Throttle Trim - - - - - - Enabled - - - - - - Disabled - - - - - - Trim Increment - - - - - - Center Beep - - - - - Flight modes Settings - - - - - - Fades - - - - - - Trims - - - - - - Switch - - - - - - - - Flight mode name - - - - - - IN - - - - - - OUT - - - - - - - - - - - - - - FM - - - - - - Gvars - - - - - - Rot. Enc. - - - - - Limits - - - - - - - - - Offset - - - - - - - - - Min - - - - - - - - - Max - - - - - - - Invert - - - - - - - - - CH - - - - - - INV - - - - - - NOR - - - - - Global Variables - - - - - - GV - - - - - Inputs - - - - - Mixers - - - - - Curves - - - - - - Curve - - - - - Logical Switches - - - - - L - - - - - Special Functions - - - - - SF - - - - - Telemetry Settings - - - - - - Analog - - - - - - Unit - - - - - - Scale - - - - - - - - A%1 - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - - RSSI Alarm - - - - - - Custom Telemetry View - - - - - - Telemetry Bars - - - - - - Bar Number - - - - - - Source - - - - + Print Document - + Select PDF output file @@ -1418,7 +1042,7 @@ May be different from firmware language ConclusionPage - + OK, I understand. @@ -1456,12 +1080,12 @@ May be different from firmware language - - Thank you all !!! + + OpenTX Blacklist - + monthly @@ -1494,22 +1118,22 @@ May be different from firmware language CurveGroup - + Diff - + Expo - + Func - + Curve @@ -1759,22 +1383,22 @@ May be different from firmware language CyclicPage - + 90 - + 120 - + 120x - + 140 @@ -1790,12 +1414,12 @@ May be different from firmware language ElevonsPage - + <br>First Elevon Channel: - + Second Elevon Channel: @@ -2132,46 +1756,26 @@ If blank then the input is considered to be "ON" all the time.Edit %1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - FblPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -2223,27 +1827,27 @@ May be different from firmware language FlapsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Flap Channel: - + Second Flap Channel: @@ -2493,8 +2097,8 @@ May be different from firmware language - - + + Warning @@ -2548,58 +2152,58 @@ May be different from firmware language - + Splash image not found - + Cannot save customized firmware - + Write Firmware to Radio - - + + Firmware check failed - + Could not check firmware from radio - + New firmware is not compatible with the one currently installed! - + Conversion failed - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore failed - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 - + Flashing done @@ -2721,37 +2325,17 @@ Please use ZADIG to properly install the driver. FlightModePanel - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - + Rotary Encoder %1 - + GVAR%1 - + Popup enabled @@ -2759,17 +2343,17 @@ Please use ZADIG to properly install the driver. FlightModesPanel - + Flight Mode %1 - + (%1) - + (default) @@ -2777,17 +2361,17 @@ Please use ZADIG to properly install the driver. FlybarSelectionPage - + Has Flybar - + Flybarless - + Flybar: @@ -3730,17 +3314,17 @@ Are you sure ? GyroPage - + No - + Yes, controled by a switch - + Yes, controlled by a pot @@ -3821,22 +3405,22 @@ Are you sure ? HeliPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -4207,9 +3791,9 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded @@ -4219,703 +3803,703 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt - + Checking for updates - + Unable to check for updates. - + A new version of Companion is available (version %1)<br>Would you like to download it? - - - + + + Save As - + Executable (*.exe) - + New release available - - + + No updates available at this time. - + Would you like to launch the installer? - - + + Error - + Error opening file %1: %2. - + Compilation server too busy, try later - + Compilation server requires registration, please check OpenTX web site - + Unknown server failure, try later - + Compilation server termporary failure, try later - + Do you want to write the firmware to the radio now ? - - + + Yes - - + + No - - + + Release Notes - - + + Do you want to download release %1 now ? - + The selected language will be used the next time you start Companion. - + The new theme will be loaded the next time you start Companion. - + The icon size will be used the next time you start Companion. - - + + Open Models and Settings file - - + + File saved - + Firmware updates - + Current firmware does not provide release notes informations. - + Read Models and Settings From Radio - + Save Radio Backup to File - + Read Radio Firmware to File - + OpenTX Home Page: <a href='%1'>%1</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> - + About Companion - + Show the list of radio profiles - + Create a new Models and Settings file - + Ignore this release %1? - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> - + Copyright OpenTX Team - - + + Save Models and Settings file - + Exit - + Exit the application - + Cut Model - + Cut current model to the clipboard - + Copy current model to the clipboard - + Paste model from clipboard - + Paste Model - + Classical - + The classic companion9x icon theme - + Yerico - + Yellow round honey sweet icon theme - + Monochrome - + A monochrome black icon theme - + MonoWhite - + A monochrome white icon theme - + MonoBlue - + A monochrome blue icon theme - + Small - + Use small toolbar icons - + Normal - + Use normal size toolbar icons - + Big - + Use big toolbar icons - + Huge - + Use huge toolbar icons - + System language - + Use system language in menus - + Czech - + Use Czech in menus - + German - + Use German in menus - + English - + Use English in menus - + Finnish - + Use Finnish in menus - + French - + Use French in menus - + Italian - + Use Italian in menus - + Polish - + Use Polish in menus - + Spanish - + Use Spanish in menus - + Swedish - + Use Swedish in menus - + About... - + Show the application's About box - + Print... - + Print current model - + Simulate... - + Simulate current model - + Alt+S - + Load Backup... - + Load backup from file - + View Log File... - + Open and view log file - + Settings... - + Edit Settings - + Download... - + Download firmware and voice files - + Check for Updates... - + Check OpenTX and Companion updates - + Companion Changes... - + Show Companion change log - + Firmware Changes... - + Show firmware change log - + Compare Models... - + Compare models - + Edit Radio Splash Image... - + Edit the splash image of your Radio - + List programmers... - + List available programmers - + Fuses... - + Show fuses dialog - - + + Read Firmware from Radio - + Read firmware from Radio - - + + Write Firmware to Radio - + Write firmware to Radio - + Add Radio Profile - + Create a new Radio Setting Profile - + Manuals and other Documents - + Open the OpenTX document page in a web browser - + Write Models and Settings To Radio - - + + Write Models and Settings to Radio - - + + Read Models and Settings from Radio - + Configure Communications... - + Configure software for communicating with the Radio - + Write Backup to Radio - + Write Backup from file to Radio - + Backup Radio to File - + Save a complete backup file of all settings and model data in the Radio - + Contributors... - + A tribute to those who have contributed to OpenTX and Companion - + Recent Files - + Recent Models+Settings - + Set Menu Language - + A new release of Companion is available, please check the OpenTX website! - + Not enough memory for all the selected firmware options - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -4924,7 +4508,7 @@ We recommend you view the release notes using the button below to learn about an - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -4935,119 +4519,119 @@ We recommend you view the release notes using the button below to learn about an - - - + + + Companion - - + + Synchronize SD - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + New - + Open... - + Save - + Save As... - + Copy Model - + SD card synchronization - + Set Icon Theme - + Set Icon Size - - + + File - - + + Edit - + Settings - + Read/Write - - + + Help - - + + Radio Profile - + Show recent Models+Settings documents - + Write - + Ready - + %2 - + New Radio @@ -5080,16 +4664,16 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error - + Unable to find file %1! @@ -5097,7 +4681,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. @@ -5110,7 +4694,7 @@ We recommend you view the release notes using the button below to learn about an - + Error reading file %1: %2. @@ -5161,12 +4745,12 @@ Do you want to save your changes? - + Open backup Models and Settings file - + Invalid binary backup File %1 @@ -5364,26 +4948,6 @@ If blank then the mix is considered to be "ON" all the time. DEST -> CH%1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - MixesPanel @@ -5417,12 +4981,12 @@ If blank then the mix is considered to be "ON" all the time. - + Not enough available mixers! - + Delete Selected Mixes? @@ -5507,12 +5071,12 @@ If blank then the mix is considered to be "ON" all the time. - + Clear Mixes? - + Really clear all the mixes? @@ -5580,30 +5144,304 @@ If blank then the mix is considered to be "ON" all the time. + + ModelPrinter + + + %1 bytes + + + + + CH%1 + + + + + Exponential + + + + + Extra Fine + + + + + Fine + + + + + Medium + + + + + Coarse + + + + + Unknown + + + + + Enabled + + + + + Disabled + + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + + + + + Master/SBUS Module + + + + + Master/CPPM Module + + + + + Master/SBUS in battery compartment + + + + + Master/Jack + + + + + Rudder + + + + + Elevator + + + + + Throttle + + + + + Aileron + + + + + Name(%1) + + + + + %1:%2 + + + + + Persistent + + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + + + + + + + + FM%1 + + + + + FM%1%2 + + + + + FM%1+%2 + + + + + [I%1] + + + + + Input%1 + + + + + + Weight + + + + + + Switch + + + + + + NoTrim + + + + + No DR/Expo + + + + + Offset + + + + + Delay + + + + + Slow + + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + + + + + Flight mode(%1) + + + + + Edge(%1, [%2:%3]) + + + + + Sticky(%1, %2) + + + + + Timer(%1, %2) + + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + + + + + Standard + + + ModelSelectionPage - + Plane - + Multirotor - + Helicopter - + Model Name: - + Model Type: @@ -5611,128 +5449,129 @@ If blank then the mix is considered to be "ON" all the time. ModelsListWidget - + + &Edit - + &Restore from backup - + &Model Wizard - + &Delete - + Delete - + &Copy - + Ctrl+C - + &Cut - + Ctrl+X - + &Paste - + Ctrl+V - + D&uplicate - + Ctrl+U - + &Use as default - + P&rint model - + Ctrl+P - + &Simulate model - + Alt+S - + General Settings - + Delete Selected Models? - - + + Cannot delete default model. - + Cannot cut default model. - + Do you want to overwrite radio general settings? - + You are pasting on an not empty model, are you sure? - + No free slot available, cannot duplicate @@ -5883,66 +5722,273 @@ If blank then the mix is considered to be "ON" all the time. ModulePanel - + Trainer Port - + Internal Radio System - + External Radio Module - - + + Radio System - + Extra Radio System - + Value - + Hold - + No Pulse + + MultiModelPrinter + + + General Model Settings + + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + + + + + + Flight mode + + + + + Switch + + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + + + + + + GV%1 + + + + + RE%1 + + + + + Limits + + + + + Channel + + + + + Name + + + + + + Offset + + + + + Min + + + + + Max + + + + + Invert + + + + + Global Variables + + + + + Inputs + + + + + Mixers + + + + + CV%1 + + + + + Curves + + + + + L%1 + + + + + Logical Switches + + + + + SF%1 + + + + + Special Functions + + + + + Telemetry Settings + + + + + Analogs + + + + + Unit + + + + + Scale + + + + + A%1 + + + + + RSSI Alarms + + + MultirotorPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -5950,17 +5996,17 @@ If blank then the mix is considered to be "ON" all the time. OptionsPage - + Throttle Cut - + Throttle Timer - + Flight Timer @@ -5983,427 +6029,17 @@ If blank then the mix is considered to be "ON" all the time. - - Setup for: - - - - - printed on: %1 - - - - - General Model Settings - - - - - - - - Name - - - - - EEprom Size - - - - - Internal Radio System - - - - - Radio System - - - - - - Protocol - - - - - Throttle Trim - - - - - Enabled - - - - - Disabled - - - - - External Radio Module - - - - - Timer%1 - - - - - Extra Radio System - - - - - Trainer port mode - - - - - Trim Increment - - - - - Center Beep - - - - - Flight modes - - - - - Fades - - - - - Trims - - - - - Gvars - - - - - Rot.Enc. - - - - - Switch - - - - - Flight mode name - - - - - IN - - - - - OUT - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - - - - - FM - - - - - Off - - - - - Inputs - - - - - Source - - - - - Mixers - - - - - Limits - - - - - - - CH - - - - - - - - - Offset - - - - - - - - Min - - - - - - - - Max - - - - - - - Invert - - - - - - - INV - - - - - - - NOR - - - - - Curves - - - - - - - Curve - - - - - pt %1 - - - - - Logical Switches - - - - - L - - - - - Global Variables - - - - - GV - - - - - Special Functions - - - - - SF - - - - - - Telemetry Settings - - - - - - Analog - - - - - Range - - - - - - - A%1 - - - - - Alarms - - - - - Low Alarm - - - - - Critical Alarm - - - - - RSSI - - - - - - Blades - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - Unit - - - - - Scale - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - RSSI Alarm - - - - - Frsky serial protocol - - - - - - Custom Telemetry View - - - - - Telemetry Bars - - - - - Bar Number - - - - + Print Document - + Select PDF output file - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) @@ -6453,86 +6089,86 @@ If blank then the mix is considered to be "ON" all the time. - + -GV%1 - + GV%1 - + Rud - + Ele - + Thr - + Ail - - + + P1 - - + + P2 - - + + P3 - + S1 - + S2 - + S3 - + LS @@ -6544,7 +6180,7 @@ If blank then the mix is considered to be "ON" all the time. - + RS @@ -6845,7 +6481,7 @@ If blank then the mix is considered to be "ON" all the time. - + V @@ -7213,13 +6849,12 @@ If blank then the mix is considered to be "ON" all the time. - + ---- - [I%1] @@ -7447,10 +7082,19 @@ If blank then the mix is considered to be "ON" all the time. - DISABLED + + + INV + + + + + NOR + + @@ -7495,8 +7139,8 @@ If blank then the mix is considered to be "ON" all the time. - - + + --- @@ -7602,88 +7246,9 @@ If blank then the mix is considered to be "ON" all the time. - Unknown - - - - Weight - - - - - - Switch - - - - - - NoTrim - - - - - No DR/Expo - - - - - Offset - - - - - Delay - - - - - Slow - - - - - Warn - - - - - Flight modes - - - - - Flight mode - - - - - Edge(%1, [%2:%3]) - - - - - Sticky(%1, %2) - - - - - Timer(%1, %2) - - - - - Duration (%1s) - - - - - Delay (%1s) - - Override %1 @@ -7838,567 +7403,569 @@ If blank then the mix is considered to be "ON" all the time. - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves - + OpenTx only accepts %1 points in all curves - - - - - + + + + + OpenTX on this board doesn't accept this function - + OpenTX doesn't accept this telemetry protocol - - + + OpenTX doesn't accept this radio protocol - + OpenTX doesn't allow this number of channels - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used - - + + Warning - + EEPROM saved with these warnings: - - + + Support for frsky telemetry mod - + Support for telemetry easy board - - + + Support for jeti telemetry mod - - + + Support for receiving ardupilot data - - + + Support for receiving NMEA data - - + + Support for MAVLINK devices - + Rotary Encoder use in menus navigation - - - - - - + + + + + + Pots use in menus navigation - + No OverrideCH functions available - - - - - - - - Enable heli menu and cyclic mix support - - - - - - - - - - - - Enable TEMPLATES menu - - - - - - - - No splash screen - - - - - - - - - - - - No flight modes - - - - - - - - - - - - Disable curves menus - - - - - - - - Support for radio modified with regular speaker - - - - - - - - - Used if you have modified your radio with voice mode - - - - - - - - - Used if you have modified your radio with haptic mode - - - - - - - - - Support for DSM2 modules - - - - - - - - - - - - PPM center adjustment in limits - - - - - Channel values displayed in us - - - - - - - - - - - - Global variables - - - - - - - Symetrical Limits + + + Enable heli menu and cyclic mix support + + + + + + + + + + + + Enable TEMPLATES menu - SmartieParts 2.2 Backlight support + + + No splash screen - - - - - - - In model setup menus automatically set source by moving the control + + + + + + + No flight modes - - - - - - - In model setup menus automatically set switch by moving the control + + + + + + + Disable curves menus - - - - Enable resetting values by pressing up and down at the same time + + + Support for radio modified with regular speaker - - - - - - - No graphical check boxes and sliders + + + + Used if you have modified your radio with voice mode - - - - - - - Battery graph - - - - - - - - - - - - Don't use bold font for highlighting active items - - - - - Use alternative SQT5 font - - - - - (displaying only first 10 warnings) - - - - - Possibility to enable FAI MODE (no telemetry) at field - - - - - FAI MODE (no telemetry) always enabled - - - - - Support for a third timer - - - - - Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - - - - - Support for PPM internal module hack - - - - - ST7565P LCD or compatible - - - - - ST7565R LCD or compatible - - - - - ERC12864FSF LCD - - - - - ST7920 LCD - - - - - 9X board - - - - - - Enable the throttle trace in Statistics + + Used if you have modified your radio with haptic mode + + + + + + + + + Support for DSM2 modules - EEprom write progress bar + + + + + + + + PPM center adjustment in limits + + + + + Channel values displayed in us - - - - - Imperial units + + + + + + + Global variables - - No Winged Shadow How High support - - - - - - No vario support + + + + + + + + Symetrical Limits - - No GPS support + + SmartieParts 2.2 Backlight support - - No gauges in the custom telemetry screen + + + + + + + + In model setup menus automatically set source by moving the control - Allow compensating for offset errors in FrSky FAS current sensors + + + + + + + + In model setup menus automatically set switch by moving the control - - Add support for reversing stick inputs (e.g. needed for FrSky gimbals) - - - - - FrSky Taranis Plus - - - - - FrSky Taranis X9E - - - - - - - - - EEprom write Progress bar - - - - - - Support for SD memory card - - - - - - Support of FrSky PXX protocol - - - - - Confirmation before radio shutdown - - - - - Support for DSM2 modules using ppm instead of true serial - - - + - Power management by soft-off circuitry + + + Enable resetting values by pressing up and down at the same time - - - Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views + + + + + + + + + No graphical check boxes and sliders - - - Enable HELI menu and cyclic mix support + + + + + + + + + Battery graph - - - Bluetooth interface - - - - - Disable HELI menu and cyclic mix support - - - - - M128 / 9X board - - - - - 9XR - - - - - 9XR with M128 chip - - - - - Gruvin9x board / 9X - - - - - MEGA2560 board - - - - - Sky9x board / 9X - - - - - 9XR-PRO - - - - - FrSky Taranis - - - - - Haptic module installed - - - - - Support for Lua model scripts + + + + + + + + + Don't use bold font for highlighting active items + Use alternative SQT5 font + + + + + (displaying only first 10 warnings) + + + + + Possibility to enable FAI MODE (no telemetry) at field + + + + + FAI MODE (no telemetry) always enabled + + + + + + + Support for a third timer + + + + + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 + + + + + Support for PPM internal module hack + + + + + ST7565P LCD or compatible + + + + + ST7565R LCD or compatible + + + + + ERC12864FSF LCD + + + + + ST7920 LCD + + + + + 9X board + + + + + + + + Enable the throttle trace in Statistics + + + + + EEprom write progress bar + + + + + + + + + + Imperial units + + + + + + No Winged Shadow How High support + + + + + + No vario support + + + + + + No GPS support + + + + + + No gauges in the custom telemetry screen + + + + + Allow compensating for offset errors in FrSky FAS current sensors + + + + + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) + + + + + FrSky Taranis Plus + + + + + FrSky Taranis X9E + + + + + + + + + EEprom write Progress bar + + + + + + Support for SD memory card + + + + + + Support of FrSky PXX protocol + + + + + Confirmation before radio shutdown + + + + + Support for DSM2 modules using ppm instead of true serial + + + + + Power management by soft-off circuitry + + + + + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views + + + + + + Enable HELI menu and cyclic mix support + + + + + + Bluetooth interface + + + + + Disable HELI menu and cyclic mix support + + + + + M128 / 9X board + + + + + 9XR + + + + + 9XR with M128 chip + + + + + Gruvin9x board / 9X + + + + + MEGA2560 board + + + + + Sky9x board / 9X + + + + + 9XR-PRO + + + + + FrSky Taranis + + + + + Haptic module installed + + + + + Support for Lua model scripts + + + + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) - + Disable Global variables @@ -8408,38 +7975,27 @@ If blank then the mix is considered to be "ON" all the time. - - - FM%1 - - - - - Input%1 - - - - + Rud Trim - + Ele Trim - + Thr Trim - + Ail Trim - + Rot Enc @@ -8529,22 +8085,22 @@ If blank then the mix is considered to be "ON" all the time. - + !Flight mode %1 - + Flight mode %1 - + Own value - + Flight mode %1 value @@ -8564,158 +8120,52 @@ If blank then the mix is considered to be "ON" all the time. - + Yellow - + Orange - + Red - + Winged Shadow How High - + Winged Shadow How High (not supported) - + FrSky Sensor Hub - + None - + Imperial - + Metric - - - Extra Fine - - - - - Fine - - - - - Medium - - - - - Coarse - - - - - %1:%2 - - - - - , Persistent - - - - - , MinuteBeep - - - - - , CountDown(Beeps) - - - - - , CountDown(Voice) - - - - - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - - - : Channel start: %1, %2 Channels - - - - - Slave/Jack - - - - - Master/SBUS Module - - - - - Master/CPPM Module - - - - - Master/SBUS in battery compartment - - - - - Master/Jack - - - - - Exponential - - - - - Rudder - - - - - Elevator - - - - - Throttle - - - - - Aileron - - - - Simulator for this firmware is not yet available @@ -8760,35 +8210,33 @@ If blank then the mix is considered to be "ON" all the time. - + Trim disabled - + Own Trim - + Use Trim from Flight mode %1 - + Use Trim from Flight mode %1 + Own Trim as an offset - - CH%1 - - + + THR @@ -8805,15 +8253,21 @@ The OpenTX Team. - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! @@ -8823,33 +8277,33 @@ The OpenTX Team. - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -8883,12 +8337,12 @@ The OpenTX Team. - + Positive - + Negative @@ -8940,17 +8394,17 @@ The OpenTX Team. RudderPage - + No - + Yes - + <br>Rudder Channel: @@ -9119,7 +8573,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SimpleTailPage - + Elevator Channel: @@ -9294,10 +8748,44 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + + + + + Warning + + + + + Invalid image in library %1 + + + + + Information + + + + + No valid image found in library, check your settings + + + StandardPage - + Channel %1 @@ -9305,25 +8793,24 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -9332,35 +8819,40 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TailPage - + Rudder Channel: - + Elevator Channel: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder - + Only Elevator - + V-tail - + Tail Type: @@ -9368,91 +8860,91 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Telemetry - + A1 - + A2 - + Alarm 1 - - + + ---- - - + + Yellow - - + + Orange - - + + Red - + Alarm 2 - + RSSI - + Center Silent - + Altitude source - + Volts source - + Top Bar - + Volt source - + Current source - + Sensors - + Disable multi sensor handling @@ -9462,87 +8954,87 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - + None - + FrSky Sensor Hub - + Blades - + Serial Protocol - + Sink Max - + Climb Max - + Sink Min - + Climb Min - + Vario source - + Vario limits - + Altimetry - + mAh count - + mAh - + A - + FAS Offset - + Persistent mAh - + Various @@ -9656,17 +9148,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - - Low Alarm - - - - - Critical Alarm - - - - + Range @@ -9679,22 +9161,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - + None - + Numbers - + Bars - + Script @@ -9722,99 +9204,99 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetryPanel - + FrSky S.PORT - + FrSky D - + FrSky D (cable) - + Telemetry screen %1 - + Low Alarm - + Critical Alarm - + Winged Shadow How High - + Winged Shadow How High (not supported) - + Alti - + Alti+ - + VSpeed + - - + A1 + - - + A2 - - + + A3 - - + + A4 - - + + FAS - + Cells - + --- @@ -9920,7 +9402,107 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - Amps Sensor : + Sensor : + + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. @@ -9928,111 +9510,11 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Raw (-) - - - Voltage (V) - - - - - Current (A) - - - - - Current (mA) - - - - - Speed (kts) - - - - - Speed (m/s) - - - - - Speed (ft/s) - - - - - Speed (km/h) - - - - - Speed (miles/h) - - - - - Meters (m) - - - - - Feet (ft) - - - - - Temp (°C) - - - - - Temp (°F) - - - - - Percentage (%) - - - - - Energy (mAh) - - - - - Power (W) - - - - - RF Power (dBm) - - RPM - - - Acceleration (g) - - - - - Heading (°) - - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - - Precision @@ -10087,22 +9569,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetrySensorPanel - + Lowest - + Cell %1 - + Highest - + Delta @@ -10323,17 +9805,17 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi ThrottlePage - + Yes - + No - + <br>Throttle Channel: @@ -10354,32 +9836,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TimerPanel - + Silent - + Beeps - + Voice - - Not persistent - - - - - Persistent (flight) + + Haptic + Not persistent + + + + + Persistent (flight) + + + + Persistent (manual reset) @@ -10512,12 +9999,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi VTailPage - + First Tail Channel: - + Second Tail Channel: @@ -10525,12 +10012,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WingtypeSelectionPage - + Standard Wing - + Flying Wing / Deltawing @@ -10812,37 +10299,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WizardPrinter - + Plane - + Multicopter - + Helicopter - + Model Name: - + Model Type: - + Options: - + Channel %1: @@ -11545,38 +11032,4 @@ Press cancel to abort joystick calibration - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - - - - - Warning - - - - - Invalid image in library %1 - - - - - Information - - - - - No valid image found in library, check your settings - - - diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index 09e6b3d54..61a6386f4 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -694,9 +694,8 @@ Może być różny od języka firmware Drążek 4 - Battery - Zasilanie + Zasilanie @@ -708,6 +707,11 @@ Może być różny od języka firmware PPM Multiplier Mnożnik PPM + + + Current Offset + Aktuany ofset + S1 @@ -823,6 +827,11 @@ Może być różny od języka firmware PPM 2 PPM 2 + + + Battery Offset + Ofset baterii + PPM 3 @@ -834,9 +843,8 @@ Może być różny od języka firmware PPM 4 - Current - Natężenie + Natężenie @@ -1379,7 +1387,7 @@ Może być różny od języka firmware Specjalne podziękowania Rafałowi Tomczakowi (RadioClone), Thomasowi Husteterowi (th9x) a także Erazowi Ravivowi(er9x i eePe) - + OpenTX Blacklist Indeks (zakaz) OpenTX @@ -1388,7 +1396,7 @@ Może być różny od języka firmware Wszystkim wam dziękujemy !!! - + monthly miesięcznie @@ -5496,25 +5504,25 @@ p, li { white-space: pre-wrap; } MixesPanel - + Move Up W górę - + Ctrl+Up Ctrl+Up - + Move Down W dół - + Ctrl+Down Ctrl+Down @@ -5556,102 +5564,102 @@ p, li { white-space: pre-wrap; } Ostrzeżenie(%1) - + Not enough available mixers! Za mało dostępnych mikserów! - + Delete Selected Mixes? Skasować wybrane miksery? - + &Add &Dodaj - + Ctrl+A Ctrl+A - + &Edit &Edycja - + Enter Enter - + &Toggle highlight &Przełącz podświetlenie - + Ctrl+T Ctrl+T - + &Delete &Wykasuj - + Delete Wykasuj - + &Copy &Kopiuj - + Ctrl+C Ctrl+C - + Ctrl+X Ctrl+X - + C&ut &Wytnij - + &Paste &Wklej - + Ctrl+V Ctrl+V - + Du&plicate &Zduplikuj - + Ctrl+U Ctrl+U - + Clear Mixes? Wyczyść miksery? - + Really clear all the mixes? Czy na pewno wyczyścić wszystkie miksery? @@ -5875,7 +5883,7 @@ p, li { white-space: pre-wrap; } - + FM%1 FM%1 @@ -5901,94 +5909,94 @@ p, li { white-space: pre-wrap; } - + Weight Waga - + Switch Przełącznik - + NoTrim Bez Trymera - + No DR/Expo Bez DR/Expo - + Offset Wyrównanie - + Delay Opóźnienie - + Slow Spowolnienie - + Warn(%1) (%1)Ostrzeżenie - + Disabled in all flight modes Wyłaczone we wszystkich fazach lotu - + Flight modes(%1) Fazy lotu(%1) - + Flight mode(%1) Faza lotu (%1) - + Edge(%1, [%2:%3]) Brzeg(%1, [%2:%3]) - + Sticky(%1, %2) Stały(%1, %2) - + Timer(%1, %2) Timer(%1, %2) - + Duration(%1s) Trwanie(%1s) - + Delay(%1s) Opóznienie(%1) - + Custom Własny - + Standard Standard @@ -7617,7 +7625,7 @@ p, li { white-space: pre-wrap; } - + Enable TEMPLATES menu Uaktywnienie menu szablonów @@ -7637,7 +7645,7 @@ p, li { white-space: pre-wrap; } - + No flight modes Firmware bez menu faz lotu @@ -7668,6 +7676,8 @@ p, li { white-space: pre-wrap; } + + Support for a third timer Wsparcie dla 3ciego Timera @@ -7731,17 +7741,17 @@ p, li { white-space: pre-wrap; } Pozwolenie na kompensację błędów w czujnikach natężenia FrSky FAS - + FrSky Taranis Plus FrSky Taranis Plus - + FrSky Taranis X9E FrSky Taranis X9E - + Confirmation before radio shutdown Potwierdzenie przez wyłączeniem radia @@ -7772,17 +7782,17 @@ p, li { white-space: pre-wrap; } Płyta Sky9x / 9X - + 9XR-PRO 9XR-PRO - + FrSky Taranis FrSky Taranis - + Haptic module installed Moduł wibracji zainstalowany @@ -7814,7 +7824,7 @@ p, li { white-space: pre-wrap; } - + Disable curves menus Bez menu krzywych @@ -7851,8 +7861,8 @@ p, li { white-space: pre-wrap; } - - + + Battery graph Grafika baterii @@ -7914,7 +7924,7 @@ p, li { white-space: pre-wrap; } - + PPM center adjustment in limits Limit dostrojenia centrowania PPM @@ -7926,7 +7936,7 @@ p, li { white-space: pre-wrap; } - + Symetrical Limits Limity symetryczne @@ -7935,8 +7945,8 @@ p, li { white-space: pre-wrap; } - - + + Pots use in menus navigation Użycie potencjometrów do nawigacji w menu @@ -7951,7 +7961,7 @@ p, li { white-space: pre-wrap; } - + Enable resetting values by pressing up and down at the same time Szybkie nastawianie wartości (+) a (-) neguje wartość @@ -7966,8 +7976,8 @@ p, li { white-space: pre-wrap; } - - + + No graphical check boxes and sliders Brak graficznych pol wyboru i suwaków @@ -7978,8 +7988,8 @@ p, li { white-space: pre-wrap; } - - + + Don't use bold font for highlighting active items Nie używaj podświetlenia dla wybranych aktywnych elementów, mikserów, krzywych, expo, etc @@ -8003,8 +8013,8 @@ p, li { white-space: pre-wrap; } Imperialne jednostki w telemetrii - - + + Bluetooth interface Interface Bluetooth @@ -8016,7 +8026,7 @@ p, li { white-space: pre-wrap; } - + Global variables Globalne zmienne @@ -8032,8 +8042,8 @@ p, li { white-space: pre-wrap; } - - + + In model setup menus automatically set source by moving the control W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim @@ -8044,8 +8054,8 @@ p, li { white-space: pre-wrap; } - - + + In model setup menus automatically set switch by moving the control W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim @@ -8073,7 +8083,7 @@ p, li { white-space: pre-wrap; } - + Enable HELI menu and cyclic mix support Uaktywnij menu HELI i cyklicznych mikserów @@ -9267,43 +9277,43 @@ p, li { white-space: pre-wrap; } Równoległe użycie expo i krzywych nie jest dłużej wspierane - + Source %1 cannot be exported on this board! Źródło %1 nie może być wyeksportowane na tę płytę! - + OpenTX only accepts %1 points in all curves OpenTX zezwala tylko na %1 punktów we wszystkich krzywych - + OpenTx only accepts %1 points in all curves OpenTX zezwala tylko na %1 punktów we wszystkich krzywych - - - - - + + + + + OpenTX on this board doesn't accept this function OpenTX na tej platformie nie dopuszcza tej funkcji - + OpenTX doesn't accept this telemetry protocol OpenTX nie obsługuje tego protokołu telemetrii - - + + OpenTX doesn't accept this radio protocol OpenTX nie obsługuje tego protokołu radiowego - + OpenTX doesn't allow this number of channels OpenTX nie obsługuje tej ilości kanałów @@ -9412,7 +9422,7 @@ Zespół OpenTX. Zapis '%1' nieudany - + -%1 -%1 @@ -9977,96 +9987,96 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również Telemetry - + A1 A1 - + A2 A2 - + RSSI RSSI - + Alarm 1 Alarm 1 - - + + ---- ---- - - + + Yellow Żółty - - + + Orange Pomarańczowy - - + + Red Czerwony - + Alarm 2 Alarm 2 - + Center Silent Środek cichy - + Altitude source Źródło wysokości - + Volts source Źródło napięcia - + Top Bar Górny pasek - + Serial Protocol Protokół szeregowy - + Sensors Czujniki - + Disable multi sensor handling Wyłącz obsługę wielu czujników - + Volt source Źródło napięcia - + Current source Źródło prądu(natężenia) @@ -10076,82 +10086,82 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również Protokół - + None Żadne - + FrSky Sensor Hub Hub Czujników FrSky - + Blades Łopaty śmigła - + Sink Max Maks. Opadanie - + Climb Max Maks. Wznoszenie - + Sink Min Min. Opadanie - + Climb Min Min. Wznoszenie - + Vario source Źródło wario - + Vario limits Limity wario - + Altimetry Wysokościomierz - + mAh mAh - + A A - + Various Różne - + mAh count Licznik mAh - + FAS Offset Wyrównanie FAS - + Persistent mAh Stałe mAh @@ -10329,99 +10339,99 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również TelemetryPanel - + Telemetry screen %1 Panel Telemetrii %1 - + Low Alarm Alarm niski - + Critical Alarm Alarm krytyczny - + Winged Shadow How High Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (Nie obsługiwane) - - - + + + A1 A1 - + Alti Wysokościomierz - + FrSky S.PORT - + FrSky D FrSky D - + FrSky D (cable) FrSky D (kabel) - + Alti+ Wysokościomierz+ - + VSpeed Prędkość Pionowa - - - + + + A2 A2 - - + + A3 A3 - - + + A4 A4 - - + + FAS FAS - + Cells Cele - + --- --- @@ -10527,8 +10537,112 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również + Sensor : + + + + + V + V + + + + A + A + + + + mA + mA + + + + kt + kt + + + + m/s + m/s + + + + ft/s + ft/s + + + + km/h + km/h + + + + mph + mph + + + + m + m + + + + ft + ft + + + + °C + °C + + + + °F + °F + + + + % + % + + + + mAh + mAh + + + + W + W + + + + dBm + dBm + + + + g + g + + + + ° + ° + + + + mL + ml + + + + US fl.Oz. + US fl.Oz. + + Amps Sensor : - Czujnik Natężenia : + Czujnik Natężenia : @@ -10536,54 +10650,44 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również Bezwymiarowe (-) - Voltage (V) - Napięcie (V) + Napięcie (V) - Current (A) - Natężenie (A) + Natężenie (A) - Current (mA) - Natężenie (mA) + Natężenie (mA) - Speed (kts) - Prędkość (kts) + Prędkość (kts) - Speed (m/s) - Prędkość (m/s) + Prędkość (m/s) - Speed (ft/s) - Prędkość (ft/s) + Prędkość (ft/s) - Speed (km/h) - Prędkość (km/h) + Prędkość (km/h) - Speed (miles/h) - Prędkość (mile/h) + Prędkość (mile/h) - Meters (m) - Wysokość (m) + Wysokość (m) - Feet (ft) - Stopa (ft) + Stopa (ft) @@ -10596,34 +10700,28 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również Dodatni - Temp (°C) - Temp (°C) + Temp (°C) - Temp (°F) - Temp (°F) + Temp (°F) - Percentage (%) - Procent (%) + Procent (%) - Energy (mAh) - Energia (mAh) + Energia (mAh) - Power (W) - Moc (W) + Moc (W) - RF Power (dBm) - Moc RF (dBm) + Moc RF (dBm) @@ -10631,24 +10729,20 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również RPM - Acceleration (g) - Przyspieszenie (g) + Przyspieszenie (g) - Heading (°) - Kurs (°) + Kurs (°) - Volume (mL) - Objętość (mL) + Objętość (mL) - Volume (US fl.Oz.) - Objętość (Uncje US) + Objętość (Uncje US) diff --git a/companion/src/translations/companion_pt.ts b/companion/src/translations/companion_pt.ts index d7d50fa1e..97334673b 100644 --- a/companion/src/translations/companion_pt.ts +++ b/companion/src/translations/companion_pt.ts @@ -4,27 +4,27 @@ AileronsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Aileron Channel: - + Second Aileron Channel: @@ -32,27 +32,27 @@ AirbrakesPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Airbrake Channel: - + Second Airbrake Channel: @@ -74,7 +74,7 @@ - + Open Folder @@ -308,7 +308,7 @@ Mode 4: - + Simulator Volume Gain @@ -445,62 +445,62 @@ May be different from firmware language - + Simulator BackLight - + Enable - + Blue - + Green - + Red - + Orange - + Yellow - + Joystick - + Calibrate - + Simulator capture folder - + Only capture to clipboard - + Remember simulator switch values @@ -515,64 +515,64 @@ May be different from firmware language - - + + No joysticks found - + EMPTY: No radio settings stored in profile - + AVAILABLE: Radio settings of unknown age - + AVAILABLE: Radio settings stored %1 - + Select your library folder - - + + Select your Models and Settings backup folder - + Select Google Earth executable - + Select the folder replicating your SD structure - + Not possible to remove profile - + The default profile can not be removed. - + Open Image to load - + Images (%1) @@ -747,11 +747,6 @@ May be different from firmware language Stick 4 - - - Battery - - v @@ -772,9 +767,14 @@ May be different from firmware language PPM 4 + + + Battery Offset + + - Current + Current Offset @@ -1024,270 +1024,82 @@ May be different from firmware language - + No name - - General Model Settings - - - - - - Name - Nome + Nome - - - EEprom Size - - - - - - Timer1 - - - - - - Timer2 - - - - - - Internal Radio System - - - - - - Radio System - - - - - - - Protocol - Protocolo + Protocolo Pulse Polarity Polaridade - - Throttle Trim - Ajuste do Acelerador + Ajuste do Acelerador - - Enabled - Activo + Activo - - Disabled - Inactivo + Inactivo Throttle Expo Exponencial do Acelerador - - - External Radio Module - - - - - - Extra Radio System - - - - - - Trainer port mode - - - - - Trim Increment - Incremento do Ajuste + Incremento do Ajuste - - Center Beep - Som ao Centrar + Som ao Centrar - - Flight modes Settings - - - - - - Fades - - - - - Trims - Ajustes + Ajustes - - Switch - Interruptor + Interruptor - - - - - Flight mode name - - - - - - IN - - - - - - OUT - - - - - - - - - - - - - - FM - - - - - - Gvars - - - - - - Rot. Enc. - - - - Limits - Limites + Limites - - - - - - Offset - - - - - - - - Min - Min + Min - - - - - Max - Max + Max - - - Invert - Inverter + Inverter - - - - - - CH - - - - - INV - INV + INV - - NOR - NOR - - - - Global Variables - - - - - - GV - - - - - Inputs - + NOR Weight Peso - - - Mixers - - Delay(u%1:d%2) Atraso(u%1:d%2) @@ -1297,148 +1109,32 @@ May be different from firmware language Lento(u%1:d%2) - Curves - Curvas + Curvas pt %1 pt %1 - - Curve - Curva - - - - Logical Switches - - - - - L - - - - - Special Functions - + Curva Function Função - - SF - - - - - Telemetry Settings - - - - - - Analog - - - - - - Unit - - - - - - Scale - - - - - - - - A%1 - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - - RSSI Alarm - - - - - - Custom Telemetry View - - - - - - Telemetry Bars - - - - - - Bar Number - - - - - Source - Fonte + Fonte - + Print Document Imprimir Documento - + Select PDF output file @@ -1446,7 +1142,7 @@ May be different from firmware language ConclusionPage - + OK, I understand. @@ -1484,12 +1180,12 @@ May be different from firmware language - - Thank you all !!! + + OpenTX Blacklist - + monthly @@ -1522,22 +1218,22 @@ May be different from firmware language CurveGroup - + Diff - + Expo - + Func - + Curve Curva @@ -1787,22 +1483,22 @@ May be different from firmware language CyclicPage - + 90 - + 120 - + 120x - + 140 @@ -1818,12 +1514,12 @@ May be different from firmware language ElevonsPage - + <br>First Elevon Channel: - + Second Elevon Channel: @@ -2160,46 +1856,26 @@ If blank then the input is considered to be "ON" all the time.Edit %1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - FblPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -2251,27 +1927,27 @@ May be different from firmware language FlapsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Flap Channel: - + Second Flap Channel: @@ -2521,8 +2197,8 @@ May be different from firmware language - - + + Warning Aviso @@ -2576,58 +2252,58 @@ May be different from firmware language - + Splash image not found - + Cannot save customized firmware - + Write Firmware to Radio - - + + Firmware check failed - + Could not check firmware from radio - + New firmware is not compatible with the one currently installed! - + Conversion failed - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore failed - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 - + Flashing done @@ -2749,37 +2425,17 @@ Please use ZADIG to properly install the driver. FlightModePanel - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - + Rotary Encoder %1 - + GVAR%1 - + Popup enabled @@ -2787,17 +2443,17 @@ Please use ZADIG to properly install the driver. FlightModesPanel - + Flight Mode %1 - + (%1) - + (default) @@ -2805,17 +2461,17 @@ Please use ZADIG to properly install the driver. FlybarSelectionPage - + Has Flybar - + Flybarless - + Flybar: @@ -3842,17 +3498,17 @@ Are you sure ? GyroPage - + No - + Yes, controled by a switch - + Yes, controlled by a pot @@ -3941,22 +3597,22 @@ Are you sure ? HeliPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -4327,43 +3983,43 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded Ficheiro carregado - - - + + + Save As Gravar Como - - + + No updates available at this time. - + Unable to check for updates. - + Executable (*.exe) - + Would you like to launch the installer? - - + + File saved Ficheiro gravado @@ -4373,39 +4029,39 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt - + New release available - - + + Error Erro - + Error opening file %1: %2. - + Compilation server termporary failure, try later - + Compilation server too busy, try later - + Unknown server failure, try later - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -4414,31 +4070,31 @@ We recommend you view the release notes using the button below to learn about an - - + + Yes - - + + No - - + + Release Notes - - + + Do you want to download release %1 now ? - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -4449,18 +4105,18 @@ We recommend you view the release notes using the button below to learn about an - - + + Synchronize SD - + Firmware updates - + Current firmware does not provide release notes informations. @@ -4469,67 +4125,67 @@ We recommend you view the release notes using the button below to learn about an Aviso - + OpenTX Home Page: <a href='%1'>%1</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> - + Load backup from file - + Compare models - + Exit the application Sair da aplicação - + Set Menu Language - + List available programmers Lista os programadores disponíveis - + Show fuses dialog - + Show the application's About box Sobre a aplicação - + Show the list of radio profiles - + Write - + %2 - + New Radio @@ -4538,644 +4194,644 @@ We recommend you view the release notes using the button below to learn about an Impossível encontrar o ficheiro %1! - + Checking for updates - + A new version of Companion is available (version %1)<br>Would you like to download it? - + A new release of Companion is available, please check the OpenTX website! - + Not enough memory for all the selected firmware options - + Compilation server requires registration, please check OpenTX web site - + The selected language will be used the next time you start Companion. - + The new theme will be loaded the next time you start Companion. - + The icon size will be used the next time you start Companion. - + About Companion - + New - + Open... - + Save - + Save As... - + Copy Model - + Paste Model - + A monochrome black icon theme - + A monochrome white icon theme - + A monochrome blue icon theme - + Small - + Use small toolbar icons - + Use normal size toolbar icons - + Normal - + Use big toolbar icons - + Big - + Use huge toolbar icons - + Huge - + Do you want to write the firmware to the radio now ? - - + + Open Models and Settings file - + Read Models and Settings From Radio - + Ignore this release %1? - - - + + + Companion - + Save Radio Backup to File - + Read Radio Firmware to File - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> - + Copyright OpenTX Team - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + Create a new Models and Settings file - - + + Save Models and Settings file - + Exit - + Cut Model - + Cut current model to the clipboard - + Copy current model to the clipboard - + Paste model from clipboard - + Classical - + The classic companion9x icon theme - + Yerico - + Yellow round honey sweet icon theme - + Monochrome - + MonoWhite - + MonoBlue - + System language - + Use system language in menus - + Czech - + Use Czech in menus - + German - + Use German in menus - + English - + Use English in menus - + Finnish - + Use Finnish in menus - + French - + Use French in menus - + Italian - + Use Italian in menus - + Polish - + Use Polish in menus - + Spanish - + Use Spanish in menus - + Swedish - + Use Swedish in menus - + About... - + Print... - + Print current model - + Simulate... - + Simulate current model - + Alt+S Alt+S - + Load Backup... - + View Log File... - + Open and view log file - + Settings... - + Edit Settings - + Download... - + Download firmware and voice files - + Check for Updates... - + Check OpenTX and Companion updates - + Companion Changes... - + Show Companion change log - + Firmware Changes... - + Show firmware change log - + Compare Models... - + Edit Radio Splash Image... - + Edit the splash image of your Radio - + List programmers... - + Fuses... - - + + Read Firmware from Radio - + Read firmware from Radio - - + + Write Firmware to Radio - + Write firmware to Radio - + Add Radio Profile - + Create a new Radio Setting Profile - + Manuals and other Documents - + Open the OpenTX document page in a web browser - + Write Models and Settings To Radio - - + + Write Models and Settings to Radio - - + + Read Models and Settings from Radio - + Configure Communications... - + Configure software for communicating with the Radio - + Write Backup to Radio - + Write Backup from file to Radio - + Backup Radio to File - + Save a complete backup file of all settings and model data in the Radio - + Contributors... - + A tribute to those who have contributed to OpenTX and Companion - + SD card synchronization - + Recent Files - + Recent Models+Settings - + Set Icon Theme - + Set Icon Size - - + + File Ficheiro - - + + Edit Editar - + Settings - + Read/Write - - + + Help - - + + Radio Profile - + Show recent Models+Settings documents - + Ready Pronto @@ -5198,10 +4854,10 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error Erro @@ -5212,13 +4868,13 @@ We recommend you view the release notes using the button below to learn about an - + Unable to find file %1! Impossível encontrar o ficheiro %1! - + Error reading file %1: %2. @@ -5237,7 +4893,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. @@ -5262,7 +4918,7 @@ We recommend you view the release notes using the button below to learn about an Gravar Como - + Open backup Models and Settings file @@ -5271,7 +4927,7 @@ We recommend you view the release notes using the button below to learn about an Aviso - + Invalid binary backup File %1 @@ -5502,26 +5158,6 @@ This determines how mixer values are added. DEST -> CH%1 DEST -> CH%1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - MixesPanel @@ -5567,12 +5203,12 @@ This determines how mixer values are added. Aviso(%1) - + Not enough available mixers! - + Delete Selected Mixes? Apagar misturas selecionadas? @@ -5657,12 +5293,12 @@ This determines how mixer values are added. - + Clear Mixes? - + Really clear all the mixes? @@ -5730,30 +5366,304 @@ This determines how mixer values are added. Simular + + ModelPrinter + + + %1 bytes + + + + + CH%1 + CH%1 + + + + Exponential + Exponencial + + + + Extra Fine + Extra-fino + + + + Fine + Fino + + + + Medium + Médio + + + + Coarse + Aberto + + + + Unknown + + + + + Enabled + Activo + + + + Disabled + Inactivo + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + + + + + Master/SBUS Module + + + + + Master/CPPM Module + + + + + Master/SBUS in battery compartment + + + + + Master/Jack + + + + + Rudder + Leme + + + + Elevator + Elevador + + + + Throttle + Acelerador + + + + Aileron + Aileron + + + + Name(%1) + + + + + %1:%2 + + + + + Persistent + + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + + + + + + + + FM%1 + + + + + FM%1%2 + + + + + FM%1+%2 + + + + + [I%1] + + + + + Input%1 + + + + + + Weight + Peso + + + + + Switch + Interruptor + + + + + NoTrim + + + + + No DR/Expo + + + + + Offset + + + + + Delay + Atraso + + + + Slow + Lento + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + + + + + Flight mode(%1) + + + + + Edge(%1, [%2:%3]) + + + + + Sticky(%1, %2) + + + + + Timer(%1, %2) + + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + + + + + Standard + + + ModelSelectionPage - + Plane - + Multirotor - + Helicopter - + Model Name: - + Model Type: @@ -5761,129 +5671,130 @@ This determines how mixer values are added. ModelsListWidget - + + &Edit &Editar - + &Restore from backup - + &Model Wizard - + &Delete - + Delete - + &Copy &Copiar - + Ctrl+C Ctrl+C - + &Cut - + Ctrl+X - + &Paste Co&lar - + Ctrl+V Ctrl+V - + D&uplicate &Duplicar - + Ctrl+U - + &Use as default - + P&rint model - + Ctrl+P - + Alt+S Alt+S - + &Simulate model - + General Settings Parâmetros Gerais - + Delete Selected Models? Apagar Modelos Seleccionados? - - + + Cannot delete default model. - + Cannot cut default model. - + Do you want to overwrite radio general settings? - + You are pasting on an not empty model, are you sure? You are pasting on an not empty model, are you sure ? - + No free slot available, cannot duplicate @@ -6042,66 +5953,273 @@ This determines how mixer values are added. ModulePanel - + Trainer Port - + Internal Radio System - + External Radio Module - - + + Radio System - + Extra Radio System - + Value - + Hold - + No Pulse + + MultiModelPrinter + + + General Model Settings + + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + + + + + + Flight mode + + + + + Switch + Interruptor + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + + + + + + GV%1 + + + + + RE%1 + + + + + Limits + Limites + + + + Channel + + + + + Name + Nome + + + + + Offset + + + + + Min + Min + + + + Max + Max + + + + Invert + Inverter + + + + Global Variables + + + + + Inputs + + + + + Mixers + + + + + CV%1 + + + + + Curves + Curvas + + + + L%1 + + + + + Logical Switches + + + + + SF%1 + + + + + Special Functions + + + + + Telemetry Settings + + + + + Analogs + + + + + Unit + + + + + Scale + + + + + A%1 + + + + + RSSI Alarms + + + MultirotorPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -6109,17 +6227,17 @@ This determines how mixer values are added. OptionsPage - + Throttle Cut - + Throttle Timer - + Flight Timer @@ -6142,194 +6260,60 @@ This determines how mixer values are added. - Setup for: - Configurar para: + Configurar para: - - printed on: %1 - - - - - General Model Settings - - - - - - - Name - Nome + Nome - - EEprom Size - - - - - Internal Radio System - - - - - Radio System - - - - - Protocol - Protocolo + Protocolo Pulse Polarity Polaridade - Throttle Trim - Ajuste do Acelerador + Ajuste do Acelerador - Enabled - Activo + Activo - Disabled - Inactivo + Inactivo Throttle Expo Exponencial do Acelerador - - External Radio Module - - - - - Extra Radio System - - - - - Trainer port mode - - - - Trim Increment - Incremento do Ajuste + Incremento do Ajuste - Center Beep - Som ao Centrar + Som ao Centrar - - Flight modes - - - - - Fades - - - - Trims - Ajustes + Ajustes - - Gvars - - - - - Rot.Enc. - - - - Switch - Interruptor - - - - Flight mode name - - - - - IN - - - - - OUT - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - - - - - FM - - - - - Off - - - - - Inputs - + Interruptor Weight Peso - Source - Fonte - - - - Mixers - + Fonte Delay(u%1:d%2) @@ -6344,253 +6328,57 @@ This determines how mixer values are added. Aviso(%1) - Limits - Limites + Limites - - - - CH - - - - - - - - - Offset - - - - - - - Min - Min + Min - - - - Max - Max + Max - - - Invert - Inverter + Inverter - - - INV - INV + INV - - - NOR - NOR + NOR - Curves - Curvas + Curvas - - - Curve - Curva + Curva - pt %1 - pt %1 - - - - Logical Switches - - - - - L - - - - - Global Variables - - - - - GV - - - - - Special Functions - + pt %1 Function Função - - Timer%1 - - - - - SF - - - - - - Telemetry Settings - - - - - - Analog - - - - - Range - - - - - - - A%1 - - - - - Alarms - - - - - Low Alarm - - - - - Critical Alarm - - - - - RSSI - - - - - - Blades - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - Unit - - - - - Scale - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - RSSI Alarm - - - - - Frsky serial protocol - - - - - - Custom Telemetry View - - - - - Telemetry Bars - - - - - Bar Number - - - - + Print Document Imprimir Documento - + Select PDF output file - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) @@ -6623,18 +6411,6 @@ This determines how mixer values are added. QObject - - - - FM%1 - FP%1 - - - - - Input%1 - - Polish @@ -6642,8 +6418,6 @@ This determines how mixer values are added. - - CH%1 CH%1 @@ -6724,33 +6498,33 @@ This determines how mixer values are added. - - + + --- - + Rud Trim - + Ele Trim - + Thr Trim - + Ail Trim - + Rot Enc @@ -6886,7 +6660,7 @@ This determines how mixer values are added. - + S3 @@ -7191,7 +6965,6 @@ This determines how mixer values are added. - [I%1] @@ -7382,7 +7155,6 @@ This determines how mixer values are added. - Unknown @@ -7453,10 +7225,19 @@ This determines how mixer values are added. - DISABLED + + + INV + INV + + + + NOR + NOR + Edge @@ -7535,150 +7316,84 @@ This determines how mixer values are added. - + !Flight mode %1 - + Flight mode %1 - + Flight mode %1 value - + Yellow - + Orange - + Red - + Winged Shadow How High - + Winged Shadow How High (not supported) - + FrSky Sensor Hub - + None - + Imperial - + Metric - Extra Fine - Extra-fino + Extra-fino - Fine - Fino + Fino - Medium - Médio + Médio - Coarse - Aberto + Aberto - - %1:%2 - - - - - , Persistent - - - - - , MinuteBeep - - - - - , CountDown(Beeps) - - - - - , CountDown(Voice) - - - - - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - - - - - : Channel start: %1, %2 Channels - - - - - Slave/Jack - - - - - Master/SBUS Module - - - - - Master/CPPM Module - - - - - Master/SBUS in battery compartment - - - - - Master/Jack - - - - Exponential - Exponencial + Exponencial Count Up @@ -7697,24 +7412,20 @@ This determines how mixer values are added. :%1 Canais, Atraso de %3 mseg {1 ?} {2m?} {1 ?} {2u?} - Rudder - Leme + Leme - Elevator - Elevador + Elevador - Throttle - Acelerador + Acelerador - Aileron - Aileron + Aileron @@ -7731,82 +7442,20 @@ This determines how mixer values are added. - - Weight - Peso + Peso - - Switch - Interruptor + Interruptor - - - NoTrim - - - - - No DR/Expo - - - - - Offset - - - - Delay - Atraso + Atraso - Slow - Lento - - - - Warn - - - - - Flight modes - - - - - Flight mode - - - - - Edge(%1, [%2:%3]) - - - - - Sticky(%1, %2) - - - - - Timer(%1, %2) - - - - - Duration (%1s) - - - - - Delay (%1s) - + Lento @@ -7814,7 +7463,7 @@ This determines how mixer values are added. - + Own value @@ -7835,7 +7484,7 @@ This determines how mixer values are added. - + -GV%1 @@ -7843,34 +7492,34 @@ This determines how mixer values are added. - + ---- - - + + THR THR - - + + P1 P1 - - + + P2 P2 - - + + P3 P3 @@ -7887,25 +7536,25 @@ This determines how mixer values are added. - + Rud - + Ele - + Thr - + Ail @@ -7932,28 +7581,28 @@ This determines how mixer values are added. - + S1 - + S2 - + LS - + RS @@ -8099,7 +7748,7 @@ This determines how mixer values are added. - + V @@ -8337,341 +7986,48 @@ This determines how mixer values are added. - + GV%1 - - + + Support for frsky telemetry mod - - + + Support for jeti telemetry mod - - + + Support for receiving ardupilot data - - + + Support for receiving NMEA data - + Support for telemetry easy board - - + + Support for MAVLINK devices - - - Rotary Encoder use in menus navigation - - - - - - - - - - Enable heli menu and cyclic mix support - - - - - - - - - - - - Enable TEMPLATES menu - - - - - - - - No splash screen - - - - - - - - - - - - Disable curves menus - - - - - - - - Support for radio modified with regular speaker - - - - - - - Used if you have modified your radio with voice mode - - - - - - - - - Used if you have modified your radio with haptic mode - - - - - Channel values displayed in us - - - - - - - - - - - - In model setup menus automatically set source by moving the control - - - - - - - - - - - - In model setup menus automatically set switch by moving the control - - - - - Use alternative SQT5 font - - - - - (displaying only first 10 warnings) - - - - - Possibility to enable FAI MODE (no telemetry) at field - - - - - FAI MODE (no telemetry) always enabled - - - - - Support for a third timer - - - - - Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - - - - - Support for PPM internal module hack - - - - - ST7565P LCD or compatible - - - - - ST7565R LCD or compatible - - - - - ERC12864FSF LCD - - - - - ST7920 LCD - - - - - 9X board - - - - - - - - Enable the throttle trace in Statistics - - - - - EEprom write progress bar - - - - - - No Winged Shadow How High support - - - - - - No vario support - - - - - - No GPS support - - - - - - No gauges in the custom telemetry screen - - - - - Allow compensating for offset errors in FrSky FAS current sensors - - - - - - Add support for reversing stick inputs (e.g. needed for FrSky gimbals) - - - - - Power management by soft-off circuitry - - - - - 9XR-PRO - - - - - FrSky Taranis - - - - - FrSky Taranis Plus - - - - - FrSky Taranis X9E - - - - - Confirmation before radio shutdown - - - - - - Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views - - - - - Haptic module installed - - - - - Support for Lua model scripts - - - - - No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) - - - - - - Support of FrSky PXX protocol - - - - - Disable HELI menu and cyclic mix support - - - - - Disable Global variables - - - - - - - - - Support for DSM2 modules - - - - - - - - - - - - PPM center adjustment in limits + Rotary Encoder use in menus navigation @@ -8679,178 +8035,473 @@ This determines how mixer values are added. - - - - - Symetrical Limits + + + Enable heli menu and cyclic mix support - + + - - - - Pots use in menus navigation - - - - - Your radio probably uses a wrong firmware, - eeprom size is 4096 but only the first 2048 are used - - - - - No OverrideCH functions available - - - - - - - - - - - - No flight modes + + + + + Enable TEMPLATES menu - SmartieParts 2.2 Backlight support + + + No splash screen + + + + + + + + + + + + Disable curves menus - - - - Enable resetting values by pressing up and down at the same time + + + Support for radio modified with regular speaker - - - - - - - No graphical check boxes and sliders + + + + Used if you have modified your radio with voice mode - - - - - - + + + + Used if you have modified your radio with haptic mode + + + + + Channel values displayed in us + + + + + + + + + + + + In model setup menus automatically set source by moving the control + + + + + + + + + + + + In model setup menus automatically set switch by moving the control + + + + + Use alternative SQT5 font + + + + + (displaying only first 10 warnings) + + + + + Possibility to enable FAI MODE (no telemetry) at field + + + + + FAI MODE (no telemetry) always enabled + + + + + + + Support for a third timer + + + + + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 + + + + + Support for PPM internal module hack + + + + + ST7565P LCD or compatible + + + + + ST7565R LCD or compatible + + + + + ERC12864FSF LCD + + + + + ST7920 LCD + + + + + 9X board + + + + + + + + Enable the throttle trace in Statistics + + + + + EEprom write progress bar + + + + + + No Winged Shadow How High support + + + + + + No vario support + + + + + + No GPS support + + + + + + No gauges in the custom telemetry screen + + + + + Allow compensating for offset errors in FrSky FAS current sensors + + + + + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) + + + + + Power management by soft-off circuitry + + + + + 9XR-PRO + + + + + FrSky Taranis + + + + + FrSky Taranis Plus + + + + + FrSky Taranis X9E + + + + + Confirmation before radio shutdown + + + + + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views + + + + + Haptic module installed + + + + + Support for Lua model scripts + + + + + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) + + + + + + Support of FrSky PXX protocol + + + + + Disable HELI menu and cyclic mix support + + + + + Disable Global variables + + + + + + + + + Support for DSM2 modules + + + + + + + + + + + + PPM center adjustment in limits + + + + + + + + + + + + Symetrical Limits + + + + + + + + + + Pots use in menus navigation + + + + + Your radio probably uses a wrong firmware, + eeprom size is 4096 but only the first 2048 are used + + + + + No OverrideCH functions available + + + + + + + + + + + + No flight modes + + + + + + SmartieParts 2.2 Backlight support + + + + + + + + + Enable resetting values by pressing up and down at the same time + + + + + + + + + + + + No graphical check boxes and sliders + + + + + + + + + + + Battery graph - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items - - - - - + + + + + EEprom write Progress bar + + + + + + + + Imperial units + + + + + M128 / 9X board + + + + + 9XR + + + + + 9XR with M128 chip + + + + + Gruvin9x board / 9X + + + + + MEGA2560 board + + + + + Sky9x board / 9X + + + + + + Bluetooth interface + + - - - - - Imperial units - - - - - M128 / 9X board - - - - - 9XR - - - - - 9XR with M128 chip - - - - - Gruvin9x board / 9X - - - - - MEGA2560 board - - - - - Sky9x board / 9X - - - - - - Bluetooth interface - - - - - - - - - - - + + + + + + Global variables - - + + Support for SD memory card - + Support for DSM2 modules using ppm instead of true serial - - + + Enable HELI menu and cyclic mix support @@ -8905,18 +8556,18 @@ This determines how mixer values are added. OFF - - + + Warning Aviso - + EEPROM saved with these warnings: - + Simulator for this firmware is not yet available @@ -8926,63 +8577,63 @@ This determines how mixer values are added. - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves - + OpenTx only accepts %1 points in all curves - - - - - + + + + + OpenTX on this board doesn't accept this function - + OpenTX doesn't accept this telemetry protocol - - + + OpenTX doesn't accept this radio protocol - + OpenTX doesn't allow this number of channels - + Trim disabled - + Own Trim - + Use Trim from Flight mode %1 - + Use Trim from Flight mode %1 + Own Trim as an offset @@ -9014,15 +8665,21 @@ The OpenTX Team. - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! @@ -9032,33 +8689,33 @@ The OpenTX Team. - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -9092,12 +8749,12 @@ The OpenTX Team. - + Positive - + Negative @@ -9149,17 +8806,17 @@ The OpenTX Team. RudderPage - + No - + Yes - + <br>Rudder Channel: @@ -9328,7 +8985,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SimpleTailPage - + Elevator Channel: @@ -9551,10 +9208,44 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + + + + + Warning + Aviso + + + + Invalid image in library %1 + + + + + Information + + + + + No valid image found in library, check your settings + + + StandardPage - + Channel %1 @@ -9562,25 +9253,24 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -9589,35 +9279,40 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TailPage - + Rudder Channel: - + Elevator Channel: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder - + Only Elevator - + V-tail - + Tail Type: @@ -9625,96 +9320,96 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Telemetry - + A1 - + A2 - + RSSI - + Alarm 1 - - + + ---- - - + + Yellow - - + + Orange - - + + Red - + Alarm 2 - + Center Silent - + Altitude source - + Volts source - + Top Bar - + Serial Protocol - + Sensors - + Disable multi sensor handling - + Volt source - + Current source @@ -9724,82 +9419,82 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Protocolo - + None - + FrSky Sensor Hub - + Blades - + Sink Max - + Climb Max - + Sink Min - + Climb Min - + Vario source - + Vario limits - + Altimetry - + mAh - + A - + Various - + mAh count - + FAS Offset - + Persistent mAh @@ -9913,17 +9608,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - - Low Alarm - - - - - Critical Alarm - - - - + Range @@ -9936,22 +9621,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - + None - + Numbers - + Bars - + Script @@ -9979,99 +9664,99 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetryPanel - + FrSky S.PORT - + FrSky D - + FrSky D (cable) - + Telemetry screen %1 - + Low Alarm - + Critical Alarm - + Winged Shadow How High - + Winged Shadow How High (not supported) - + Alti - + Alti+ - + VSpeed + - - + A1 + - - + A2 - - + + A3 - - + + A4 - - + + FAS - + Cells - + --- @@ -10177,7 +9862,107 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - Amps Sensor : + Sensor : + + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. @@ -10185,111 +9970,11 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Raw (-) - - - Voltage (V) - - - - - Current (A) - - - - - Current (mA) - - - - - Speed (kts) - - - - - Speed (m/s) - - - - - Speed (ft/s) - - - - - Speed (km/h) - - - - - Speed (miles/h) - - - - - Meters (m) - - - - - Feet (ft) - - - - - Temp (°C) - - - - - Temp (°F) - - - - - Percentage (%) - - - - - Energy (mAh) - - - - - Power (W) - - - - - RF Power (dBm) - - RPM - - - Acceleration (g) - - - - - Heading (°) - - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - - Precision @@ -10344,22 +10029,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetrySensorPanel - + Lowest - + Cell %1 - + Highest - + Delta @@ -10580,17 +10265,17 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi ThrottlePage - + Yes - + No - + <br>Throttle Channel: @@ -10615,32 +10300,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TimerPanel - + Silent - + Beeps - + Voice - - Not persistent - - - - - Persistent (flight) + + Haptic + Not persistent + + + + + Persistent (flight) + + + + Persistent (manual reset) @@ -10773,12 +10463,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi VTailPage - + First Tail Channel: - + Second Tail Channel: @@ -10786,12 +10476,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WingtypeSelectionPage - + Standard Wing - + Flying Wing / Deltawing @@ -11073,37 +10763,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WizardPrinter - + Plane - + Multicopter - + Helicopter - + Model Name: - + Model Type: - + Options: - + Channel %1: @@ -12158,38 +11848,4 @@ Press cancel to abort joystick calibration Imprimir Documento - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - - - - - Warning - Aviso - - - - Invalid image in library %1 - - - - - Information - - - - - No valid image found in library, check your settings - - - diff --git a/companion/src/translations/companion_ru.ts b/companion/src/translations/companion_ru.ts index a73d8ab0e..8c1852f61 100644 --- a/companion/src/translations/companion_ru.ts +++ b/companion/src/translations/companion_ru.ts @@ -4,27 +4,27 @@ AileronsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Aileron Channel: - + Second Aileron Channel: @@ -32,27 +32,27 @@ AirbrakesPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Airbrake Channel: - + Second Airbrake Channel: @@ -74,7 +74,7 @@ - + Open Folder @@ -308,7 +308,7 @@ Mode 4: - + Simulator Volume Gain @@ -445,62 +445,62 @@ May be different from firmware language - + Simulator BackLight - + Enable - + Blue - + Green - + Red - + Orange - + Yellow - + Joystick - + Calibrate - + Simulator capture folder - + Only capture to clipboard - + Remember simulator switch values @@ -515,64 +515,64 @@ May be different from firmware language - - + + No joysticks found - + EMPTY: No radio settings stored in profile - + AVAILABLE: Radio settings of unknown age - + AVAILABLE: Radio settings stored %1 - + Select your library folder - - + + Select your Models and Settings backup folder - + Select Google Earth executable - + Select the folder replicating your SD structure - + Not possible to remove profile - + The default profile can not be removed. - + Open Image to load - + Images (%1) @@ -753,11 +753,6 @@ May be different from firmware language Stick 4 - - - Battery - - v @@ -778,9 +773,14 @@ May be different from firmware language PPM 4 + + + Battery Offset + + - Current + Current Offset @@ -1030,266 +1030,58 @@ May be different from firmware language - + No name - - General Model Settings - - - - - - - Name - - - - - - EEprom Size - - - - - - Timer1 - - - - - - Timer2 - - - - - - Internal Radio System - - - - - - Radio System - - - - - - - Protocol - Протокол + Протокол - - - External Radio Module - - - - - - Extra Radio System - - - - - - Trainer port mode - - - - - Throttle Trim - Газ трим - - - - - Enabled - - - - - - Disabled - + Газ трим Throttle Expo Газ экспо - - Trim Increment - Изм. триммеров + Изм. триммеров - - - Center Beep - - - - - Flight modes Settings - - - - - - Fades - - - - - Trims - Триммеры + Триммеры - - Switch - Тумблер + Тумблер - - - - - Flight mode name - - - - - - IN - - - - - - OUT - - - - - - - - - - - - - - FM - - - - - - Gvars - - - - - - Rot. Enc. - - - - Limits - Лимиты + Лимиты - - - - - Offset - Смещен. + Смещен. - - - - - Min - Мин + Мин - - - - - Max - Макс + Макс - - - Invert - Инверт - - - - - - - - CH - - - - - - INV - - - - - - NOR - - - - - Global Variables - - - - - - GV - - - - - Inputs - + Инверт Weight Вес - - - Mixers - - Delay(u%1:d%2) Задержка(u%1:d%2) @@ -1299,144 +1091,32 @@ May be different from firmware language Задержка(u%1:d%2) - Curves - Кривые + Кривые - - Curve - Кривая - - - - Logical Switches - - - - - L - - - - - Special Functions - + Кривая Function Функция - - SF - - - - - Telemetry Settings - - - - - - Analog - - - - - - Unit - - - - - - Scale - - - - - - - - A%1 - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - - - - Type - - - - - - - - Condition - - - - - - - Value - Значение + Значение - - - RSSI Alarm - - - - - - Custom Telemetry View - - - - - - Telemetry Bars - - - - - - Bar Number - - - - - Source - Источник + Источник - + Print Document - + Select PDF output file @@ -1444,7 +1124,7 @@ May be different from firmware language ConclusionPage - + OK, I understand. @@ -1482,12 +1162,12 @@ May be different from firmware language - - Thank you all !!! + + OpenTX Blacklist - + monthly @@ -1520,22 +1200,22 @@ May be different from firmware language CurveGroup - + Diff - + Expo - + Func - + Curve Кривая @@ -1785,22 +1465,22 @@ May be different from firmware language CyclicPage - + 90 - + 120 - + 120x - + 140 @@ -1816,12 +1496,12 @@ May be different from firmware language ElevonsPage - + <br>First Elevon Channel: - + Second Elevon Channel: @@ -2175,46 +1855,26 @@ If blank then the input is considered to be "ON" all the time.Edit %1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - FblPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -2266,27 +1926,27 @@ May be different from firmware language FlapsPage - + No - + Yes, controlled by a single channel - + Yes, controlled by two channels - + <br>First Flap Channel: - + Second Flap Channel: @@ -2539,8 +2199,8 @@ May be different from firmware language - - + + Warning Звук @@ -2594,58 +2254,58 @@ May be different from firmware language - + Splash image not found - + Cannot save customized firmware - + Write Firmware to Radio - - + + Firmware check failed - + Could not check firmware from radio - + New firmware is not compatible with the one currently installed! - + Conversion failed - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore failed - + Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1 - + Flashing done @@ -2767,37 +2427,17 @@ Please use ZADIG to properly install the driver. FlightModePanel - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - + Rotary Encoder %1 - + GVAR%1 - + Popup enabled @@ -2805,17 +2445,17 @@ Please use ZADIG to properly install the driver. FlightModesPanel - + Flight Mode %1 - + (%1) - + (default) @@ -2823,17 +2463,17 @@ Please use ZADIG to properly install the driver. FlybarSelectionPage - + Has Flybar - + Flybarless - + Flybar: @@ -3947,17 +3587,17 @@ Are you sure ? GyroPage - + No - + Yes, controled by a switch - + Yes, controlled by a pot @@ -4046,22 +3686,22 @@ Are you sure ? HeliPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -4433,43 +4073,43 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt MainWindow - - - + + + File loaded Файл загружен - - - + + + Save As Сохранить как... - - + + No updates available at this time. - + Unable to check for updates. - + Executable (*.exe) - + Would you like to launch the installer? - - + + File saved Файл записан @@ -4479,39 +4119,39 @@ The columns for altitude "GAlt" and for speed "GSpd" are opt - + New release available - - + + Error Ошибка - + Error opening file %1: %2. - + Compilation server termporary failure, try later - + Compilation server too busy, try later - + Unknown server failure, try later - + Firmware %1 does not seem to have ever been downloaded. Release %2 is available. Do you want to download it now? @@ -4520,31 +4160,31 @@ We recommend you view the release notes using the button below to learn about an - - + + Yes - - + + No - - + + Release Notes - - + + Do you want to download release %1 now ? - + A new version of %1 firmware is available: - current is %2 - newer is %3 @@ -4555,33 +4195,33 @@ We recommend you view the release notes using the button below to learn about an - + The selected language will be used the next time you start Companion. - + The new theme will be loaded the next time you start Companion. - + The icon size will be used the next time you start Companion. - - + + Synchronize SD - + Firmware updates - + Current firmware does not provide release notes informations. @@ -4596,97 +4236,97 @@ We recommend you view the release notes using the button below to learn about an Звук - + OpenTX Home Page: <a href='%1'>%1</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> - + New - + Open... - + Save - + Save As... - + Copy Model - + Paste Model - + Load backup from file - + Compare models - + Exit the application Выйти из программы - + List available programmers Показать список программаторов - + Show fuses dialog Показать диалог установки фьюзов - + Show the application's About box Показать окно "О программе" - + Set Menu Language - + Show the list of radio profiles - + Write - + %2 - + New Radio @@ -4701,599 +4341,599 @@ We recommend you view the release notes using the button below to learn about an %2. - + Checking for updates - + A new version of Companion is available (version %1)<br>Would you like to download it? - + A new release of Companion is available, please check the OpenTX website! - + Not enough memory for all the selected firmware options - + Compilation server requires registration, please check OpenTX web site - + About Companion - + A monochrome black icon theme - + A monochrome white icon theme - + A monochrome blue icon theme - + Small - + Use small toolbar icons - + Use normal size toolbar icons - + Normal нормально - + Use big toolbar icons - + Big - + Use huge toolbar icons - + Huge - + Do you want to write the firmware to the radio now ? - - + + Open Models and Settings file - + Read Models and Settings From Radio - + Ignore this release %1? - - - + + + Companion - + Save Radio Backup to File - + Read Radio Firmware to File - + The OpenTX Companion project was originally forked from <a href='%1'>eePe</a> - + Copyright OpenTX Team - + OpenTX Companion %1 - Radio: %2 - Profile: %3 - + Create a new Models and Settings file - - + + Save Models and Settings file - + Exit - + Cut Model - + Cut current model to the clipboard - + Copy current model to the clipboard - + Paste model from clipboard - + Classical - + The classic companion9x icon theme - + Yerico - + Yellow round honey sweet icon theme - + Monochrome - + MonoWhite - + MonoBlue - + System language - + Use system language in menus - + Czech - + Use Czech in menus - + German - + Use German in menus - + English - + Use English in menus - + Finnish - + Use Finnish in menus - + French - + Use French in menus - + Italian - + Use Italian in menus - + Polish - + Use Polish in menus - + Spanish - + Use Spanish in menus - + Swedish - + Use Swedish in menus - + About... - + Print... - + Print current model - + Simulate... - + Simulate current model - + Alt+S - + Load Backup... - + View Log File... - + Open and view log file - + Settings... - + Edit Settings - + Download... - + Download firmware and voice files - + Check for Updates... - + Check OpenTX and Companion updates - + Companion Changes... - + Show Companion change log - + Firmware Changes... - + Show firmware change log - + Compare Models... - + Edit Radio Splash Image... - + Edit the splash image of your Radio - + List programmers... - + Fuses... - - + + Read Firmware from Radio - + Read firmware from Radio - - + + Write Firmware to Radio - + Write firmware to Radio - + Add Radio Profile - + Create a new Radio Setting Profile - + Manuals and other Documents - + Open the OpenTX document page in a web browser - + Write Models and Settings To Radio - - + + Write Models and Settings to Radio - - + + Read Models and Settings from Radio - + Configure Communications... - + Configure software for communicating with the Radio - + Write Backup to Radio - + Write Backup from file to Radio - + Backup Radio to File - + Save a complete backup file of all settings and model data in the Radio - + Contributors... - + A tribute to those who have contributed to OpenTX and Companion - + SD card synchronization - + Recent Files - + Recent Models+Settings - + Set Icon Theme - + Set Icon Size - - + + File Файл - - + + Edit Правка - + Settings - + Read/Write - - + + Help - - + + Radio Profile - + Show recent Models+Settings documents - + Ready Готово @@ -5316,10 +4956,10 @@ We recommend you view the release notes using the button below to learn about an - - - - + + + + Error Ошибка @@ -5330,13 +4970,13 @@ We recommend you view the release notes using the button below to learn about an - + Unable to find file %1! Невозможно найти файл %1! - + Error reading file %1: %2. Ошибка при считывании файла %1: @@ -5346,7 +4986,7 @@ We recommend you view the release notes using the button below to learn about an - + Error opening file %1: %2. @@ -5391,7 +5031,7 @@ We recommend you view the release notes using the button below to learn about an %2. - + Open backup Models and Settings file @@ -5400,7 +5040,7 @@ We recommend you view the release notes using the button below to learn about an Звук - + Invalid binary backup File %1 @@ -5644,26 +5284,6 @@ p, li { white-space: pre-wrap; } DEST -> CH%1 - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - MixesPanel @@ -5709,12 +5329,12 @@ p, li { white-space: pre-wrap; } Пред(%1) - + Not enough available mixers! - + Delete Selected Mixes? Удалить выбранные микшеры? @@ -5803,12 +5423,12 @@ p, li { white-space: pre-wrap; } - + Clear Mixes? - + Really clear all the mixes? @@ -5876,30 +5496,304 @@ p, li { white-space: pre-wrap; } Симуляция + + ModelPrinter + + + %1 bytes + + + + + CH%1 + + + + + Exponential + экспонента + + + + Extra Fine + очень точно + + + + Fine + точно + + + + Medium + средне + + + + Coarse + грубо + + + + Unknown + + + + + Enabled + + + + + Disabled + + + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + + %1, Channels(%2-%3) + + + + + Receiver number(%1) + + + + + Slave/Jack + + + + + Master/SBUS Module + + + + + Master/CPPM Module + + + + + Master/SBUS in battery compartment + + + + + Master/Jack + + + + + Rudder + Руддер + + + + Elevator + Элеватор + + + + Throttle + Газ + + + + Aileron + Элероны + + + + Name(%1) + + + + + %1:%2 + + + + + Persistent + + + + + MinuteBeep + + + + + CountDown(Beeps) + + + + + CountDown(Voice) + + + + + CountDown(Haptic) + + + + + Off + + + + + + + + FM%1 + + + + + FM%1%2 + + + + + FM%1+%2 + + + + + [I%1] + + + + + Input%1 + + + + + + Weight + Вес + + + + + Switch + Тумблер + + + + + NoTrim + + + + + No DR/Expo + + + + + Offset + Смещен. + + + + Delay + Задержка + + + + Slow + Замедлен. + + + + Warn(%1) + + + + + Disabled in all flight modes + + + + + Flight modes(%1) + + + + + Flight mode(%1) + + + + + Edge(%1, [%2:%3]) + + + + + Sticky(%1, %2) + + + + + Timer(%1, %2) + + + + + Duration(%1s) + + + + + Delay(%1s) + + + + + Custom + + + + + Standard + + + ModelSelectionPage - + Plane - + Multirotor - + Helicopter - + Model Name: - + Model Type: @@ -5907,129 +5801,130 @@ p, li { white-space: pre-wrap; } ModelsListWidget - + + &Edit Правка - + &Restore from backup - + &Model Wizard - + &Delete Удалить - + Delete Удалить - + &Copy Копировать - + Ctrl+C - + &Cut Вырезать - + Ctrl+X - + &Paste Вставить - + Ctrl+V - + D&uplicate Дублировать - + Ctrl+U - + &Use as default - + P&rint model - + Ctrl+P - + Alt+S - + &Simulate model - + General Settings Основные настройки - + Delete Selected Models? Удалить выбранные модели? - - + + Cannot delete default model. - + Cannot cut default model. - + Do you want to overwrite radio general settings? - + You are pasting on an not empty model, are you sure? You are pasting on an not empty model, are you sure ? - + No free slot available, cannot duplicate @@ -6188,66 +6083,273 @@ p, li { white-space: pre-wrap; } ModulePanel - + Trainer Port - + Internal Radio System - + External Radio Module - - + + Radio System - + Extra Radio System - + Value Значение - + Hold - + No Pulse + + MultiModelPrinter + + + General Model Settings + + + + + Name: + + + + + EEprom Size: + + + + + Timer%1: + + + + + Module%1: + + + + + Module: + + + + + Trainer port: + + + + + Throttle Trim: + + + + + Trim Increment: + + + + + Center Beep: + + + + + Flight modes + + + + + + Flight mode + + + + + Switch + Тумблер + + + + Fade IN + + + + + Fade OUT + + + + + + FM%1 + + + + + + GV%1 + + + + + RE%1 + + + + + Limits + Лимиты + + + + Channel + + + + + Name + + + + + + Offset + Смещен. + + + + Min + Мин + + + + Max + Макс + + + + Invert + Инверт + + + + Global Variables + + + + + Inputs + + + + + Mixers + + + + + CV%1 + + + + + Curves + Кривые + + + + L%1 + + + + + Logical Switches + + + + + SF%1 + + + + + Special Functions + + + + + Telemetry Settings + + + + + Analogs + + + + + Unit + + + + + Scale + + + + + A%1 + + + + + RSSI Alarms + + + MultirotorPage - + Throttle Channel: - + Yaw Channel: - + Pitch Channel: - + Roll Channel: @@ -6255,17 +6357,17 @@ p, li { white-space: pre-wrap; } OptionsPage - + Throttle Cut - + Throttle Timer - + Flight Timer @@ -6288,190 +6390,36 @@ p, li { white-space: pre-wrap; } - - Setup for: - - - - - printed on: %1 - - - - - General Model Settings - - - - - - - - Name - - - - - EEprom Size - - - - - Internal Radio System - - - - - Radio System - - - - - Protocol - Протокол + Протокол - Throttle Trim - Газ трим - - - - Enabled - - - - - Disabled - + Газ трим Throttle Expo Газ экспо - - External Radio Module - - - - - Extra Radio System - - - - - Trainer port mode - - - - Trim Increment - Изм. триммеров + Изм. триммеров - - Center Beep - - - - - Flight modes - - - - - Fades - - - - Trims - Триммеры + Триммеры - - Gvars - - - - - Rot.Enc. - - - - Switch - Тумблер - - - - Flight mode name - - - - - IN - - - - - OUT - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - - - - - FM - - - - - Off - - - - - Inputs - + Тумблер Weight Вес - Source - Источник - - - - Mixers - + Источник Delay(u%1:d%2) @@ -6486,253 +6434,53 @@ p, li { white-space: pre-wrap; } Пред(%1) - Limits - Лимиты + Лимиты - - - - CH - - - - - - - - Offset - Смещен. + Смещен. - - - - Min - Мин + Мин - - - - Max - Макс + Макс - - - Invert - Инверт + Инверт - - - - INV - - - - - - - NOR - - - - Curves - Кривые + Кривые - - - Curve - Кривая - - - - pt %1 - - - - - Logical Switches - - - - - L - - - - - Global Variables - - - - - GV - - - - - Special Functions - + Кривая Function Функция - - Timer%1 - - - - - SF - - - - - - Telemetry Settings - - - - - - Analog - - - - - Range - - - - - - - A%1 - - - - - Alarms - - - - - Low Alarm - - - - - Critical Alarm - - - - - RSSI - - - - - - Blades - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - Unit - - - - - Scale - - - - - - - - Type - - - - - - - - Condition - - - - - - - Value - Значение + Значение - - RSSI Alarm - - - - - Frsky serial protocol - - - - - - Custom Telemetry View - - - - - Telemetry Bars - - - - - Bar Number - - - - + Print Document - + Select PDF output file - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) @@ -6765,18 +6513,6 @@ p, li { white-space: pre-wrap; } QObject - - - - FM%1 - FP%1 - - - - - Input%1 - - Polish @@ -6784,8 +6520,6 @@ p, li { white-space: pre-wrap; } - - CH%1 @@ -6866,33 +6600,33 @@ p, li { white-space: pre-wrap; } - - + + --- - + Rud Trim - + Ele Trim - + Thr Trim - + Ail Trim - + Rot Enc @@ -7028,7 +6762,7 @@ p, li { white-space: pre-wrap; } - + S3 @@ -7333,7 +7067,6 @@ p, li { white-space: pre-wrap; } - [I%1] @@ -7584,7 +7317,6 @@ p, li { white-space: pre-wrap; } - Unknown @@ -7655,10 +7387,19 @@ p, li { white-space: pre-wrap; } - DISABLED + + + INV + + + + + NOR + + Edge @@ -7737,150 +7478,84 @@ p, li { white-space: pre-wrap; } - + !Flight mode %1 - + Flight mode %1 - + Flight mode %1 value - + Yellow - + Orange - + Red - + Winged Shadow How High - + Winged Shadow How High (not supported) - + FrSky Sensor Hub - + None - + Imperial - + Metric - Extra Fine - очень точно + очень точно - Fine - точно + точно - Medium - средне + средне - Coarse - грубо + грубо - - %1:%2 - - - - - , Persistent - - - - - , MinuteBeep - - - - - , CountDown(Beeps) - - - - - , CountDown(Voice) - - - - - - : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - - - - - : Channel start: %1, %2 Channels - - - - - Slave/Jack - - - - - Master/SBUS Module - - - - - Master/CPPM Module - - - - - Master/SBUS in battery compartment - - - - - Master/Jack - - - - Exponential - экспонента + экспонента Count Up @@ -7891,24 +7566,20 @@ p, li { white-space: pre-wrap; } Обратный отсчет - Rudder - Руддер + Руддер - Elevator - Элеватор + Элеватор - Throttle - Газ + Газ - Aileron - Элероны + Элероны @@ -7925,82 +7596,24 @@ p, li { white-space: pre-wrap; } - - Weight - Вес + Вес - - Switch - Тумблер + Тумблер - - - NoTrim - - - - - No DR/Expo - - - - Offset - Смещен. + Смещен. - Delay - Задержка + Задержка - Slow - Замедлен. - - - - Warn - - - - - Flight modes - - - - - Flight mode - - - - - Edge(%1, [%2:%3]) - - - - - Sticky(%1, %2) - - - - - Timer(%1, %2) - - - - - Duration (%1s) - - - - - Delay (%1s) - + Замедлен. @@ -8008,7 +7621,7 @@ p, li { white-space: pre-wrap; } - + Own value @@ -8029,7 +7642,7 @@ p, li { white-space: pre-wrap; } - + -GV%1 @@ -8037,28 +7650,28 @@ p, li { white-space: pre-wrap; } - + ---- - - + + P1 - - + + P2 - - + + P3 @@ -8069,25 +7682,25 @@ p, li { white-space: pre-wrap; } - + Rud - + Ele - + Thr - + Ail @@ -8189,7 +7802,7 @@ p, li { white-space: pre-wrap; } - + S1 @@ -8200,7 +7813,7 @@ p, li { white-space: pre-wrap; } - + V @@ -8293,21 +7906,21 @@ p, li { white-space: pre-wrap; } - + S2 - + LS - + RS @@ -8496,13 +8109,13 @@ p, li { white-space: pre-wrap; } - + GV%1 - - + + THR @@ -8521,336 +8134,43 @@ p, li { white-space: pre-wrap; } ВЫКЛ - - + + Support for frsky telemetry mod - - + + Support for jeti telemetry mod - - + + Support for receiving ardupilot data - - + + Support for receiving NMEA data - + Support for telemetry easy board - - + + Support for MAVLINK devices - - - Rotary Encoder use in menus navigation - - - - - - - - - - Enable heli menu and cyclic mix support - - - - - - - - - - - - Enable TEMPLATES menu - - - - - - - - No splash screen - - - - - - - - - - - - Disable curves menus - - - - - - - - Support for radio modified with regular speaker - - - - - - - Used if you have modified your radio with voice mode - - - - - - - - - Used if you have modified your radio with haptic mode - - - - - Channel values displayed in us - - - - - - - - - - - - In model setup menus automatically set source by moving the control - - - - - - - - - - - - In model setup menus automatically set switch by moving the control - - - - - Use alternative SQT5 font - - - - - (displaying only first 10 warnings) - - - - - Possibility to enable FAI MODE (no telemetry) at field - - - - - FAI MODE (no telemetry) always enabled - - - - - Support for a third timer - - - - - Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - - - - - Support for PPM internal module hack - - - - - ST7565P LCD or compatible - - - - - ST7565R LCD or compatible - - - - - ERC12864FSF LCD - - - - - ST7920 LCD - - - - - 9X board - - - - - - - - Enable the throttle trace in Statistics - - - - - EEprom write progress bar - - - - - - No Winged Shadow How High support - - - - - - No vario support - - - - - - No GPS support - - - - - - No gauges in the custom telemetry screen - - - - - Allow compensating for offset errors in FrSky FAS current sensors - - - - - - Add support for reversing stick inputs (e.g. needed for FrSky gimbals) - - - - - Power management by soft-off circuitry - - - - - 9XR-PRO - - - - - FrSky Taranis - - - - - FrSky Taranis Plus - - - - - FrSky Taranis X9E - - - - - Confirmation before radio shutdown - - - - - - Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views - - - - - Haptic module installed - - - - - Support for Lua model scripts - - - - - No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) - - - - - - Support of FrSky PXX protocol - - - - - Disable HELI menu and cyclic mix support - - - - - Disable Global variables - - - - - - - - - Support for DSM2 modules - - - - - - - - - - - - PPM center adjustment in limits + Rotary Encoder use in menus navigation @@ -8858,194 +8178,489 @@ p, li { white-space: pre-wrap; } - - - - - Symetrical Limits + + + Enable heli menu and cyclic mix support - + + - - - - Pots use in menus navigation - - - - - Your radio probably uses a wrong firmware, - eeprom size is 4096 but only the first 2048 are used - - - - - No OverrideCH functions available - - - - - - - - - - - - No flight modes + + + + + Enable TEMPLATES menu - SmartieParts 2.2 Backlight support + + + No splash screen + + + + + + + + + + + + Disable curves menus - - - - Enable resetting values by pressing up and down at the same time + + + Support for radio modified with regular speaker - - - - - - - No graphical check boxes and sliders + + + + Used if you have modified your radio with voice mode - - - - - - + + + + Used if you have modified your radio with haptic mode + + + + + Channel values displayed in us + + + + + + + + + + + + In model setup menus automatically set source by moving the control + + + + + + + + + + + + In model setup menus automatically set switch by moving the control + + + + + Use alternative SQT5 font + + + + + (displaying only first 10 warnings) + + + + + Possibility to enable FAI MODE (no telemetry) at field + + + + + FAI MODE (no telemetry) always enabled + + + + + + + Support for a third timer + + + + + Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 + + + + + Support for PPM internal module hack + + + + + ST7565P LCD or compatible + + + + + ST7565R LCD or compatible + + + + + ERC12864FSF LCD + + + + + ST7920 LCD + + + + + 9X board + + + + + + + + Enable the throttle trace in Statistics + + + + + EEprom write progress bar + + + + + + No Winged Shadow How High support + + + + + + No vario support + + + + + + No GPS support + + + + + + No gauges in the custom telemetry screen + + + + + Allow compensating for offset errors in FrSky FAS current sensors + + + + + + Add support for reversing stick inputs (e.g. needed for FrSky gimbals) + + + + + Power management by soft-off circuitry + + + + + 9XR-PRO + + + + + FrSky Taranis + + + + + FrSky Taranis Plus + + + + + FrSky Taranis X9E + + + + + Confirmation before radio shutdown + + + + + + Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views + + + + + Haptic module installed + + + + + Support for Lua model scripts + + + + + No Joystick emulation inside the FW (only Mass Storage as in the Bootloader) + + + + + + Support of FrSky PXX protocol + + + + + Disable HELI menu and cyclic mix support + + + + + Disable Global variables + + + + + + + + + Support for DSM2 modules + + + + + + + + + + + + PPM center adjustment in limits + + + + + + + + + + + + Symetrical Limits + + + + + + + + + + Pots use in menus navigation + + + + + Your radio probably uses a wrong firmware, + eeprom size is 4096 but only the first 2048 are used + + + + + No OverrideCH functions available + + + + + + + + + + + + No flight modes + + + + + + SmartieParts 2.2 Backlight support + + + + + + + + + Enable resetting values by pressing up and down at the same time + + + + + + + + + + + + No graphical check boxes and sliders + + + + + + + + + + + Battery graph - - - - - - - - + + + + + + + + Don't use bold font for highlighting active items - - - - - + + + + + EEprom write Progress bar + + + + + + + + Imperial units + + + + + M128 / 9X board + + + + + 9XR + + + + + 9XR with M128 chip + + + + + Gruvin9x board / 9X + + + + + MEGA2560 board + + + + + Sky9x board / 9X + + + + + + Bluetooth interface + + - - - - - Imperial units - - - - - M128 / 9X board - - - - - 9XR - - - - - 9XR with M128 chip - - - - - Gruvin9x board / 9X - - - - - MEGA2560 board - - - - - Sky9x board / 9X - - - - - - Bluetooth interface - - - - - - - - - - - + + + + + + Global variables - - + + Support for SD memory card - + Support for DSM2 modules using ppm instead of true serial - - + + Enable HELI menu and cyclic mix support - - + + Warning Звук - + EEPROM saved with these warnings: - + Simulator for this firmware is not yet available @@ -9055,63 +8670,63 @@ p, li { white-space: pre-wrap; } - + Source %1 cannot be exported on this board! - + OpenTX only accepts %1 points in all curves - + OpenTx only accepts %1 points in all curves - - - - - + + + + + OpenTX on this board doesn't accept this function - + OpenTX doesn't accept this telemetry protocol - - + + OpenTX doesn't accept this radio protocol - + OpenTX doesn't allow this number of channels - + Trim disabled - + Own Trim - + Use Trim from Flight mode %1 - + Use Trim from Flight mode %1 + Own Trim as an offset @@ -9143,15 +8758,21 @@ The OpenTX Team. - + + + - Synchronization error - + + No SD directory configured! + + + + No Radio connected! @@ -9161,33 +8782,33 @@ The OpenTX Team. - + -%1 + - The directory '%1' doesn't exist! - + Create '%1' failed - + Copy '%1' to '%2' failed - + Open '%1' failed - + Write '%1' failed @@ -9222,12 +8843,12 @@ The OpenTX Team. - + Positive - + Negative @@ -9279,17 +8900,17 @@ The OpenTX Team. RudderPage - + No - + Yes - + <br>Rudder Channel: @@ -9458,7 +9079,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SimpleTailPage - + Elevator Channel: @@ -9633,10 +9254,44 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi + + SplashLibraryDialog + + + + ... + + + + + Splash Library - page %1 of %2 + + + + + Warning + Звук + + + + Invalid image in library %1 + + + + + Information + + + + + No valid image found in library, check your settings + + + StandardPage - + Channel %1 @@ -9644,25 +9299,24 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi SyncProcess - + + %1/%2 files + + + + Create directory %1 - + Copy %1 to %2 - - Read %1 - - - - - + Write %1 @@ -9671,35 +9325,40 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TailPage - + Rudder Channel: - + Elevator Channel: + + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage - + Elevator and Rudder - + Only Elevator - + V-tail - + Tail Type: @@ -9707,96 +9366,96 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Telemetry - + A1 - + A2 - + RSSI - + Alarm 1 - - + + ---- - - + + Yellow - - + + Orange - - + + Red - + Alarm 2 - + Center Silent - + Altitude source - + Volts source - + Top Bar - + Serial Protocol - + Sensors - + Disable multi sensor handling - + Volt source - + Current source @@ -9806,82 +9465,82 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Протокол - + None - + FrSky Sensor Hub - + Blades - + Sink Max - + Climb Max - + Sink Min - + Climb Min - + Vario source - + Vario limits - + Altimetry - + mAh - + A - + Various - + mAh count - + FAS Offset - + Persistent mAh @@ -9995,17 +9654,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - - Low Alarm - - - - - Critical Alarm - - - - + Range @@ -10018,22 +9667,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - + None - + Numbers - + Bars - + Script @@ -10061,99 +9710,99 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetryPanel - + FrSky S.PORT - + FrSky D - + FrSky D (cable) - + Telemetry screen %1 - + Low Alarm - + Critical Alarm - + Winged Shadow How High - + Winged Shadow How High (not supported) - + Alti - + Alti+ - + VSpeed + - - + A1 + - - + A2 - - + + A3 - - + + A4 - - + + FAS - + Cells - + --- @@ -10259,7 +9908,107 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - Amps Sensor : + Sensor : + + + + + V + + + + + A + + + + + mA + + + + + kt + + + + + m/s + + + + + ft/s + + + + + km/h + + + + + mph + + + + + m + + + + + ft + + + + + °C + + + + + °F + + + + + % + + + + + mAh + + + + + W + + + + + dBm + + + + + g + + + + + ° + + + + + mL + + + + + US fl.Oz. @@ -10267,111 +10016,11 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Raw (-) - - - Voltage (V) - - - - - Current (A) - - - - - Current (mA) - - - - - Speed (kts) - - - - - Speed (m/s) - - - - - Speed (ft/s) - - - - - Speed (km/h) - - - - - Speed (miles/h) - - - - - Meters (m) - - - - - Feet (ft) - - - - - Temp (°C) - - - - - Temp (°F) - - - - - Percentage (%) - - - - - Energy (mAh) - - - - - Power (W) - - - - - RF Power (dBm) - - RPM - - - Acceleration (g) - - - - - Heading (°) - - - - - Volume (mL) - - - - - Volume (US fl.Oz.) - - Precision @@ -10426,22 +10075,22 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TelemetrySensorPanel - + Lowest - + Cell %1 - + Highest - + Delta @@ -10662,17 +10311,17 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi ThrottlePage - + Yes - + No - + <br>Throttle Channel: @@ -10693,32 +10342,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi TimerPanel - + Silent - + Beeps - + Voice - - Not persistent - - - - - Persistent (flight) + + Haptic + Not persistent + + + + + Persistent (flight) + + + + Persistent (manual reset) @@ -10857,12 +10511,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi VTailPage - + First Tail Channel: - + Second Tail Channel: @@ -10870,12 +10524,12 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WingtypeSelectionPage - + Standard Wing - + Flying Wing / Deltawing @@ -11157,37 +10811,37 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi WizardPrinter - + Plane - + Multicopter - + Helicopter - + Model Name: - + Model Type: - + Options: - + Channel %1: @@ -12163,38 +11817,4 @@ This is used by the templated to determine which channel goes to what number out Значение - - SplashLibraryDialog - - - - ... - - - - - Splash Library - page %1 of %2 - - - - - Warning - Звук - - - - Invalid image in library %1 - - - - - Information - - - - - No valid image found in library, check your settings - - - diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index 6de88b9a8..712085618 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -457,7 +457,7 @@ Behöver inte vara samma som menyspråk Backup folder - + Folder för säkerhetskopiering If set it will override the application general setting @@ -469,15 +469,15 @@ Behöver inte vara samma som menyspråk Simulator Volume Gain - + Simulatorns Volymförstärkning Use OpenTX firmware nightly builds - + Använd OpenTX nattliga byggningar Use Companion nightly builds - + Använd Companions nattliga byggningar @@ -628,7 +628,7 @@ Behöver inte vara samma som menyspråk Battery - Batteri + Batteri v @@ -648,7 +648,7 @@ Behöver inte vara samma som menyspråk Current - Spänning + Spänning S1 @@ -732,34 +732,42 @@ Behöver inte vara samma som menyspråk SQ - + SQ SR - + SR LS2 - + LS2 SP - + SP SO - + SO S4 - S4 + S4 RS2 - + RS2 Bluetooth + Blåtand + + + Battery Offset + + + + Current Offset @@ -767,35 +775,35 @@ Behöver inte vara samma som menyspråk CalibrationPanel None - Ingen + Ingen 2 Positions Toggle - + 2-Läges-brytare 2 Positions - + 2 Lägen 3 Positions - + 3 Lägen Pot with detent - + Ratt med mittklick Multipos switch - + Flerlägesväljare Pot without detent - Ratt utan mittklick + Ratt utan mittklick Slider with detent - + Skjutpot med mittklick @@ -877,27 +885,27 @@ Behöver inte vara samma som menyspråk General Model Settings - Generella modell-inställningar + Generella modell-inställningar Name - Namn + Namn EEprom Size - Storlek på modelldata + Storlek på modelldata Timer1 - Timer1 + Timer1 Timer2 - Timer2 + Timer2 Protocol - Protokoll + Protokoll Pulse Polarity @@ -905,103 +913,103 @@ Behöver inte vara samma som menyspråk Throttle Trim - Gastrim + Gastrim Enabled - Aktiv + Aktiv Disabled - Inaktiv + Inaktiv Trim Increment - Trimökning + Trimökning Center Beep - Centrumpip + Centrumpip Flight modes Settings - Inställningar för flyglägen + Inställningar för flyglägen Fades - Toningar + Toningar Trims - Trimmar + Trimmar Switch - Brytare + Brytare Flight mode name - Namn på flygläget + Namn på flygläget IN - IN + IN OUT - UT + UT FM - FM + FM Gvars - Gvars + Gvars Rot. Enc. - Inm.Hjul. + Inm.Hjul. Limits - Gränser + Gränser Offset - Offset + Offset Min - Min + Min Max - Max + Max Invert - Invertera + Invertera CH - KN + KN INV - INV + INV NOR - NOR + NOR Global Variables - Globala Variabler + Globala Variabler GV - GV + GV Expo/Dr Settings @@ -1025,7 +1033,7 @@ Behöver inte vara samma som menyspråk Mixers - Mixar + Mixar noTrim @@ -1045,7 +1053,7 @@ Behöver inte vara samma som menyspråk Curves - Kurvor + Kurvor 5 Point Curves @@ -1057,7 +1065,7 @@ Behöver inte vara samma som menyspråk Curve - Kurva + Kurva 9 Point Curves @@ -1065,11 +1073,11 @@ Behöver inte vara samma som menyspråk Logical Switches - Logiska Brytare + Logiska Brytare Special Functions - Specialfunktioner + Specialfunktioner Function @@ -1089,67 +1097,67 @@ Behöver inte vara samma som menyspråk SF - SF + SF Telemetry Settings - Inställningar för Telemetri + Inställningar för Telemetri Analog - Analog + Analog Unit - Enhet + Enhet Scale - Skala + Skala A%1 - A%1 + A%1 Alarm 1 - Alarm 1 + Alarm 1 Alarm 2 - Alarm 2 + Alarm 2 Type - Typ + Typ Condition - Villkor + Villkor Value - Värde + Värde RSSI Alarm - RSSI-alarm + RSSI-alarm Custom Telemetry View - Egna inställning av telemetriskärmen + Egna inställning av telemetriskärmen Telemetry Bars - Telemetri-staplar + Telemetri-staplar Bar Number - Stapelnummer + Stapelnummer Source - Källa + Källa Print Document @@ -1165,31 +1173,31 @@ Behöver inte vara samma som menyspråk Internal Radio System - Intern Radosändare + Intern Radosändare Radio System - Radiosystem + Radiosystem External Radio Module - Extern Sändarmodul + Extern Sändarmodul Extra Radio System - Ytterligare Radiosystem + Ytterligare Radiosystem Trainer port mode - + Trainer-läge Inputs - Inputs + Inputs L - L + L @@ -1203,34 +1211,38 @@ Behöver inte vara samma som menyspråk ContributorsDialog OpenTX Contributors - + Bidragande till OpenTX Main Developers - + Huvudutvecklare Other contributors - + Andra Bidragande Companies and projects who have donated to OpenTX - + Företag och projekt som donerat till OpenTX People who have donated to OpenTX - + Människor som har donerat till OpenTX Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe) - All ära åt Rafal Tomczak (RadioClone), Thomas Husterer (th9x) och Erez Raviv (er9x and eePe) + All ära åt Rafal Tomczak (RadioClone), Thomas Husterer (th9x) och Erez Raviv (er9x and eePe) Thank you all !!! - Tack till er alla !!! + Tack till er alla !!! monthly + månatligen + + + OpenTX Blacklist @@ -1376,27 +1388,27 @@ Behöver inte vara samma som menyspråk Copy - + Kopiera Paste - + Lista In Clear - + Ta Bort Clear all curves - + Ta bort alla kurvor Are you sure you want to reset curve %1? - + Är du säker på att du vill ta bort kurva %1? Are you sure you want to reset all curves? - + Är du säker på att du vill ta bort alla kurvor? @@ -1511,19 +1523,19 @@ Behöver inte vara samma som menyspråk Er9x::Templates V-Tail - V-stjärt + V-stjärt THR - GAS + GAS Clear Mixes? - Ta bort mixarna? + Ta bort mixarna? Simple 4-CH - + Enkel 4kanal T-Cut @@ -1563,79 +1575,79 @@ Behöver inte vara samma som menyspråk Servo Test - + Servotest MultiCopter - + Multikopter Use Model Config Wizard - + Använd modellguiden Apply Template? - + Tillämpa Mall? Apply template "%1"? - + Tillämpa mallen "%1"? RUD - + ROD ELE - + HJD AIL - + SKE AIL2 - + SKE2 ELE2 - + HJD2 FLAPS - + FLAPS FLAP%1 - + FLAP%1 PITCH - + PITCH GYRO - + GYRO SPOIL - + SPOIL SPOIL%1 - + SPOIL%1 RUD2 - + ROD2 Really clear existing mixes on CH6? - + Vill du verkligen ta bort mixarna på kanal 6? Really clear existing mixes on CH5? - + Vill du verkligen ta bort mixarna på kanal 5? @@ -1732,19 +1744,19 @@ Om fältet lämnas tomt så är raden aktivt hela tiden. Rud - Rod + Rod Ele - Hjd + Hjd Thr - Gas + Gas Ail - Ske + Ske @@ -1950,7 +1962,7 @@ Behöver inte vara samma som menyspråk Invalid Models and Settings file %1 - + Filen innehåller inte Modeller och Inställningar: %1 @@ -2168,17 +2180,19 @@ Du använder för närvarande: unknown - + okänd Your radio does not seem connected to USB or the driver is not installed!!! Please use ZADIG to properly install the driver. - + Din radio verkar inte vara ansluten via USB eller så är USB-drivrutinen inte installerad!!! + +Använd Zadig för att installera drivrutinen. Your radio does not seem connected to USB or the driver is not initialized!!!. - + Din radio verkar inte vara ansluten via USB eller så är USB-drivrutinen inte startad!!!. @@ -2204,19 +2218,19 @@ Please use ZADIG to properly install the driver. FlightModePanel Rud - Rod + Rod Ele - Hjd + Hjd Thr - Gas + Gas Ail - Ske + Ske Rotary Encoder %1 @@ -2460,7 +2474,7 @@ Dessa inställningar gäller för alla modeller. Hardware / Calibration - + Hårdvara / Kalibrering @@ -3088,27 +3102,27 @@ brytare Stick reverse - + Inverterad spak Adjust RTC - + Justera RTC Min - Min + Min v - v + v Max - Max + Max Battery Meter Range - + Batterimätarens Mätområde @@ -3197,11 +3211,11 @@ FAI-funktionen kan inte slås av i sändaren. Long. cyc - + Long. cyc Lateral cyc - + Lateral cyc @@ -3413,123 +3427,123 @@ FAI-funktionen kan inte slås av i sändaren. LogsDialog Companion Log Viewer - Companion Logg-läsare + Companion Logg-läsare Filename - Filnamn + Filnamn Open LogFile - Öppna Loggfil + Öppna Loggfil Zoom - Zoom + Zoom X - X + X Y - Y + Y Reset - Nollställ + Nollställ Fly sessions - Flygningar + Flygningar Telemetry logs - Telemetriloggar + Telemetriloggar Time (hh:mm:ss) - Tid + Tid Plot Title Change - + Ändra Plottitel New plot title: - + Ny plottitel: Axis Label Change - + Ändra Axelnamn New axis label: - + Nytt axelnamn: Graph Name Change - + Ändra Grafnamn New graph name: - + Nytt grafnamn: Error: no GPS data not found - + Fel: GPS-data saknas The column containing GPS coordinates must be named "GPS". The columns for altitude "GAlt" and for speed "GSpd" are optional - + Kolumnen för GPS-koordinater måste heta "GPS". Kolumnerna för höjd (GAlt) och hastighet (GSpd) är valfria Error - Fel + Fel Cannot write file %1: %2. - Filen %1 kunde inte skrivas: + Filen %1 kunde inte skrivas: %2. Select your log file - Välj loggfil + Välj loggfil Available fields - Tillgängliga fält + Tillgängliga fält The selected logfile contains %1 invalid lines out of %2 total lines - Denn aktuella filen innehåller %1 felaktiga rader. Totalt innehåller filen %2 rader + Denn aktuella filen innehåller %1 felaktiga rader. Totalt innehåller filen %2 rader total duration - + Totaltid duration - + tid (L1) - + (L1) (R1) - + (R1) (L2) - + (L2) (R2) - + (R2) @@ -4315,7 +4329,11 @@ Release %2 is available. Do you want to download it now? We recommend you view the release notes using the button below to learn about any changes that may be important to you. - + Programvaran %1 för radion verkar inte ha laddats ned. +Version %2 finns tillgänglig. +Vill du ladda ned den nu? + +Vi rekommenderar att du använder knappen nedan för att ta del av de senaste förändringarna och bedöma om de är viktiga för dig. A new version of %1 firmware is available: @@ -4325,23 +4343,29 @@ We recommend you view the release notes using the button below to learn about an Do you want to download it now? We recommend you view the release notes using the button below to learn about any changes that may be important to you. - + En ny programvaruversion för radion finns tillgänglig (%1): + - installerad version %2 + - ny version %3 + +Vill du ladda ned den nya versionen nu? + +Vi rekommenderar att du använder knappen nedan för att ta del av de senaste förändringarna och bedöma om de är viktiga för dig. Spanish - Spanska + Spanska Use Spanish in menus - + Använd Spanska i menyerna Companion - Companion + Companion OpenTX Companion %1 - Radio: %2 - Profile: %3 - + OpenTX Companion %1 - Radio: %2 - Profil: %3 @@ -4610,19 +4634,19 @@ p, li { white-space: pre-wrap; } Rud - Rod + Rod Ele - Hjd + Hjd Thr - Gas + Gas Ail - Ske + Ske Name @@ -4745,7 +4769,7 @@ p, li { white-space: pre-wrap; } &Toggle highlight - Slå om markering + &Slå om markering &Delete @@ -4769,7 +4793,7 @@ p, li { white-space: pre-wrap; } C&ut - Klipp Ut + &Klipp Ut &Paste @@ -4860,7 +4884,222 @@ p, li { white-space: pre-wrap; } Outputs - Utgångar + Utgångar + + + + ModelPrinter + + %1 bytes + + + + CH%1 + KN%1 + + + Exponential + + + + Extra Fine + + + + Fine + + + + Medium + Medium + + + Coarse + + + + Unknown + Okänd + + + Enabled + Aktiv + + + Disabled + Inaktiv + + + %1, Channels(%2-%3), PPM delay(%4usec), Pulse polarity(%5) + + + + %1, Channels(%2-%3) + + + + Receiver number(%1) + + + + Slave/Jack + Elev/Uttag + + + Master/SBUS Module + Tränare/SBUS-modul + + + Master/CPPM Module + Tränare/CPPM-modul + + + Master/SBUS in battery compartment + Tränare/SBUS i batterifacket + + + Master/Jack + Tränare/Uttag + + + Rudder + Sidroder + + + Elevator + Höjdroder + + + Throttle + Gas + + + Aileron + Skevroder + + + Name(%1) + + + + %1:%2 + %1:%2 + + + Persistent + Bestående + + + MinuteBeep + + + + CountDown(Beeps) + + + + CountDown(Voice) + + + + CountDown(Haptic) + + + + Off + Av + + + FM%1 + FM%1 + + + FM%1%2 + FM%1%2 + + + FM%1+%2 + + + + [I%1] + [I%1] + + + Input%1 + Input%1 + + + Weight + Vikt + + + Switch + Brytare + + + NoTrim + EjTrim + + + No DR/Expo + Ingen DR/Expo + + + Offset + Offset + + + Delay + Fördröjning + + + Slow + Tröghet + + + Warn(%1) + + + + Disabled in all flight modes + + + + Flight modes(%1) + Flyglägen(%1) + + + Flight mode(%1) + Flygläge(%1) + + + Edge(%1, [%2:%3]) + + + + Sticky(%1, %2) + + + + Timer(%1, %2) + Timer(%1, %2) + + + Duration(%1s) + + + + Delay(%1s) + + + + Custom + Special + + + Standard + Standard @@ -4975,7 +5214,7 @@ p, li { white-space: pre-wrap; } &Model Wizard - Modellguide + &Modellguide Ctrl+P @@ -5090,7 +5329,7 @@ p, li { white-space: pre-wrap; } Not set - + Ej inställt Output type @@ -5129,14 +5368,177 @@ p, li { white-space: pre-wrap; } Value - Värde + Värde Hold - Håll senaste + Håll senaste No Pulse + Ingen Puls + + + + MultiModelPrinter + + General Model Settings + Generella modell-inställningar + + + Name: + + + + EEprom Size: + + + + Timer%1: + Timer%1: + + + Module%1: + + + + Module: + + + + Trainer port: + + + + Throttle Trim: + + + + Trim Increment: + + + + Center Beep: + + + + Flight modes + Flyglägen + + + Flight mode + Flygläge + + + Switch + Brytare + + + Fade IN + + + + Fade OUT + + + + FM%1 + FM%1 + + + GV%1 + GV%1 + + + RE%1 + + + + Limits + Gränser + + + Channel + + + + Name + Namn + + + Offset + Offset + + + Min + Min + + + Max + Max + + + Invert + Invertera + + + Global Variables + Globala Variabler + + + Inputs + Inputs + + + Mixers + Mixar + + + CV%1 + + + + Curves + Kurvor + + + L%1 + LB%1 + + + Logical Switches + Logiska Brytare + + + SF%1 + SF%1 + + + Special Functions + Specialfunktioner + + + Telemetry Settings + Inställningar för Telemetri + + + Analogs + + + + Unit + Enhet + + + Scale + Skala + + + A%1 + A%1 + + + RSSI Alarms @@ -5190,23 +5592,23 @@ p, li { white-space: pre-wrap; } Setup for: - Inställningar för: + Inställningar för: printed on: %1 - Utskriven: %1 + Utskriven: %1 General Model Settings - Generella modell-inställningar + Generella modell-inställningar Name - Namn + Namn EEprom Size - Storlek på modelldata + Storlek på modelldata Timer1 @@ -5218,7 +5620,7 @@ p, li { white-space: pre-wrap; } Protocol - Protokoll + Protokoll Pulse Polarity @@ -5226,75 +5628,75 @@ p, li { white-space: pre-wrap; } Throttle Trim - Gastrim + Gastrim Enabled - Aktiv + Aktiv Disabled - Inaktiv + Inaktiv Trim Increment - Trimökning + Trimökning Center Beep - Centrumpip + Centrumpip Fades - Toningar + Toningar Trims - Trimmar + Trimmar Gvars - Gvars + Gvars Rot.Enc. - Inm.Hjul. + Inm.Hjul. Switch - Brytare + Brytare Flight mode name - Namn för flygläget + Namn för flygläget IN - IN + IN OUT - UT + UT Rud - Rod + Rod Ele - Hjd + Hjd Thr - Gas + Gas Ail - Ske + Ske FM - FM + FM Weight @@ -5302,7 +5704,7 @@ p, li { white-space: pre-wrap; } Flight modes - Flyglägen + Flyglägen DISABLED @@ -5310,15 +5712,15 @@ p, li { white-space: pre-wrap; } Mixers - Mixar + Mixar CH - KN + KN Offset - Offset + Offset Delay(u%1:d%2) @@ -5330,55 +5732,55 @@ p, li { white-space: pre-wrap; } Limits - Gränser + Gränser Min - Min + Min Max - Max + Max Invert - Invertera + Invertera INV - INV + INV NOR - NOR + NOR Curves - Kurvor + Kurvor Curve - Kurva + Kurva pt %1 - pt %1 + pt %1 Logical Switches - Logiska Brytare + Logiska Brytare Global Variables - Globala Variabler + Globala Variabler GV - GV + GV Special Functions - Specialfunktioner + Specialfunktioner Function @@ -5394,23 +5796,23 @@ p, li { white-space: pre-wrap; } Telemetry Settings - Inställningar för Telemetri + Inställningar för Telemetri Alarm 1 - Alarm 1 + Alarm 1 Alarm 2 - Alarm 2 + Alarm 2 Analog - Analog + Analog Inputs - Inputs + Inputs NoTrim @@ -5438,7 +5840,7 @@ p, li { white-space: pre-wrap; } L - L + L SF%1 @@ -5446,75 +5848,75 @@ p, li { white-space: pre-wrap; } Range - Räckvidd + Räckvidd Alarms - Alarm + Alarm Low Alarm - Låg Alarmnivå + Låg Alarmnivå Critical Alarm - Kritisk Alarmnivå + Kritisk Alarmnivå RSSI - RSSI + RSSI Unit - Enhet + Enhet Scale - Skala + Skala Type - Typ + Typ Condition - Villkor + Villkor Value - Värde + Värde A%1 - A%1 + A%1 RSSI Alarm - RSSI-alarm + RSSI-alarm Frsky serial protocol - Frsky serieprotokoll + Frsky serieprotokoll Blades - Blad + Blad Custom Telemetry View - Egna inställning av telemetriskärmen + Egna inställning av telemetriskärmen Telemetry Bars - Telemetri-staplar + Telemetri-staplar Bar Number - Stapelnummer + Stapelnummer Source - Källa + Källa Print Document @@ -5530,35 +5932,35 @@ p, li { white-space: pre-wrap; } Internal Radio System - Intern Radosändare + Intern Radosändare Radio System - Radiosystem + Radiosystem External Radio Module - Extern Sändarmodul + Extern Sändarmodul Extra Radio System - Ytterligare Radiosystem + Ytterligare Radiosystem Trainer port mode - + Trainer-läge Off - Av + Av Timer%1 - + Timer%1 SF - SF + SF @@ -5843,15 +6245,15 @@ p, li { white-space: pre-wrap; } Timer(%1, %2) - Timer(%1, %2) + Timer(%1, %2) Duration (%1s) - Fördröjning (%1s) + Fördröjning (%1s) Delay (%1s) - Fördröjning (%1s) + Fördröjning (%1s) Haptic @@ -6671,23 +7073,23 @@ p, li { white-space: pre-wrap; } Extra Fine - Extrafin + Extrafin Fine - Fin + Fin Medium - Medium + Medium Coarse - Grov + Grov Exponential - Exponentiell + Exponentiell : %1 Channels, %2usec Delay @@ -6703,19 +7105,19 @@ p, li { white-space: pre-wrap; } Rudder - Sidroder + Sidroder Elevator - Höjdroder + Höjdroder Throttle - Gas + Gas Aileron - Skevroder + Skevroder Rotary Encoder use in menus navigation @@ -6799,11 +7201,11 @@ p, li { white-space: pre-wrap; } FM%1 - FM%1 + FM%1 Input%1 - Input%1 + Input%1 English @@ -7087,14 +7489,6 @@ OpenTX-gruppen. Edge - - Edge(%1, [%2:%3]) - - - - Sticky(%1, %2) - - Play Script Spela Script @@ -7117,23 +7511,23 @@ OpenTX-gruppen. %1:%2 - %1:%2 + %1:%2 , Persistent - , Bestående + , Bestående , MinuteBeep - , Minutpip + , Minutpip , CountDown(Beeps) - , Nedräkning(Pip) + , Nedräkning(Pip) , CountDown(Voice) - , Nedräkning(Röst) + , Nedräkning(Röst) GV @@ -7227,206 +7621,218 @@ OpenTX-gruppen. h:m - + h:m m:s - + m:s h:m:s - + h:m:s F1 - + F1 F2 - + F2 F3 - + F3 F4 - + F4 Positive - Positiv + Positiv Negative - Negativ + Negativ Source %1 cannot be exported on this board! - + Information från %1 finns inte tillgänglig på detta kort! ERC12864FSF LCD - + ERC12864FSF LCD ST7920 LCD - + ST7920 LCD Power management by soft-off circuitry - + Strömbrytare styrd av mjukvara : Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4 - + : Kanalstart: %1, %2 Kanaler, %3usek Fördröjning, Pulspolaritet %4 : Channel start: %1, %2 Channels - + : Kanalstart: %1, %2 Kanaler Slave/Jack - Elev/Uttag + Elev/Uttag Master/SBUS Module - Tränare/SBUS-modul + Tränare/SBUS-modul Master/CPPM Module - Tränare/CPPM-modul + Tränare/CPPM-modul Master/SBUS in battery compartment - Tränare/SBUS i batterifacket + Tränare/SBUS i batterifacket Master/Jack - Tränare/Uttag + Tränare/Uttag Support for a third timer - + Stöd för en tredje timer Support for PPM internal module hack - + Stöd för hårdvaruhack med intern PPM-modul Confirmation before radio shutdown - + Bekräfta avstängning av radion Flight - + Flygning °F - + °F repeat - + upprepa DISABLED - INAKTIV + INAKTIV Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015 - + Ta bort FrSkys radioprotokoll D8 och R12,l som inte är lagliga i EU för sändare sålda efter 2015-01-01 9X board - + 9X-kort M128 / 9X board - + M128 / 9X kort 9XR - + 9XR 9XR with M128 chip - + 9XR med M128-CPU Gruvin9x board / 9X - + 9X med Gruvin9X-kort MEGA2560 board - + MEGA2560-kort Sky9x board / 9X - + 9X med Sky9X-kort 9XR-PRO - + 9XR-PRO FrSky Taranis - + FrSky Taranis FrSky Taranis Plus - + FrSky Taranis Plus FrSky Taranis X9E - + FrSky Taranis X9E Weight - Vikt + Vikt Switch - Brytare + Brytare NoTrim - EjTrim + EjTrim No DR/Expo - Ingen DR/Expo + Ingen DR/Expo Offset - Offset + Offset Delay - Fördröjning + Fördröjning Slow - Tröghet + Tröghet Warn - Varn + Varn Flight modes - Flyglägen + Flyglägen Flight mode - Flygläge + Flygläge Radio type - + Radiotyp Which radio type do you want to simulate? + Vilken typ av radio vill du simulera? + + + INV + INV + + + NOR + NOR + + + No SD directory configured! @@ -7449,14 +7855,14 @@ OpenTX-gruppen. ReleaseNotesDialog Companion Release Notes - Companion Release Notes + Companion Release Notes ReleaseNotesFirmwareDialog OpenTX Release Notes - OpenTX Release Notes + OpenTX Release Notes @@ -7604,7 +8010,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Global Functions - Globala Funktioner + Globala Funktioner @@ -7732,11 +8138,38 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga S3 - S3 + S3 S4 - S4 + S4 + + + + SplashLibraryDialog + + ... + ... + + + Splash Library - page %1 of %2 + Bildbibliotek - Sida %1 av %2 + + + Warning + Varning + + + Invalid image in library %1 + Felaktig bild i biblioteket %1 + + + Information + Information + + + No valid image found in library, check your settings + Ingen användbar bild i biblioteket. Kontrollera inställningarna @@ -7763,7 +8196,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Read %1 - Läs %1 + Läs %1 @@ -7772,6 +8205,10 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Skriv %1 + + %1/%2 files + + TailPage @@ -7783,6 +8220,10 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Elevator Channel: Höjdroderkanal: + + Only one channel still available!<br>You probably should configure your model without using the wizard. + + TailSelectionPage @@ -7939,11 +8380,11 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Center Silent - + Centrumtystnad Disable multi sensor handling - + Inaktivera multisensor-hantering @@ -8030,11 +8471,11 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Low Alarm - Låg Alarmnivå + Låg Alarmnivå Critical Alarm - Kritisk Alarmnivå + Kritisk Alarmnivå Range @@ -8227,7 +8668,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Amps Sensor : - Amp-sensor : + Amp-sensor : Raw (-) @@ -8235,35 +8676,35 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Voltage (V) - Spänning (V) + Spänning (V) Current (A) - Ström (A) + Ström (A) Current (mA) - Ström (mA) + Ström (mA) Speed (kts) - Hastighet (knop) + Hastighet (knop) Speed (m/s) - Hastighet (m/s) + Hastighet (m/s) Speed (km/h) - Hastighet (km/h) + Hastighet (km/h) Speed (miles/h) - Hastighet (miles/h) + Hastighet (miles/h) Meters (m) - Meter(m) + Meter(m) Feet (f) @@ -8271,15 +8712,15 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Temp (°C) - Temp (°C) + Temp (°C) Temp (°F) - Temp (°F) + Temp (°F) Percentage (%) - Procent (%) + Procent (%) Precision @@ -8311,7 +8752,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Calculated - + Beräknad Totalize @@ -8319,63 +8760,147 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Speed (ft/s) - + Hastighet (ft/s) Feet (ft) - + Fot (ft) Energy (mAh) - + Energi (mAh) Power (W) - + Effekt (W) RF Power (dBm) - + RFeffekt (dBm) RPM - + RPM Acceleration (g) - + Acceleration (g) Heading (°) - + Riktning (°) Volume (mL) - + Volym (mL) Volume (US fl.Oz.) - + Volym (US fl.Oz.) Blades - Blad + Blad Multiplier - + Multiplikator Filter - + Filter Ratio - + Förhållande Positive - Positiv + Positiv + + + Sensor : + + + + V + V + + + A + A + + + mA + + + + kt + + + + m/s + m/s + + + ft/s + + + + km/h + km/h + + + mph + mph + + + m + m + + + ft + ft + + + °C + °C + + + °F + °F + + + % + % + + + mAh + mAh + + + W + W + + + dBm + + + + g + g + + + ° + ° + + + mL + + + + US fl.Oz. + @@ -8425,139 +8950,139 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Vario Altitude - + Variohöjd V-ALT - + V-ALT Vario Vertical Speed - + Vertikal hastighet från vario V-VSPD - + V-VSPD ACCZ - + ACCZ GPS Time - GPS-tid + GPS-tid GPS-T - + GPS-T ACCX - + ACCX GPS Lat/Lon - + GPS-LL - + GPS-LL VFAS - + VFAS FAS-V - + FAS-V GPS Speed - + GPS-hastighet GPS-S - + GPS-S CELLS - + CELLS ACCY - + ACCY GPS Course - + GPS-kurs GPS-C - + GPS-C GPS Altitude - + GPS Höjd GPS-A - + GPS-A CURRENT - + CURRENT FAS-C - + FAS-C 30 - 30 + 30 75 - 75 + 75 FR_ID_AIR_SPEED - + ASPD - + ASPD A3 - A3 + A3 A4 - A4 + A4 Temperature 1 - + Temperatur 1 T1 - T1 + T1 Temperature 2 - + Temperatur 2 T2 - T2 + T2 RPM - + RPM FUEL - + FUEL When enabled, sends any non-blank values as simulated telemetry data. @@ -8565,7 +9090,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga <html><head/><body><p>Start with <span style=" font-style:italic;">0x</span> for hex, <span style=" font-style:italic;">0</span> for octal, otherwise decimal.<br/>Numeric entry only. Blank values are not sent.</p></body></html> - + <html><head/><body><p>Inled hextal med <span style=" font-style:italic;">0x</span>. Inled octaltal med <span style=" font-style:italic;">0</span>. Alla andra tal antas vara decimala.<br/>Enbart numeriska tecken. Tomma tal skickas ej.</p></body></html> @@ -8620,6 +9145,10 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Persistent (manual reset) Bestående (återställs manuellt) + + Haptic + Spela Vibration + Trainer @@ -9883,7 +10412,7 @@ Tryck på Avbryt för att avburyta kalibreringen Duplicated stick assignment - + Dubblerad koppling av spak @@ -10324,31 +10853,4 @@ Får skilja från språket för mjukvaran Sökväg till SD-struktur - - SplashLibraryDialog - - ... - ... - - - Splash Library - page %1 of %2 - Bildbibliotek - Sida %1 av %2 - - - Warning - Varning - - - Invalid image in library %1 - Felaktig bild i biblioteket %1 - - - Information - Information - - - No valid image found in library, check your settings - Ingen användbar bild i biblioteket. Kontrollera inställningarna - - diff --git a/companion/src/xmlinterface.cpp b/companion/src/xmlinterface.cpp index 14f90d863..1bbb7ee74 100644 --- a/companion/src/xmlinterface.cpp +++ b/companion/src/xmlinterface.cpp @@ -69,7 +69,7 @@ void saveGeneralSettings(GeneralSettings & settings, global_settings & gs) // TODO BSS settings.currModel; gs.contrast(settings.contrast); - gs.battery(battery(settings.vBatCalib, settings.vBatWarn)); + gs.battery(battery(settings.txVoltageCalibration, settings.vBatWarn)); gs.ppm_input_calibration(ppm_input_calibration(settings.PPM_Multiplier, PPMCalibration(settings.trainer.calib[0]), @@ -124,7 +124,7 @@ void saveModel(ModelData & m, model & xm) } } */ - if (m.moduleData[0].protocol != PPM || m.moduleData[0].channelsCount != 8 || m.moduleData[0].ppmDelay != 300 || m.moduleData[0].ppmPulsePol != 0) { + if (m.moduleData[0].protocol != PULSES_PPM || m.moduleData[0].channelsCount != 8 || m.moduleData[0].ppmDelay != 300 || m.moduleData[0].ppmPulsePol != 0) { modulation mod; mod.type(modulation::type_type::value(m.moduleData[0].protocol)); mod.channels(m.moduleData[0].channelsCount); diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt index 3aaa5cf6b..e7ccd5a9a 100644 --- a/radio/releasenotes.txt +++ b/radio/releasenotes.txt @@ -4,18 +4,35 @@
  • Fixed several issues with D series altimeter/vario (negative values, hi/lo precision vario) (#2685)
  • Auto-offset for Frsky variometer on per default (#2693)
    • -
  • 9XE top LDC fixes: added TX battery blinking on battery warning, fixed display problem when battery voltage lower than batlow value. (#2671)
    • +
  • X9E top LDC fixes: added TX battery blinking on battery warning, fixed display problem when battery voltage lower than batlow value. (#2671)
  • Timers range extended (it was limited to around 9 hours before) (#2702)
  • Fixed: Playing two background sounds at once causes sound to stop (#2704)
  • Several fixes to the SD card manager menu (#2623)
  • Fixed the difference between top and main LCD TX battery bars on 9Xe (#2671)
  • Several Lua getValue() fields were not exported correctly (tx-voltage, clock and timers1-3)
  • Fixed: Edge Logical Switch could trigger right after the model was loaded or the radio turned on (#2728)
    • +
  • Fixed output channel jitter if trim was used (#2774)
    • +
  • Some telemetry sensors did not work in logical switches if there were more than 16 sensors (#2787)
    • +
  • Improved mixer screen layout (#2785)
+[X9E] +
    +
  • Unwanted radio turning off on watchdog reset fixed (#2681, #2790)
    • +
  • Added code to help mitigate the issue of RTC loosing its time when radio was turned off (#2626)
    • +
+ + [Sky9x / 9XR-PRO]
  • Sound was unintelligible (#2665)
    • +
  • PXX wasn't enabled
    • +
+ +[All] +
    +
  • Various texts and translations corrections
    • +
  • Various small bug-fixes
diff --git a/radio/src/Makefile b/radio/src/Makefile index 895caffe3..849bd4d23 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -273,6 +273,10 @@ SHUTDOWN_CONFIRMATION = NO # Values = YES, NO DEBUG = NO +# Activate Command Line Interpreter +# Values = NO, YES +CLI = NO + # Activate writing of SPORT telemetry received data to sport.log file # Values = YES, NO SPORT_FILE_LOG = NO @@ -306,9 +310,10 @@ LUA = NO MENUS_LOCK = NO # USB options in the main image -# Values = JOYSTICK, MASSSTORAGE +# Values = JOYSTICK, MASSSTORAGE, SERIAL # JOYSTICK: The TX will appear as a joystick # MASSSTORAGE: The TX will appear as a drive +# SERIAL: The TX will appear as a serial port USB = JOYSTICK # Mixers monitor view added to Channels monitor one @@ -366,6 +371,10 @@ SIMU_DISKIO = NO # Values = NO, YES SIMU_AUDIO = NO +# Enable Watchdog test (DANGEROUS) +# Values = NO, YES +WATCHDOG_TEST = NO + #------- END BUILD OPTIONS --------------------------- # Define programs and commands. @@ -811,7 +820,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO AR9X)) 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 CPPSRC += tasks_arm.cpp audio_arm.cpp haptic.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp telemetry/telemetry.cpp - CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/second_serial_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp + CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/serial2_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp CPPSRC += loadboot.cpp debug.cpp BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm ifeq ($(SDCARD), YES) @@ -928,17 +937,20 @@ ifeq ($(PCB), TARANIS) LDSCRIPT = targets/taranis/stm32f2_flash.ld endif STM32USBPATH = $(THIRDPARTY)/STM32_USB-Host-Device_Lib_V2.1.0/Libraries - INCDIRS += $(STM32USBPATH)/STM32_USB_OTG_Driver/inc $(STM32USBPATH)/STM32_USB_Device_Library/Core/inc - INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/inc $(STM32USBPATH)/STM32_USB_Device_Library/Class/hid/inc + INCDIRS += $(STM32USBPATH)/STM32_USB_OTG_Driver/inc + INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Core/inc + INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/inc + INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/hid/inc + INCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/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/i2c_driver.cpp targets/taranis/aspi.c targets/taranis/delays.c + EXTRABOARDSRC += targets/taranis/configure_pins.cpp targets/taranis/lcd_driver.cpp targets/taranis/flash_driver.cpp targets/taranis/i2c_driver.cpp targets/taranis/aspi.c targets/taranis/delays.c serial.cpp SRC += $(COOSDIR)/kernel/core.c $(COOSDIR)/kernel/hook.c $(COOSDIR)/kernel/task.c $(COOSDIR)/kernel/event.c $(COOSDIR)/kernel/time.c $(COOSDIR)/kernel/timer.c $(COOSDIR)/kernel/flag.c $(COOSDIR)/kernel/mutex.c $(COOSDIR)/kernel/serviceReq.c $(COOSDIR)/portable/GCC/port.c $(COOSDIR)/portable/arch.c SRC += targets/taranis/pwr_driver.c targets/taranis/usb_driver.c EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp eeprom_conversions.cpp PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp CPPSRC += tasks_arm.cpp audio_arm.cpp sbus.cpp telemetry/telemetry.cpp - CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/uart3_driver.cpp targets/taranis/telemetry_driver.cpp + CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/serial2_driver.cpp targets/taranis/telemetry_driver.cpp CPPSRC += bmp.cpp gui/$(GUIDIRECTORY)/view_channels.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp debug.cpp CPPSRC += loadboot.cpp ifeq ($(PCBREV), REV9E) @@ -981,6 +993,10 @@ ifeq ($(PCB), TARANIS) ifeq ($(USB), JOYSTICK) CPPDEFS += -DUSB_JOYSTICK SRC += targets/taranis/usbd_hid_joystick.c + else ifeq ($(USB), SERIAL) + CPPDEFS += -DUSB_SERIAL + SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c + EXTRABOARDSRC += targets/taranis/usbd_cdc.cpp else CPPDEFS += -DUSB_MASS_STORAGE SRC += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c @@ -1036,6 +1052,9 @@ ifeq ($(PCB), TARANIS) ifeq ($(MIXERS_MONITOR), YES) CPPDEFS += -DMIXERS_MONITOR endif + ifeq ($(WATCHDOG_TEST), YES) + CPPDEFS += -DWATCHDOG_TEST + endif endif CC = $(TRGT)gcc @@ -1253,10 +1272,10 @@ ifeq ($(EXT), JETI) endif ifeq ($(EXT), MAVLINK) - CPPDEFS += -DMAVLINK - INCDIRS += thirdparty - CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp serial.cpp - EEPROM_VARIANT += ${MAVLINK_VARIANT} + CPPDEFS += -DMAVLINK + INCDIRS += thirdparty + CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp targets/common_avr/serial_driver.cpp + EEPROM_VARIANT += ${MAVLINK_VARIANT} endif ifeq ($(EXT), TELEMETREZ) @@ -1297,8 +1316,15 @@ ifeq ($(EXT), $(filter $(EXT), FRSKY FRSKY_SPORT TELEMETREZ)) EEPROM_VARIANT += ${FRSKY_VARIANT} endif -ifeq ($(DEBUG), YES) +ifeq ($(SIMU), YES) CPPDEFS += -DDEBUG + CPPSRC += dump.cpp +else ifeq ($(CLI), YES) + CPPDEFS += -DCLI -DDEBUG + CPPSRC += cli.cpp dump.cpp +else ifeq ($(DEBUG), YES) + CPPDEFS += -DDEBUG + CPPSRC += dump.cpp endif ifeq ($(EEPROM_PROGRESS_BAR), YES) diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp index df2a75955..75dff4974 100644 --- a/radio/src/audio_arm.cpp +++ b/radio/src/audio_arm.cpp @@ -305,24 +305,28 @@ void getPhaseAudioFile(char * filename, int index, unsigned int event) void getSwitchAudioFile(char * filename, int index) { char * str = getModelAudioPath(filename); - int len = STR_VSWITCHES[0]; - strncpy(str, &STR_VSWITCHES[1+len*(index+1)], len); - str += len-1; - if (*str == '\300') { - strcpy(str, "-up"); - str += 3; - } - else if (*str == '-') { - strcpy(str, "-mid"); - str += 4; - } - else if (*str == '\301') { - strcpy(str, "-down"); - str += 5; + +#if defined(PCBTARANIS) + if (index <= SWSRC_LAST_SWITCH) { + div_t swinfo = switchInfo(index); + *str++ = 'S'; + *str++ = 'A' + swinfo.quot; + const char * positions[] = { "-up", "-mid", "-down" }; + strcpy(str, positions[swinfo.rem]); } else { - *(str+1) = 0; + div_t swinfo = div(index - SWSRC_FIRST_MULTIPOS_SWITCH, XPOTS_MULTIPOS_COUNT); + *str++ = 'S'; + *str++ = '1' + swinfo.quot; + *str++ = '1' + swinfo.rem; + *str = '\0'; } +#else + int len = STR_VSWITCHES[0]; + strncpy(str, &STR_VSWITCHES[1+(len*index)], len); + str += len; + *str = '\0'; +#endif strcat(str, SOUNDS_EXT); } @@ -381,7 +385,7 @@ void referenceModelAudioFiles() } // Switches Audio Files -[up|mid|down].wav - for (int i=0; i 0) { #if defined(CPUM2560) if (tone2Freq) { - OCR0A = (5000 / tone2Freq); // sticking with old values approx 20(abs. min) to 90, 60 being the default tone(?). + OCR4A = (5000 / tone2Freq); // sticking with old values approx 20(abs. min) to 90, 60 being the default tone(?). speakerOn(); } #else diff --git a/radio/src/bin_allocator.cpp b/radio/src/bin_allocator.cpp index f74e351f2..73e847a18 100644 --- a/radio/src/bin_allocator.cpp +++ b/radio/src/bin_allocator.cpp @@ -39,11 +39,11 @@ void * bin_realloc(void * ptr, size_t size) // if it fits in current slot, return it // TODO if new size is smaller, try to relocate in smaller slot if ( slots1.can_fit(ptr, size) ) { - // TRACE("OUR realloc %p[%lu] fits in slot1", ptr, size); FLUSH(); + // TRACE("OUR realloc %p[%lu] fits in slot1", ptr, size); return ptr; } if ( slots2.can_fit(ptr, size) ) { - // TRACE("OUR realloc %p[%lu] fits in slot2", ptr, size); FLUSH(); + // TRACE("OUR realloc %p[%lu] fits in slot2", ptr, size); return ptr; } @@ -51,10 +51,10 @@ void * bin_realloc(void * ptr, size_t size) void * res = bin_malloc(size); if (res == 0) { // we don't have the space, use libc malloc - // TRACE("bin_malloc [%lu] FAILURE", size); FLUSH(); + // TRACE("bin_malloc [%lu] FAILURE", size); res = malloc(size); if (res == 0) { - TRACE("libc malloc [%lu] FAILURE", size); FLUSH(); + TRACE("libc malloc [%lu] FAILURE", size); return 0; } } @@ -73,7 +73,7 @@ void *bin_l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) if (ptr) { // avoid a bunch of NULL pointer free calls if (!bin_free(ptr)) { // not our range, use libc allocator - // TRACE("libc free %p", ptr); FLUSH(); + // TRACE("libc free %p", ptr); free(ptr); } } @@ -89,18 +89,18 @@ void *bin_l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) } if ( SimulateMallocFailure > 0) { // simulate one malloc failure - TRACE("bin_l_alloc(): simulating malloc failure at %p[%lu]", ptr, nsize); FLUSH(); + TRACE("bin_l_alloc(): simulating malloc failure at %p[%lu]", ptr, nsize); return 0; } #endif // #if defined(DEBUG) // try our allocator, if it fails use libc allocator void * res = bin_realloc(ptr, nsize); if (res && ptr) { - // TRACE("OUR realloc %p[%lu] -> %p[%lu]", ptr, osize, res, nsize); FLUSH(); + // TRACE("OUR realloc %p[%lu] -> %p[%lu]", ptr, osize, res, nsize); } if (res == 0) { res = realloc(ptr, nsize); - // TRACE("libc realloc %p[%lu] -> %p[%lu]", ptr, osize, res, nsize); FLUSH(); + // TRACE("libc realloc %p[%lu] -> %p[%lu]", ptr, osize, res, nsize); // if (res == 0 ){ // TRACE("realloc FAILURE %lu", nsize); // dumpFreeMemory(); diff --git a/radio/src/bin_allocator.h b/radio/src/bin_allocator.h index 1c50fb75b..bfb1b7a97 100644 --- a/radio/src/bin_allocator.h +++ b/radio/src/bin_allocator.h @@ -20,7 +20,7 @@ public: if (ptr == Bins[n].data) { Bins[n].Used = false; --NoUsedBins; - // TRACE("\tBinAllocator<%d> free %lu ------", SIZE_SLOT, n); FLUSH(); + // TRACE("\tBinAllocator<%d> free %lu ------", SIZE_SLOT, n); return true; } } @@ -31,22 +31,22 @@ public: } void * malloc(size_t size) { if (size > SIZE_SLOT) { - // TRACE("BinAllocator<%d> malloc [%lu] size > SIZE_SLOT", SIZE_SLOT, size); FLUSH(); + // TRACE("BinAllocator<%d> malloc [%lu] size > SIZE_SLOT", SIZE_SLOT, size); return 0; } if (NoUsedBins >= NUM_BINS) { - // TRACE("BinAllocator<%d> malloc [%lu] no free slots", SIZE_SLOT, size); FLUSH(); + // TRACE("BinAllocator<%d> malloc [%lu] no free slots", SIZE_SLOT, size); return 0; } for (size_t n = 0; n < NUM_BINS; ++n) { if (!Bins[n].Used) { Bins[n].Used = true; ++NoUsedBins; - // TRACE("\tBinAllocator<%d> malloc %lu[%lu]", SIZE_SLOT, n, size); FLUSH(); + // TRACE("\tBinAllocator<%d> malloc %lu[%lu]", SIZE_SLOT, n, size); return Bins[n].data; } } - // TRACE("BinAllocator<%d> malloc [%lu] no free slots", SIZE_SLOT , size); FLUSH(); + // TRACE("BinAllocator<%d> malloc [%lu] no free slots", SIZE_SLOT , size); return 0; } size_t size(void * ptr) { diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp new file mode 100644 index 000000000..912f9870e --- /dev/null +++ b/radio/src/cli.cpp @@ -0,0 +1,353 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include "opentx.h" +#include + +#define CLI_COMMAND_MAX_ARGS 8 +#define CLI_COMMAND_MAX_LEN 256 + +OS_TID cliTaskId; +TaskStack cliStack; +Fifo<256> cliRxFifo; +uint8_t cliTracesEnabled = false; + +typedef int (* CliFunction) (const char ** args); + +struct CliCommand +{ + const char * name; + CliFunction func; + const char * args; +}; + +struct MemArea +{ + const char * name; + void * start; + int size; +}; + +void cliPrompt() +{ + serialPutc('>'); +} + +int toInt(const char ** argv, int index, int * val) +{ + if (*argv[index] == '\0') { + return 0; + } + else { + int base = 10; + const char * s = argv[index]; + if (strlen(s) > 2 && s[0] == '0' && s[1] == 'x') { + base = 16; + s = &argv[index][2]; + } + char * endptr = NULL; + *val = strtol(s, &endptr, base); + if (*endptr == '\0') + return 1; + else { + serialPrint("%s: Invalid argument \"%s\"", argv[0], argv[index]); + return -1; + } + } +} + +int cliBeep(const char ** argv) +{ + int freq = BEEP_DEFAULT_FREQ; + int duration = 100; + if (toInt(argv, 1, &freq) >= 0 && toInt(argv, 2, &duration) >= 0) { + audioQueue.playTone(freq, duration, 20, PLAY_NOW); + } + return 0; +} + +int cliPlay(const char ** argv) +{ + audioQueue.playFile(argv[1], PLAY_NOW); + return 0; +} + +int cliLs(const char ** argv) +{ + FILINFO fno; + DIR dir; + char *fn; /* This function is assuming non-Unicode cfg. */ +#if _USE_LFN + TCHAR lfn[_MAX_LFN + 1]; + fno.lfname = lfn; + fno.lfsize = sizeof(lfn); +#endif + + FRESULT res = f_opendir(&dir, argv[1]); /* Open the directory */ + if (res == FR_OK) { + for (;;) { + res = f_readdir(&dir, &fno); /* Read a directory item */ + if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */ + +#if _USE_LFN + fn = *fno.lfname ? fno.lfname : fno.fname; +#else + fn = fno.fname; +#endif + serialPrint(fn); + } + } + else { + serialPrint("%s: Invalid directory \"%s\"", argv[0], argv[1]); + } + return 0; +} + +int cliTrace(const char ** argv) +{ + if (!strcmp(argv[1], "on")) { + cliTracesEnabled = true; + } + else if (!strcmp(argv[1], "off")) { + cliTracesEnabled = false; + } + else { + serialPrint("%s: Invalid argument \"%s\"", argv[0], argv[1]); + } + return 0; +} + +int cliStackInfo(const char ** argv) +{ + int tid = 0; + if (toInt(argv, 1, &tid) > 0) { + int available = 0; + int total = 0; + switch(tid) { + case MENU_TASK_INDEX: + total = menusStack.size(); + available = menusStack.available(); + break; + case MIXER_TASK_INDEX: + total = mixerStack.size(); + available = mixerStack.available(); + break; + case AUDIO_TASK_INDEX: + total = audioStack.size(); + available = audioStack.available(); + break; + case CLI_TASK_INDEX: + total = cliStack.size(); + available = cliStack.available(); + break; + case MAIN_TASK_INDEX: + total = stackAvailable(); + available = stackSize(); + break; + default: + break; + } + serialPrint("%d available (%d total)", available, total); + } + else { + serialPrint("%s: Invalid argument \"%s\"", argv[0], argv[1]); + } + return 0; +} + +int cliVolume(const char ** argv) +{ + int level = 0; + if (toInt(argv, 1, &level) > 0) { + setVolume(level); + } + else { + serialPrint("%s: Invalid argument \"%s\"", argv[0], argv[1]); + } + return 0; +} + +const MemArea memAreas[] = { + { "RCC", RCC, sizeof(RCC_TypeDef) }, + { "GPIOA", GPIOA, sizeof(GPIO_TypeDef) }, + { "GPIOB", GPIOB, sizeof(GPIO_TypeDef) }, + { "GPIOC", GPIOC, sizeof(GPIO_TypeDef) }, + { "GPIOD", GPIOD, sizeof(GPIO_TypeDef) }, + { "GPIOE", GPIOE, sizeof(GPIO_TypeDef) }, + { "GPIOF", GPIOF, sizeof(GPIO_TypeDef) }, + { "GPIOG", GPIOG, sizeof(GPIO_TypeDef) }, + { "USART1", USART1, sizeof(USART_TypeDef) }, + { "USART3", USART3, sizeof(USART_TypeDef) }, + { NULL, NULL, 0 }, +}; + +int cliDisplay(const char ** argv) +{ + int address = 0; + + for (const MemArea * area = memAreas; area->name != NULL; area++) { + if (!strcmp(area->name, argv[1])) { + dump((uint8_t *)area->start, area->size); + return 0; + } + } + + if (!strcmp(argv[1], "adc")) { + for (int i=0; i 0) { + int size = 256; + if (toInt(argv, 2, &size) >= 0) { + dump((uint8_t *)address, size); + } + } + return 0; +} + +int cliHelp(const char ** argv); + +const CliCommand cliCommands[] = { + { "beep", cliBeep, "[] []" }, + { "ls", cliLs, "" }, + { "play", cliPlay, "" }, + { "print", cliDisplay, "
[] | " }, + { "stackinfo", cliStackInfo, "" }, + { "trace", cliTrace, "on | off" }, + { "volume", cliVolume, "" }, + { "help", cliHelp, "[]" }, + { NULL, NULL, NULL } /* sentinel */ +}; + +int cliHelp(const char ** argv) +{ + for (const CliCommand * command = cliCommands; command->name != NULL; command++) { + if (argv[1][0] == '\0' || !strcmp(command->name, argv[0])) { + serialPrint("%s %s", command->name, command->args); + if (argv[1][0] != '\0') { + return 0; + } + } + } + if (argv[1][0] != '\0') { + serialPrint("Invalid command \"%s\"", argv[0]); + } + return -1; +} + +int cliExecCommand(const char ** argv) +{ + if (argv[0][0] == '\0') + return 0; + + for (const CliCommand * command = cliCommands; command->name != NULL; command++) { + if (!strcmp(command->name, argv[0])) { + return command->func(argv); + } + } + serialPrint("Invalid command \"%s\"", argv[0]); + return -1; +} + +int cliExecLine(char * line) +{ + int len = strlen(line); + const char * argv[CLI_COMMAND_MAX_ARGS]; + memset(argv, 0, sizeof(argv)); + int argc = 1; + argv[0] = line; + for (int i=0; i + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#ifndef _CLI_H_ +#define _CLI_H_ + +#include "serial.h" + +extern uint8_t cliTracesEnabled; + +#ifdef __cplusplus +#include "fifo.h" +extern Fifo<256> cliRxFifo; +#include "tasks_arm.h" +#define CLI_STACK_SIZE 1000 +extern TaskStack cliStack; +#endif + +void cliStart(); + +#endif // _CLI_H_ diff --git a/radio/src/debug.cpp b/radio/src/debug.cpp index 468840cba..8ef5baafc 100644 --- a/radio/src/debug.cpp +++ b/radio/src/debug.cpp @@ -34,225 +34,34 @@ * */ -extern "C" { -#include -#include -} - #include "opentx.h" - -#if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU) +#include #if defined(SIMU) traceCallbackFunc traceCallback = 0; #endif #if defined(SIMU) - #define PRINTF_BUFFER_SIZE 1024 -#else - #define PRINTF_BUFFER_SIZE 256 -#endif - -// Outputs a string to the UART -void debugPuts(const char *format, ...) +#define PRINTF_BUFFER_SIZE 1024 +void debugPrintf(const char * format, ...) { va_list arglist; char tmp[PRINTF_BUFFER_SIZE]; - + va_start(arglist, format); vsnprintf(tmp, PRINTF_BUFFER_SIZE, format, arglist); va_end(arglist); - -#if defined(SIMU) fputs(tmp, stdout); fflush(stdout); if (traceCallback) { traceCallback(tmp); } -#else - const char *t = tmp; - while (*t) { - debugPutc(*t++); - } +} #endif -} - -void dump(unsigned char *data, unsigned int size) -{ - debugPuts("DUMP %d bytes ...\n\r", size); - unsigned int i = 0, j=0; - while (i*32+j < size) { - debugPuts("%.2X ", data[i*32+j]); - j++; - if (j==32) { - i++; j=0; - debugPuts("\n\r"); - } - } - debugPuts("\n\r"); -} - - -#if !defined(SIMU) - -uint32_t Mem_address ; -uint32_t Next_mem_address ; -uint32_t Memaddmode ; -Fifo<512> debugRxFifo; - -void crlf() -{ - debugPutc( 13 ) ; - debugPutc( 10 ) ; -} - -// Send a single 4 bit value to the RS232 port as a hex digit -void hex_digit_send( unsigned char c ) -{ - c &= 0x0F ; - if ( c > 9 ) - { - c += 7 ; - } - c += '0' ; - debugPutc( c ) ; -} - -// Send the 8 bit value to the RS232 port as 2 hex digits -void p2hex( unsigned char c ) -{ -// asm("swap %c") ; - hex_digit_send( c >> 4 ) ; -// asm("swap %c") ; - hex_digit_send( c ) ; -} - -// Send the 16 bit value to the RS232 port as 4 hex digits -void p4hex( uint16_t value ) -{ - p2hex( value >> 8 ) ; - p2hex( value ) ; -} - -// Send the 32 bit value to the RS232 port as 8 hex digits -void p8hex( uint32_t value ) -{ - p4hex( value >> 16 ) ; - p4hex( value ) ; -} - - -static void dispw_256( register uint32_t address, register uint32_t lines ) -{ - register uint32_t i ; - register uint32_t j ; - address &= 0xFFFFFFFC ; - for ( i = 0 ; i < lines ; i += 1 ) - { - p8hex( address ) ; - for ( j = 0 ; j < 4 ; j += 1 ) - { - debugPutc(' ') ; - p8hex( *( (uint32_t *)address ) ) ; - address += 4 ; - } - crlf() ; - } -} - -extern Fifo<512> uart3TxFifo; - -void debugFlush() -{ - uart3TxFifo.flush(); -} - -void debugTask(void* pdata) -{ - uint8_t rxchar ; - - TRACE("DEBUG Task started"); - - crlf() ; - dispw_256( (uint32_t)USART3, 4 ) ; - - for (;;) { - - while ( (USART3->SR & USART_SR_RXNE) == 0 ) - CoTickDelay(5); // 10ms - - rxchar = USART3->DR; - - if ( Memaddmode ) - { - if ( ( rxchar >= 'a' ) && ( rxchar <= 'f' ) ) - { - rxchar -= 0x20; // toupper! - } - if ( ( ( rxchar >= '0' ) && ( rxchar <= '9' ) ) || ( ( rxchar >= 'A' ) && ( rxchar <= 'F' ) ) ) - { - debugPutc( rxchar ); - rxchar -= '0'; - if ( rxchar > 9 ) - { - rxchar -= 7; - } - Mem_address <<= 4; - Mem_address |= rxchar; - } - else if ( rxchar == 13 ) - { - crlf(); - if ( Mem_address == 0 ) - { - Mem_address = Next_mem_address; - } - dispw_256( Mem_address, 4 ); - Next_mem_address = Mem_address + 64; - Memaddmode = 0; - } - else if ( rxchar == 8 ) - { - debugPutc( rxchar ); - debugPutc( rxchar ); - debugPutc( rxchar ); - Mem_address >>= 4; - } - else if ( rxchar == 27 ) - { - crlf(); - Memaddmode = 0; - } - - } - - if ( rxchar == '?' ) - { - Memaddmode = 1; - Mem_address = 0; - debugPutc( '>' ); - } - - if ( rxchar == 'm' ) - { - crlf(); - p8hex( (uint32_t) &g_model.moduleData[0] ); - debugPutc( ' ' ); - p8hex( (uint32_t) &g_model.moduleData[1] ); - crlf(); - } - - } -} -#endif // #if !defined(SIMU) -#endif // #if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU) - #if defined(DEBUG_TRACE_BUFFER) - static struct TraceElement traceBuffer[TRACE_BUFFER_LEN]; static uint8_t traceBufferPos; -extern Fifo<512> uart3TxFifo; gtime_t filltm(gtime_t *t, struct gtm *tp); void trace_event(enum TraceEvent event, uint32_t data) @@ -298,13 +107,11 @@ void dumpTraceBuffer() TRACE(" %03d 0x%08x", traceBuffer[n].event, traceBuffer[n].data); if (traceBuffer[n].time == 0 && traceBuffer[n].time_ms == 0) break; if ((n % 5) == 0) { - while (!uart3TxFifo.empty()) { + while (!serial2TxFifo.empty()) { CoTickDelay(1); } } } TRACE("End of Trace Buffer dump"); } - #endif - diff --git a/radio/src/debug.h b/radio/src/debug.h index 998b5550e..da513ad70 100644 --- a/radio/src/debug.h +++ b/radio/src/debug.h @@ -39,58 +39,42 @@ #include #include "rtc.h" +#include "dump.h" +#if defined(CLI) +#include "cli.h" +#endif -#if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU) - -#ifdef __cplusplus +#if defined(__cplusplus) extern "C" { #endif +uint8_t serial2TracesEnabled(); +#if defined(__cplusplus) +} +#endif #if defined(SIMU) typedef void (*traceCallbackFunc)(const char * text); extern traceCallbackFunc traceCallback; +void debugPrintf(const char * format, ...); +#elif defined(DEBUG) && defined(CLI) && defined(USB_SERIAL) +#define debugPrintf(...) do { if (cliTracesEnabled) serialPrintf(__VA_ARGS__); } while(0) +#elif defined(DEBUG) && defined(CLI) +#define debugPrintf(...) do { if (serial2TracesEnabled() && cliTracesEnabled) serialPrintf(__VA_ARGS__); } while(0) +#elif defined(DEBUG) && defined(CPUARM) +#define debugPrintf(...) do { if (serial2TracesEnabled()) serialPrintf(__VA_ARGS__); } while(0) +#else +#define debugPrintf(...) #endif -void debugPuts(const char *string, ...); -void dump(unsigned char *data, unsigned int size); -void debugFlush(); - -#ifdef __cplusplus -} -#endif - -#define TRACE(...) do { debugPuts(__VA_ARGS__); debugPuts("\r\n"); } while(0) +#define TRACE(...) do { debugPrintf(__VA_ARGS__); debugPrintf("\r\n"); } while(0) #define DUMP(data, size) dump(data, size) -#define TRACE_DEBUG(...) debugPuts("-D- " __VA_ARGS__) -#define TRACE_DEBUG_WP(...) debugPuts(__VA_ARGS__) -#define TRACE_INFO(...) debugPuts("-I- " __VA_ARGS__) -#define TRACE_INFO_WP(...) debugPuts(__VA_ARGS__) -#define TRACE_WARNING(...) debugPuts("-W- " __VA_ARGS__) -#define TRACE_WARNING_WP(...) debugPuts(__VA_ARGS__) -#define TRACE_ERROR(...) debugPuts("-E- " __VA_ARGS__) - -#if !defined(SIMU) -#define FLUSH() debugFlush(); -void debugTask(void* pdata); -#else -#define FLUSH() -#endif - -#else - -#define TRACE(...) { } -#define DUMP(...) { } -#define TRACE_DEBUG(...) { } -#define TRACE_DEBUG_WP(...) { } -#define TRACE_INFO(...) { } -#define TRACE_INFO_WP(...) { } -#define TRACE_WARNING(...) { } -#define TRACE_WARNING_WP(...) { } -#define TRACE_ERROR(...) { } -#define FLUSH() - -#endif - +#define TRACE_DEBUG(...) debugPrintf("-D- " __VA_ARGS__) +#define TRACE_DEBUG_WP(...) debugPrintf(__VA_ARGS__) +#define TRACE_INFO(...) debugPrintf("-I- " __VA_ARGS__) +#define TRACE_INFO_WP(...) debugPrintf(__VA_ARGS__) +#define TRACE_WARNING(...) debugPrintf("-W- " __VA_ARGS__) +#define TRACE_WARNING_WP(...) debugPrintf(__VA_ARGS__) +#define TRACE_ERROR(...) debugPrintf("-E- " __VA_ARGS__) #if defined(DEBUG_TRACE_BUFFER) diff --git a/radio/src/dump.cpp b/radio/src/dump.cpp new file mode 100644 index 000000000..25bf29ab3 --- /dev/null +++ b/radio/src/dump.cpp @@ -0,0 +1,38 @@ +#include "opentx.h" + +#if defined(SIMU) +#define dumpPrintf(...) debugPrintf(__VA_ARGS__) +#else +#define dumpPrintf(...) serialPrintf(__VA_ARGS__) +#endif + +uint8_t dumpPosition; + +void dumpStart(unsigned int size) +{ + dumpPrintf("DUMP %d bytes ...\n\r", size); + dumpPosition = 0; +} + +void dumpBody(const uint8_t *data, unsigned int size) +{ + for (unsigned int i=0; i= TMRMODE_COUNT) timer.mode = TMRMODE_COUNT + ConvertSwitch_216_to_217(oldModel.timers[i].mode - TMRMODE_COUNT + 1) - 1; else - timer.mode = oldModel.timers[i].mode; + timer.mode = ConvertSwitch_216_to_217(oldModel.timers[i].mode); timer.start = oldModel.timers[i].start; timer.countdownBeep = oldModel.timers[i].countdownBeep; timer.minuteBeep = oldModel.timers[i].minuteBeep; diff --git a/radio/src/eeprom_raw.cpp b/radio/src/eeprom_raw.cpp index 859858b2f..1b801f0a7 100644 --- a/radio/src/eeprom_raw.cpp +++ b/radio/src/eeprom_raw.cpp @@ -370,6 +370,17 @@ void eeLoadModel(uint8_t id) restoreTimers(); +#if defined(CPUARM) + for (int i=0; iv1), LEFT|PREC1|attr); + v1_min = -128; + v1_max = 122; } else { v1_val = (uint8_t)cs->v1; @@ -163,8 +164,9 @@ void menuModelLogicalSwitchOne(uint8_t event) v2_min = SWSRC_OFF+1; v2_max = SWSRC_ON-1; } else if (cstate == LS_FAMILY_TIMER) { - lcd_outdezAtt(CSWONE_2ND_COLUMN, y, cs->v2+1, LEFT|attr); - v2_max = 99; + lcd_outdezAtt(CSWONE_2ND_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1|attr); + v2_min = -128; + v2_max = 122; } else if (cstate == LS_FAMILY_EDGE) { putsEdgeDelayParam(CSWONE_2ND_COLUMN, y, cs, m_posHorz==0 ? attr : 0, m_posHorz==1 ? attr : 0); @@ -286,8 +288,8 @@ void menuModelLogicalSwitches(uint8_t event) putsEdgeDelayParam(CSW_3RD_COLUMN, y, cs, 0, 0); } else if (cstate == LS_FAMILY_TIMER) { - lcd_outdezAtt(CSW_2ND_COLUMN, y, cs->v1+1, LEFT); - lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2+1, LEFT); + lcd_outdezAtt(CSW_2ND_COLUMN, y, lswTimerValue(cs->v1), LEFT|PREC1); + lcd_outdezAtt(CSW_3RD_COLUMN, y, lswTimerValue(cs->v2), LEFT|PREC1); } else { uint8_t v1 = cs->v1; diff --git a/radio/src/gui/9X/menu_model_setup.cpp b/radio/src/gui/9X/menu_model_setup.cpp index 0b12529b3..1261dd574 100644 --- a/radio/src/gui/9X/menu_model_setup.cpp +++ b/radio/src/gui/9X/menu_model_setup.cpp @@ -256,7 +256,7 @@ void menuModelSetup(uint8_t event) case ITEM_MODEL_TIMER3_COUNTDOWN_BEEP: { TimerData * timer = &g_model.timers[k>=ITEM_MODEL_TIMER3 ? 2 : (k>=ITEM_MODEL_TIMER2 ? 1 : 0)]; - timer->countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, timer->countdownBeep, 0, 2, attr, event); + timer->countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, timer->countdownBeep, COUNTDOWN_SILENT, COUNTDOWN_COUNT-1, attr, event); break; } diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9X/menu_model_telemetry.cpp index 80f87b938..55f2865be 100644 --- a/radio/src/gui/9X/menu_model_telemetry.cpp +++ b/radio/src/gui/9X/menu_model_telemetry.cpp @@ -86,8 +86,10 @@ enum menuModelTelemetryItems { ITEM_TELEMETRY_SENSOR30, ITEM_TELEMETRY_SENSOR31, ITEM_TELEMETRY_SENSOR32, - ITEM_TELEMETRY_NEWSENSOR, - ITEM_TELEMETRY_IGNORE_SENSORID, + ITEM_TELEMETRY_DISCOVER_SENSORS, + ITEM_TELEMETRY_NEW_SENSOR, + ITEM_TELEMETRY_DELETE_ALL_SENSORS, + ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE, #endif #if !defined(CPUARM) #if defined(FRSKY_HUB) || defined(WS_HOW_HIGH) @@ -132,30 +134,30 @@ enum menuModelTelemetryItems { }; #if defined(FRSKY) - #define TELEM_COL1 INDENT_WIDTH + #define TELEM_COL1 INDENT_WIDTH #if defined(TRANSLATIONS_FR) || defined(TRANSLATIONS_CZ) - #define TELEM_COL2 (9*FW) + #define TELEM_COL2 (9*FW) #else - #define TELEM_COL2 (8*FW) + #define TELEM_COL2 (8*FW) #endif - #define TELEM_BARS_COLMIN (56-3*FW) - #define TELEM_BARS_COLMAX (14*FW-3) - #define TELEM_SCRTYPE_COL TELEM_COL2 + #define TELEM_BARS_COLMIN (56-3*FW) + #define TELEM_BARS_COLMAX (14*FW-3) + #define TELEM_SCRTYPE_COL TELEM_COL2 -#define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0) +#define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0) #if defined(CPUARM) #define CHANNELS_ROWS - #define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW) - #define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0, + #define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW) + #define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0, 0, 0, #else - #define CHANNEL_ROWS(x) LABEL(CHANNEL), 1, 0, 2, 2 - #define CHANNELS_ROWS CHANNEL_ROWS(0), CHANNEL_ROWS(1), + #define CHANNEL_ROWS(x) LABEL(CHANNEL), 1, 0, 2, 2 + #define CHANNELS_ROWS CHANNEL_ROWS(0), CHANNEL_ROWS(1), #define SENSORS_ROWS #endif #if defined(FAS_OFFSET) || !defined(CPUM64) - #define IF_FAS_OFFSET(x) x, + #define IF_FAS_OFFSET(x) x, #else #define IF_FAS_OFFSET(x) #endif @@ -163,38 +165,38 @@ enum menuModelTelemetryItems { #if defined(CPUARM) #define USRDATA_ROWS #elif defined(FRSKY_HUB) || defined(WS_HOW_HIGH) - #define USRDATA_ROWS LABEL(UsrData), 0, 0, 0, 0, IF_FAS_OFFSET(0) + #define USRDATA_ROWS LABEL(UsrData), 0, 0, 0, 0, IF_FAS_OFFSET(0) #else - #define USRDATA_ROWS 0, 0, IF_FAS_OFFSET(0) + #define USRDATA_ROWS 0, 0, IF_FAS_OFFSET(0) #endif -#define RSSI_ROWS LABEL(RSSI), 1, 1, +#define RSSI_ROWS LABEL(RSSI), 1, 1, #if defined(CPUARM) || defined(GAUGES) - #define SCREEN_TYPE_ROWS 0 + #define SCREEN_TYPE_ROWS 0 #else - #define SCREEN_TYPE_ROWS LABEL(SCREEN) + #define SCREEN_TYPE_ROWS LABEL(SCREEN) #endif #if defined(PCBSTD) - #define VARIO_RANGE_ROWS 1 + #define VARIO_RANGE_ROWS 1 #else - #define VARIO_RANGE_ROWS 3 + #define VARIO_RANGE_ROWS 3 #endif #if defined(CPUARM) - #define TELEMETRY_TYPE_ROWS 0, + #define TELEMETRY_TYPE_ROWS 0, #else #define TELEMETRY_TYPE_ROWS #endif #if defined(CPUARM) - #define TELEMETRY_SCREEN_LINE(x) (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2) - #define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x) - #define TELEMETRY_CURRENT_EDIT_SCREEN(k) (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3))) + #define TELEMETRY_SCREEN_LINE(x) (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2) + #define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x) + #define TELEMETRY_CURRENT_SCREEN(k) (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3))) #else - #define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, 2, 2, 2, 2 - #define TELEMETRY_CURRENT_EDIT_CHANNEL(k) (k >= ITEM_TELEMETRY_A2_LABEL ? TELEM_ANA_A2 : TELEM_ANA_A1) + #define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, 2, 2, 2, 2 + #define TELEMETRY_CURRENT_CHANNEL(k) (k >= ITEM_TELEMETRY_A2_LABEL ? TELEM_ANA_A2 : TELEM_ANA_A1) #endif #if defined(CPUARM) @@ -497,7 +499,7 @@ void onSensorMenu(const char *result) if (index= HIDDEN_ROW) || (l_posVert==2 && MAXCOL(vertpos_t(0)) >= HIDDEN_ROW && MAXCOL(vertpos_t(1)) >= HIDDEN_ROW)) { + s_pgOfs = 0; + if (horTab) { + linesCount = 0; + for (int i=0; i=horTabMax || horTab[i] != HIDDEN_ROW) { + linesCount++; + } + } } } - if (realPosVert>(LCD_LINES-1)+realPgOfs) realPgOfs = realPosVert-(LCD_LINES-1); - else if (realPosVert<1+realPgOfs) realPgOfs = realPosVert-1; - s_pgOfs = realPgOfs; - for (vertpos_t i=1; i<=realPgOfs; i++) { - if (MAXCOL(i) == HIDDEN_ROW) { - s_pgOfs++; + else if (horTab) { + if (maxrow > NUM_BODY_LINES) { + while (1) { + vertpos_t firstLine = 0; + for (int numLines=0; firstLine=horTabMax || horTab[firstLine+1] != HIDDEN_ROW) { + numLines++; + } + } + if (l_posVert <= firstLine) { + s_pgOfs--; + } + else { + vertpos_t lastLine = firstLine; + for (int numLines=0; lastLine=horTabMax || horTab[lastLine+1] != HIDDEN_ROW) { + numLines++; + } + } + if (l_posVert > lastLine) { + s_pgOfs++; + } + else { + linesCount = s_pgOfs + NUM_BODY_LINES; + for (int i=lastLine; i=horTabMax || horTab[i] != HIDDEN_ROW) { + linesCount++; + } + } + break; + } + } + } + } + } + else { + if (l_posVert>NUM_BODY_LINES+s_pgOfs) { + s_pgOfs = l_posVert-NUM_BODY_LINES; + } + else if (l_posVert<=s_pgOfs) { + s_pgOfs = l_posVert-1; } } - maxrow = realMaxrow; - } - else { - uint8_t max = menuTab ? LCD_LINES-1 : LCD_LINES-2; - if (l_posVert>max+s_pgOfs) s_pgOfs = l_posVert-max; - else if (l_posVert<1+s_pgOfs) s_pgOfs = l_posVert-1; - } #else uint8_t max = menuTab ? LCD_LINES-1 : LCD_LINES-2; if (l_posVert<1) s_pgOfs=0; diff --git a/radio/src/gui/9X/view_main.cpp b/radio/src/gui/9X/view_main.cpp index 8bec32479..031e1e672 100644 --- a/radio/src/gui/9X/view_main.cpp +++ b/radio/src/gui/9X/view_main.cpp @@ -226,8 +226,8 @@ void displayVoltageOrAlarm() if (g_eeGeneral.temperatureWarn && getTemperature() >= g_eeGeneral.temperatureWarn) { putsValueWithUnit(6*FW-1, 2*FH, getTemperature(), UNIT_TEMPERATURE, BLINK|INVERS|DBLSIZE); } - else if (g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib)/8192/36) / 500 >= g_eeGeneral.mAhWarn) { - putsValueWithUnit(7*FW-1, 2*FH, (g_eeGeneral.mAhUsed + Current_used*(488 + g_eeGeneral.currentCalib)/8192/36)/10, UNIT_MAH, BLINK|INVERS|DBLSIZE); + else if (g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.txCurrentCalibration)/8192/36) / 500 >= g_eeGeneral.mAhWarn) { + putsValueWithUnit(7*FW-1, 2*FH, (g_eeGeneral.mAhUsed + Current_used*(488 + g_eeGeneral.txCurrentCalibration)/8192/36)/10, UNIT_MAH, BLINK|INVERS|DBLSIZE); } else { displayBattVoltage(); diff --git a/radio/src/gui/9X/view_mavlink.h b/radio/src/gui/9X/view_mavlink.h index 993bca2b3..9032124f2 100755 --- a/radio/src/gui/9X/view_mavlink.h +++ b/radio/src/gui/9X/view_mavlink.h @@ -46,7 +46,7 @@ #include "opentx.h" #include "telemetry/mavlink.h" #include "gui/9X/menus.h" -#include "serial.h" +#include "targets/common_avr/serial_driver.h" #define APSIZE (BSS | DBLSIZE) diff --git a/radio/src/gui/9X/view_statistics.cpp b/radio/src/gui/9X/view_statistics.cpp index bba47eda7..f70176609 100755 --- a/radio/src/gui/9X/view_statistics.cpp +++ b/radio/src/gui/9X/view_statistics.cpp @@ -155,7 +155,7 @@ void menuStatisticsDebug(uint8_t event) // current lcd_putsLeft(MENU_DEBUG_Y_CURRENT, STR_CPU_CURRENT); putsValueWithUnit(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_CURRENT, getCurrent(), UNIT_MILLIAMPS, LEFT); - uint32_t current_scale = 488 + g_eeGeneral.currentCalib; + uint32_t current_scale = 488 + g_eeGeneral.txCurrentCalibration; lcd_putc(MENU_DEBUG_COL2_OFS, MENU_DEBUG_Y_CURRENT, '>'); putsValueWithUnit(MENU_DEBUG_COL2_OFS+FW+1, MENU_DEBUG_Y_CURRENT, Current_max*10*current_scale/8192, UNIT_RAW, LEFT); // consumption @@ -196,11 +196,11 @@ void menuStatisticsDebug(uint8_t event) #if defined(CPUARM) lcd_putsLeft(MENU_DEBUG_Y_RTOS, STR_FREESTACKMINB); - lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS+2, stack_free(0), UNSIGN|LEFT|TINSIZE); + lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS+2, menusStack.available(), UNSIGN|LEFT|TINSIZE); lcd_puts(lcdLastPos, MENU_DEBUG_Y_RTOS, "/"); - lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS+2, stack_free(1), UNSIGN|LEFT|TINSIZE); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS+2, mixerStack.available(), UNSIGN|LEFT|TINSIZE); lcd_puts(lcdLastPos, MENU_DEBUG_Y_RTOS, "/"); - lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS+2, stack_free(2), UNSIGN|LEFT|TINSIZE); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS+2, audioStack.available(), UNSIGN|LEFT|TINSIZE); #endif #if !defined(CPUARM) @@ -213,7 +213,7 @@ void menuStatisticsDebug(uint8_t event) lcd_putsLeft(4*FH, STR_TMIXMAXMS); lcd_outdezAtt(MENU_DEBUG_COL1_OFS, 4*FH, DURATION_MS_PREC2(maxMixerDuration), PREC2); lcd_putsLeft(5*FH, STR_FREESTACKMINB); - lcd_outdezAtt(14*FW, 5*FH, stack_free(), UNSIGN) ; + lcd_outdezAtt(14*FW, 5*FH, stackAvailable(), UNSIGN) ; #endif lcd_puts(4*FW, 7*FH+1, STR_MENUTORESET); diff --git a/radio/src/gui/9X/view_telemetry.cpp b/radio/src/gui/9X/view_telemetry.cpp index bc78cd932..d948da6b8 100755 --- a/radio/src/gui/9X/view_telemetry.cpp +++ b/radio/src/gui/9X/view_telemetry.cpp @@ -246,6 +246,10 @@ bool displayGaugesTelemetryScreen(FrSkyScreenData & screen) #if defined(CPUARM) getvalue_t barMin = bar.barMin; getvalue_t barMax = bar.barMax; + if (source <= MIXSRC_LAST_CH) { + barMin = calc100toRESX(barMin); + barMax = calc100toRESX(barMax); + } #else getvalue_t barMin = convertBarTelemValue(source, bar.barMin); getvalue_t barMax = convertBarTelemValue(source, 255-bar.barMax); diff --git a/radio/src/gui/Taranis/helpers.cpp b/radio/src/gui/Taranis/helpers.cpp index d60934a3c..0d8a56a9a 100755 --- a/radio/src/gui/Taranis/helpers.cpp +++ b/radio/src/gui/Taranis/helpers.cpp @@ -203,7 +203,7 @@ bool isSwitchAvailable(int swtch, SwitchContext context) if (swtch < 0) { negative = true; - if (swtch == -SWSRC_ON || swtch == -SWSRC_One) { + if (swtch == -SWSRC_ON || swtch == -SWSRC_ONE) { return false; } swtch = -swtch; @@ -245,7 +245,7 @@ bool isSwitchAvailable(int swtch, SwitchContext context) } } - if (context != ModelCustomFunctionsContext && context != GeneralCustomFunctionsContext && (swtch == SWSRC_ON || swtch == SWSRC_One)) { + if (context != ModelCustomFunctionsContext && context != GeneralCustomFunctionsContext && (swtch == SWSRC_ON || swtch == SWSRC_ONE)) { return false; } diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp index 3d5030080..f8bfd2373 100755 --- a/radio/src/gui/Taranis/lcd.cpp +++ b/radio/src/gui/Taranis/lcd.cpp @@ -674,7 +674,7 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att) else lcd_putsiAtt(x, y, STR_VSRCRAW, idx+1, att); } - else if (idx >= MIXSRC_FIRST_SWITCH && idx < MIXSRC_FIRST_LOGICAL_SWITCH) { + else if (idx >= MIXSRC_FIRST_SWITCH && idx <= MIXSRC_LAST_SWITCH) { idx = idx-MIXSRC_FIRST_SWITCH; if (ZEXIST(g_eeGeneral.switchNames[idx])) { lcd_putcAtt(x, y, '\312', att); //switch symbol @@ -692,8 +692,8 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att) else if (idx <= MIXSRC_LAST_CH) { putsStrIdx(x, y, STR_CH, idx-MIXSRC_CH1+1, att); if (ZEXIST(g_model.limitData[idx-MIXSRC_CH1].name) && (att & STREXPANDED)) { - lcd_putcAtt(lcdLastPos, y, ' ', att); - lcd_putsnAtt(lcdLastPos+3, y, g_model.limitData[idx-MIXSRC_CH1].name, LEN_CHANNEL_NAME, ZCHAR|att); + lcd_putcAtt(lcdLastPos, y, ' ', att|SMLSIZE); + lcd_putsnAtt(lcdLastPos+3, y, g_model.limitData[idx-MIXSRC_CH1].name, LEN_CHANNEL_NAME, ZCHAR|att|SMLSIZE); } } else if (idx <= MIXSRC_LAST_GVAR) @@ -727,29 +727,48 @@ void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att) } } -void putsSwitches(coord_t x, coord_t y, int8_t idx, LcdFlags att) +void putsSwitches(coord_t x, coord_t y, int32_t idx, LcdFlags att) { - if (idx == SWSRC_OFF) + if (idx == SWSRC_NONE) { + return lcd_putsiAtt(x, y, STR_VSWITCHES, 0, att); + } + else if (idx == SWSRC_OFF) { return lcd_putsiAtt(x, y, STR_OFFON, 0, att); + } + if (idx < 0) { lcd_putcAtt(x-2, y, '!', att); idx = -idx; } -#if defined(FLIGHT_MODES) - if (idx >= SWSRC_FIRST_FLIGHT_MODE) { - return putsStrIdx(x, y, STR_FP, idx-SWSRC_FIRST_FLIGHT_MODE, att); - } -#endif - if (idx >= SWSRC_FIRST_SWITCH && idx <= SWSRC_LAST_SWITCH) { + + if (idx <= SWSRC_LAST_SWITCH) { div_t swinfo = switchInfo(idx); if (ZEXIST(g_eeGeneral.switchNames[swinfo.quot])) { lcd_putsnAtt(x, y, g_eeGeneral.switchNames[swinfo.quot], LEN_SWITCH_NAME, ZCHAR|att); - char c = "\300-\301"[swinfo.rem]; - lcd_putcAtt(lcdNextPos, y, c, att); - return; } + else { + lcd_putcAtt(x, y, 'S', att); + lcd_putcAtt(lcdNextPos, y, 'A'+swinfo.quot, att); + } + char c = "\300-\301"[swinfo.rem]; + lcd_putcAtt(lcdNextPos, y, c, att); + } + else if (idx <= SWSRC_LAST_MULTIPOS_SWITCH) { + div_t swinfo = div(idx - SWSRC_FIRST_MULTIPOS_SWITCH, XPOTS_MULTIPOS_COUNT); + putsStrIdx(x, y, "S", swinfo.quot*10+swinfo.rem+11, att); + } + else if (idx <= SWSRC_LAST_TRIM) { + lcd_putsiAtt(x, y, STR_VSWITCHES, idx-SWSRC_FIRST_TRIM+1, att); + } + else if (idx <= SWSRC_LAST_LOGICAL_SWITCH) { + putsStrIdx(x, y, "L", idx-SWSRC_FIRST_LOGICAL_SWITCH+1, att); + } + else if (idx <= SWSRC_ONE) { + lcd_putsiAtt(x, y, STR_VSWITCHES, idx-SWSRC_ON+1+(2*NUM_STICKS), att); + } + else { + putsStrIdx(x, y, STR_FP, idx-SWSRC_FIRST_FLIGHT_MODE, att); } - return lcd_putsiAtt(x, y, STR_VSWITCHES, idx, att); } #if defined(FLIGHT_MODES) @@ -803,7 +822,7 @@ void putsCurve(coord_t x, coord_t y, int8_t idx, LcdFlags att) putsStrIdx(x, y, STR_CV, idx, att); } -void putsTimerMode(coord_t x, coord_t y, int8_t mode, LcdFlags att) +void putsTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att) { if (mode >= 0) { if (mode < TMRMODE_COUNT) diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/Taranis/lcd.h index 52a4c3ea6..a5342efb8 100755 --- a/radio/src/gui/Taranis/lcd.h +++ b/radio/src/gui/Taranis/lcd.h @@ -167,7 +167,7 @@ void lcd_outdez8(coord_t x, coord_t y, int8_t val); void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att=0); void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att); -void putsSwitches(coord_t x, coord_t y, int8_t swtch, LcdFlags att=0); +void putsSwitches(coord_t x, coord_t y, int32_t swtch, LcdFlags att=0); void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att=0); void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); @@ -175,7 +175,7 @@ void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); void putsCurveRef(coord_t x, coord_t y, CurveRef &curve, LcdFlags att); #endif void putsCurve(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); -void putsTimerMode(coord_t x, coord_t y, int8_t mode, LcdFlags att=0); +void putsTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att=0); void putsTrimMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, LcdFlags att); #define putsChn(x, y, idx, att) putsMixerSource(x, y, MIXSRC_CH1+idx-1, att) diff --git a/radio/src/gui/Taranis/menu_general_diaganas.cpp b/radio/src/gui/Taranis/menu_general_diaganas.cpp index f067ee868..05b0d9f4f 100755 --- a/radio/src/gui/Taranis/menu_general_diaganas.cpp +++ b/radio/src/gui/Taranis/menu_general_diaganas.cpp @@ -62,9 +62,9 @@ void menuGeneralDiagAna(uint8_t event) lcd_putsLeft(MENU_HEADER_HEIGHT+1+5*FH, STR_BATT_CALIB); static int32_t adcBatt; adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8; - uint32_t batCalV = (adcBatt + (adcBatt*g_eeGeneral.vBatCalib)/128) * BATT_SCALE; + uint32_t batCalV = (adcBatt + (adcBatt*g_eeGeneral.txVoltageCalibration)/128) * BATT_SCALE; batCalV >>= 11; batCalV += 2; // because of the diode putsVolts(LEN_CALIB_FIELDS*FW+4*FW, MENU_HEADER_HEIGHT+1+5*FH, batCalV, s_editMode > 0 ? BLINK|INVERS : INVERS); - if (s_editMode > 0) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatCalib, -127, 127); + if (s_editMode > 0) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127); } diff --git a/radio/src/gui/Taranis/menu_general_hardware.cpp b/radio/src/gui/Taranis/menu_general_hardware.cpp index df8e99e82..f1b9deee2 100755 --- a/radio/src/gui/Taranis/menu_general_hardware.cpp +++ b/radio/src/gui/Taranis/menu_general_hardware.cpp @@ -219,9 +219,9 @@ void menuGeneralHardware(uint8_t event) break; #endif case ITEM_SETUP_HW_UART3_MODE: - g_eeGeneral.uart3Mode = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.uart3Mode, 0, UART_MODE_MAX, attr, event); + g_eeGeneral.serial2Mode = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.serial2Mode, 0, UART_MODE_MAX, attr, event); if (attr && checkIncDec_Ret) { - uart3Init(g_eeGeneral.uart3Mode, MODEL_TELEMETRY_PROTOCOL()); + serial2Init(g_eeGeneral.serial2Mode, MODEL_TELEMETRY_PROTOCOL()); } break; } diff --git a/radio/src/gui/Taranis/menu_model_custom_functions.cpp b/radio/src/gui/Taranis/menu_model_custom_functions.cpp index 3c59042d4..5fe854ebb 100644 --- a/radio/src/gui/Taranis/menu_model_custom_functions.cpp +++ b/radio/src/gui/Taranis/menu_model_custom_functions.cpp @@ -121,6 +121,35 @@ void onCustomFunctionsMenu(const char *result) } } +void onAdjustGvarSourceLongEnterPress(const char * result) +{ + CustomFunctionData * cfn = &g_model.customFn[m_posVert]; + + if (result == STR_CONSTANT) { + CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_CONSTANT; + CFN_PARAM(cfn) = 0; + eeDirty(EE_MODEL); + } + else if (result == STR_MIXSOURCE) { + CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_SOURCE; + CFN_PARAM(cfn) = 0; + eeDirty(EE_MODEL); + } + else if (result == STR_GLOBALVAR) { + CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_GVAR; + CFN_PARAM(cfn) = 0; + eeDirty(EE_MODEL); + } + else if (result == STR_INCDEC) { + CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_INC; + CFN_PARAM(cfn) = 0; + eeDirty(EE_MODEL); + } + else { + onSourceLongEnterPress(result); + } +} + void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFunctionsContext * functionsContext) { int sub = m_posVert; @@ -325,8 +354,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu case FUNC_ADJUST_GVAR_SOURCE: val_max = MIXSRC_LAST_CH; putsMixerSource(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr); - // TODO later, we have a conflict on [Enter Long] here ... - // INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE); + INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE); INCDEC_ENABLE_CHECK(isSourceAvailable); break; case FUNC_ADJUST_GVAR_GVAR: @@ -334,27 +362,39 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu putsStrIdx(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, STR_GV, val_displayed+1, attr); break; default: // FUNC_ADJUST_GVAR_INC +#if 0 // TODO 2.2.X + val_min = -100; val_max = +100; + if (val_displayed < 0) + lcd_putsAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, "-=", attr); + else + lcd_putsAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, "+=", attr); + lcd_outdezAtt(lcdNextPos, y, abs(val_displayed), attr|LEFT); +#endif val_max = 1; lcd_putsiAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, PSTR("\003-=1+=1"), val_displayed, attr); break; } - - if (attr && event==EVT_KEY_LONG(KEY_ENTER)) { - killEvents(event); - s_editMode = !s_editMode; - active = true; - CFN_GVAR_MODE(cfn) += 1; - CFN_GVAR_MODE(cfn) &= 0x03; - val_displayed = 0; - } } #endif else if (attr) { REPEAT_LAST_CURSOR_MOVE(); } - if (active) { + if (active || event==EVT_KEY_LONG(KEY_ENTER)) { CFN_PARAM(cfn) = CHECK_INCDEC_PARAM(event, val_displayed, val_min, val_max); + if (attr && event==EVT_KEY_LONG(KEY_ENTER)) { + killEvents(event); + if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_CONSTANT) + MENU_ADD_ITEM(STR_CONSTANT); + if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE) + MENU_ADD_ITEM(STR_MIXSOURCE); + if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_GVAR) + MENU_ADD_ITEM(STR_GLOBALVAR); + if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_INC) + MENU_ADD_ITEM(STR_INCDEC); + menuHandler = onAdjustGvarSourceLongEnterPress; + s_editMode = EDIT_MODIFY_FIELD; + } } break; } diff --git a/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp b/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp index d6639b0e8..38eb02c88 100644 --- a/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp +++ b/radio/src/gui/Taranis/menu_model_inputs_mixes.cpp @@ -88,7 +88,7 @@ void DrawFunction(FnFuncP fn, uint8_t offset) coord_t prev_yv = (coord_t)-1; - for (int8_t xv=-WCHART; xv<=WCHART; xv++) { + for (int xv=-WCHART; xv<=WCHART; xv++) { coord_t yv = (LCD_H-1) - (((uint16_t)RESX + fn(xv * (RESX/WCHART))) / 2 * (LCD_H-1) / RESX); if (prev_yv != (coord_t)-1) { if (abs((int8_t)yv-prev_yv) <= 1) { @@ -108,7 +108,7 @@ uint8_t getExpoMixCount(uint8_t expo) uint8_t count = 0; uint8_t ch ; - for(int8_t i=(expo ? MAX_EXPOS-1 : MAX_MIXERS-1); i>=0; i--) { + for (int i=(expo ? MAX_EXPOS-1 : MAX_MIXERS-1); i>=0; i--) { ch = (expo ? EXPO_VALID(expoAddress(i)) : mixAddress(i)->srcRaw); if (ch != 0) { count++; @@ -652,7 +652,7 @@ void displayHeaderChannelName(uint8_t ch) { uint8_t len = zlen(g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name)); if (len) { - lcd_putsnAtt(70, 1, g_model.limitData[ch].name, len, ZCHAR|SMLSIZE); + lcd_putsnAtt(80, 1, g_model.limitData[ch].name, len, ZCHAR|SMLSIZE); } } @@ -837,14 +837,14 @@ void menuModelExpoMix(uint8_t expo, uint8_t event) // Value uint8_t index = expoAddress(s_currIdx)->chn; if (!s_currCh) { - lcd_outdezAtt(120, 2, calcRESXto1000(anas[index]), PREC1|TINSIZE); + lcd_outdezAtt(127, 2, calcRESXto1000(anas[index]), PREC1|TINSIZE); } SIMPLE_MENU(STR_MENUINPUTS, menuTabModel, e_InputsAll, s_maxLines); // Gauge if (!s_currCh) { - drawGauge(120, 1, 58, 6, anas[index], 1024); + drawGauge(127, 1, 58, 6, anas[index], 1024); } } else { @@ -855,14 +855,14 @@ void menuModelExpoMix(uint8_t expo, uint8_t event) uint8_t index = mixAddress(s_currIdx)->destCh; if (!s_currCh) { displayHeaderChannelName(index); - lcd_outdezAtt(120, 2, calcRESXto1000(ex_chans[index]), PREC1|TINSIZE); + lcd_outdezAtt(127, 2, calcRESXto1000(ex_chans[index]), PREC1|TINSIZE); } SIMPLE_MENU(STR_MIXER, menuTabModel, e_MixAll, s_maxLines); // Gauge if (!s_currCh) { - drawGauge(120, 1, 58, 6, ex_chans[index], 1024); + drawGauge(127, 1, 58, 6, ex_chans[index], 1024); } } diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp index 6b1c135a5..8b6428936 100644 --- a/radio/src/gui/Taranis/menu_model_setup.cpp +++ b/radio/src/gui/Taranis/menu_model_setup.cpp @@ -142,15 +142,15 @@ void editTimerMode(int timerIdx, coord_t y, LcdFlags attr, uint8_t event) switch (m_posHorz) { case 0: { - int8_t timerMode = timer->mode; + swsrc_t timerMode = timer->mode; if (timerMode < 0) timerMode -= TMRMODE_COUNT-1; CHECK_INCDEC_MODELVAR_CHECK(event, timerMode, -TMRMODE_COUNT-SWSRC_LAST+1, TMRMODE_COUNT+SWSRC_LAST-1, isSwitchAvailableInTimers); if (timerMode < 0) timerMode += TMRMODE_COUNT-1; timer->mode = timerMode; #if defined(AUTOSWITCH) if (s_editMode>0) { - int8_t val = timer->mode - (TMRMODE_COUNT-1); - int8_t switchVal = checkIncDecMovedSwitch(val); + swsrc_t val = timer->mode - (TMRMODE_COUNT-1); + swsrc_t switchVal = checkIncDecMovedSwitch(val); if (val != switchVal) { timer->mode = switchVal + (TMRMODE_COUNT-1); eeDirty(EE_MODEL); @@ -321,7 +321,7 @@ void menuModelSetup(uint8_t event) break; case ITEM_MODEL_TIMER1_COUNTDOWN_BEEP: - g_model.timers[0].countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, g_model.timers[0].countdownBeep, 0, 2, attr, event); + g_model.timers[0].countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, g_model.timers[0].countdownBeep, COUNTDOWN_SILENT, COUNTDOWN_COUNT-1, attr, event); break; case ITEM_MODEL_TIMER1_PERSISTENT: @@ -342,7 +342,7 @@ void menuModelSetup(uint8_t event) break; case ITEM_MODEL_TIMER2_COUNTDOWN_BEEP: - g_model.timers[1].countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, g_model.timers[1].countdownBeep, 0, 2, attr, event); + g_model.timers[1].countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, g_model.timers[1].countdownBeep, COUNTDOWN_SILENT, COUNTDOWN_COUNT-1, attr, event); break; case ITEM_MODEL_TIMER2_PERSISTENT: @@ -364,7 +364,7 @@ void menuModelSetup(uint8_t event) break; case ITEM_MODEL_TIMER3_COUNTDOWN_BEEP: - g_model.timers[2].countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, g_model.timers[2].countdownBeep, 0, 2, attr, event); + g_model.timers[2].countdownBeep = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_BEEPCOUNTDOWN, STR_VBEEPCOUNTDOWN, g_model.timers[2].countdownBeep, COUNTDOWN_SILENT, COUNTDOWN_COUNT-1, attr, event); break; case ITEM_MODEL_TIMER3_PERSISTENT: diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp index 62b21c4e5..8eea1b51f 100644 --- a/radio/src/gui/Taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp @@ -73,8 +73,10 @@ enum menuModelTelemetryItems { ITEM_TELEMETRY_SENSOR30, ITEM_TELEMETRY_SENSOR31, ITEM_TELEMETRY_SENSOR32, - ITEM_TELEMETRY_NEWSENSOR, - ITEM_TELEMETRY_IGNORE_SENSORID, + ITEM_TELEMETRY_DISCOVER_SENSORS, + ITEM_TELEMETRY_NEW_SENSOR, + ITEM_TELEMETRY_DELETE_ALL_SENSORS, + ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE, #if defined(VARIO) ITEM_TELEMETRY_VARIO_LABEL, ITEM_TELEMETRY_VARIO_SOURCE, @@ -110,39 +112,39 @@ enum menuModelTelemetryItems { ITEM_TELEMETRY_MAX }; -#define TELEM_COL1 (1*FW) -#define TELEM_COL2 (16*FW) -#define TELEM_COL3 (28*FW) -#define TELEM_BARS_COLMIN TELEM_COL2 -#define TELEM_BARS_COLMAX TELEM_COL3 -#define TELEM_SCRTYPE_COL TELEM_COL2 +#define TELEM_COL1 (1*FW) +#define TELEM_COL2 (16*FW) +#define TELEM_COL3 (28*FW) +#define TELEM_BARS_COLMIN TELEM_COL2 +#define TELEM_BARS_COLMAX TELEM_COL3 +#define TELEM_SCRTYPE_COL TELEM_COL2 -#define IF_FAS_OFFSET(x) x, -#define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0) +#define IF_FAS_OFFSET(x) x, +#define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0) -#define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW) -#define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0, +#define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW) +#define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0, 0, 0, #if defined(VARIO) - #define VARIO_ROWS LABEL(Vario), 0, 1, 2, + #define VARIO_ROWS LABEL(Vario), 0, 1, 2, #else #define VARIO_ROWS #endif -#define RSSI_ROWS LABEL(RSSI), 0, 0, +#define RSSI_ROWS LABEL(RSSI), 0, 0, #if defined(LUA) - #define SCREEN_TYPE_ROWS 1 + #define SCREEN_TYPE_ROWS 1 #else - #define SCREEN_TYPE_ROWS 0 + #define SCREEN_TYPE_ROWS 0 #endif -#define VARIO_RANGE_ROWS 3 -#define TELEMETRY_TYPE_ROWS (g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW, +#define VARIO_RANGE_ROWS 3 +#define TELEMETRY_TYPE_ROWS (g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW, #if defined(LUA) - #define TELEMETRY_SCREEN_LINE(x) ((TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE || TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_SCRIPT) ? HIDDEN_ROW : (uint8_t)2) + #define TELEMETRY_SCREEN_LINE(x) ((TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE || TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_SCRIPT) ? HIDDEN_ROW : (uint8_t)2) #else - #define TELEMETRY_SCREEN_LINE(x) (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2) + #define TELEMETRY_SCREEN_LINE(x) (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2) #endif -#define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x) -#define TELEMETRY_CURRENT_EDIT_SCREEN(k) (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3))) +#define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x) +#define TELEMETRY_CURRENT_SCREEN(k) (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3))) enum SensorFields { SENSOR_FIELD_NAME, @@ -344,7 +346,7 @@ void menuModelSensor(uint8_t event) lcd_putsLeft(y, STR_CURRENTSENSOR); putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr); if (attr) { - sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isCurrentSensor); + sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isTelemetryFieldAvailable); } break; } @@ -467,7 +469,7 @@ void onSensorMenu(const char *result) if (index0) { - int8_t swtch = getMovedSwitch(); + swsrc_t swtch = getMovedSwitch(); if (swtch) { div_t info = switchInfo(swtch); if (IS_TOGGLE(info.quot)) { diff --git a/radio/src/gui/Taranis/view_statistics.cpp b/radio/src/gui/Taranis/view_statistics.cpp index 29c01f0ee..575a45f0b 100755 --- a/radio/src/gui/Taranis/view_statistics.cpp +++ b/radio/src/gui/Taranis/view_statistics.cpp @@ -98,13 +98,28 @@ void menuStatisticsView(uint8_t event) #define MENU_DEBUG_Y_MIXMAX (2*FH-3) #define MENU_DEBUG_Y_LUA (3*FH-2) #define MENU_DEBUG_Y_FREE_RAM (4*FH-1) -#define MENU_DEBUG_Y_STACK (5*FH) +#define MENU_DEBUG_Y_USB (5*FH) #define MENU_DEBUG_Y_RTOS (6*FH) +#if defined(USB_SERIAL) + extern uint16_t usbWraps; + extern uint16_t charsWritten; + extern "C" volatile uint32_t APP_Rx_ptr_in; +#endif + void menuStatisticsDebug(uint8_t event) { TITLE(STR_MENUDEBUG); +#if defined(WATCHDOG_TEST) + if (s_warning_result) { + s_warning_result = 0; + // do a user requested watchdog test + TRACE("Performing watchdog test"); + pausePulses(); + } +#endif + switch(event) { case EVT_KEY_LONG(KEY_ENTER): @@ -136,10 +151,19 @@ void menuStatisticsDebug(uint8_t event) case EVT_KEY_FIRST(KEY_EXIT): chainMenu(menuMainView); break; +#if defined(WATCHDOG_TEST) + case EVT_KEY_LONG(KEY_MENU): + { + POPUP_CONFIRMATION("Test the watchdog?"); + const char * w = "The radio will reset!"; + SET_WARNING_INFO(w, strlen(w), 0); + } + break; +#endif } lcd_putsLeft(MENU_DEBUG_Y_FREE_RAM, "Free Mem"); - lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_FREE_RAM, getAvailableMemory(), LEFT); + lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_FREE_RAM, availableMemory(), LEFT); lcd_puts(lcdLastPos, MENU_DEBUG_Y_FREE_RAM, "b"); #if defined(LUA) @@ -154,15 +178,24 @@ void menuStatisticsDebug(uint8_t event) lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_MIXMAX, DURATION_MS_PREC2(maxMixerDuration), PREC2|LEFT); lcd_puts(lcdLastPos, MENU_DEBUG_Y_MIXMAX, "ms"); +#if defined(USB_SERIAL) + lcd_putsLeft(MENU_DEBUG_Y_USB, "Usb"); + lcd_outdezAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_USB, charsWritten, LEFT); + lcd_puts(lcdLastPos, MENU_DEBUG_Y_USB, " "); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_USB, APP_Rx_ptr_in, LEFT); + lcd_puts(lcdLastPos, MENU_DEBUG_Y_USB, " "); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_USB, usbWraps, LEFT); +#endif + lcd_putsLeft(MENU_DEBUG_Y_RTOS, STR_FREESTACKMINB); lcd_putsAtt(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS+1, "[M]", SMLSIZE); - lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, stack_free(0), UNSIGN|LEFT); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, menusStack.available(), UNSIGN|LEFT); lcd_putsAtt(lcdLastPos+2, MENU_DEBUG_Y_RTOS+1, "[X]", SMLSIZE); - lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, stack_free(1), UNSIGN|LEFT); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, mixerStack.available(), UNSIGN|LEFT); lcd_putsAtt(lcdLastPos+2, MENU_DEBUG_Y_RTOS+1, "[A]", SMLSIZE); - lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, stack_free(2), UNSIGN|LEFT); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, audioStack.available(), UNSIGN|LEFT); lcd_putsAtt(lcdLastPos+2, MENU_DEBUG_Y_RTOS+1, "[I]", SMLSIZE); - lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, stack_free(255), UNSIGN|LEFT); + lcd_outdezAtt(lcdLastPos, MENU_DEBUG_Y_RTOS, stackAvailable(), UNSIGN|LEFT); lcd_puts(3*FW, 7*FH+1, STR_MENUTORESET); lcd_status_line(); diff --git a/radio/src/keys.h b/radio/src/keys.h index 1023f3e9d..d234a6b2b 100644 --- a/radio/src/keys.h +++ b/radio/src/keys.h @@ -128,19 +128,6 @@ enum EnumKeys { SW_SR0, SW_SR1, SW_SR2, -#else - SW_SI0, - SW_SI2, - SW_SJ0, - SW_SJ2, - SW_SK0, - SW_SK2, - SW_SL0, - SW_SL2, - SW_SM0, - SW_SM2, - SW_SN0, - SW_SN2, #endif #else SW_ID0=SW_BASE, diff --git a/radio/src/loadboot.cpp b/radio/src/loadboot.cpp index f4dbd0feb..affa37fd6 100644 --- a/radio/src/loadboot.cpp +++ b/radio/src/loadboot.cpp @@ -89,27 +89,55 @@ const uint8_t BootCode[] = { __attribute__ ((section(".bootrodata"), used)) void _bootStart() { - // turn soft power ON now - RCC->AHB1ENR |= RCC_AHB1ENR_GPIODEN; // Enable portD clock - GPIOD->BSRRL = 1; - GPIOD->MODER = (GPIOD->MODER & 0xFFFFFFFC) | 1; - #if defined(REV9E) - RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN; // Enable portC clock - RCC->AHB1ENR |= RCC_AHB1ENR_GPIOGEN; // Enable portG clock + RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOGEN | RCC_AHB1ENR_GPIODEN; #else - RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN; // Enable portC clock - RCC->AHB1ENR |= RCC_AHB1ENR_GPIOEEN; // Enable portE clock + RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOEEN | RCC_AHB1ENR_GPIODEN; #endif + // these two NOPs are needed (see STM32F errata sheet) before the peripheral + // register can be written after the peripheral clock was enabled + __ASM volatile ("nop"); + __ASM volatile ("nop"); + + // Turn soft power ON now, but only if we got started because of the watchdog + // or software reset. If the radio was started by user pressing the power button + // then that button is providing power and we don't need to enable it here. + // + // If we were to turn it on here indiscriminately, then the radio can go into the + // power on/off loop after being powered off by the user. (issue #2790) + if (WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) { + GPIOD->BSRRL = 1; // set PWR_GPIO_PIN_ON pin to 1 + GPIOD->MODER = (GPIOD->MODER & 0xFFFFFFFC) | 1; // General purpose output mode + } + + // TRIMS_GPIO_PIN_LHR is on PG0 on 9XE and on PE3 on Taranis + // TRIMS_GPIO_PIN_RHL is on PC1 on all versions + // turn on pull-ups on trim keys GPIOC->PUPDR = 0x00000004; +#if defined(REV9E) + GPIOG->PUPDR = 0x00000001; +#else GPIOE->PUPDR = 0x00000040; - - uint32_t i; - for (i = 0; i < 50000; i += 1) { +#endif + + // wait for inputs to stabilize + for (uint32_t i = 0; i < 50000; i += 1) { bwdt_reset(); } + // now the second part of power on sequence + // If we got here and the radio was not started by the watchdog/software reset, + // then we must have a power button pressed. If not then we are in power on/off loop + // and to terminate it, just wait here without turning on PWR pin. The power supply will + // eventually exhaust and the radio will turn off. + if (!WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) { + // wait here until the power key is pressed + while (GPIOD->IDR & PWR_GPIO_PIN_SWITCH) { + bwdt_reset(); + } + } + if (!(TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR) && !(TRIMS_GPIO_REG_RHL & TRIMS_GPIO_PIN_RHL)) { // Bootloader needed const uint8_t *src; diff --git a/radio/src/lua_api.cpp b/radio/src/lua_api.cpp index c06b2ffac..246d69a1d 100644 --- a/radio/src/lua_api.cpp +++ b/radio/src/lua_api.cpp @@ -116,33 +116,91 @@ static int luaGetTime(lua_State *L) return 1; } +static void luaPushDateTime(lua_State *L, uint32_t year, uint32_t mon, uint32_t day, + uint32_t hour, uint32_t min, uint32_t sec) +{ + lua_createtable(L, 0, 6); + lua_pushtableinteger(L, "year", year); + lua_pushtableinteger(L, "mon", mon); + lua_pushtableinteger(L, "day", day); + lua_pushtableinteger(L, "hour", hour); + lua_pushtableinteger(L, "min", min); + lua_pushtableinteger(L, "sec", sec); +} + static int luaGetDateTime(lua_State *L) { struct gtm utm; gettime(&utm); - lua_newtable(L); - lua_pushtableinteger(L, "year", utm.tm_year+1900); - lua_pushtableinteger(L, "mon", utm.tm_mon+1); - lua_pushtableinteger(L, "day", utm.tm_mday); - lua_pushtableinteger(L, "hour", utm.tm_hour); - lua_pushtableinteger(L, "min", utm.tm_min); - lua_pushtableinteger(L, "sec", utm.tm_sec); + luaPushDateTime(L, utm.tm_year + 1900, utm.tm_mon + 1, utm.tm_mday, utm.tm_hour, utm.tm_min, utm.tm_sec); return 1; } +static void luaPushLatLon(TelemetrySensor & telemetrySensor, TelemetryItem & telemetryItem) +/* result is lua table containing members ["lat"] and ["lon"] as lua_Number (doubles) in decimal degrees */ +{ + lua_Number lat = 0.0; + lua_Number lon = 0.0; + uint32_t gpsLat = 0; + uint32_t gpsLon = 0; + + telemetryItem.gps.extractLatitudeLongitude(&gpsLat, &gpsLon); /* close, but not the format we want */ + lat = gpsLat / 1000000.0; + if (telemetryItem.gps.latitudeNS == 'S') lat = -lat; + lon = gpsLon / 1000000.0; + if (telemetryItem.gps.longitudeEW == 'W') lon = -lon; + + lua_createtable(L, 0, 2); + lua_pushtablenumber(L, "lat", lat); + lua_pushtablenumber(L, "lon", lon); +} + +static void luaPushTelemetryDateTime(TelemetrySensor & telemetrySensor, TelemetryItem & telemetryItem) +{ + luaPushDateTime(L, telemetryItem.datetime.year + 2000, telemetryItem.datetime.month, telemetryItem.datetime.day, + telemetryItem.datetime.hour, telemetryItem.datetime.min, telemetryItem.datetime.sec); +} + +static void luaPushCells(TelemetrySensor & telemetrySensor, TelemetryItem & telemetryItem) +{ + if (telemetryItem.cells.count == 0) + lua_pushinteger(L, (int)0); // returns zero if no cells + else { + lua_createtable(L, telemetryItem.cells.count, 0); + for (int i = 0; i < telemetryItem.cells.count; i++) { + lua_pushnumber(L, i + 1); + lua_pushnumber(L, telemetryItem.cells.values[i].value / 100.0); + lua_settable(L, -3); + } + } +} + static void luaGetValueAndPush(int src) { - getvalue_t value = getValue(src); + getvalue_t value = getValue(src); // ignored for GPS, DATETIME, and CELLS if (src >= MIXSRC_FIRST_TELEM && src <= MIXSRC_LAST_TELEM) { src = (src-MIXSRC_FIRST_TELEM) / 3; // telemetry values if (TELEMETRY_STREAMING() && telemetryItems[src].isAvailable()) { TelemetrySensor & telemetrySensor = g_model.telemetrySensors[src]; - if (telemetrySensor.prec > 0) - lua_pushnumber(L, float(value)/(telemetrySensor.prec == 2 ? 100.0 : 10.0)); - else - lua_pushinteger(L, value); + switch (telemetrySensor.unit) { + case UNIT_GPS: + luaPushLatLon(telemetrySensor, telemetryItems[src]); + break; + case UNIT_DATETIME: + luaPushTelemetryDateTime(telemetrySensor, telemetryItems[src]); + break; + case UNIT_CELLS: + luaPushCells(telemetrySensor, telemetryItems[src]); + break; + default: + if (telemetrySensor.prec > 0) + lua_pushnumber(L, float(value)/(telemetrySensor.prec == 2 ? 100.0 : 10.0)); + else + lua_pushinteger(L, value); + break; + } } else { // telemetry not working, return zero for telemetry sources diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp index 17369470c..bed1ce257 100644 --- a/radio/src/main_arm.cpp +++ b/radio/src/main_arm.cpp @@ -44,29 +44,40 @@ void handleUsbConnection() { #if defined(PCBTARANIS) && !defined(SIMU) static bool usbStarted = false; + if (!usbStarted && usbPlugged()) { + usbStarted = true; + + /* + We used to initialize USB peripheral and driver here. + According to my tests this is way too late. The USB peripheral + therefore does not have enough information to start responding to + USB host request, which causes very slow USB device recognition, + multiple USB device resets, etc... + + If we want to change the USB profile, the procedure is simple: + * USB cable must be disconnected + * call usbDeInit(); + * call usbUnit(); which initializes USB with the new profile. + Obviously the usbInit() should be modified to have a runtime + selection of the USB profile. + */ + #if defined(USB_MASS_STORAGE) opentxClose(); -#endif - usbStart(); -#if defined(USB_MASS_STORAGE) usbPluggedIn(); #endif - usbStarted = true; + } + if (usbStarted && !usbPlugged()) { + usbStarted = false; } #if defined(USB_JOYSTICK) - if (usbStarted) { - if (!usbPlugged()) { - //disable USB - usbStop(); - usbStarted = false; - } - else { - usbJoystickUpdate(); - } + if (usbStarted ) { + usbJoystickUpdate(); } #endif + #endif //#if defined(PCBTARANIS) && !defined(SIMU) } diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index aefdb9732..6185447e8 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -511,13 +511,16 @@ void evalInputs(uint8_t mode) } #if defined(VIRTUALINPUTS) -int getStickTrimValue(int stick, int value) +int getStickTrimValue(int stick, int stickValue) { + if (stick < 0) + return 0; + int trim = trims[stick]; if (stick == THR_STICK) { if (g_model.thrTrim) { int trimMin = g_model.extendedTrims ? 2*TRIM_EXTENDED_MIN : 2*TRIM_MIN; - trim = ((g_model.throttleReversed ? (trim+trimMin) : (trim-trimMin)) * (RESX-value)) >> (RESX_SHIFT+1); + trim = ((g_model.throttleReversed ? (trim+trimMin) : (trim-trimMin)) * (RESX-stickValue)) >> (RESX_SHIFT+1); } if (g_model.throttleReversed) { trim = -trim; @@ -526,12 +529,12 @@ int getStickTrimValue(int stick, int value) return trim; } -int getSourceTrimValue(int source, int value=0) +int getSourceTrimValue(int source, int stickValue=0) { if (source >= MIXSRC_Rud && source <= MIXSRC_Ail) - return getStickTrimValue(source - MIXSRC_Rud, value); + return getStickTrimValue(source - MIXSRC_Rud, stickValue); else if (source >= MIXSRC_FIRST_INPUT && source <= MIXSRC_LAST_INPUT) - return getStickTrimValue(virtualInputsTrims[source - MIXSRC_FIRST_INPUT], value); + return getStickTrimValue(virtualInputsTrims[source - MIXSRC_FIRST_INPUT], stickValue); else return 0; } diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index de897a5b2..aa66ba49e 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -116,7 +116,7 @@ #define MAX_FLIGHT_MODES 9 #define MAX_MIXERS 64 #define MAX_EXPOS 64 - #define NUM_LOGICAL_SWITCH 32 // number of custom switches + #define NUM_LOGICAL_SWITCH 32 // number of logical switches #define NUM_CFN 64 // number of functions assigned to switches #define MAX_SCRIPTS 7 #define MAX_INPUTS 32 @@ -203,7 +203,7 @@ PACK(typedef struct { }) CurveInfo; #else struct CurveInfo { - int8_t *crv; + int8_t * crv; uint8_t points; bool custom; }; @@ -328,7 +328,7 @@ enum BeeperMode { #if defined(CPUARM) #define EXTRA_GENERAL_FIELDS_ARM \ uint8_t backlightBright; \ - int8_t currentCalib; \ + int8_t txCurrentCalibration; \ int8_t temperatureWarn; \ uint8_t mAhWarn; \ uint16_t mAhUsed; \ @@ -382,7 +382,7 @@ enum BeeperMode { #define LEN_SWITCH_NAME 3 #define LEN_ANA_NAME 3 #define LEN_BLUETOOTH_NAME 10 - #define HAS_WIRELESS_TRAINER_HARDWARE() (g_eeGeneral.uart3Mode==UART_MODE_SBUS_TRAINER/* || g_eeGeneral.uart3Mode==UART_MODE_CPPM_TRAINER*/) + #define HAS_WIRELESS_TRAINER_HARDWARE() (g_eeGeneral.serial2Mode==UART_MODE_SBUS_TRAINER/* || g_eeGeneral.serial2Mode==UART_MODE_CPPM_TRAINER*/) #if defined(REV9E) #define BLUETOOTH_FIELDS \ @@ -394,7 +394,7 @@ enum BeeperMode { #define EXTRA_GENERAL_FIELDS \ EXTRA_GENERAL_FIELDS_ARM \ - uint8_t uart3Mode:6; \ + uint8_t serial2Mode:6; \ uint8_t slidersConfig:2; \ uint8_t potsConfig; /*two bits for every pot*/\ uint8_t backlightColor; \ @@ -754,7 +754,7 @@ PACK(typedef struct { int8_t currModel; uint8_t contrast; uint8_t vBatWarn; - int8_t vBatCalib; + int8_t txVoltageCalibration; int8_t backlightMode; TrainerData trainer; uint8_t view; // index of view in main screen @@ -1749,7 +1749,7 @@ enum SwitchSources { SWSRC_LAST_LOGICAL_SWITCH = SWSRC_FIRST_LOGICAL_SWITCH+NUM_LOGICAL_SWITCH-1, SWSRC_ON, - SWSRC_One, + SWSRC_ONE, #if defined(CPUARM) SWSRC_FIRST_FLIGHT_MODE, @@ -1764,12 +1764,13 @@ enum SwitchSources { SWSRC_FIRST = -SWSRC_LAST, #if defined(CPUARM) - SWSRC_LAST_IN_LOGICAL_SWITCHES = SWSRC_LAST_FLIGHT_MODE, - SWSRC_LAST_IN_MIXES = SWSRC_LAST_FLIGHT_MODE, + SWSRC_LAST_IN_LOGICAL_SWITCHES = SWSRC_COUNT-1, + SWSRC_LAST_IN_MIXES = SWSRC_COUNT-1, #else SWSRC_LAST_IN_LOGICAL_SWITCHES = SWSRC_LAST_LOGICAL_SWITCH, SWSRC_LAST_IN_MIXES = SWSRC_LAST_LOGICAL_SWITCH, #endif + SWSRC_FIRST_IN_LOGICAL_SWITCHES = -SWSRC_LAST_IN_LOGICAL_SWITCHES, SWSRC_FIRST_IN_MIXES = -SWSRC_LAST_IN_MIXES, @@ -1962,7 +1963,11 @@ enum TimerModes { enum CountDownModes { COUNTDOWN_SILENT, COUNTDOWN_BEEPS, - COUNTDOWN_VOICE + COUNTDOWN_VOICE, +#if defined(CPUARM) && defined(HAPTIC) + COUNTDOWN_HAPTIC, +#endif + COUNTDOWN_COUNT }; #if defined(CPUARM) @@ -2152,8 +2157,9 @@ PACK(typedef struct { FlightModeData flightModeData[MAX_FLIGHT_MODES]; AVR_FIELD(int8_t ppmFrameLength) // 0=22.5ms (10ms-30ms) 0.5ms increments - uint8_t thrTraceSrc; - + + uint8_t thrTraceSrc; + swarnstate_t switchWarningState; swarnenable_t switchWarningEnable; diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index f3f5938f9..d9733bc76 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1260,12 +1260,7 @@ void alert(const pm_char * t, const pm_char *s MESSAGE_SOUND_ARG) #if defined(PCBTARANIS) && defined(REV9E) uint32_t pwr_check = pwrCheck(); if (pwr_check == e_power_off) { - // TODO this is quick & dirty - lcdOff(); - BACKLIGHT_OFF(); - topLcdOff(); - SysTick->CTRL = 0; // turn off systick - pwrOff(); + boardOff(); } else if (pwr_check == e_power_press) { refresh = true; @@ -1276,7 +1271,7 @@ void alert(const pm_char * t, const pm_char *s MESSAGE_SOUND_ARG) } #else if (pwrCheck() == e_power_off) { - pwrOff(); // turn power off now + boardOff(); // turn power off now } #endif } @@ -1886,7 +1881,7 @@ void opentxClose() #endif #if defined(PCBSKY9X) - uint32_t mAhUsed = g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib) / 8192 / 36; + uint32_t mAhUsed = g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.txCurrentCalibration) / 8192 / 36; if (g_eeGeneral.mAhUsed != mAhUsed) { g_eeGeneral.mAhUsed = mAhUsed; } @@ -2013,16 +2008,16 @@ void checkBattery() counter = 10; int32_t instant_vbat = anaIn(TX_VOLTAGE); #if defined(PCBTARANIS) - instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * BATT_SCALE; + instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.txVoltageCalibration)/128) * BATT_SCALE; instant_vbat >>= 11; instant_vbat += 2; // because of the diode #elif defined(PCBSKY9X) - instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * 4191; + instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.txVoltageCalibration)/128) * 4191; instant_vbat /= 55296; #elif defined(CPUM2560) - instant_vbat = (instant_vbat*1112 + instant_vbat*g_eeGeneral.vBatCalib + (BandGap<<2)) / (BandGap<<3); + instant_vbat = (instant_vbat*1112 + instant_vbat*g_eeGeneral.txVoltageCalibration + (BandGap<<2)) / (BandGap<<3); #else - instant_vbat = (instant_vbat*16 + instant_vbat*g_eeGeneral.vBatCalib/8) / BandGap; + instant_vbat = (instant_vbat*16 + instant_vbat*g_eeGeneral.txVoltageCalibration/8) / BandGap; #endif static uint8_t s_batCheck; @@ -2061,7 +2056,7 @@ void checkBattery() else if (g_eeGeneral.temperatureWarn && getTemperature() >= g_eeGeneral.temperatureWarn) { AUDIO_TX_TEMP_HIGH(); } - else if (g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib)/8192/36) / 500 >= g_eeGeneral.mAhWarn) { + else if (g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.txCurrentCalibration)/8192/36) / 500 >= g_eeGeneral.mAhWarn) { AUDIO_TX_MAH_HIGH(); } #endif @@ -2353,7 +2348,7 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim #if !defined(CPUARM) && !defined(SIMU) extern unsigned char __bss_end ; #define STACKPTR _SFR_IO16(0x3D) -void stack_paint() +void stackPaint() { // Init Stack while interrupts are disabled unsigned char *p ; @@ -2367,7 +2362,7 @@ void stack_paint() } } -uint16_t stack_free() +uint16_t stackAvailable() { unsigned char *p ; @@ -2456,7 +2451,7 @@ void opentxInit(OPENTX_INIT_ARGS) backlightOn(); #if defined(PCBTARANIS) - uart3Init(g_eeGeneral.uart3Mode, MODEL_TELEMETRY_PROTOCOL()); + serial2Init(g_eeGeneral.serial2Mode, MODEL_TELEMETRY_PROTOCOL()); #endif #if defined(PCBSKY9X) && !defined(SIMU) @@ -2497,7 +2492,7 @@ int main(void) lcdInit(); #endif - stack_paint(); + stackPaint(); #if defined(GUI) g_menuStack[0] = menuMainView; @@ -2577,7 +2572,7 @@ int main(void) opentxClose(); lcd_clear() ; lcdRefresh() ; - pwrOff(); // Only turn power off if necessary + boardOff(); // Only turn power off if necessary wdt_disable(); while(1); // never return from main() - there is no code to return back, if any delays occurs in physical power it does dead loop. #endif diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 675bc3fe2..a94b9f541 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -297,33 +297,39 @@ #include "debug.h" #if defined(SIMU) -#include "targets/simu/simpgmspace.h" + #include "targets/simu/simpgmspace.h" #elif defined(CPUARM) -typedef const unsigned char pm_uchar; -typedef const char pm_char; -typedef const uint16_t pm_uint16_t; -typedef const uint8_t pm_uint8_t; -typedef const int16_t pm_int16_t; -typedef const int8_t pm_int8_t; -#define pgm_read_byte(address_short) (*(uint8_t*)(address_short)) -#define PSTR(adr) adr -#define PROGMEM -#define pgm_read_adr(x) *(x) -#define cli() -#define sei() -extern void boardInit(); + typedef const unsigned char pm_uchar; + typedef const char pm_char; + typedef const uint16_t pm_uint16_t; + typedef const uint8_t pm_uint8_t; + typedef const int16_t pm_int16_t; + typedef const int8_t pm_int8_t; + #define pgm_read_byte(address_short) (*(uint8_t*)(address_short)) + #define PSTR(adr) adr + #define PROGMEM + #define pgm_read_adr(x) *(x) + #define cli() + #define sei() + extern void boardInit(); + #if defined(PCBTARANIS) + extern void boardOff(); + #else + #define boardOff() pwrOff(); + #endif #else -#include -#include -#include "pgmtypes.h" + #define boardOff() pwrOff(); + #include + #include + #include "pgmtypes.h" -#include -#include -#include -#define F_CPU 16000000UL // 16 MHz -#include -#define pgm_read_adr(address_short) pgm_read_word(address_short) -#include + #include + #include + #include + #define F_CPU 16000000UL // 16 MHz + #include + #define pgm_read_adr(address_short) pgm_read_word(address_short) + #include #endif #if defined(PCBTARANIS) @@ -416,6 +422,7 @@ extern void boardInit(); typedef int32_t rotenc_t; typedef int32_t getvalue_t; typedef uint32_t mixsrc_t; + typedef int8_t swsrc_t; #else #define tmr10ms_t uint16_t extern volatile tmr10ms_t g_tmr10ms; @@ -430,7 +437,7 @@ extern void boardInit(); typedef int8_t rotenc_t; typedef int16_t getvalue_t; typedef uint8_t mixsrc_t; - void watchdogSetTimeout(uint32_t timeout); + typedef int8_t swsrc_t; #endif #if defined(NAVIGATION_STICKS) @@ -529,7 +536,7 @@ typedef struct { MASK_CFN_TYPE activeSwitches; tmr10ms_t lastFunctionTime[NUM_CFN]; - inline bool isFuunctionActive(uint8_t func) + inline bool isFunctionActive(uint8_t func) { return activeFunctions & ((MASK_FUNC_TYPE)1 << func); } @@ -716,14 +723,14 @@ extern uint8_t flightModeTransitionLast; #endif #if defined(SIMU) - inline int getAvailableMemory() { return 1000; } + inline int availableMemory() { return 1000; } #elif defined(CPUARM) && !defined(SIMU) extern unsigned char *heap; extern int _end; extern int _estack; extern int _main_stack_start; extern int _heap_end; - #define getAvailableMemory() ((unsigned int)((unsigned char *)&_heap_end - heap)) + #define availableMemory() ((unsigned int)((unsigned char *)&_heap_end - heap)) #endif void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms); @@ -767,7 +774,7 @@ void logicalSwitchesReset(); #endif extern swarnstate_t switches_states; -int8_t getMovedSwitch(); +swsrc_t getMovedSwitch(); #if defined(PCBTARANIS) #define GET_MOVED_SOURCE_PARAMS uint8_t min @@ -941,11 +948,8 @@ extern uint16_t lastMixerDuration; uint16_t getTmr16KHz(); #endif -#if defined(CPUARM) - uint32_t stack_free(uint32_t tid); - void stack_paint(); -#else - uint16_t stack_free(); +#if !defined(CPUARM) + uint16_t stackAvailable(); #endif #if defined(SPLASH) @@ -1049,12 +1053,7 @@ template void SWAP(t & a, t & b) { t tmp = b; b = a; a = tmp; } uint16_t isqrt32(uint32_t n); #if defined(CPUARM) && !defined(BOOT) -#if !defined(SIMU) -extern "C" { -#include -} -#endif - +#include "tasks_arm.h" extern OS_MutexID mixerMutex; inline void pauseMixerCalculations() { @@ -1332,7 +1331,7 @@ extern CustomFunctionsContext modelFunctionsContext; extern CustomFunctionsContext globalFunctionsContext; inline bool isFunctionActive(uint8_t func) { - return globalFunctionsContext.isFuunctionActive(func) || modelFunctionsContext.isFuunctionActive(func); + return globalFunctionsContext.isFunctionActive(func) || modelFunctionsContext.isFunctionActive(func); } void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext & functionsContext); inline void customFunctionsReset() @@ -1342,7 +1341,7 @@ inline void customFunctionsReset() } #else extern CustomFunctionsContext modelFunctionsContext; -#define isFunctionActive(func) modelFunctionsContext.isFuunctionActive(func) +#define isFunctionActive(func) modelFunctionsContext.isFunctionActive(func) void evalFunctions(); #define customFunctionsReset() modelFunctionsContext.reset() #endif diff --git a/radio/src/serial.cpp b/radio/src/serial.cpp index c90ebefe0..e64e0ec6d 100644 --- a/radio/src/serial.cpp +++ b/radio/src/serial.cpp @@ -1,297 +1,72 @@ /* - * Authors - Gerard Valade + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer * - * Adapted from frsky + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * */ #include "opentx.h" #include "serial.h" +#include +#include -/* - Receive serial (RS-232) characters, detecting and storing each Fr-Sky - 0x7e-framed packet as it arrives. When a complete packet has been - received, process its data into storage variables. NOTE: This is an - interrupt routine and should not get too lengthy. I originally had - the buffer being checked in the perMain function (because per10ms - isn't quite often enough for data streaming at 9600baud) but alas - that scheme lost packets also. So each packet is parsed as it arrives, - directly at the ISR function (through a call to frskyProcessPacket). +#define PRINTF_BUFFER_SIZE 256 - If this proves a problem in the future, then I'll just have to implement - a second buffer to receive data while one buffer is being processed (slowly). - */ - -#ifndef SIMU -ISR (USART0_RX_vect) +void serialPutc(char c) { - uint8_t iostat; //USART control and Status Register 0 A - // uint8_t rh; //USART control and Status Register 0 B - UCSR0B &= ~(1 << RXCIE0); // disable Interrupt - sei(); - iostat = UCSR0A; //USART control and Status Register 0 A - uint8_t byte = UDR0; - - /* - bit 7 6 5 4 3 2 1 0 - RxC0 TxC0 UDRE0 FE0 DOR0 UPE0 U2X0 MPCM0 - - RxC0: Receive complete - TXC0: Transmit Complete - UDRE0: USART Data Register Empty - FE0: Frame Error - DOR0: Data OverRun - UPE0: USART Parity Error - U2X0: Double Tx Speed - MPCM0: MultiProcessor Comms Mode - */ - if (iostat & ((1 << FE0) | (1 << DOR0) | (1 << UPE0))) { - byte = 0; - } - //rh = UCSR0B; //USART control and Status Register 0 B -#ifdef MAVLINK - (RXHandler)(byte); +#if defined(USB_SERIAL) + usbSerialPutc(c); +#else + serial2Putc(c); #endif - - cli(); - UCSR0B |= (1 << RXCIE0); // enable Interrupt - -} -#endif - -inline void SERIAL_EnableRXD(void) { - UCSR0B |= (1 << RXEN0); // enable RX - UCSR0B |= (1 << RXCIE0); // enable Interrupt } -#if 0 -void SERIAL_DisableRXD(void) { - UCSR0B &= ~(1 << RXEN0); // disable RX - UCSR0B &= ~(1 << RXCIE0); // disable Interrupt -} -#endif - -/* - USART0 (transmit) Data Register Emtpy ISR - Usef to transmit FrSky data packets, which are buffered in frskyTXBuffer. - */ -uint8_t serialTxBuffer[MAX_TX_BUFFER]; // 32 characters -uint8_t serialTxBufferCount = 0; -uint8_t * ptrTxISR = 0; -serial_tx_state_t serialTxState = TX_STATE_EMPTY; - -#ifndef SIMU -ISR(USART0_UDRE_vect) +void serialPrintf(const char * format, ...) { - if (serialTxBufferCount > 0) { - UDR0 = *ptrTxISR++; - serialTxBufferCount--; - } else { - UCSR0B &= ~(1 << UDRIE0); // disable UDRE0 interrupt - serialTxState = TX_STATE_EMPTY; - } -} -#endif + va_list arglist; + char tmp[PRINTF_BUFFER_SIZE]; -void SERIAL_start_uart_send() { - ptrTxISR = serialTxBuffer; - serialTxBufferCount = 0; + va_start(arglist, format); + vsnprintf(tmp, PRINTF_BUFFER_SIZE, format, arglist); + va_end(arglist); + + const char *t = tmp; + while (*t) { + serialPutc(*t++); + } } -void SERIAL_end_uart_send() { - ptrTxISR = serialTxBuffer; - //UCSR0B |= (1 << UDRIE0); // enable UDRE0 interrupt - serialTxState = TX_STATE_READY; +void serialCrlf() +{ + serialPutc('\r'); + serialPutc('\n'); } - -void SERIAL_send_uart_bytes(const uint8_t * buf, uint16_t len) { - while (len--) { - *ptrTxISR++ = *buf++; - serialTxBufferCount++; - } - -} - -#if 0 -void SERIAL_transmitBuffer(uint8_t len) { - serialTxBufferCount = len; - ptrTxISR = serialTxBuffer; - //UCSR0B |= (1 << UDRIE0); // enable UDRE0 interrupt - serialTxState = TX_STATE_READY; -} -#endif - -void SERIAL_startTX(void) { - if (serialTxState == TX_STATE_READY) { - serialTxState = TX_STATE_BUSY; - UCSR0B |= (1 << UDRIE0); // enable UDRE0 interrupt - } -} - -static void uart_4800(void) { -#ifndef SIMU -#undef BAUD // avoid compiler warning -#define BAUD 4800 -#include - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif -#endif -} - -static void uart_9600(void) { -#ifndef SIMU -#undef BAUD // avoid compiler warning -#define BAUD 9600 -#include - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif -#endif -} - -static void uart_14400(void) { -#ifndef SIMU -#undef BAUD // avoid compiler warning -#define BAUD 14400 -#include - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif -#endif -} - -static void uart_19200(void) { -#ifndef SIMU -#undef BAUD // avoid compiler warning -#define BAUD 19200 -#include - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif -#endif -} - -static void uart_38400(void) { -#ifndef SIMU -#undef BAUD // avoid compiler warning -#define BAUD 38400 -#include - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif -#endif -} - -static void uart_57600(void) { -#ifndef SIMU -#undef BAUD // avoid compiler warning -#define BAUD 57600 -#include - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif -#endif -} - - -static void uart_76800(void) { -#ifndef SIMU -#undef BAUD // avoid compiler warning -#define BAUD 76800 -#include - UBRR0H = UBRRH_VALUE; - UBRR0L = UBRRL_VALUE; -#if USE_2X - UCSR0A |= (1 << U2X0); -#else - UCSR0A &= ~(1 << U2X0); -#endif -#endif -} - -inline void SERIAL_EnableTXD(void) { - //UCSR0B |= (1 << TXEN0); // enable TX - UCSR0B |= (1 << TXEN0) | (1 << UDRIE0); // enable TX and TX interrupt -} - -#if 0 -void SERIAL_DisableTXD(void) { - UCSR0B &= ~(1 << TXEN0); // disable TX - UCSR0B &= ~(1 << UDRIE0); // disable Interrupt -} -#endif - -void SERIAL_Init(void) { - DDRE &= ~(1 << DDE0); // set RXD0 pin as input - PORTE &= ~(1 << PORTE0); // disable pullup on RXD0 pin - - switch (g_eeGeneral.mavbaud) { - case BAUD_4800: - uart_4800(); - break; - case BAUD_9600: - uart_9600(); - break; - case BAUD_14400: - uart_14400(); - break; - case BAUD_19200: - uart_19200(); - break; - case BAUD_38400: - uart_38400(); - break; - case BAUD_57600: - uart_57600(); - break; - case BAUD_76800: - uart_76800(); - break; - } - - - // UCSR0A &= ~(1 << U2X0); // disable double speed operation - // set 8N1 - UCSR0B = 0 | (0 << RXCIE0) | (0 << TXCIE0) | (0 << UDRIE0) | (0 << RXEN0) | (0 << TXEN0) | (0 << UCSZ02); - UCSR0C = 0 | (1 << UCSZ01) | (1 << UCSZ00); - while (UCSR0A & (1 << RXC0)) - UDR0; // flush receive buffer - - SERIAL_EnableTXD(); - SERIAL_EnableRXD(); -} - diff --git a/radio/src/serial.h b/radio/src/serial.h index a3089d691..9d887512b 100644 --- a/radio/src/serial.h +++ b/radio/src/serial.h @@ -1,59 +1,55 @@ -/* - * Authors - Gerard Valade - * - * Adapted from frsky - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - */ - -#ifndef _SERIAL_H_ -#define _SERIAL_H_ - -typedef enum serial_tx_state_ { - TX_STATE_EMPTY = 0, // - TX_STATE_READY, // - TX_STATE_BUSY -} serial_tx_state_t; -extern serial_tx_state_t serialTxState; - -//! \brief Baudrate selection. -enum SERIAL_BAUDS { - BAUD_4800 = 0, - BAUD_9600, - BAUD_14400, - BAUD_19200, - BAUD_38400, - BAUD_57600, - BAUD_76800 -}; - -//! \brief Definition of baudrate settings item choices. -typedef void (*SerialFuncP)(uint8_t event); - -extern SerialFuncP RXHandler; - -#define MAX_TX_BUFFER 32 -//#if 0 -extern uint8_t serialTxBuffer[MAX_TX_BUFFER]; // 32 characters -extern uint8_t serialTxBufferCount; -extern uint8_t * ptrTxISR; -//#endif - -void SERIAL_Init(void); -//void SERIAL_transmitBuffer(uint8_t len); -extern void SERIAL_start_uart_send(); -extern void SERIAL_end_uart_send(); -extern void SERIAL_send_uart_bytes(uint8_t * buf, uint16_t len); - -void SERIAL_startTX(void); -#define IS_TX_BUSY (serialTxState!=TX_STATE_EMPTY) - -#endif +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#ifndef _SERIAL_H_ +#define _SERIAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +void serialPutc(char c); +void serialPrintf(const char *format, ...); +void serialCrlf(); + +#ifdef __cplusplus +} +#endif + +#define serialPrint(...) do { serialPrintf(__VA_ARGS__); serialCrlf(); } while(0) + +#endif // _SERIAL_H_ + diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 6415699ff..8ad5694d9 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -72,11 +72,18 @@ volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value = 0; #endif #if defined(PCBTARANIS) -tmr10ms_t switchesMidposStart[6] = { 0 }; +#if defined(REV9E) +tmr10ms_t switchesMidposStart[6]; +#else +tmr10ms_t switchesMidposStart[16]; // TODO constant +#endif uint64_t switchesPos = 0; -tmr10ms_t potsLastposStart[NUM_XPOTS] = { 0 }; +tmr10ms_t potsLastposStart[NUM_XPOTS]; uint8_t potsPos[NUM_XPOTS]; +#define SWITCH_POSITION(sw) (switchesPos & ((MASK_CFN_TYPE)1<<(sw))) +#define POT_POSITION(sw) ((potsPos[(sw)/XPOTS_MULTIPOS_COUNT] & 0x0f) == ((sw) % XPOTS_MULTIPOS_COUNT)) + div_t switchInfo(int switchPosition) { return div(switchPosition-SWSRC_FIRST_SWITCH, 3); @@ -92,7 +99,7 @@ uint64_t check2PosSwitchPosition(EnumKeys sw) else index = sw - SW_SA0 + 2; - result = ((int64_t)1 << index); + result = ((uint64_t)1 << index); if (!(switchesPos & result)) { PLAY_SWITCH_MOVED(index); @@ -101,32 +108,33 @@ uint64_t check2PosSwitchPosition(EnumKeys sw) return result; } -uint32_t check3PosSwitchPosition(uint8_t idx, EnumKeys sw, bool startup) +uint64_t check3PosSwitchPosition(uint8_t idx, EnumKeys sw, bool startup) { - uint32_t result; + uint64_t result; uint32_t index; if (switchState(sw)) { index = sw - SW_SA0; - result = (1 << index); + result = ((MASK_CFN_TYPE)1 << index); switchesMidposStart[idx] = 0; } else if (switchState(EnumKeys(sw+2))) { index = sw - SW_SA0 + 2; - result = (1 << index); - switchesMidposStart[idx] = 0; - } - else if (startup || (switchesPos & (1 << (sw - SW_SA0 + 1))) || g_eeGeneral.switchesDelay==SWITCHES_DELAY_NONE || (switchesMidposStart[idx] && (tmr10ms_t)(get_tmr10ms() - switchesMidposStart[idx]) > SWITCHES_DELAY())) { - index = sw - SW_SA0 + 1; - result = (1 << index); + result = ((MASK_CFN_TYPE)1 << index); switchesMidposStart[idx] = 0; } else { index = sw - SW_SA0 + 1; - if (!switchesMidposStart[idx]) { - switchesMidposStart[idx] = get_tmr10ms(); + if (startup || SWITCH_POSITION(index) || g_eeGeneral.switchesDelay==SWITCHES_DELAY_NONE || (switchesMidposStart[idx] && (tmr10ms_t)(get_tmr10ms() - switchesMidposStart[idx]) > SWITCHES_DELAY())) { + result = ((MASK_CFN_TYPE)1 << index); + switchesMidposStart[idx] = 0; + } + else { + result = (switchesPos & ((MASK_CFN_TYPE)0x7 << (sw - SW_SA0))); + if (!switchesMidposStart[idx]) { + switchesMidposStart[idx] = get_tmr10ms(); + } } - result = (switchesPos & (0x7 << (sw - SW_SA0))); } if (!(switchesPos & result)) { @@ -151,6 +159,19 @@ void getSwitchesPosition(bool startup) CHECK_3POS(5, SW_SG); CHECK_2POS(SW_SH); +#if defined(REV9E) + CHECK_3POS(6, SW_SI); + CHECK_3POS(7, SW_SJ); + CHECK_3POS(8, SW_SK); + CHECK_3POS(9, SW_SL); + CHECK_3POS(10, SW_SM); + CHECK_3POS(11, SW_SN); + CHECK_3POS(12, SW_SO); + CHECK_3POS(13, SW_SP); + CHECK_3POS(14, SW_SQ); + CHECK_3POS(15, SW_SR); +#endif + switchesPos = newPos; for (int i=0; i=MIXSRC_FIRST_INPUT && i<=MIXSRC_LAST_INPUT) { @@ -276,7 +295,7 @@ bool getLogicalSwitch(uint8_t idx) } } else { - uint8_t v1 = ls->v1; + mixsrc_t v1 = ls->v1; #if defined(FRSKY) // Telemetry if (v1 >= MIXSRC_FIRST_TELEM) { @@ -436,7 +455,7 @@ bool getSwitch(int8_t swtch) uint8_t cs_idx = abs(swtch); - if (cs_idx == SWSRC_One) { + if (cs_idx == SWSRC_ONE) { result = !s_mixer_first_run_done; } else if (cs_idx == SWSRC_ON) { @@ -444,18 +463,10 @@ bool getSwitch(int8_t swtch) } else if (cs_idx <= SWSRC_LAST_SWITCH) { #if defined(PCBTARANIS) - if (flags & GETSWITCH_MIDPOS_DELAY) { - div_t swinfo = switchInfo(cs_idx); - if (IS_3POS(swinfo.quot)) { - result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH); - } - else { - result = switchState((EnumKeys)(SW_BASE+cs_idx-SWSRC_FIRST_SWITCH)); - } - } - else { + if (flags & GETSWITCH_MIDPOS_DELAY) + result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH); + else result = switchState((EnumKeys)(SW_BASE+cs_idx-SWSRC_FIRST_SWITCH)); - } #else result = switchState((EnumKeys)(SW_BASE+cs_idx-SWSRC_FIRST_SWITCH)); #endif @@ -552,10 +563,10 @@ void evalLogicalSwitches(bool isCurrentPhase) #endif swarnstate_t switches_states = 0; -int8_t getMovedSwitch() +swsrc_t getMovedSwitch() { static tmr10ms_t s_move_last_time = 0; - int8_t result = 0; + swsrc_t result = 0; #if defined(PCBTARANIS) for (int i=0; i + * + * Adapted from frsky + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + */ + +#include "serial_driver.h" +#include "opentx.h" + +/* + Receive serial (RS-232) characters, detecting and storing each Fr-Sky + 0x7e-framed packet as it arrives. When a complete packet has been + received, process its data into storage variables. NOTE: This is an + interrupt routine and should not get too lengthy. I originally had + the buffer being checked in the perMain function (because per10ms + isn't quite often enough for data streaming at 9600baud) but alas + that scheme lost packets also. So each packet is parsed as it arrives, + directly at the ISR function (through a call to frskyProcessPacket). + + If this proves a problem in the future, then I'll just have to implement + a second buffer to receive data while one buffer is being processed (slowly). + */ + +#ifndef SIMU +ISR (USART0_RX_vect) +{ + uint8_t iostat; //USART control and Status Register 0 A + // uint8_t rh; //USART control and Status Register 0 B + UCSR0B &= ~(1 << RXCIE0); // disable Interrupt + sei(); + iostat = UCSR0A; //USART control and Status Register 0 A + uint8_t byte = UDR0; + + /* + bit 7 6 5 4 3 2 1 0 + RxC0 TxC0 UDRE0 FE0 DOR0 UPE0 U2X0 MPCM0 + + RxC0: Receive complete + TXC0: Transmit Complete + UDRE0: USART Data Register Empty + FE0: Frame Error + DOR0: Data OverRun + UPE0: USART Parity Error + U2X0: Double Tx Speed + MPCM0: MultiProcessor Comms Mode + */ + if (iostat & ((1 << FE0) | (1 << DOR0) | (1 << UPE0))) { + byte = 0; + } + //rh = UCSR0B; //USART control and Status Register 0 B +#ifdef MAVLINK + (RXHandler)(byte); +#endif + + cli(); + UCSR0B |= (1 << RXCIE0); // enable Interrupt + +} +#endif + +inline void SERIAL_EnableRXD(void) { + UCSR0B |= (1 << RXEN0); // enable RX + UCSR0B |= (1 << RXCIE0); // enable Interrupt +} + +#if 0 +void SERIAL_DisableRXD(void) { + UCSR0B &= ~(1 << RXEN0); // disable RX + UCSR0B &= ~(1 << RXCIE0); // disable Interrupt +} +#endif + +/* + USART0 (transmit) Data Register Emtpy ISR + Usef to transmit FrSky data packets, which are buffered in frskyTXBuffer. + */ +uint8_t serialTxBuffer[MAX_TX_BUFFER]; // 32 characters +uint8_t serialTxBufferCount = 0; +uint8_t * ptrTxISR = 0; +serial_tx_state_t serialTxState = TX_STATE_EMPTY; + +#ifndef SIMU +ISR(USART0_UDRE_vect) +{ + if (serialTxBufferCount > 0) { + UDR0 = *ptrTxISR++; + serialTxBufferCount--; + } else { + UCSR0B &= ~(1 << UDRIE0); // disable UDRE0 interrupt + serialTxState = TX_STATE_EMPTY; + } +} +#endif + +void SERIAL_start_uart_send() { + ptrTxISR = serialTxBuffer; + serialTxBufferCount = 0; +} + +void SERIAL_end_uart_send() { + ptrTxISR = serialTxBuffer; + //UCSR0B |= (1 << UDRIE0); // enable UDRE0 interrupt + serialTxState = TX_STATE_READY; +} + +void SERIAL_send_uart_bytes(const uint8_t * buf, uint16_t len) { + while (len--) { + *ptrTxISR++ = *buf++; + serialTxBufferCount++; + } + +} + +#if 0 +void SERIAL_transmitBuffer(uint8_t len) { + serialTxBufferCount = len; + ptrTxISR = serialTxBuffer; + //UCSR0B |= (1 << UDRIE0); // enable UDRE0 interrupt + serialTxState = TX_STATE_READY; +} +#endif + +void SERIAL_startTX(void) { + if (serialTxState == TX_STATE_READY) { + serialTxState = TX_STATE_BUSY; + UCSR0B |= (1 << UDRIE0); // enable UDRE0 interrupt + } +} + +static void uart_4800(void) { +#ifndef SIMU +#undef BAUD // avoid compiler warning +#define BAUD 4800 +#include + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif +#endif +} + +static void uart_9600(void) { +#ifndef SIMU +#undef BAUD // avoid compiler warning +#define BAUD 9600 +#include + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif +#endif +} + +static void uart_14400(void) { +#ifndef SIMU +#undef BAUD // avoid compiler warning +#define BAUD 14400 +#include + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif +#endif +} + +static void uart_19200(void) { +#ifndef SIMU +#undef BAUD // avoid compiler warning +#define BAUD 19200 +#include + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif +#endif +} + +static void uart_38400(void) { +#ifndef SIMU +#undef BAUD // avoid compiler warning +#define BAUD 38400 +#include + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif +#endif +} + +static void uart_57600(void) { +#ifndef SIMU +#undef BAUD // avoid compiler warning +#define BAUD 57600 +#include + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif +#endif +} + + +static void uart_76800(void) { +#ifndef SIMU +#undef BAUD // avoid compiler warning +#define BAUD 76800 +#include + UBRR0H = UBRRH_VALUE; + UBRR0L = UBRRL_VALUE; +#if USE_2X + UCSR0A |= (1 << U2X0); +#else + UCSR0A &= ~(1 << U2X0); +#endif +#endif +} + +inline void SERIAL_EnableTXD(void) { + //UCSR0B |= (1 << TXEN0); // enable TX + UCSR0B |= (1 << TXEN0) | (1 << UDRIE0); // enable TX and TX interrupt +} + +#if 0 +void SERIAL_DisableTXD(void) { + UCSR0B &= ~(1 << TXEN0); // disable TX + UCSR0B &= ~(1 << UDRIE0); // disable Interrupt +} +#endif + +void SERIAL_Init(void) { + DDRE &= ~(1 << DDE0); // set RXD0 pin as input + PORTE &= ~(1 << PORTE0); // disable pullup on RXD0 pin + + switch (g_eeGeneral.mavbaud) { + case BAUD_4800: + uart_4800(); + break; + case BAUD_9600: + uart_9600(); + break; + case BAUD_14400: + uart_14400(); + break; + case BAUD_19200: + uart_19200(); + break; + case BAUD_38400: + uart_38400(); + break; + case BAUD_57600: + uart_57600(); + break; + case BAUD_76800: + uart_76800(); + break; + } + + + // UCSR0A &= ~(1 << U2X0); // disable double speed operation + // set 8N1 + UCSR0B = 0 | (0 << RXCIE0) | (0 << TXCIE0) | (0 << UDRIE0) | (0 << RXEN0) | (0 << TXEN0) | (0 << UCSZ02); + UCSR0C = 0 | (1 << UCSZ01) | (1 << UCSZ00); + while (UCSR0A & (1 << RXC0)) + UDR0; // flush receive buffer + + SERIAL_EnableTXD(); + SERIAL_EnableRXD(); +} + diff --git a/radio/src/targets/common_avr/serial_driver.h b/radio/src/targets/common_avr/serial_driver.h new file mode 100644 index 000000000..a3089d691 --- /dev/null +++ b/radio/src/targets/common_avr/serial_driver.h @@ -0,0 +1,59 @@ +/* + * Authors - Gerard Valade + * + * Adapted from frsky + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + */ + +#ifndef _SERIAL_H_ +#define _SERIAL_H_ + +typedef enum serial_tx_state_ { + TX_STATE_EMPTY = 0, // + TX_STATE_READY, // + TX_STATE_BUSY +} serial_tx_state_t; +extern serial_tx_state_t serialTxState; + +//! \brief Baudrate selection. +enum SERIAL_BAUDS { + BAUD_4800 = 0, + BAUD_9600, + BAUD_14400, + BAUD_19200, + BAUD_38400, + BAUD_57600, + BAUD_76800 +}; + +//! \brief Definition of baudrate settings item choices. +typedef void (*SerialFuncP)(uint8_t event); + +extern SerialFuncP RXHandler; + +#define MAX_TX_BUFFER 32 +//#if 0 +extern uint8_t serialTxBuffer[MAX_TX_BUFFER]; // 32 characters +extern uint8_t serialTxBufferCount; +extern uint8_t * ptrTxISR; +//#endif + +void SERIAL_Init(void); +//void SERIAL_transmitBuffer(uint8_t len); +extern void SERIAL_start_uart_send(); +extern void SERIAL_end_uart_send(); +extern void SERIAL_send_uart_bytes(uint8_t * buf, uint16_t len); + +void SERIAL_startTX(void); +#define IS_TX_BUSY (serialTxState!=TX_STATE_EMPTY) + +#endif diff --git a/radio/src/targets/mega2560/board_mega2560.cpp b/radio/src/targets/mega2560/board_mega2560.cpp index 30026111f..d153186df 100644 --- a/radio/src/targets/mega2560/board_mega2560.cpp +++ b/radio/src/targets/mega2560/board_mega2560.cpp @@ -62,11 +62,10 @@ inline void boardInit() OCR2A = 156; TIMSK2 |= (1< serial2RxFifo; * This function is synchronous (i.e. uses polling). * c Character to send. */ -void debugPutc(const char c) +void serial2Putc(const char c) { Uart *pUart = SECOND_SERIAL_UART; @@ -64,6 +64,11 @@ void debugPutc(const char c) pUart->UART_THR = c; } +uint8_t serial2TracesEnabled() +{ + return false; +} + /** * Configures a UART peripheral with the specified parameters. * @@ -117,7 +122,7 @@ extern "C" void UART0_IRQHandler() #endif #if defined(FRSKY) -void telemetrySecondPortInit(unsigned int /*protocol*/) +void serial2TelemetryInit(unsigned int /*protocol*/) { SECOND_UART_Configure(FRSKY_D_BAUDRATE, Master_frequency); // startPdcUsartReceive(); diff --git a/radio/src/targets/taranis/bluetooth_driver.cpp b/radio/src/targets/taranis/bluetooth_driver.cpp index d2d43c15c..65789778c 100755 --- a/radio/src/targets/taranis/bluetooth_driver.cpp +++ b/radio/src/targets/taranis/bluetooth_driver.cpp @@ -133,7 +133,7 @@ void bluetoothWriteString(const char * str) void bluetoothWriteWakeup(void) { if (bluetoothWriteState == BLUETOOTH_WRITE_IDLE) { - if (!btTxFifo.empty()) { + if (!btTxFifo.isEmpty()) { bluetoothWriteState = BLUETOOTH_WRITE_INIT; GPIO_ResetBits(BT_GPIO_BRTS, BT_GPIO_PIN_BRTS); } diff --git a/radio/src/targets/taranis/board_taranis.cpp b/radio/src/targets/taranis/board_taranis.cpp index 25cb19f48..e73accc14 100644 --- a/radio/src/targets/taranis/board_taranis.cpp +++ b/radio/src/targets/taranis/board_taranis.cpp @@ -156,7 +156,7 @@ void boardInit() #endif #if defined(REV9E) - if (!(RCC->CSR & (RCC_CSR_SFTRSTF | RCC_CSR_WDGRSTF))) { + if (!WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) { lcd_clear(); lcd_bmp(76, 2, bmp_lock, 0, 60); lcdRefresh(); @@ -187,7 +187,7 @@ void boardInit() lcdRefreshWait(); } if (duration < PWR_PRESS_DURATION_MIN || duration >= PWR_PRESS_DURATION_MAX) { - pwrOff(); + boardOff(); } } else { @@ -198,8 +198,27 @@ void boardInit() backlightInit(); #endif } + +void boardOff() +{ + BACKLIGHT_OFF(); +#if defined(REV9E) + topLcdOff(); #endif +#if defined(REV9E) + while (pwrPressed()) { + wdt_reset(); + } +#endif + + lcdOff(); + SysTick->CTRL = 0; // turn off systick + pwrOff(); +} + +#endif // #if !defined(SIMU) + #if defined(USB_JOYSTICK) && !defined(SIMU) extern USB_OTG_CORE_HANDLE USB_OTG_dev; @@ -258,7 +277,7 @@ void checkTrainerSettings() stop_sbus_on_heartbeat_capture() ; break; case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT: - uart3Stop(); + serial2Stop(); } currentTrainerMode = requiredTrainerMode; @@ -273,8 +292,8 @@ void checkTrainerSettings() init_sbus_on_heartbeat_capture() ; break; case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT: - if (g_eeGeneral.uart3Mode == UART_MODE_SBUS_TRAINER) { - uart3SbusInit(); + if (g_eeGeneral.serial2Mode == UART_MODE_SBUS_TRAINER) { + serial2SbusInit(); break; } // no break diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index e33217b8c..9430d7beb 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -74,9 +74,10 @@ extern "C" { #endif #if !defined(SIMU) - #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_core.h" - #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/inc/usbd_hid_core.h" - #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_usr.h" + #include "usbd_cdc_core.h" + #include "usbd_msc_core.h" + #include "usbd_hid_core.h" + #include "usbd_usr.h" #include "usbd_desc.h" #include "usb_conf.h" #include "usbd_conf.h" @@ -236,8 +237,9 @@ void checkRotaryEncoder(void); void watchdogInit(unsigned int duration); #define wdt_enable(x) watchdogInit(1500) #define wdt_reset() IWDG->KR = 0xAAAA -#define WAS_RESET_BY_WATCHDOG() (RCC->CSR & (RCC_CSR_WDGRSTF | RCC_CSR_WWDGRSTF)) -#define WAS_RESET_BY_SOFTWARE() (RCC->CSR & RCC_CSR_SFTRSTF) +#define WAS_RESET_BY_SOFTWARE() (RCC->CSR & RCC_CSR_SFTRSTF) +#define WAS_RESET_BY_WATCHDOG() (RCC->CSR & (RCC_CSR_WDGRSTF | RCC_CSR_WWDGRSTF)) +#define WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() (RCC->CSR & (RCC_CSR_WDGRSTF | RCC_CSR_WWDGRSTF | RCC_CSR_SFTRSTF)) #endif // ADC driver @@ -281,10 +283,8 @@ void backlightInit(void); // USB driver int usbPlugged(void); void usbInit(void); -void usbStart(void); -#if defined(USB_JOYSTICK) -void usbStop(void); -#endif +void usbDeInit(void); +void usbSerialPutc(uint8_t c); #if defined(__cplusplus) && !defined(SIMU) } @@ -322,13 +322,13 @@ void hapticOff(void); void hapticOn(void); #endif -// SERIAL_USART driver +// Second serial port driver #define DEBUG_BAUDRATE 115200 -void uart3Init(unsigned int mode, unsigned int protocol); -void uart3Putc(const char c); -#define telemetrySecondPortInit(protocol) uart3Init(UART_MODE_TELEMETRY, protocol) -void uart3SbusInit(void); -void uart3Stop(void); +void serial2Init(unsigned int mode, unsigned int protocol); +void serial2Putc(char c); +#define serial2TelemetryInit(protocol) serial2Init(UART_MODE_TELEMETRY, protocol) +void serial2SbusInit(void); +void serial2Stop(void); // BT driver #define BLUETOOTH_DEFAULT_BAUDRATE 115200 diff --git a/radio/src/targets/taranis/bootloader/Makefile b/radio/src/targets/taranis/bootloader/Makefile index 84e78cfb6..745ff1c4b 100755 --- a/radio/src/targets/taranis/bootloader/Makefile +++ b/radio/src/targets/taranis/bootloader/Makefile @@ -109,6 +109,8 @@ ifeq ($(PCB), TARANIS) EXTRAINCDIRS += $(STM32USBPATH)/STM32_USB_OTG_Driver/inc EXTRAINCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Core/inc EXTRAINCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/msc/inc + EXTRAINCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/hid/inc + EXTRAINCDIRS += $(STM32USBPATH)/STM32_USB_Device_Library/Class/cdc/inc EXTRAINCDIRS += .. ../../.. ../../../fonts/std ifeq ($(PCBREV), REV4a) CPPDEFS += -DREV4a diff --git a/radio/src/targets/taranis/bootloader/boot.cpp b/radio/src/targets/taranis/bootloader/boot.cpp index 8567199e4..2460dd7fe 100755 --- a/radio/src/targets/taranis/bootloader/boot.cpp +++ b/radio/src/targets/taranis/bootloader/boot.cpp @@ -418,7 +418,6 @@ int main() // SD card detect pin sdInit(); usbInit(); - usbStart(); #endif for (;;) { diff --git a/radio/src/targets/taranis/lcd_driver.cpp b/radio/src/targets/taranis/lcd_driver.cpp index 4ad229b7e..0ea21d8c5 100644 --- a/radio/src/targets/taranis/lcd_driver.cpp +++ b/radio/src/targets/taranis/lcd_driver.cpp @@ -363,7 +363,7 @@ void lcdInit() { LCD_Hardware_Init(); - if (WAS_RESET_BY_WATCHDOG()|WAS_RESET_BY_SOFTWARE()) return; //no need to reset LCD module + if (WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) return; //no need to reset LCD module //reset LCD module LCD_RST_LOW(); @@ -400,7 +400,7 @@ void lcdInitFinish() initialization (without reset) is also recommended by the data sheet. */ - if (!WAS_RESET_BY_WATCHDOG() && !WAS_RESET_BY_SOFTWARE()) { + if (!WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) { #if !defined(BOOT) while(g_tmr10ms < (RESET_WAIT_DELAY_MS/10)) {}; //wait measured from the power-on #else diff --git a/radio/src/targets/taranis/pwr_driver.c b/radio/src/targets/taranis/pwr_driver.c index b02ba3b14..6ad746999 100644 --- a/radio/src/targets/taranis/pwr_driver.c +++ b/radio/src/targets/taranis/pwr_driver.c @@ -37,11 +37,11 @@ #include "board_taranis.h" #include "../../pwr.h" -extern volatile uint32_t g_tmr10ms; -#define get_tmr10ms() g_tmr10ms - void pwrInit() { + // if any changes are done to the PWR PIN or pwrOn() function + // then the same changes must be done in _bootStart() + GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Pin = PWR_GPIO_PIN_ON; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; @@ -84,23 +84,29 @@ void pwrOff() { GPIO_ResetBits(PWR_GPIO, PWR_GPIO_PIN_ON); -#if defined(REV9E) - // 9E needs watchdog reset because CPU is still running while the power - // key is held pressed by the user - while (1) { + // disable interrupts + __disable_irq(); + + while(1) { wdt_reset(); -#if 0 - // It doesn't work correctly, if we press long on the pwr button, the radio restarts when the button is released - PWR->CR |= PWR_CR_CWUF; - /* Select STANDBY mode */ - PWR->CR |= PWR_CR_PDDS; - /* Set SLEEPDEEP bit of Cortex System Control Register */ - SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk; - /* Request Wait For Event */ - __WFE(); +#if defined(REV9E) + // 9E needs watchdog reset because CPU is still running while + // the power key is held pressed by the user. + // The power key should be released by now, but we must make sure + if (!pwrPressed()) { + // Put the CPU into sleep to reduce the consumption, + // it might help with the RTC reset issue + PWR->CR |= PWR_CR_CWUF; + /* Select STANDBY mode */ + PWR->CR |= PWR_CR_PDDS; + /* Set SLEEPDEEP bit of Cortex System Control Register */ + SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk; + /* Request Wait For Event */ + __WFE(); + } #endif } -#endif + //this function must not return! } #if defined(REV9E) diff --git a/radio/src/targets/taranis/uart3_driver.cpp b/radio/src/targets/taranis/serial2_driver.cpp similarity index 84% rename from radio/src/targets/taranis/uart3_driver.cpp rename to radio/src/targets/taranis/serial2_driver.cpp index d91ec4479..5b4f60036 100644 --- a/radio/src/targets/taranis/uart3_driver.cpp +++ b/radio/src/targets/taranis/serial2_driver.cpp @@ -36,8 +36,8 @@ #include "../../opentx.h" -uint8_t uart3Mode = UART_MODE_NONE; -Fifo<512> uart3TxFifo; +uint8_t serial2Mode = 0; +Fifo<512> serial2TxFifo; extern Fifo<512> telemetryFifo; extern Fifo<32> sbusFifo; @@ -73,17 +73,17 @@ void uart3Setup(unsigned int baudrate) NVIC_EnableIRQ(SERIAL_USART_IRQn); } -void uart3Init(unsigned int mode, unsigned int protocol) +void serial2Init(unsigned int mode, unsigned int protocol) { USART_DeInit(SERIAL_USART); - uart3Mode = false; + serial2Mode = mode; switch (mode) { case UART_MODE_TELEMETRY_MIRROR: uart3Setup(FRSKY_SPORT_BAUDRATE); break; -#if defined(DEBUG) +#if !defined(USB_SERIAL) && (defined(DEBUG) || defined(CLI)) case UART_MODE_DEBUG: uart3Setup(DEBUG_BAUDRATE); break; @@ -94,43 +94,38 @@ void uart3Init(unsigned int mode, unsigned int protocol) } break; } - - uart3Mode = mode; } -void uart3Putc(const char c) +void serial2Putc(char c) { - uart3TxFifo.push(c); + while (serial2TxFifo.isFull()); + serial2TxFifo.push(c); USART_ITConfig(SERIAL_USART, USART_IT_TXE, ENABLE); } -#if defined(DEBUG) -void debugPutc(const char c) -{ - if (uart3Mode == UART_MODE_DEBUG) { - uart3Putc(c); - } -} -#endif - -void uart3SbusInit() +void serial2SbusInit() { uart3Setup(100000); SERIAL_USART->CR1 |= USART_CR1_M | USART_CR1_PCE ; } -void uart3Stop() +void serial2Stop() { USART_DeInit(SERIAL_USART); } +uint8_t serial2TracesEnabled() +{ + return (serial2Mode == 0); +} + #if !defined(SIMU) extern "C" void SERIAL_USART_IRQHandler(void) { // Send if (USART_GetITStatus(SERIAL_USART, USART_IT_TXE) != RESET) { uint8_t txchar; - if (uart3TxFifo.pop(txchar)) { + if (serial2TxFifo.pop(txchar)) { /* Write one byte to the transmit data register */ USART_SendData(SERIAL_USART, txchar); } @@ -145,13 +140,18 @@ extern "C" void SERIAL_USART_IRQHandler(void) uint8_t data = SERIAL_USART->DR; if (!(status & USART_FLAG_ERRORS)) { - switch (uart3Mode) { + switch (serial2Mode) { case UART_MODE_TELEMETRY: telemetryFifo.push(data); break; case UART_MODE_SBUS_TRAINER: sbusFifo.push(data); break; +#if !defined(USB_SERIAL) && defined(CLI) + case UART_MODE_DEBUG: + cliRxFifo.push(data); + break; +#endif } } diff --git a/radio/src/targets/taranis/usb_conf.h b/radio/src/targets/taranis/usb_conf.h index a1e0279d4..a84c15bba 100644 --- a/radio/src/targets/taranis/usb_conf.h +++ b/radio/src/targets/taranis/usb_conf.h @@ -47,7 +47,7 @@ * when FS core is used. *******************************************************************************/ #ifndef USE_USB_OTG_FS - #define USE_USB_OTG_FS + #define USE_USB_OTG_FS // USB2.0 Full Speed == 12 Mbit #endif /* USE_USB_OTG_FS */ #ifdef USE_USB_OTG_FS diff --git a/radio/src/targets/taranis/usb_driver.c b/radio/src/targets/taranis/usb_driver.c index 97963ce06..448752fe3 100644 --- a/radio/src/targets/taranis/usb_driver.c +++ b/radio/src/targets/taranis/usb_driver.c @@ -35,8 +35,6 @@ */ #include "board_taranis.h" -#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h" -#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h" int usbPlugged(void) { @@ -63,28 +61,24 @@ USB_OTG_CORE_HANDLE USB_OTG_dev; void OTG_FS_IRQHandler(void) { - USBD_OTG_ISR_Handler (&USB_OTG_dev); + USBD_OTG_ISR_Handler(&USB_OTG_dev); } void usbInit(void) -{ - USB_OTG_BSP_Init(&USB_OTG_dev); -} - -void usbStart(void) { #if defined(USB_JOYSTICK) // initialize USB as HID device USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_HID_cb, &USR_cb); +#elif defined(USB_SERIAL) + // initialize USB as CDC device (virtual serial port) + USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_CDC_cb, &USR_cb); #elif defined(USB_MASS_STORAGE) // initialize USB as MSC device USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_MSC_cb, &USR_cb); #endif } -#if defined(USB_JOYSTICK) -void usbStop(void) +void usbDeInit(void) { USBD_DeInit(&USB_OTG_dev); } -#endif diff --git a/radio/src/targets/taranis/usbd_cdc.cpp b/radio/src/targets/taranis/usbd_cdc.cpp new file mode 100644 index 000000000..7b1a44634 --- /dev/null +++ b/radio/src/targets/taranis/usbd_cdc.cpp @@ -0,0 +1,222 @@ +/** + ****************************************************************************** + * @file usbd_cdc_vcp.c + * @author MCD Application Team + * @version V1.1.0 + * @date 19-March-2012 + * @brief Generic media access Layer. + ****************************************************************************** + * @attention + * + *

© COPYRIGHT 2012 STMicroelectronics

+ * + * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.st.com/software_license_agreement_liberty_v2 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ****************************************************************************** + */ + +#ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED +#pragma data_alignment = 4 +#endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */ + +#include "opentx.h" + +extern "C" { + +/* Includes ------------------------------------------------------------------*/ +#include "usb_conf.h" + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + + +/* These are external variables imported from CDC core to be used for IN + transfer management. */ +extern uint8_t APP_Rx_Buffer []; /* Write CDC received data in this buffer. + These data will be sent over USB IN endpoint + in the CDC core functions. */ +extern volatile uint32_t APP_Rx_ptr_in; /* Increment this pointer or roll it back to + start address when writing received data + in the buffer APP_Rx_Buffer. */ +extern volatile uint32_t APP_Rx_ptr_out; + +/* Private function prototypes -----------------------------------------------*/ +static uint16_t VCP_Init (void); +static uint16_t VCP_DeInit (void); +static uint16_t VCP_Ctrl (uint32_t Cmd, uint8_t* Buf, uint32_t Len); +static uint16_t VCP_DataRx (uint8_t* Buf, uint32_t Len); + +// static uint16_t VCP_COMConfig(uint8_t Conf); + +CDC_IF_Prop_TypeDef VCP_fops = +{ + VCP_Init, + VCP_DeInit, + VCP_Ctrl, + 0, + VCP_DataRx +}; + +} // extern "C" + +bool cdcConnected = false; + +/* Private functions ---------------------------------------------------------*/ +/** + * @brief VCP_Init + * Initializes the Media on the STM32 + * @param None + * @retval Result of the opeartion (USBD_OK in all cases) + */ +static uint16_t VCP_Init(void) +{ + cdcConnected = true; + return USBD_OK; +} + +/** + * @brief VCP_DeInit + * DeInitializes the Media on the STM32 + * @param None + * @retval Result of the opeartion (USBD_OK in all cases) + */ +static uint16_t VCP_DeInit(void) +{ + cdcConnected = false; + return USBD_OK; +} + + +/** + * @brief VCP_Ctrl + * Manage the CDC class requests + * @param Cmd: Command code + * @param Buf: Buffer containing command data (request parameters) + * @param Len: Number of data to be sent (in bytes) + * @retval Result of the opeartion (USBD_OK in all cases) + */ +static uint16_t VCP_Ctrl (uint32_t Cmd, uint8_t* Buf, uint32_t Len) +{ + switch (Cmd) + { + case SEND_ENCAPSULATED_COMMAND: + /* Not needed for this driver */ + break; + + case GET_ENCAPSULATED_RESPONSE: + /* Not needed for this driver */ + break; + + case SET_COMM_FEATURE: + /* Not needed for this driver */ + break; + + case GET_COMM_FEATURE: + /* Not needed for this driver */ + break; + + case CLEAR_COMM_FEATURE: + /* Not needed for this driver */ + break; + + case SET_LINE_CODING: + /* Not needed for this driver */ + break; + + case GET_LINE_CODING: + /* Not needed for this driver */ + break; + + case SET_CONTROL_LINE_STATE: + /* Not needed for this driver */ + break; + + case SEND_BREAK: + /* Not needed for this driver */ + break; + + default: + break; + } + + return USBD_OK; +} + +// some debug vars +uint16_t usbWraps = 0; +uint16_t charsWritten = 0; + +void usbSerialPutc(uint8_t c) +{ + if (!cdcConnected) return; + + uint32_t txDataLen; + do { + txDataLen = APP_RX_DATA_SIZE + APP_Rx_ptr_in - APP_Rx_ptr_out; + if (txDataLen >= APP_RX_DATA_SIZE) { + txDataLen -= APP_RX_DATA_SIZE; + } + } while (txDataLen >= (APP_RX_DATA_SIZE - CDC_DATA_MAX_PACKET_SIZE)); + + APP_Rx_Buffer[APP_Rx_ptr_in] = c; + ++charsWritten; + /* To avoid buffer overflow */ + if (APP_Rx_ptr_in >= APP_RX_DATA_SIZE-1) { + APP_Rx_ptr_in = 0; + ++usbWraps; + } + else { + APP_Rx_ptr_in++; + } +} + +/** + * @brief VCP_DataRx + * Data received over USB OUT endpoint is available here + * + * @note + * This function will block any OUT packet reception on USB endpoint + * until exiting this function. If you exit this function before transfer + * is complete on CDC interface (ie. using DMA controller) it will result + * in receiving more data while previous ones are still not sent. + * + * @note + * This function is executed inside the USBD_OTG_ISR_Handler() interrupt handler! + + * @param Buf: Buffer of data to be received + * @param Len: Number of data received (in bytes) + * @retval Result of the opeartion: USBD_OK if all operations are OK else VCP_FAIL + */ +static uint16_t VCP_DataRx (uint8_t* Buf, uint32_t Len) +{ + // TODO: try implementing inbound flow control: + // if the cliRxFifo does not have enough free space to receive all + // available characters, return VCP_FAIL. Maybe that will throttle down + // the sender and we will receive the same packet at a later time. + +#if defined(CLI) + //copy data to the application FIFO + for (uint32_t i = 0; i < Len; i++) + { + cliRxFifo.push(Buf[i]); + } +#endif + + return USBD_OK; +} + + + +// /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/radio/src/targets/taranis/usbd_conf.h b/radio/src/targets/taranis/usbd_conf.h index 7308a64c8..557973a26 100644 --- a/radio/src/targets/taranis/usbd_conf.h +++ b/radio/src/targets/taranis/usbd_conf.h @@ -36,13 +36,13 @@ #define USBD_ITF_MAX_NUM 1 #define USB_MAX_STR_DESC_SIZ 64 -#define USBD_SELF_POWERED +#define USBD_SELF_POWERED /* Class Layer Parameter */ #define MSC_IN_EP 0x81 #define MSC_OUT_EP 0x01 -#define MSC_MAX_PACKET 64 +#define MSC_MAX_PACKET 64 #define MSC_MEDIA_PACKET 4096 @@ -52,6 +52,17 @@ #define HID_IN_PACKET 9 #define HID_OUT_PACKET 9 +#define CDC_IN_EP 0x81 /* EP1 for data IN */ +#define CDC_OUT_EP 0x01 /* EP1 for data OUT */ +#define CDC_CMD_EP 0x82 /* EP2 for CDC commands */ + +/* CDC Endpoints parameters: you can fine tune these values depending on the needed baudrates and performance. */ +#define CDC_DATA_MAX_PACKET_SIZE 64 /* Endpoint IN & OUT Packet size */ +#define CDC_CMD_PACKET_SZE 8 /* Control Endpoint Packet size */ + +#define CDC_IN_FRAME_INTERVAL 5 /* Number of frames between IN transfers */ +#define APP_RX_DATA_SIZE 512 // USB serial port output buffer. TODO: tune this buffer size /* Total size of IN buffer: APP_RX_DATA_SIZE*8/MAX_BAUDARATE*1000 should be > CDC_IN_FRAME_INTERVAL */ +#define APP_FOPS VCP_fops #endif //__USBD_CONF__H__ diff --git a/radio/src/targets/taranis/usbd_desc.c b/radio/src/targets/taranis/usbd_desc.c index f61065a2a..2c2011255 100644 --- a/radio/src/targets/taranis/usbd_desc.c +++ b/radio/src/targets/taranis/usbd_desc.c @@ -73,6 +73,11 @@ #define USBD_PRODUCT_FS_STRING "FrSky Taranis Joystick" #define USBD_CONFIGURATION_FS_STRING "HID Config" #define USBD_INTERFACE_FS_STRING "HID Interface" +#elif defined(USB_SERIAL) + #define USBD_PID 0x5740 // do not change, this ID is used by the ST USB driver for Windows + #define USBD_PRODUCT_FS_STRING "FrSky Taranis Serial Port" + #define USBD_CONFIGURATION_FS_STRING "VSP Config" + #define USBD_INTERFACE_FS_STRING "VSP Interface" #elif defined(USB_MASS_STORAGE) #define USBD_PID 0x5720 #define USBD_PRODUCT_FS_STRING "FrSky Taranis Mass Storage" diff --git a/radio/src/tasks_arm.cpp b/radio/src/tasks_arm.cpp index 8d3762411..7b990e387 100644 --- a/radio/src/tasks_arm.cpp +++ b/radio/src/tasks_arm.cpp @@ -36,11 +36,10 @@ #include "opentx.h" -#define MENUS_STACK_SIZE 2000 -#define MIXER_STACK_SIZE 500 -#define AUDIO_STACK_SIZE 500 -#define BT_STACK_SIZE 500 -#define DEBUG_STACK_SIZE 500 +#define MENUS_STACK_SIZE 2000 +#define MIXER_STACK_SIZE 500 +#define AUDIO_STACK_SIZE 500 +#define BLUETOOTH_STACK_SIZE 500 #if defined(_MSC_VER) #define _ALIGNED(x) __declspec(align(x)) @@ -49,78 +48,85 @@ #endif OS_TID menusTaskId; -// stack must be aligned to 8 bytes otherwise printf for %f does not work! -OS_STK _ALIGNED(8) menusStack[MENUS_STACK_SIZE]; +// menus stack must be aligned to 8 bytes otherwise printf for %f does not work! +TaskStack _ALIGNED(8) menusStack; OS_TID mixerTaskId; -OS_STK mixerStack[MIXER_STACK_SIZE]; +TaskStack mixerStack; OS_TID audioTaskId; -OS_STK audioStack[AUDIO_STACK_SIZE]; +TaskStack audioStack; #if defined(BLUETOOTH) OS_TID btTaskId; -OS_STK btStack[BT_STACK_SIZE]; -#endif - -#if defined(DEBUG) -OS_TID debugTaskId; -OS_STK debugStack[DEBUG_STACK_SIZE]; +TaskStack bluetoothStack; #endif OS_MutexID audioMutex; OS_MutexID mixerMutex; -void stack_paint() +enum TaskIndex { + MENU_TASK_INDEX, + MIXER_TASK_INDEX, + AUDIO_TASK_INDEX, + CLI_TASK_INDEX, + BLUETOOTH_TASK_INDEX, + TASK_INDEX_COUNT, + MAIN_TASK_INDEX = 255 +}; + +template +void TaskStack::paint() { - for (uint32_t i=0; i +uint16_t TaskStack::size() { - OS_STK *stack; - uint32_t size; + return SIZE*4; +} - switch(tid) { - case 0: - stack = menusStack; - size = MENUS_STACK_SIZE; - break; - case 1: - stack = mixerStack; - size = MIXER_STACK_SIZE; - break; - case 2: - stack = audioStack; - size = AUDIO_STACK_SIZE; - break; -#if defined(PCBTARANIS) - case 255: - #if defined(SIMU) - return 1024; - #else - // main stack - stack = (OS_STK *)&_main_stack_start; - size = ((unsigned char *)&_estack - (unsigned char *)&_main_stack_start) / 4; - #endif - break; -#endif - default: - return 0; +uint16_t getStackAvailable(void * address, uint16_t size) +{ + uint32_t * array = (uint32_t *)address; + uint16_t i = 0; + while (i < size && array[i] == 0x55555555) { + i++; } - - uint32_t i=0; - for (; i +uint16_t TaskStack::available() +{ + return getStackAvailable(stack, SIZE); +} + +void stackPaint() +{ + menusStack.paint(); + mixerStack.paint(); + audioStack.paint(); +#if defined(CLI) + cliStack.paint(); +#endif +} + +#if defined(CPUSTM32) && !defined(SIMU) +uint16_t stackSize() +{ + return ((unsigned char *)&_estack - (unsigned char *)&_main_stack_start) / 4; +} + +uint16_t stackAvailable() +{ + return getStackAvailable(&_main_stack_start, stackSize()); +} +#endif + #if !defined(SIMU) void mixerTask(void * pdata) @@ -182,7 +188,7 @@ void menusTask(void * pdata) } } -#if defined(REV9E) +#if defined(PCBTARANIS) && defined(REV9E) topLcdOff(); #endif @@ -196,12 +202,7 @@ void menusTask(void * pdata) #endif opentxClose(); - -#if !defined(SIMU) - SysTick->CTRL = 0; // turn off systick -#endif - - pwrOff(); // Only turn power off if necessary + boardOff(); // Only turn power off if necessary } extern void audioTask(void* pdata); @@ -210,17 +211,17 @@ void tasksStart() { CoInitOS(); -#if defined(CPUARM) && defined(DEBUG) && !defined(SIMU) - debugTaskId = CoCreateTaskEx(debugTask, NULL, 10, &debugStack[DEBUG_STACK_SIZE-1], DEBUG_STACK_SIZE, 1, false); +#if defined(CLI) + cliStart(); #endif #if defined(BLUETOOTH) - btTaskId = CoCreateTask(btTask, NULL, 15, &btStack[BT_STACK_SIZE-1], BT_STACK_SIZE); + btTaskId = CoCreateTask(btTask, NULL, 15, &bluetoothStack.stack[BLUETOOTH_STACK_SIZE-1], BLUETOOTH_STACK_SIZE); #endif - mixerTaskId = CoCreateTask(mixerTask, NULL, 5, &mixerStack[MIXER_STACK_SIZE-1], MIXER_STACK_SIZE); - menusTaskId = CoCreateTask(menusTask, NULL, 10, &menusStack[MENUS_STACK_SIZE-1], MENUS_STACK_SIZE); - audioTaskId = CoCreateTask(audioTask, NULL, 7, &audioStack[AUDIO_STACK_SIZE-1], AUDIO_STACK_SIZE); + mixerTaskId = CoCreateTask(mixerTask, NULL, 5, &mixerStack.stack[MIXER_STACK_SIZE-1], MIXER_STACK_SIZE); + menusTaskId = CoCreateTask(menusTask, NULL, 10, &menusStack.stack[MENUS_STACK_SIZE-1], MENUS_STACK_SIZE); + audioTaskId = CoCreateTask(audioTask, NULL, 7, &audioStack.stack[AUDIO_STACK_SIZE-1], AUDIO_STACK_SIZE); #if !defined(SIMU) audioMutex = CoCreateMutex(); diff --git a/radio/src/tasks_arm.h b/radio/src/tasks_arm.h new file mode 100644 index 000000000..e4d61db91 --- /dev/null +++ b/radio/src/tasks_arm.h @@ -0,0 +1,61 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#ifndef _TASKS_ARM_H_ +#define _TASKS_ARM_H_ + +#if !defined(SIMU) +extern "C" { +#include +} +#endif + +template +class TaskStack +{ + public: + TaskStack() { } + void paint(); + uint16_t size(); + uint16_t available(); + OS_STK stack[SIZE]; +}; + +void stackPaint(); +uint16_t stackSize(); +uint16_t stackAvailable(); + +#endif // _TASKS_ARM_H_ diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp index bb832b122..2402eb8f1 100644 --- a/radio/src/telemetry/frsky.cpp +++ b/radio/src/telemetry/frsky.cpp @@ -165,8 +165,8 @@ NOINLINE void processSerialData(uint8_t data) #endif #if defined(PCBTARANIS) - if (g_eeGeneral.uart3Mode == UART_MODE_TELEMETRY_MIRROR) { - uart3Putc(data); + if (g_eeGeneral.serial2Mode == UART_MODE_TELEMETRY_MIRROR) { + serial2Putc(data); } #endif @@ -604,7 +604,7 @@ void telemetryInit(void) } else if (telemetryProtocol==PROTOCOL_FRSKY_D_SECONDARY) { telemetryPortInit(0); - telemetrySecondPortInit(PROTOCOL_FRSKY_D_SECONDARY); + serial2TelemetryInit(PROTOCOL_FRSKY_D_SECONDARY); } else { telemetryPortInit(FRSKY_SPORT_BAUDRATE); diff --git a/radio/src/telemetry/mavlink.h b/radio/src/telemetry/mavlink.h index 9c76b54c6..63ae2f661 100644 --- a/radio/src/telemetry/mavlink.h +++ b/radio/src/telemetry/mavlink.h @@ -43,10 +43,8 @@ #define MAVLINK_COMM_NUM_BUFFERS 1 #include "GCS_MAVLink/include_v1.0/mavlink_types.h" -#include "serial.h" +#include "targets/common_avr/serial_driver.h" #include "opentx.h" -#include "serial.h" -//#include "include/mavlink_helpers.h" extern mavlink_system_t mavlink_system; diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 2c85a702d..872e389c2 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -1,6 +1,7 @@ #include "../opentx.h" TelemetryItem telemetryItems[MAX_SENSORS]; +uint8_t allowNewSensors; void TelemetryItem::gpsReceived() { @@ -491,11 +492,11 @@ void setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t instance if (telemetrySensor.type == TELEM_TYPE_CUSTOM && telemetrySensor.id == id && (telemetrySensor.instance == instance || g_model.ignoreSensorIds)) { telemetryItems[index].setValue(telemetrySensor, value, unit, prec); available = true; - // we continue search here, because more than one sensor can have the same id and instance + // we continue search here, because sensors can share the same id and instance } } - if (available) { + if (available || !allowNewSensors) { return; } diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index 37e89e492..5885f95bd 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -165,6 +165,7 @@ class TelemetryItem }; extern TelemetryItem telemetryItems[MAX_SENSORS]; +extern uint8_t allowNewSensors; inline bool isTelemetryFieldAvailable(int index) { diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp index 2db052dcd..c82109319 100644 --- a/radio/src/tests/frsky.cpp +++ b/radio/src/tests/frsky.cpp @@ -129,6 +129,8 @@ TEST(FrSky, Vfas_0x39_HiPrecision) TELEMETRY_RESET(); EXPECT_EQ(telemetryItems[0].value, 0); + allowNewSensors = true; + // normal precision, resolution 0.1V processHubPacket(VFAS_ID, 1234); // set value of 123.4V EXPECT_EQ(telemetryItems[0].value, 12340); // stored value has resolution of 0.01V @@ -148,6 +150,8 @@ TEST(FrSky, HubAltNegative) TELEMETRY_RESET(); EXPECT_EQ(telemetryItems[0].value, 0); + allowNewSensors = true; + // altimeter auto offset processHubPacket(BARO_ALT_BP_ID, 0); processHubPacket(BARO_ALT_AP_ID, 0); diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp index e3cebfbf3..dbba72798 100644 --- a/radio/src/tests/lcd.cpp +++ b/radio/src/tests/lcd.cpp @@ -92,7 +92,7 @@ void doPaint(QPainter & p) } } -bool checkScreenshot(QString test) +bool checkScreenshot(const QString & test) { lcdRefresh(); QImage buffer(LCD_W, LCD_H, QImage::Format_RGB32); diff --git a/radio/src/tests/timers.cpp b/radio/src/tests/timers.cpp index 4eff9c825..5b526afb2 100644 --- a/radio/src/tests/timers.cpp +++ b/radio/src/tests/timers.cpp @@ -38,42 +38,6 @@ #include "opentx.h" #include "timers.h" -/* -struct TimerState { - uint16_t cnt; - uint16_t sum; - uint8_t state; - int16_t val; - uint8_t val_10ms; -}; - -PACK(typedef struct t_TimerData { - int8_t mode; // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw - uint16_t start; - uint8_t countdownBeep:2; - uint8_t minuteBeep:1; - uint8_t persistent:2; // 0 off, 1 flight, 2 manual reset - uint8_t spare:3; - uint16_t value; -}) TimerData; - -enum TimerModes { - TMRMODE_NONE, - TMRMODE_ABS, - TMRMODE_THR, - TMRMODE_THR_REL, - TMRMODE_THR_TRG, - TMRMODE_COUNT -}; - -enum CountDownModes { - COUNTDOWN_SILENT, - COUNTDOWN_BEEPS, - COUNTDOWN_VOICE -}; - -*/ - #if !defined(CPUARM) #undef timerSet void timerSet(int idx, int16_t val) diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c index a91772b71..3856f778d 100644 --- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c +++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c @@ -122,7 +122,7 @@ static uint8_t usbd_cdc_SOF (void *pdev); CDC specific management functions *********************************************/ static void Handle_USBAsynchXfer (void *pdev); -static uint8_t *USBD_cdc_GetCfgDesc (uint8_t speed, uint16_t *length); +static const uint8_t *USBD_cdc_GetCfgDesc (uint8_t speed, uint16_t *length); #ifdef USE_USB_OTG_HS static uint8_t *USBD_cdc_GetOtherCfgDesc (uint8_t speed, uint16_t *length); #endif @@ -134,7 +134,7 @@ static uint8_t *USBD_cdc_GetOtherCfgDesc (uint8_t speed, uint16_t *length); * @{ */ extern CDC_IF_Prop_TypeDef APP_FOPS; -extern uint8_t USBD_DeviceDesc [USB_SIZ_DEVICE_DESC]; +extern const uint8_t USBD_DeviceDesc [USB_SIZ_DEVICE_DESC]; #ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED #if defined ( __ICCARM__ ) /*!< IAR Compiler */ @@ -179,8 +179,8 @@ __ALIGN_BEGIN uint8_t APP_Rx_Buffer [APP_RX_DATA_SIZE] __ALIGN_END ; #endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */ __ALIGN_BEGIN uint8_t CmdBuff[CDC_CMD_PACKET_SZE] __ALIGN_END ; -uint32_t APP_Rx_ptr_in = 0; -uint32_t APP_Rx_ptr_out = 0; +volatile uint32_t APP_Rx_ptr_in = 0; +volatile uint32_t APP_Rx_ptr_out = 0; uint32_t APP_Rx_length = 0; uint8_t USB_Tx_State = 0; @@ -782,7 +782,7 @@ static void Handle_USBAsynchXfer (void *pdev) * @param length : pointer data length * @retval pointer to descriptor buffer */ -static uint8_t *USBD_cdc_GetCfgDesc (uint8_t speed, uint16_t *length) +static const uint8_t *USBD_cdc_GetCfgDesc (uint8_t speed, uint16_t *length) { *length = sizeof (usbd_cdc_CfgDesc); return usbd_cdc_CfgDesc; diff --git a/radio/src/timers.cpp b/radio/src/timers.cpp index bc591c0f9..4826eea64 100644 --- a/radio/src/timers.cpp +++ b/radio/src/timers.cpp @@ -188,15 +188,15 @@ void evalTimers(int16_t throttle, uint8_t tick10ms) timerState->val = newTimerVal; if (timerState->state == TMR_RUNNING) { if (g_model.timers[i].countdownBeep && g_model.timers[i].start) { - if (newTimerVal==30) { + if (newTimerVal == 30) { AUDIO_TIMER_30(); // TRACE("Timer[%d] 30s announcement", i); } - if (newTimerVal==20) { + if (newTimerVal == 20) { AUDIO_TIMER_20(); // TRACE("Timer[%d] 20s announcement", i); } - if (newTimerVal<=10) { + if (newTimerVal <= 10) { AUDIO_TIMER_LT10(g_model.timers[i].countdownBeep, newTimerVal); // TRACE("Timer[%d] %ds announcement", i, newTimerVal); } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index febcbb99c..cf2f7cd9b 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -570,7 +570,11 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_ONLYPOSITIVE[] PROGMEM = TR_ONLYPOSITIVE; const pm_char STR_FILTER[] PROGMEM = TR_FILTER; const pm_char STR_TELEMETRYFULL[] PROGMEM = TR_TELEMETRYFULL; - const pm_char STR_IGNOREIDS[] PROGMEM = TR_IGNOREIDS; + const pm_char STR_IGNORE_INSTANCE[] PROGMEM = TR_IGNORE_INSTANCE; + const pm_char STR_DISCOVER_SENSORS[] PROGMEM = TR_DISCOVER_SENSORS; + const pm_char STR_STOP_DISCOVER_SENSORS[] PROGMEM = TR_STOP_DISCOVER_SENSORS; + const pm_char STR_DELETE_ALL_SENSORS[] PROGMEM = TR_DELETE_ALL_SENSORS; + const pm_char STR_CONFIRMDELETE[] PROGMEM = TR_CONFIRMDELETE; #endif #if defined(PCBTARANIS) @@ -590,6 +594,10 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_SMOOTH[] PROGMEM = TR_SMOOTH; const pm_char STR_COPY_STICKS_TO_OFS[] PROGMEM = TR_COPY_STICKS_TO_OFS; const pm_char STR_COPY_TRIMS_TO_OFS[] PROGMEM = TR_COPY_TRIMS_TO_OFS; + const pm_char STR_INCDEC[] PROGMEM = TR_INCDEC; + const pm_char STR_GLOBALVAR[] PROGMEM = TR_GLOBALVAR; + const pm_char STR_MIXSOURCE[] PROGMEM = TR_MIXSOURCE; + const pm_char STR_CONSTANT[] PROGMEM = TR_CONSTANT; const pm_char STR_TOP_BAR[] PROGMEM = TR_TOP_BAR; const pm_char STR_ALTITUDE[] PROGMEM = TR_ALTITUDE; const pm_char STR_SCALE[] PROGMEM = TR_SCALE; diff --git a/radio/src/translations.h b/radio/src/translations.h index 651a0fe13..88ac0147b 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -789,7 +789,11 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_ONLYPOSITIVE[]; extern const pm_char STR_FILTER[]; extern const pm_char STR_TELEMETRYFULL[]; - extern const pm_char STR_IGNOREIDS[]; + extern const pm_char STR_IGNORE_INSTANCE[]; + extern const pm_char STR_DISCOVER_SENSORS[]; + extern const pm_char STR_STOP_DISCOVER_SENSORS[]; + extern const pm_char STR_DELETE_ALL_SENSORS[]; + extern const pm_char STR_CONFIRMDELETE[]; #endif #if defined(PCBTARANIS) @@ -809,6 +813,10 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_SMOOTH[]; extern const pm_char STR_COPY_STICKS_TO_OFS[]; extern const pm_char STR_COPY_TRIMS_TO_OFS[]; + extern const pm_char STR_INCDEC[]; + extern const pm_char STR_GLOBALVAR[]; + extern const pm_char STR_MIXSOURCE[]; + extern const pm_char STR_CONSTANT[]; extern const pm_char STR_TOP_BAR[]; extern const pm_char STR_ALTITUDE[]; extern const pm_char STR_SCALE[]; @@ -827,13 +835,13 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_MENU_HELI[]; extern const pm_char STR_MENU_TRIMS[]; extern const pm_char STR_MENU_SWITCHES[]; -extern const pm_char STR_MENU_LOGICAL_SWITCHES[]; + extern const pm_char STR_MENU_LOGICAL_SWITCHES[]; extern const pm_char STR_MENU_TRAINER[]; extern const pm_char STR_MENU_CHANNELS[]; extern const pm_char STR_MENU_GVARS[]; extern const pm_char STR_MENU_TELEMETRY[]; -extern const pm_char STR_MENU_OTHER[]; -extern const pm_char STR_MENU_INVERT[]; + extern const pm_char STR_MENU_OTHER[]; + extern const pm_char STR_MENU_INVERT[]; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4fffeae9b..5a40422cf 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -119,7 +119,7 @@ #define TR_VDISPLAYTRIMS "Ne\0 ""Změna\0""Ano\0 " #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "Ne\0 ""Zvuk\0 ""Hlas\0 " +#define TR_VBEEPCOUNTDOWN "Ne\0 ""Zvuk\0 ""Hlas\0 Haptic" #define LEN_VVARIOCENTER "\005" #define TR_VVARIOCENTER "Tón\0 ""Ticho" @@ -487,23 +487,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ZAP""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ZAP""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ZAP""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -949,6 +943,10 @@ #define TR_SMOOTH "Hladká" #define TR_COPY_STICKS_TO_OFS "Kopie pák do subtrimu" #define TR_COPY_TRIMS_TO_OFS "Kopíe trimů do subtrimu" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH TR(INDENT "Str mAh", INDENT "Ukládat mAh") #define TR_PREFLIGHT "Předletová kontrola" #define TR_CHECKLIST INDENT "Zobrazit poznámky" @@ -1074,12 +1072,16 @@ #define TR_ALTSENSOR "Senzor výšky" #define TR_CELLSENSOR "Senzor článků" #define TR_GPSSENSOR "GPS senzor" -#define TR_CURRENTSENSOR "Sensor proudu" +#define TR_CURRENTSENSOR "Senzor" #define TR_AUTOOFFSET "Auto ofset" #define TR_ONLYPOSITIVE "Jen kladné" #define TR_FILTER "Filtr" #define TR_TELEMETRYFULL "Všechny sloty jsou plné!" -#define TR_IGNOREIDS INDENT "Ignoruj chyby ID" +#define TR_IGNORE_INSTANCE INDENT "Ignoruj chyby ID" +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" #define TR_MENU_INPUTS "\314Vstupy" #define TR_MENU_LUA "\322Lua skripty" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index f0bc56e99..d9db63ae1 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -124,7 +124,7 @@ #define TR_VDISPLAYTRIMS "Nein\0 ""Kurz\0 ""Ja\0" //Trimmwerte Keine, kurze Anzeigen, Ja #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "Kein\0 Pieps\0Stimme" +#define TR_VBEEPCOUNTDOWN "Kein\0 Pieps\0StimmeHaptic" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Ton\0 ""Ruhe " @@ -491,23 +491,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -953,6 +947,10 @@ #define TR_SMOOTH "Runden" #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_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH TR(INDENT "Spr. mAh", INDENT "Speichern mAh") //9XR-Pro #define TR_PREFLIGHT TR("---Vorflug-Checkliste--", "----Vorflug-Checkliste----") #define TR_CHECKLIST TR(INDENT "Checkliste", INDENT "Checkliste anzeigen") //9XR-Pro @@ -1078,12 +1076,16 @@ #define TR_ALTSENSOR "Höhen Sensor" #define TR_CELLSENSOR "Zellen Sensor" #define TR_GPSSENSOR "GPS Sensor" -#define TR_CURRENTSENSOR "Strom Sensor" +#define TR_CURRENTSENSOR "Sensor" #define TR_AUTOOFFSET "Auto Offset" #define TR_ONLYPOSITIVE "Nur Positiv" #define TR_FILTER "Filter aktiv" #define TR_TELEMETRYFULL "Telemetriezeilen voll!" -#define TR_IGNOREIDS INDENT "Ignore instance" +#define TR_IGNORE_INSTANCE INDENT "Ignore instance" +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" // ----------------------------- Symbole für Auswahlliste---------- #define TR_MENU_INPUTS "\314Inputs" #define TR_MENU_LUA "\322Lua Scripte" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 133566315..4cafc0e9a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -119,7 +119,7 @@ #define TR_VDISPLAYTRIMS "No\0 ""Change""Yes\0" #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" +#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0Haptic" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tone\0 ""Silent" @@ -486,23 +486,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -544,8 +538,8 @@ #define LEN_VFORMULAS "\010" #define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" -#define LEN_VPREC "\005" -#define TR_VPREC "PREC0""PREC1""PREC2" +#define LEN_VPREC "\004" +#define TR_VPREC "0.--""0.0 ""0.00" #define LEN_VCELLINDEX "\007" #define TR_VCELLINDEX "Lowest\0""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Highest""Delta\0" @@ -948,6 +942,10 @@ #define TR_SMOOTH "Smooth" #define TR_COPY_STICKS_TO_OFS "Copy sticks to subtrim" #define TR_COPY_TRIMS_TO_OFS "Copy trims to subtrim" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH TR(INDENT "Str mAh", INDENT "Persistent mAh") #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Display Checklist") @@ -1073,12 +1071,16 @@ #define TR_ALTSENSOR "Alt sensor" #define TR_CELLSENSOR "Cell sensor" #define TR_GPSSENSOR "GPS sensor" -#define TR_CURRENTSENSOR "Curr. sensor" +#define TR_CURRENTSENSOR "Sensor" #define TR_AUTOOFFSET "Auto Offset" #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_IGNOREIDS TR(INDENT "No inst.","Ignore instance") +#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "Ignore instances") +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" #define TR_MENU_INPUTS "\314Inputs" #define TR_MENU_LUA "\322Lua scripts" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 5567fd123..98d124fef 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -119,7 +119,7 @@ #define TR_VDISPLAYTRIMS "No\0 ""Change""Yes\0" #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voz\0" +#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voz\0 Haptic" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tone\0 ""Silent" @@ -471,23 +471,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -522,8 +516,8 @@ #define LEN_VFORMULAS "\010" #define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" -#define LEN_VPREC "\005" -#define TR_VPREC "PREC0""PREC1""PREC2" +#define LEN_VPREC "\004" +#define TR_VPREC "0.--""0.0 ""0.00" #define LEN_VCELLINDEX "\007" #define TR_VCELLINDEX "Lowest\0""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Highest""Delta\0" @@ -903,6 +897,10 @@ #define TR_SMOOTH "Smooth" #define TR_COPY_STICKS_TO_OFS "Copy Sticks To Offset" #define TR_COPY_TRIMS_TO_OFS "Copy trims to subtrim" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH INDENT "Valor mAh" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" @@ -1028,12 +1026,16 @@ #define TR_ALTSENSOR "Alt sensor" #define TR_CELLSENSOR "Cell sensor" #define TR_GPSSENSOR "GPS sensor" -#define TR_CURRENTSENSOR "Current sensor" +#define TR_CURRENTSENSOR "Sensor" #define TR_AUTOOFFSET "Auto Offset" #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_IGNOREIDS INDENT "Ignore instance" +#define TR_IGNORE_INSTANCE INDENT "Ignore instance" +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" #define TR_MENU_INPUTS "\314Inputs" #define TR_MENU_LUA "\322Lua scripts" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 8edfeaa02..d028f9086 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -119,7 +119,7 @@ #define TR_VDISPLAYTRIMS "No\0 ""Change""Yes\0" #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" +#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0Haptic" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tone\0 ""Silent" @@ -471,23 +471,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -522,8 +516,8 @@ #define LEN_VFORMULAS "\010" #define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" -#define LEN_VPREC "\005" -#define TR_VPREC "PREC0""PREC1""PREC2" +#define LEN_VPREC "\004" +#define TR_VPREC "0.--""0.0 ""0.00" #define LEN_VCELLINDEX "\007" #define TR_VCELLINDEX "Lowest\0""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Highest""Delta\0" @@ -903,6 +897,10 @@ #define TR_SMOOTH "Smooth" #define TR_COPY_STICKS_TO_OFS "Copy Sticks To Offset" #define TR_COPY_TRIMS_TO_OFS "Copy trims to subtrim" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" @@ -1028,12 +1026,16 @@ #define TR_ALTSENSOR "Alt sensor" #define TR_CELLSENSOR "Cell sensor" #define TR_GPSSENSOR "GPS sensor" -#define TR_CURRENTSENSOR "Current sensor" +#define TR_CURRENTSENSOR "Sensor" #define TR_AUTOOFFSET "Auto Offset" #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_IGNOREIDS INDENT "Ignore instance" +#define TR_IGNORE_INSTANCE INDENT "Ignore instance" +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" #define TR_MENU_INPUTS "\314Inputs" #define TR_MENU_LUA "\322Lua scripts" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index aef5876c9..01c8db114 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -119,7 +119,7 @@ #define TR_VDISPLAYTRIMS "Non\0 ""Change""Oui\0" #define LEN_VBEEPCOUNTDOWN "\007" -#define TR_VBEEPCOUNTDOWN "Aucun\0 ""Bips\0 ""Voix\0 " +#define TR_VBEEPCOUNTDOWN "Aucun\0 ""Bips\0 ""Voix\0 Haptic\0" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tone\0 ""Silent" @@ -486,23 +486,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""Un" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""Un" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""Un" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -544,8 +538,8 @@ #define LEN_VFORMULAS "\010" #define TR_VFORMULAS "Addition""Moyenne\0""Min\0 ""Max\0 ""Multipl.""Totalise""Elément\0""Consomm.""Distance" -#define LEN_VPREC "\005" -#define TR_VPREC "PREC0""PREC1""PREC2" +#define LEN_VPREC "\004" +#define TR_VPREC "0.--""0.0 ""0.00" #define LEN_VCELLINDEX "\007" #define TR_VCELLINDEX "Mini.\0 ""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Maxi.\0 ""Diff.\0 " @@ -720,7 +714,7 @@ #define OFS_RX 4 #define TR_ACCEL "Acc:" #define TR_NODATA CENTER "NO DATA" -#define TR_TOTTM1TM2THRTHP "\037\146SES\036TM1\037\146TM2\036000GAZ\037\146GZ%" +#define TR_TOTTM1TM2THRTHP "\037\146SES\036TM1\037\146TM2\036GAZ\037\146GZ%" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define STR_US (STR_TMR1LATMAXUS+13) #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" @@ -940,6 +934,10 @@ #define TR_SMOOTH "Lissage" #define TR_COPY_STICKS_TO_OFS "Manche vers subtrim" #define TR_COPY_TRIMS_TO_OFS "Trim vers subtrim" +#define TR_INCDEC "Inc/Décrementer" +#define TR_GLOBALVAR "Var. Globale" +#define TR_MIXSOURCE "Source mixeur" +#define TR_CONSTANT "Constante" #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh") #define TR_PREFLIGHT "Vérifications avant vol" #define TR_CHECKLIST TR(INDENT "Notes", INDENT "Afficher notes") @@ -951,7 +949,7 @@ #define TR_EEBACKUP "\004[ENTER Long]: Sauvegarder l'EEPROM" #define TR_FACTORYRESET "\016[MENU Long]: RAZ d'usine" #define TR_CONFIRMRESET "Effacer TOUS modèles/réglages?" -#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" +#define TR_TO_MANY_LUA_SCRIPTS "Trop de scripts lua!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "RSSI Max" @@ -1065,12 +1063,16 @@ #define TR_ALTSENSOR "Capteur Alt" #define TR_CELLSENSOR "Capteur Elém" #define TR_GPSSENSOR "Capteur GPS" -#define TR_CURRENTSENSOR "Capt courant" +#define TR_CURRENTSENSOR "Capteur" #define TR_AUTOOFFSET "Offset auto" #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filtrage" #define TR_TELEMETRYFULL "Plus de capteurs libres!" -#define TR_IGNOREIDS TR(INDENT "Ign. inst.",INDENT "Ignorer instance") +#define TR_IGNORE_INSTANCE TR(INDENT "Ign. inst.",INDENT "Ignorer instance") +#define TR_DISCOVER_SENSORS INDENT "Découvrir capteurs" +#define TR_STOP_DISCOVER_SENSORS INDENT "Terminer découverte" +#define TR_DELETE_ALL_SENSORS TR(INDENT "Suppr. tous capteurs",INDENT "Supprimer tous capteurs") +#define TR_CONFIRMDELETE TR("Tout effacer?","Vraiment tout effacer?") #define TR_MENU_INPUTS "\314Entrées" #define TR_MENU_LUA "\322Scripts Lua" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 3b9c64a3e..0ef44d023 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -122,7 +122,7 @@ #define TR_VDISPLAYTRIMS "No\0 ""Cambio""Si\0 " #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "NienteSuoni\0Voce\0 " +#define TR_VBEEPCOUNTDOWN "NienteSuoni\0Voce\0 Haptic" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tono\0 ""Silent" @@ -489,23 +489,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -547,8 +541,8 @@ #define LEN_VFORMULAS "\011" #define TR_VFORMULAS "Somma\0 ""Media\0 ""Min\0 ""Max\0 ""Moltipl\0 ""Totalizza""Cella\0 ""Consumo\0 ""Distanza\0" -#define LEN_VPREC "\005" -#define TR_VPREC "PREC0""PREC1""PREC2" +#define LEN_VPREC "\004" +#define TR_VPREC "0.--""0.0 ""0.00" #define LEN_VCELLINDEX "\010" #define TR_VCELLINDEX "Minore\0 ""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Maggiore""Delta\0" @@ -951,6 +945,10 @@ #define TR_SMOOTH "Smussa" #define TR_COPY_STICKS_TO_OFS "Copia Stick su Offset" #define TR_COPY_TRIMS_TO_OFS "Copia Trim in Subtrim" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH INDENT "Memo mAh" #define TR_PREFLIGHT "Controlli Prevolo" #define TR_CHECKLIST INDENT "Mostra Checklist" @@ -1076,12 +1074,16 @@ #define TR_ALTSENSOR "Sensore Alt" #define TR_CELLSENSOR "Sensore Cell" #define TR_GPSSENSOR "Sensore GPS" -#define TR_CURRENTSENSOR "Sensore Currente" +#define TR_CURRENTSENSOR "Sensore" #define TR_AUTOOFFSET "Auto Offset" #define TR_ONLYPOSITIVE "Positivo" #define TR_FILTER "Filtro" #define TR_TELEMETRYFULL "Tutti gli slot sono pieni!" -#define TR_IGNOREIDS TR(INDENT "No inst.","Ignora instanza") +#define TR_IGNORE_INSTANCE TR(INDENT "No inst.","Ignora instanza") +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" #define TR_MENU_INPUTS "\314Ingressi" #define TR_MENU_LUA "\322Lua scripts" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index c1d9bc433..757c0fae0 100755 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -122,7 +122,7 @@ #define TR_VDISPLAYTRIMS "Nee\0 ""Kort\0 ""Ja\0 " #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "StilteBeeps\0Spraak" +#define TR_VBEEPCOUNTDOWN "StilteBeeps\0SpraakTril\0 " #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tonen\0""Stilte" @@ -319,22 +319,22 @@ #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0") + #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0 ""RotEnc B\0 ") #elif ROTARY_ENCODERS == 1 - #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif #if LCD_W >= 212 - #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " + #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " #elif defined(CPUARM) #define TR_FSW_RESET_TIMERS "Tmr1""Tmr2""Tmr3" #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 TR_VFSWRESET TR(TR_FSW_RESET_TIMERS "All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, TR_FSW_RESET_TIMERS "Vliegdata\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") @@ -489,23 +489,27 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else + + +#if !defined(PCBTARANIS) + + #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES + + #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + + + + + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -545,7 +549,8 @@ #define TR_VSENSORTYPES "Custom\0 ""Berekend" #define LEN_VFORMULAS "\014" -#define TR_VFORMULAS "Optellen\0 ""Gemiddeld\0 ""Min\0 ""Max\0 ""Vermenigvuld""Totaal\0 ""Cellen\0 ""Verbruik\0 ""Afstand\0 " +#define TR_VFORMULAS "Optellen\0 ""Gemiddeld\0 ""Min\0 ""Max\0 ""Vermenigvuld""Totaal\0 ""Cellen\0 ""Verbruik\0 ""Afstand\0 " + #define LEN_VPREC "\004" // "\005" Prec0 Prec1 Prec2 @@ -956,9 +961,13 @@ #define TR_COUNT "Punten" #define TR_PT "Pt" #define TR_PTS "Ptn" -#define TR_SMOOTH "Afronden" +#define TR_SMOOTH "Zacht" #define TR_COPY_STICKS_TO_OFS "Kopieer Sticks naar Subtrim" #define TR_COPY_TRIMS_TO_OFS "Kopieer Trim naar Subtrim" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Globale Var" +#define TR_MIXSOURCE "Mixer Bron" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH TR(INDENT "Str mAh", INDENT "Vasthouden mAh") #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Display Checklist") @@ -1089,7 +1098,11 @@ #define TR_ONLYPOSITIVE "Geen Negatief" #define TR_FILTER "Filter aktief" #define TR_TELEMETRYFULL "Telemetrie slots vol!" -#define TR_IGNOREIDS TR(INDENT "Neg. ID ","Negeer ID's") +#define TR_IGNORE_INSTANCE TR(INDENT "Neg. ID ","Negeer ID's") +#define TR_DISCOVER_SENSORS INDENT "Ontdek nieuwe sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop ontdekking" +#define TR_DELETE_ALL_SENSORS INDENT "Wis alle sensors" +#define TR_CONFIRMDELETE "Echt alles wissen?" #define TR_MENU_INPUTS "\314Inputs" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index c1755638a..f766963c9 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -123,7 +123,7 @@ #define TR_VDISPLAYTRIMS "Nie\0 ""Zmień\0""Tak\0" #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "Cichy Pik \0Dźwięk" +#define TR_VBEEPCOUNTDOWN "Cichy Pik \0DźwiękWibrac" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Ton\0 ""Cicho " @@ -490,23 +490,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "GAZ""SK ""SW ""LOT""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -548,8 +542,8 @@ #define LEN_VFORMULAS "\010" /*8 decimal*/ #define TR_VFORMULAS "Dodaj\0 ""Średnie\0""Min\0 ""Max\0 ""Mnóż\0 ""Zliczani""Komórka\0""Zużycie\0""Zasięg\0 " -#define LEN_VPREC "\005" -#define TR_VPREC "PREC0""PREC1""PREC2" +#define LEN_VPREC "\004" +#define TR_VPREC "0.--""0.0 ""0.00" #define LEN_VCELLINDEX "\007" #define TR_VCELLINDEX "Niskie\0""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Wysokie""Delta\0" @@ -952,6 +946,10 @@ #define TR_SMOOTH "Gładka" #define TR_COPY_STICKS_TO_OFS "Skopiuj Drążki Do Offsetu" #define TR_COPY_TRIMS_TO_OFS "Skopiuj Trymery Do subtrymerów" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH TR(INDENT "Zap. mAh", INDENT "Zapisz mAh") #define TR_PREFLIGHT "Lista Ostrzeżeń" #define TR_CHECKLIST TR(INDENT "Czeklista",INDENT "Pokaż Listę Ostrzeżeń") @@ -1077,12 +1075,16 @@ #define TR_ALTSENSOR "Alt sensor" #define TR_CELLSENSOR "Cell sensor" #define TR_GPSSENSOR "GPS sensor" -#define TR_CURRENTSENSOR "Curr. sensor" +#define TR_CURRENTSENSOR "Sensor" #define TR_AUTOOFFSET "Auto Ofset" #define TR_ONLYPOSITIVE "Dodatni" #define TR_FILTER "Filtr" #define TR_TELEMETRYFULL "Wszyskie miejsca zajęte!" -#define TR_IGNOREIDS INDENT "Ignoruj przypadek" +#define TR_IGNORE_INSTANCE INDENT "Ignoruj przypadek" +#define TR_DISCOVER_SENSORS INDENT "Znajdź nowe czujniki" +#define TR_STOP_DISCOVER_SENSORS INDENT "Szukanie STOP " +#define TR_DELETE_ALL_SENSORS INDENT "Usuń czujniki " +#define TR_CONFIRMDELETE "Usunąć wszystkie ?" #define TR_MENU_INPUTS "\314Wejści" #define TR_MENU_LUA "\322SkryptyLUA" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index a965d1e30..9b4f9bbbf 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -119,7 +119,7 @@ #define TR_VDISPLAYTRIMS "No\0 ""Change""Yes\0" #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" +#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0Haptic" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tone\0 ""Silent" @@ -471,23 +471,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -903,6 +897,10 @@ #define TR_SMOOTH "Smooth" #define TR_COPY_STICKS_TO_OFS "Copy Sticks To Offset" #define TR_COPY_TRIMS_TO_OFS "Copy trims to subtrim" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" @@ -1028,12 +1026,16 @@ #define TR_ALTSENSOR "Alt sensor" #define TR_CELLSENSOR "Cell sensor" #define TR_GPSSENSOR "GPS sensor" -#define TR_CURRENTSENSOR "Current sensor" +#define TR_CURRENTSENSOR "Sensor" #define TR_AUTOOFFSET "Auto Offset" #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_IGNOREIDS INDENT "Ignore instance" +#define TR_IGNORE_INSTANCE INDENT "Ignore instance" +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" #define TR_MENU_INPUTS "\314Inputs" #define TR_MENU_LUA "\322Lua scripts" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3655b6ffc..84065e28b 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -119,7 +119,7 @@ #define TR_VDISPLAYTRIMS "No\0 ""Change""Yes\0" #define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "Tyst\0 Pip\0 Röst\0 " +#define TR_VBEEPCOUNTDOWN "Tyst\0 Pip\0 Röst\0 Haptic" #define LEN_VVARIOCENTER "\006" #define TR_VVARIOCENTER "Tone\0 ""Silent" @@ -471,23 +471,17 @@ #define TR_ROTENC_SWITCHES #endif -#if defined(PCBTARANIS) && defined(REV9E) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301""SI\300""SI-""SI\301""SJ\300""SJ-""SJ\301""SK\300""SK-""SK\301""SL\300""SL-""SL\301""SM\300""SM-""SM\301""SN\300""SN-""SN\301""SO\300""SO-""SO\301""SP\300""SP-""SP\301""SQ\300""SQ-""SQ\301""SR\300""SR-""SR\301" -#elif defined(PCBTARANIS) - #define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH-""SH\301" -#else +#if !defined(PCBTARANIS) #define TR_PHYS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif +#define TR_ON_ONE_SWITCHES "ON\0""One" + #if defined(PCBTARANIS) - #if defined(REV9E) - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36""S41""S42""S43""S44""S45""S46" - #else - #define TR_6POS_POTS "S11""S12""S13""S14""S15""S16""S21""S22""S23""S24""S25""S26""S31""S32""S33""S34""S35""S36" - #endif - #define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + // only special switches here + #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #else - #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One" + #define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES #endif #if defined(HELI) @@ -522,8 +516,8 @@ #define LEN_VFORMULAS "\010" #define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" -#define LEN_VPREC "\005" -#define TR_VPREC "PREC0""PREC1""PREC2" +#define LEN_VPREC "\004" +#define TR_VPREC "0.--""0.0 ""0.00" #define LEN_VCELLINDEX "\007" #define TR_VCELLINDEX "Lowest\0""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Highest""Delta\0" @@ -903,6 +897,10 @@ #define TR_SMOOTH "Mjuk" #define TR_COPY_STICKS_TO_OFS "Spara spakar som offset" #define TR_COPY_TRIMS_TO_OFS "Spara trimmar som offset" +#define TR_INCDEC "Inc/Decrement" +#define TR_GLOBALVAR "Global Var" +#define TR_MIXSOURCE "Mixer Source" +#define TR_CONSTANT "Constant" #define TR_PERSISTENT_MAH INDENT "Lagra mAh" #define TR_PREFLIGHT "Startkontroller" #define TR_CHECKLIST TR(INDENT "Checklista", INDENT "Visa Checklista") @@ -1028,12 +1026,16 @@ #define TR_ALTSENSOR "Alt sensor" #define TR_CELLSENSOR "Cell sensor" #define TR_GPSSENSOR "GPS sensor" -#define TR_CURRENTSENSOR "Current sensor" +#define TR_CURRENTSENSOR "Sensor" #define TR_AUTOOFFSET "Auto Offset" #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_IGNOREIDS INDENT "Ignore instance" +#define TR_IGNORE_INSTANCE INDENT "Ignore instance" +#define TR_DISCOVER_SENSORS INDENT "Discover new sensors" +#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery" +#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors" +#define TR_CONFIRMDELETE "Really delete all?" #define TR_MENU_INPUTS "\314Inputs" #define TR_MENU_LUA "\322Lua scripts" diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index b605552fa..892fb57cd 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -88,7 +88,7 @@ I18N_PLAY_FUNCTION(pl, pushUnitPrompt, int16_t number, uint8_t unitprompt) test_2 =number % 10; int ten=0; ten=(number - (number % 10))/10; - if ((test_2 > 1 && test_2 < 5) && ten >2) + if ((test_2 > 1 && test_2 < 5) && ten >=2) PUSH_NUMBER_PROMPT(unitprompt+1); else PUSH_NUMBER_PROMPT(unitprompt+2); @@ -149,11 +149,16 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att) switch(unit) { case 0: break; +// ft/s + case 6: +// mph + case 8: +// feet case 10: - case 13: - case 15: - case 16: - case 17: +//mAh + case 14: +//flOz + case 21: att = ZENSKI; break; case 100: @@ -186,10 +191,14 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att) if (number >= 1000) { if (number >= 2000) PLAY_NUMBER(number / 1000, 0, 0); + if (number >= 2000 && number < 5000) PUSH_NUMBER_PROMPT(PL_PROMPT_TYSIACE); - else + else if (number >= 5000) + PUSH_NUMBER_PROMPT(PL_PROMPT_TYSIECY); + else PUSH_NUMBER_PROMPT(PL_PROMPT_TYSIAC); + number %= 1000; if (number == 0) number = -1; diff --git a/radio/util/add-issue-links.py b/radio/util/add-issue-links.py new file mode 100755 index 000000000..d5fd9fcf9 --- /dev/null +++ b/radio/util/add-issue-links.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + + +import sys +import os +import traceback +import time +import re +import re + + +inputFile = sys.argv[1] +inp = open(inputFile, "r") + +pattern = re.compile("#\d+") +while True: + skip = False + line = inp.readline() + if len(line) == 0: + break + line = line.strip('\r\n') + + if len(line) == 0: + skip = True + if line.startswith("<"): + skip = True + if line.startswith("["): + skip = True + + if not skip: + #line = line.strip() + #print "line: %s" % line + found = re.findall(pattern, line) + if len(found) > 0: + for issue in found: + line = line.replace(issue, '') + #add issues + issue_links = ["#%d" % (int(issue[1:]), int(issue[1:])) for issue in found] + links = "(" + ", ".join(issue_links) + ")" + line = "
  • " + line + " " + links + "
    • " + + print line + + +inp.close() +sys.exit(0)