");
str.append("| "+tr("Switch")+" | ");
str.append(""+tr("Function")+" | ");
@@ -1112,7 +1112,7 @@ void compareDialog::printFSwitches()
} else {
str.append(" | | | | | ");
}
- str.append(doTC(tr("CF")+QString("%1").arg(i+1),"",true));
+ str.append(doTC(tr("SF")+QString("%1").arg(i+1),"",true));
if (g_model2->funcSw[i].swtch.type) {
str.append(doTC(g_model2->funcSw[i].swtch.toString(),color2));
str.append(doTC(g_model2->funcSw[i].funcToString(),color2));
diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp
index 42bf463da..3e9ed21c9 100644
--- a/companion/src/customizesplashdialog.cpp
+++ b/companion/src/customizesplashdialog.cpp
@@ -142,7 +142,7 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
ui(new Ui::customizeSplashDialog)
{
ui->setupUi(this);
- this->setWindowIcon(CompanionIcon("paint.png"));
+ setWindowIcon(CompanionIcon("paintbrush.png"));
ui->leftLibraryButton->setIcon(CompanionIcon("library.png"));
ui->rightLibraryButton->setIcon(CompanionIcon("library.png"));
diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui
index 72b241276..9a6971893 100644
--- a/companion/src/customizesplashdialog.ui
+++ b/companion/src/customizesplashdialog.ui
@@ -10,7 +10,7 @@
0
0
1087
- 285
+ 298
@@ -165,6 +165,9 @@
QFrame::Plain
+
+ 0
+
@@ -470,6 +473,9 @@
QFrame::Plain
+
+ 0
+
diff --git a/companion/src/downloaddialog.cpp b/companion/src/downloaddialog.cpp
index 794dbbcd1..aa7ea6ef3 100644
--- a/companion/src/downloaddialog.cpp
+++ b/companion/src/downloaddialog.cpp
@@ -2,6 +2,7 @@
#include "ui_downloaddialog.h"
#include
#include
+#include
#include "helpers.h"
downloadDialog::downloadDialog(QWidget *parent, QString src, QString tgt) :
@@ -87,3 +88,14 @@ void downloadDialog::fileError()
file = 0;
reject();
}
+
+void downloadDialog::closeEvent( QCloseEvent * event)
+{
+ // Delay closing 2 seconds to avoid unpleasant flashing download dialogs
+ QTime closeTime= QTime::currentTime().addSecs(2);
+ while( QTime::currentTime() < closeTime )
+ QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
+
+ event->accept();
+}
+
diff --git a/companion/src/downloaddialog.h b/companion/src/downloaddialog.h
index 596002250..9730e3134 100644
--- a/companion/src/downloaddialog.h
+++ b/companion/src/downloaddialog.h
@@ -27,6 +27,7 @@ private slots:
void updateDataReadProgress(qint64 bytesRead, qint64 totalBytes);
private:
+ void closeEvent( QCloseEvent * event);
Ui::downloadDialog *ui;
QNetworkAccessManager qnam;
diff --git a/companion/src/eepromimportexport.h b/companion/src/eepromimportexport.h
index 242c1f7f7..0d7ea49ec 100644
--- a/companion/src/eepromimportexport.h
+++ b/companion/src/eepromimportexport.h
@@ -638,41 +638,45 @@ class ConversionField: public TransformedField {
virtual void beforeExport()
{
- int val = field;
+ _field = field;
if (scale) {
- val /= scale;
+ _field /= scale;
}
if (table) {
- if (table->exportValue(val, _field))
+ if (table->exportValue(_field, _field))
return;
if (!error.isEmpty())
EEPROMWarnings += error + "\n";
}
if (shift) {
- if (val < min) _field = min + shift;
- else if (val > max) _field = max + shift;
- else _field = val + shift;
+ if (_field < min) _field = min + shift;
+ else if (_field > max) _field = max + shift;
+ else _field += shift;
}
if (exportFunc) {
- _field = exportFunc(val);
+ _field = exportFunc(_field);
}
}
virtual void afterImport()
{
+ field = _field;
+
if (table) {
- if (table->importValue(_field, field))
+ if (table->importValue(field, field))
return;
}
- field = _field - shift;
+ if (shift) {
+ field -= shift;
+ }
if (importFunc) {
- field = importFunc(_field);
+ field = importFunc(field);
}
if (scale) {
diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 6ffcf3df3..91964ec18 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -127,11 +127,14 @@ RawSourceRange RawSource::getRange(bool singleprec)
result.max = singleprec ? 1540 : 3000;
break;
case TELEMETRY_SOURCE_T1:
+ case TELEMETRY_SOURCE_T1_MAX:
case TELEMETRY_SOURCE_T2:
+ case TELEMETRY_SOURCE_T2_MAX:
result.min = -30;
result.max = 225;
break;
case TELEMETRY_SOURCE_RPM:
+ case TELEMETRY_SOURCE_RPM_MAX:
result.step = singleprec ? 50 : 1;
result.max = singleprec ? 12750 : 20000;
break;
@@ -139,6 +142,7 @@ RawSourceRange RawSource::getRange(bool singleprec)
result.max = 100;
break;
case TELEMETRY_SOURCE_SPEED:
+ case TELEMETRY_SOURCE_SPEED_MAX:
result.step = singleprec ? 4 : 1;
result.max = singleprec ? 944 : 2000;
if (model && !model->frsky.imperial) {
@@ -147,21 +151,26 @@ RawSourceRange RawSource::getRange(bool singleprec)
}
break;
case TELEMETRY_SOURCE_DIST:
+ case TELEMETRY_SOURCE_DIST_MAX:
result.step = singleprec ? 8 : 1;
result.max = singleprec ? 2040 : 10000;
break;
case TELEMETRY_SOURCE_CELL:
+ case TELEMETRY_SOURCE_CELL_MIN:
result.step = singleprec ? 0.02 : 0.01;
result.max = 5.1;
result.decimals = 2;
break;
case TELEMETRY_SOURCE_CELLS_SUM:
+ case TELEMETRY_SOURCE_CELLS_MIN:
case TELEMETRY_SOURCE_VFAS:
+ case TELEMETRY_SOURCE_VFAS_MIN:
result.step = 0.1;
result.max = 25.5;
result.decimals = 1;
break;
case TELEMETRY_SOURCE_CURRENT:
+ case TELEMETRY_SOURCE_CURRENT_MAX:
result.step = singleprec ? 0.5 : 0.1;
result.max = singleprec ? 127.5 : 200.0;
result.decimals = 1;
@@ -171,6 +180,7 @@ RawSourceRange RawSource::getRange(bool singleprec)
result.max = singleprec ? 5100 : 10000;
break;
case TELEMETRY_SOURCE_POWER:
+ case TELEMETRY_SOURCE_POWER_MAX:
result.step = singleprec ? 5 : 1;
result.max = singleprec ? 1275 : 2000;
break;
@@ -222,20 +232,20 @@ QString RawSource::toString()
QObject::tr("A1"), QObject::tr("A2"), QObject::tr("A3"), QObject::tr("A4"),
QObject::tr("Alt"), QObject::tr("Rpm"), QObject::tr("Fuel"), QObject::tr("T1"), QObject::tr("T2"),
QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"),
- QObject::tr("Cell"), QObject::tr("Cels"), QObject::tr("Vfas"), QObject::tr("Curr"), QObject::tr("Cnsp"), QObject::tr("Powr"),
+ QObject::tr("Cell"), QObject::tr("Cells"), QObject::tr("Vfas"), QObject::tr("Curr"), QObject::tr("Cnsp"), QObject::tr("Powr"),
QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"),
QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("ASpd"), QObject::tr("dTE"),
QObject::tr("A1-"), QObject::tr("A2-"), QObject::tr("A3-"), QObject::tr("A4-"),
- QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Spd+"), QObject::tr("Dst+"),
- QObject::tr("Cel-"), QObject::tr("Cels-"), QObject::tr("Vfs-"), QObject::tr("Cur+"), QObject::tr("Pwr+"),
+ QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Speed+"), QObject::tr("Dist+"),
+ QObject::tr("Cell-"), QObject::tr("Cells-"), QObject::tr("Vfas-"), QObject::tr("Curr+"), QObject::tr("Powr+"),
QObject::tr("ACC"), QObject::tr("Time"),
};
static const QString virtualSwitches[] = {
- QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"),
- QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"),
- QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"),
- QObject::tr("LSV"), QObject::tr("LSW")
+ QObject::tr("L1"), QObject::tr("L2"), QObject::tr("L3"), QObject::tr("L4"), QObject::tr("L5"), QObject::tr("L6"), QObject::tr("L7"), QObject::tr("L8"), QObject::tr("L9"), QObject::tr("L10"),
+ QObject::tr("L11"), QObject::tr("L12"), QObject::tr("L13"), QObject::tr("L14"), QObject::tr("L15"), QObject::tr("L16"), QObject::tr("L17"), QObject::tr("L18"), QObject::tr("L19"), QObject::tr("L20"),
+ QObject::tr("L21"), QObject::tr("L22"), QObject::tr("L23"), QObject::tr("L24"), QObject::tr("L25"), QObject::tr("L26"), QObject::tr("L27"), QObject::tr("L28"), QObject::tr("L29"), QObject::tr("L30"),
+ QObject::tr("L31"), QObject::tr("L32")
};
if (index<0) {
@@ -265,7 +275,7 @@ QString RawSource::toString()
case SOURCE_TYPE_CYC:
return QObject::tr("CYC%1").arg(index+1);
case SOURCE_TYPE_PPM:
- return QObject::tr("PPM%1").arg(index+1);
+ return QObject::tr("TR%1").arg(index+1);
case SOURCE_TYPE_CH:
if (index < GetEepromInterface()->getCapability(Outputs))
return QObject::tr("CH%1%2").arg((index+1)/10).arg((index+1)%10);
@@ -312,10 +322,10 @@ QString RawSwitch::toString()
};
static const QString virtualSwitches[] = {
- QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"),
- QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"),
- QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"),
- QObject::tr("LSV"), QObject::tr("LSW")
+ QObject::tr("L1"), QObject::tr("L2"), QObject::tr("L3"), QObject::tr("L4"), QObject::tr("L5"), QObject::tr("L6"), QObject::tr("L7"), QObject::tr("L8"), QObject::tr("L9"), QObject::tr("L10"),
+ QObject::tr("L11"), QObject::tr("L12"), QObject::tr("L13"), QObject::tr("L14"), QObject::tr("L15"), QObject::tr("L16"), QObject::tr("L17"), QObject::tr("L18"), QObject::tr("L19"), QObject::tr("L20"),
+ QObject::tr("L21"), QObject::tr("L22"), QObject::tr("L23"), QObject::tr("L24"), QObject::tr("L25"), QObject::tr("L26"), QObject::tr("L27"), QObject::tr("L28"), QObject::tr("L29"), QObject::tr("L30"),
+ QObject::tr("L31"), QObject::tr("L32")
};
static const QString multiposPots[] = {
@@ -451,7 +461,7 @@ QString LogicalSwitchData::funcToString()
case LS_FN_STICKY:
return QObject::tr("Sticky");
case LS_FN_STAY:
- return QObject::tr("Stay");
+ return QObject::tr("Edge");
default:
return QObject::tr("Unknown");
}
@@ -782,115 +792,122 @@ QString FuncSwData::repeatToString()
GeneralSettings::GeneralSettings()
{
memset(this, 0, sizeof(GeneralSettings));
+
contrast = 25;
vBatWarn = 90;
- for (int i=0; i<(NUM_STICKS+C9X_NUM_POTS ); ++i) {
+
+ for (int i=0; igetBoard())) {
+ potsType[0] = 1;
+ potsType[1] = 1;
+ }
+
templateSetup = g.profile[g.id()].channelOrder();
stickMode = g.profile[g.id()].defaultMode();
- QString t_calib=g.profile[g.id()].stickPotCalib();
- int potsnum=GetEepromInterface()->getCapability(Pots);
- if (t_calib.isEmpty()) {
- return;
- }
- 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_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();
- QString t_DisplaySet=g.profile[g.id()].display();
- QString t_BeeperSet=g.profile[g.id()].beeper();
- QString t_HapticSet=g.profile[g.id()].haptic();
- QString t_SpeakerSet=g.profile[g.id()].speaker();
- QString t_CountrySet=g.profile[g.id()].countryCode();
+ QString t_calib=g.profile[g.id()].stickPotCalib();
+ int potsnum=GetEepromInterface()->getCapability(Pots);
+ if (t_calib.isEmpty()) {
+ return;
+ }
+ 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_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();
+ QString t_DisplaySet=g.profile[g.id()].display();
+ QString t_BeeperSet=g.profile[g.id()].beeper();
+ QString t_HapticSet=g.profile[g.id()].haptic();
+ QString t_SpeakerSet=g.profile[g.id()].speaker();
+ QString t_CountrySet=g.profile[g.id()].countryCode();
- if ((t_calib.length()==(NUM_STICKS+potsnum)*12) && (t_trainercalib.length()==16)) {
- QString Byte;
- int16_t byte16;
- bool ok;
- for (int i=0; i<(NUM_STICKS+potsnum); i++) {
- Byte=t_calib.mid(i*12,4);
- byte16=(int16_t)Byte.toInt(&ok,16);
- if (ok)
- calibMid[i]=byte16;
- Byte=t_calib.mid(4+i*12,4);
- byte16=(int16_t)Byte.toInt(&ok,16);
- if (ok)
- calibSpanNeg[i]=byte16;
- Byte=t_calib.mid(8+i*12,4);
- byte16=(int16_t)Byte.toInt(&ok,16);
- if (ok)
- calibSpanPos[i]=byte16;
- }
- for (int i=0; i<4; i++) {
- Byte=t_trainercalib.mid(i*4,4);
- byte16=(int16_t)Byte.toInt(&ok,16);
- if (ok)
- trainer.calib[i]=byte16;
- }
- currentCalib=t_currentCalib;
- vBatCalib=t_vBatCalib;
- vBatWarn=t_vBatWarn;
- PPM_Multiplier=t_PPM_Multiplier;
- stickMode = t_stickMode;
+ if ((t_calib.length()==(NUM_STICKS+potsnum)*12) && (t_trainercalib.length()==16)) {
+ QString Byte;
+ int16_t byte16;
+ bool ok;
+ for (int i=0; i<(NUM_STICKS+potsnum); i++) {
+ Byte=t_calib.mid(i*12,4);
+ byte16=(int16_t)Byte.toInt(&ok,16);
+ if (ok)
+ calibMid[i]=byte16;
+ Byte=t_calib.mid(4+i*12,4);
+ byte16=(int16_t)Byte.toInt(&ok,16);
+ if (ok)
+ calibSpanNeg[i]=byte16;
+ Byte=t_calib.mid(8+i*12,4);
+ byte16=(int16_t)Byte.toInt(&ok,16);
+ if (ok)
+ calibSpanPos[i]=byte16;
}
- if ((t_DisplaySet.length()==6) && (t_BeeperSet.length()==4) && (t_HapticSet.length()==6) && (t_SpeakerSet.length()==6)) {
- uint8_t byte8u;
- int8_t byte8;
- bool ok;
- byte8=(int8_t)t_DisplaySet.mid(0,2).toInt(&ok,16);
+ for (int i=0; i<4; i++) {
+ Byte=t_trainercalib.mid(i*4,4);
+ byte16=(int16_t)Byte.toInt(&ok,16);
if (ok)
- optrexDisplay=(byte8==1 ? true : false);
- byte8u=(uint8_t)t_DisplaySet.mid(2,2).toUInt(&ok,16);
+ trainer.calib[i]=byte16;
+ }
+ currentCalib=t_currentCalib;
+ vBatCalib=t_vBatCalib;
+ vBatWarn=t_vBatWarn;
+ PPM_Multiplier=t_PPM_Multiplier;
+ stickMode = t_stickMode;
+ }
+ if ((t_DisplaySet.length()==6) && (t_BeeperSet.length()==4) && (t_HapticSet.length()==6) && (t_SpeakerSet.length()==6)) {
+ uint8_t byte8u;
+ int8_t byte8;
+ bool ok;
+ byte8=(int8_t)t_DisplaySet.mid(0,2).toInt(&ok,16);
+ if (ok)
+ optrexDisplay=(byte8==1 ? true : false);
+ byte8u=(uint8_t)t_DisplaySet.mid(2,2).toUInt(&ok,16);
+ if (ok)
+ contrast=byte8u;
+ byte8u=(uint8_t)t_DisplaySet.mid(4,2).toUInt(&ok,16);
+ if (ok)
+ backlightBright=byte8u;
+ byte8=(int8_t)t_BeeperSet.mid(0,2).toUInt(&ok,16);
+ if (ok)
+ beeperMode=(BeeperMode)byte8;
+ byte8=(int8_t)t_BeeperSet.mid(2,2).toInt(&ok,16);
+ if (ok)
+ beeperLength=byte8;
+ byte8=(int8_t)t_HapticSet.mid(0,2).toUInt(&ok,16);
+ if (ok)
+ hapticMode=(BeeperMode)byte8;
+ byte8u=(uint8_t)t_HapticSet.mid(2,2).toUInt(&ok,16);
+ if (ok)
+ hapticStrength=byte8u;
+ byte8=(int8_t)t_HapticSet.mid(4,2).toInt(&ok,16);
+ if (ok)
+ hapticLength=byte8;
+ byte8u=(uint8_t)t_SpeakerSet.mid(0,2).toUInt(&ok,16);
+ if (ok)
+ speakerMode=byte8u;
+ byte8u=(uint8_t)t_SpeakerSet.mid(2,2).toUInt(&ok,16);
+ if (ok)
+ speakerPitch=byte8u;
+ byte8u=(uint8_t)t_SpeakerSet.mid(4,2).toUInt(&ok,16);
+ if (ok)
+ speakerVolume=byte8u;
+ if (t_CountrySet.length()==6) {
+ byte8u=(uint8_t)t_CountrySet.mid(0,2).toUInt(&ok,16);
if (ok)
- contrast=byte8u;
- byte8u=(uint8_t)t_DisplaySet.mid(4,2).toUInt(&ok,16);
+ countryCode=byte8u;
+ byte8u=(uint8_t)t_CountrySet.mid(2,2).toUInt(&ok,16);
if (ok)
- backlightBright=byte8u;
- byte8=(int8_t)t_BeeperSet.mid(0,2).toUInt(&ok,16);
- if (ok)
- beeperMode=(BeeperMode)byte8;
- byte8=(int8_t)t_BeeperSet.mid(2,2).toInt(&ok,16);
- if (ok)
- beeperLength=byte8;
- byte8=(int8_t)t_HapticSet.mid(0,2).toUInt(&ok,16);
- if (ok)
- hapticMode=(BeeperMode)byte8;
- byte8u=(uint8_t)t_HapticSet.mid(2,2).toUInt(&ok,16);
- if (ok)
- hapticStrength=byte8u;
- byte8=(int8_t)t_HapticSet.mid(4,2).toInt(&ok,16);
- if (ok)
- hapticLength=byte8;
- byte8u=(uint8_t)t_SpeakerSet.mid(0,2).toUInt(&ok,16);
- if (ok)
- speakerMode=byte8u;
- byte8u=(uint8_t)t_SpeakerSet.mid(2,2).toUInt(&ok,16);
- if (ok)
- speakerPitch=byte8u;
- byte8u=(uint8_t)t_SpeakerSet.mid(4,2).toUInt(&ok,16);
- if (ok)
- speakerVolume=byte8u;
- if (t_CountrySet.length()==6) {
- byte8u=(uint8_t)t_CountrySet.mid(0,2).toUInt(&ok,16);
- if (ok)
- countryCode=byte8u;
- byte8u=(uint8_t)t_CountrySet.mid(2,2).toUInt(&ok,16);
- if (ok)
- imperial=byte8u;
- QString chars=t_CountrySet.mid(4,2);
- ttsLanguage[0]=chars[0].toAscii();
- ttsLanguage[1]=chars[1].toAscii();
- }
+ imperial=byte8u;
+ QString chars=t_CountrySet.mid(4,2);
+ ttsLanguage[0]=chars[0].toAscii();
+ ttsLanguage[1]=chars[1].toAscii();
}
}
-
+ }
}
RawSource GeneralSettings::getDefaultSource(unsigned int channel) const
@@ -899,6 +916,15 @@ RawSource GeneralSettings::getDefaultSource(unsigned int channel) const
return RawSource(SOURCE_TYPE_STICK, stick_index);
}
+void FrSkyData::clear()
+{
+ memset(this, 0, sizeof(FrSkyData));
+ rssiAlarms[0].clear(2, 45);
+ rssiAlarms[1].clear(3, 42);
+ varioSource = 2/*VARIO*/;
+ blades = 2;
+}
+
ModelData::ModelData()
{
clear();
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 60e85ab79..15ee10c48 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -170,6 +170,19 @@ enum HeliSwashTypes {
extern const char * switches9X[];
extern const char * switchesX9D[];
+enum ThrottleSource {
+ THROTTLE_SOURCE_THR,
+ THROTTLE_SOURCE_P1,
+ THROTTLE_SOURCE_P2,
+ THROTTLE_SOURCE_P3,
+ THROTTLE_SOURCE_S1 = THROTTLE_SOURCE_P1,
+ THROTTLE_SOURCE_S2,
+ THROTTLE_SOURCE_S3,
+ THROTTLE_SOURCE_LS,
+ THROTTLE_SOURCE_RS,
+ THROTTLE_SOURCE_FIRST_CHANNEL,
+};
+
enum TelemetrySource {
TELEMETRY_SOURCE_TX_BATT,
TELEMETRY_SOURCE_TIMER1,
@@ -217,6 +230,7 @@ enum TelemetrySource {
TELEMETRY_SOURCE_CELL_MIN,
TELEMETRY_SOURCE_CELLS_MIN,
TELEMETRY_SOURCE_VFAS_MIN,
+ TELEMETRY_SOURCE_CURRENT_MAX,
TELEMETRY_SOURCE_POWER_MAX,
TELEMETRY_SOURCE_ACC,
TELEMETRY_SOURCE_GPS_TIME,
@@ -579,7 +593,6 @@ class MixData {
MixData() { clear(); }
unsigned int destCh; // 1..C9X_NUM_CHNOUT
RawSource srcRaw;
- unsigned int srcVariant;
int weight;
RawSwitch swtch;
CurveReference curve; //0=symmetrisch
@@ -804,7 +817,7 @@ class FrSkyData {
FrSkyChannelData channels[2];
unsigned int usrProto;
unsigned int imperial;
- unsigned int blades;
+ int blades;
unsigned int voltsSource;
bool altitudeDisplayed;
unsigned int currentSource;
@@ -820,7 +833,7 @@ class FrSkyData {
unsigned int storedMah;
int fasOffset;
- void clear() { memset(this, 0, sizeof(FrSkyData)); rssiAlarms[0].clear(2, 45); rssiAlarms[1].clear(3, 42); varioSource = 2/*VARIO*/; }
+ void clear();
};
class MavlinkData {
@@ -975,7 +988,6 @@ class RadioData {
// TODO rename FlightPhase to FlightMode
enum Capability {
- OwnerName,
FlightPhases,
FlightModesName,
FlightPhasesHaveFades,
@@ -1002,7 +1014,6 @@ enum Capability {
ExtraChannels,
ExtraInputs,
ExtendedTrims,
- HasInputFilter,
NumCurves,
NumCurvePoints,
OffsetWeight,
@@ -1015,11 +1026,7 @@ enum Capability {
Haptic,
HapticLength,
HapticMode,
- HasBlInvert,
HasBeeper,
- BandgapMeasure,
- PotScrolling,
- TrainerSwitch,
ModelTrainerEnable,
Timer2ThrTrig,
HasExpoNames,
@@ -1034,8 +1041,6 @@ enum Capability {
OptrexDisplay,
PPMExtCtrl,
PPMFrameLength,
- gsSwitchMask,
- BLonStickMove,
DSM2Indexes,
Telemetry,
TelemetryUnits,
@@ -1050,8 +1055,6 @@ enum Capability {
TelemetryCustomScreens,
TelemetryCustomScreensFieldsPerLine,
TelemetryRSSIModel,
- TelemetryAlarm,
- TelemetryInternalAlarm,
TelemetryTimeshift,
TelemetryMaxMultiplier,
HasAltitudeSel,
@@ -1059,9 +1062,6 @@ enum Capability {
HasVarioSink,
HasVariants,
HasFailsafe,
- HasPPMSim,
- HasCrossTrims,
- HasStickScroll,
HasSoundMixer,
NumModules,
PPMCenter,
@@ -1084,7 +1084,6 @@ enum Capability {
LuaInputs,
LimitsPer1000,
EnhancedCurves,
- TelemetryInternalAlarms,
HasFasOffset,
HasMahPersistent,
MultiposPots,
@@ -1373,6 +1372,11 @@ inline unsigned int GetCurrentFirmwareVariant()
return current_firmware_variant.variant;
}
+inline int divRoundClosest(const int n, const int d)
+{
+ return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
+}
+
#define CHECK_IN_ARRAY(T, index) ((unsigned int)index < (unsigned int)(sizeof(T)/sizeof(T[0])) ? T[(unsigned int)index] : "???")
#endif
diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp
index af05f58c5..bde6ef768 100644
--- a/companion/src/firmwares/er9x/er9xinterface.cpp
+++ b/companion/src/firmwares/er9x/er9xinterface.cpp
@@ -213,22 +213,14 @@ int Er9xInterface::getCapability(const Capability capability)
return 1;
case Timer2ThrTrig:
return 1;
- case TrainerSwitch:
- return 1;
case OffsetWeight:
return 125;
- case BandgapMeasure:
- return 1;
- case PotScrolling:
- return 1;
case SoundMod:
return 1;
case SoundPitch:
return 1;
case Haptic:
return 1;
- case OwnerName:
- return 10;
case Timers:
return 1;
case Pots:
@@ -251,10 +243,6 @@ int Er9xInterface::getCapability(const Capability capability)
return 0;
case Simulation:
return 1;
- case gsSwitchMask:
- return 1;
- case BLonStickMove:
- return 1;
case Telemetry:
return TM_HASTELEMETRY|TM_HASWSHH;
case TelemetryUnits:
@@ -270,14 +258,9 @@ int Er9xInterface::getCapability(const Capability capability)
case LCDWidth:
return 128;
case VoicesAsNumbers:
- case TelemetryInternalAlarm:
- case HasPPMSim:
- case HasCrossTrims:
- case HasStickScroll:
case HasAltitudeSel:
case HasContrast:
case HasVolume:
- case HasBlInvert:
case ModelVoice:
case Gvars:
return 7;
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
index 7ff98b5a1..91ae4ec59 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
@@ -255,22 +255,12 @@ int Ersky9xInterface::getCapability(const Capability capability)
return 1;
case Timer2ThrTrig:
return 1;
- case TrainerSwitch:
- return 1;
- case BandgapMeasure:
- return 1;
- case PotScrolling:
- return 1;
case SoundMod:
return 1;
case SoundPitch:
return 1;
case Haptic:
return 1;
- case OwnerName:
- return 10;
- case HasInputFilter:
- return 0;
case ModelVoice:
return 1;
case Timers:
@@ -297,10 +287,6 @@ int Ersky9xInterface::getCapability(const Capability capability)
return 0;
case Simulation:
return 1;
- case gsSwitchMask:
- return 1;
- case BLonStickMove:
- return 1;
case Telemetry:
return TM_HASTELEMETRY|TM_HASWSHH;
case TelemetryUnits:
diff --git a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
index 7a2ce5f46..2afe8ba03 100644
--- a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
+++ b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
@@ -219,8 +219,6 @@ int Gruvin9xInterface::getSize(GeneralSettings &settings)
int Gruvin9xInterface::getCapability(const Capability capability)
{
switch (capability) {
- case OwnerName:
- return 0;
case Mixes:
return G9X_MAX_MIXERS;
case FlightPhases:
diff --git a/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp b/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp
index 36b6229ac..d50b42cf0 100644
--- a/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp
+++ b/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp
@@ -681,7 +681,7 @@ t_Open9xArmFrSkyData_v210::operator FrSkyData ()
c9x.channels[1] = channels[1];
c9x.usrProto = usrProto;
c9x.voltsSource = voltsSource;
- c9x.blades = blades;
+ c9x.blades = blades+2;
c9x.currentSource=currentSource;
c9x.screens[0].type = 1;
for (int i=0; i<4; i++) {
@@ -709,7 +709,7 @@ t_Open9xArmFrSkyData_v211::operator FrSkyData ()
c9x.channels[1] = channels[1];
c9x.usrProto = usrProto;
c9x.voltsSource = voltsSource;
- c9x.blades = blades;
+ c9x.blades = blades+2;
c9x.currentSource=currentSource;
c9x.screens[0].type = 1;
for (int i=0; i<4; i++) {
diff --git a/companion/src/firmwares/opentx/open9xStockeeprom.cpp b/companion/src/firmwares/opentx/open9xStockeeprom.cpp
index 73cb22164..44c16e78b 100644
--- a/companion/src/firmwares/opentx/open9xStockeeprom.cpp
+++ b/companion/src/firmwares/opentx/open9xStockeeprom.cpp
@@ -843,7 +843,7 @@ t_Open9xFrSkyData_v204::operator FrSkyData ()
c9x.channels[1] = channels[1];
c9x.usrProto = usrProto;
c9x.imperial = imperial;
- c9x.blades = blades;
+ c9x.blades = blades+2;
c9x.screens[0].type = 1;
for (int i=0; i<4; i++)
c9x.screens[0].body.bars[i] = bars[i];
@@ -857,7 +857,7 @@ t_Open9xFrSkyData_v205::operator FrSkyData ()
c9x.channels[1] = channels[1];
c9x.usrProto = usrProto;
c9x.imperial = imperial;
- c9x.blades = blades;
+ c9x.blades = blades+2;
c9x.screens[0].type = 1;
for (int i=0; i<4; i++)
c9x.screens[0].body.bars[i] = bars[i];
@@ -873,7 +873,7 @@ t_Open9xFrSkyData_v208::operator FrSkyData ()
c9x.channels[1] = channels[1];
c9x.usrProto = usrProto;
c9x.voltsSource = voltsSource;
- c9x.blades = blades;
+ c9x.blades = blades+2;
c9x.currentSource=currentSource;
c9x.screens[0].type = 1;
for (int i=0; i<4; i++)
@@ -890,7 +890,7 @@ t_Open9xFrSkyData_v210::operator FrSkyData ()
c9x.channels[1] = channels[1];
c9x.usrProto = usrProto;
c9x.voltsSource = voltsSource;
- c9x.blades = blades;
+ c9x.blades = blades+2;
c9x.currentSource=currentSource;
int lines_screen_index = 0;
diff --git a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
index fb101b359..bca5842ad 100644
--- a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
@@ -74,6 +74,7 @@ namespace Open9xGruvin9x {
#include "radio/src/simpgmspace.cpp"
#include "radio/src/templates.cpp"
#include "radio/src/translations.cpp"
+#include "radio/src/fonts.cpp"
#include "radio/src/audio_avr.cpp"
#include "radio/src/buzzer.cpp"
#include "radio/src/targets/gruvin9x/somo14d.cpp"
diff --git a/companion/src/firmwares/opentx/opentxM128simulator.cpp b/companion/src/firmwares/opentx/opentxM128simulator.cpp
index a03045c2d..14100e857 100644
--- a/companion/src/firmwares/opentx/opentxM128simulator.cpp
+++ b/companion/src/firmwares/opentx/opentxM128simulator.cpp
@@ -73,6 +73,7 @@ namespace Open9xM128 {
#include "radio/src/simpgmspace.cpp"
#include "radio/src/templates.cpp"
#include "radio/src/translations.cpp"
+#include "radio/src/fonts.cpp"
#include "radio/src/audio_avr.cpp"
#include "radio/src/targets/stock/voice.cpp"
#include "radio/src/telemetry/frsky.cpp"
diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
index e17a14be3..21d9df740 100644
--- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
@@ -54,6 +54,7 @@
#define GPS
#define FAI_CHOICE
+#define NUM_POTS 3
#define EEPROM_VARIANT 3
#undef min
@@ -90,6 +91,7 @@ namespace Open9xSky9x {
#include "radio/src/simpgmspace.cpp"
#include "radio/src/templates.cpp"
#include "radio/src/translations.cpp"
+#include "radio/src/fonts.cpp"
#include "radio/src/telemetry/frsky.cpp"
#include "radio/src/targets/sky9x/audio_driver.cpp"
#include "radio/src/audio_arm.cpp"
diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index f147e1fc5..ed934036a 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -23,7 +23,6 @@
#define PCBTARANIS
#define CPUARM
#define HELI
-#define TEMPLATES
#define SPLASH
#define FLIGHT_MODES
#define FRSKY
@@ -54,6 +53,8 @@
#define LUA_MODEL_SCRIPTS
#define EEPROM_VARIANT 3
+#define NUM_POTS 5
+
#undef min
#undef max
@@ -71,7 +72,6 @@ inline int geteepromsize() {
#include "radio/src/protocols/ppm_arm.cpp"
#include "radio/src/protocols/pxx_arm.cpp"
#include "radio/src/protocols/dsm2_arm.cpp"
-#include "radio/src/targets/taranis/pwr_driver.cpp"
#include "radio/src/eeprom_common.cpp"
#include "radio/src/eeprom_conversions.cpp"
#include "radio/src/eeprom_rlc.cpp"
@@ -102,8 +102,8 @@ inline int geteepromsize() {
#undef SDCARD
#include "radio/src/simpgmspace.cpp"
#define SDCARD
-#include "radio/src/templates.cpp"
#include "radio/src/translations.cpp"
+#include "radio/src/fonts.cpp"
#include "radio/src/telemetry/frsky_sport.cpp"
#include "radio/src/targets/taranis/audio_driver.cpp"
#include "radio/src/audio_arm.cpp"
@@ -152,9 +152,6 @@ int16_t g_anas[NUM_STICKS+5];
uint16_t anaIn(uint8_t chan)
{
- if (chan == 8)
- return 1800;
- else
return g_anas[chan];
}
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 8a9744bc0..5f7d277ac 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -11,7 +11,7 @@
#define HAS_PERSISTENT_TIMERS(board) (IS_ARM(board) || board == BOARD_GRUVIN9X)
#define HAS_LARGE_LCD(board) IS_TARANIS(board)
#define MAX_VIEWS(board) (HAS_LARGE_LCD(board) ? 2 : 256)
-#define MAX_POTS(board, version) (IS_TARANIS(board) ? (version>=216 ? 5 : 4) : 3)
+#define MAX_POTS(board) (IS_TARANIS(board) ? 5 : 3)
#define MAX_SWITCHES(board) (IS_TARANIS(board) ? 8 : 7)
#define MAX_SWITCHES_POSITION(board) (IS_TARANIS(board) ? 22 : 9)
#define MAX_ROTARY_ENCODERS(board) (board==BOARD_GRUVIN9X ? 2 : (board==BOARD_SKY9X ? 1 : 0))
@@ -172,8 +172,11 @@ class SourcesConversionTable: public ConversionTable {
}
}
- for (int i=0; i<4+MAX_POTS(board, version); i++)
+ for (int i=0; i<4+MAX_POTS(board); i++) {
+ if (IS_TARANIS(board) && version < 216 && i==6)
+ continue;
addConversion(RawSource(SOURCE_TYPE_STICK, i), val++);
+ }
for (int i=0; i= 216)
+ addConversion(THROTTLE_SOURCE_S3, val++);
+ addConversion(THROTTLE_SOURCE_LS, val++);
+ addConversion(THROTTLE_SOURCE_RS, val++);
+ }
+ else {
+ addConversion(THROTTLE_SOURCE_P1, val++);
+ addConversion(THROTTLE_SOURCE_P2, val++);
+ addConversion(THROTTLE_SOURCE_P3, val++);
+ }
+
+ for (int i=0; i
class SwitchField: public ConversionField< SignedField > {
public:
@@ -384,8 +413,12 @@ class TelemetrySourcesConversionTable: public ConversionTable {
addConversion(1+TELEMETRY_SOURCE_T2_MAX, val++);
addConversion(1+TELEMETRY_SOURCE_SPEED_MAX, val++);
addConversion(1+TELEMETRY_SOURCE_DIST_MAX, val++);
- addConversion(1+TELEMETRY_SOURCE_CELL_MIN, val++);
- addConversion(1+TELEMETRY_SOURCE_VFAS_MIN, val++);
+ if (version >= 216) {
+ addConversion(1+TELEMETRY_SOURCE_CELL_MIN, val++);
+ addConversion(1+TELEMETRY_SOURCE_CELLS_MIN, val++);
+ addConversion(1+TELEMETRY_SOURCE_VFAS_MIN, val++);
+ }
+ addConversion(1+TELEMETRY_SOURCE_CURRENT_MAX, val++);
addConversion(1+TELEMETRY_SOURCE_POWER_MAX, val++);
if (IS_ARM(board) && version >= 216) {
for (int i=0; i<5; i++)
@@ -697,32 +730,36 @@ void concatGvarParam(int & gvar, const int _gvar, const unsigned int _gvarParam,
}
}
-void exportGvarParam(const int gvar, int & _gvar)
+void exportGvarParam(const int gvar, int & _gvar, int version)
{
+ int GV1 = (version >= 216 ? 4096 : 512);
+
if (gvar < -10000) {
- _gvar = 512 + gvar + 10000;
+ _gvar = GV1 + gvar + 10000;
}
else if (gvar > 10000) {
- _gvar = 512 + gvar - 10001;
+ _gvar = GV1 + gvar - 10001;
}
else {
_gvar = gvar;
}
}
-void importGvarParam(int & gvar, const int _gvar)
+void importGvarParam(int & gvar, const int _gvar, int version)
{
- if (_gvar >= 512) {
- gvar = 10001 + _gvar - 512;
+ int GV1 = (version >= 216 ? 4096 : 512);
+
+ if (_gvar >= GV1) {
+ gvar = 10001 + _gvar - GV1;
}
- else if (_gvar >= 512-5) {
- gvar = -10000 + _gvar - 512;
+ else if (_gvar >= GV1-9) {
+ gvar = -10000 + _gvar - GV1;
}
- else if (_gvar < -512) {
- gvar = -10000 + _gvar + 513;
+ else if (_gvar < -GV1) {
+ gvar = -10000 + _gvar + GV1 + 1;
}
- else if (_gvar < -512+5) {
- gvar = 10000 + _gvar + 513;
+ else if (_gvar < -GV1+9) {
+ gvar = 10000 + _gvar + GV1 + 1;
}
else {
gvar = _gvar;
@@ -744,12 +781,14 @@ class MixField: public TransformedField {
if (IS_TARANIS(board) && version >= 216) {
internalField.Append(new UnsignedField<8>(_destCh));
internalField.Append(new UnsignedField<16>(mix.phases));
- internalField.Append(new UnsignedField<8>((unsigned int &)mix.mltpx));
+ internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
+ internalField.Append(new UnsignedField<1>((unsigned int &)mix.carryTrim));
+ internalField.Append(new SpareBitsField<5>());
internalField.Append(new SignedField<16>(_weight));
internalField.Append(new SwitchField<8>(mix.swtch, board, version));
internalField.Append(new CurveReferenceField(mix.curve, board, version));
internalField.Append(new UnsignedField<4>(mix.mixWarn));
- internalField.Append(new UnsignedField<4>(mix.srcVariant));
+ internalField.Append(new SpareBitsField<4>());
internalField.Append(new UnsignedField<8>(mix.delayUp));
internalField.Append(new UnsignedField<8>(mix.delayDown));
internalField.Append(new UnsignedField<8>(mix.speedUp));
@@ -759,6 +798,26 @@ class MixField: public TransformedField {
internalField.Append(new ZCharField<8>(mix.name));
internalField.Append(new SpareBitsField<8>());
}
+ else if (IS_ARM(board) && version >= 216) {
+ internalField.Append(new UnsignedField<4>(_destCh));
+ internalField.Append(new UnsignedField<4>(mix.mixWarn));
+ internalField.Append(new UnsignedField<16>(mix.phases));
+ internalField.Append(new BoolField<1>(_curveMode));
+ internalField.Append(new BoolField<1>(mix.noExpo));
+ internalField.Append(new SignedField<3>(mix.carryTrim));
+ internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
+ internalField.Append(new SpareBitsField<1>());
+ internalField.Append(new SignedField<16>(_weight));
+ internalField.Append(new SwitchField<8>(mix.swtch, board, version));
+ internalField.Append(new SignedField<8>(_curveParam));
+ internalField.Append(new UnsignedField<8>(mix.delayUp));
+ internalField.Append(new UnsignedField<8>(mix.delayDown));
+ internalField.Append(new UnsignedField<8>(mix.speedUp));
+ internalField.Append(new UnsignedField<8>(mix.speedDown));
+ internalField.Append(new SourceField<8>(mix.srcRaw, board, version, FLAG_NOTELEMETRY));
+ internalField.Append(new SignedField<16>(_offset));
+ internalField.Append(new ZCharField<6>(mix.name));
+ }
else if (IS_ARM(board)) {
internalField.Append(new UnsignedField<8>(_destCh));
internalField.Append(new UnsignedField<16>(mix.phases));
@@ -775,7 +834,7 @@ class MixField: public TransformedField {
internalField.Append(new SignedField<8>(_curveParam));
if (version >= 214) {
internalField.Append(new UnsignedField<4>(mix.mixWarn));
- internalField.Append(new UnsignedField<4>(mix.srcVariant));
+ internalField.Append(new SpareBitsField<4>());
}
else {
internalField.Append(new UnsignedField<8>(mix.mixWarn));
@@ -865,9 +924,9 @@ class MixField: public TransformedField {
}
if (IS_ARM(board)) {
- exportGvarParam(mix.weight, _weight);
+ exportGvarParam(mix.weight, _weight, version);
if (version >= 214)
- exportGvarParam(mix.sOffset, _offset);
+ exportGvarParam(mix.sOffset, _offset, version);
else
splitGvarParam(mix.sOffset, _offset, _offsetMode, board, version);
}
@@ -879,7 +938,7 @@ class MixField: public TransformedField {
virtual void afterImport()
{
- if (IS_TARANIS(board) || version < 216) {
+ if (IS_TARANIS(board) && version < 216) {
if (mix.srcRaw.type == SOURCE_TYPE_STICK && mix.srcRaw.index < NUM_STICKS) {
if (!mix.noExpo) {
mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, mix.srcRaw.index, model);
@@ -900,9 +959,9 @@ class MixField: public TransformedField {
}
if (IS_ARM(board)) {
- importGvarParam(mix.weight, _weight);
+ importGvarParam(mix.weight, _weight, version);
if (version >= 214)
- importGvarParam(mix.sOffset, _offset);
+ importGvarParam(mix.sOffset, _offset, version);
else
concatGvarParam(mix.sOffset, _offset, _offsetMode, board, version);
}
@@ -910,6 +969,13 @@ class MixField: public TransformedField {
concatGvarParam(mix.weight, _weight, _weightMode, board, version);
concatGvarParam(mix.sOffset, _offset, _offsetMode, board, version);
}
+
+ if (IS_TARANIS(board) && version < 216) {
+ if (mix.sOffset >= -500 && mix.sOffset <= 500 && mix.weight >= -500 && mix.weight <= 500) {
+ mix.sOffset = divRoundClosest(mix.sOffset * mix.weight, 100);
+ }
+ if (mix.carryTrim < 0) mix.carryTrim = 0;
+ }
}
protected:
@@ -938,17 +1004,28 @@ class InputField: public TransformedField {
{
if (IS_TARANIS(board) && version >= 216) {
internalField.Append(new SourceField<8>(expo.srcRaw, board, version, 0));
- internalField.Append(new UnsignedField<16>(expo.scale));
+ internalField.Append(new UnsignedField<16>(expo.scale, "Scale"));
internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
internalField.Append(new SwitchField<8>(expo.swtch, board, version));
internalField.Append(new UnsignedField<16>(expo.phases));
internalField.Append(new SignedField<8>(_weight, "Weight"));
- internalField.Append(new SignedField<8>(expo.carryTrim));
+ internalField.Append(new SignedField<6>(expo.carryTrim, "CarryTrim"));
+ internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
internalField.Append(new ZCharField<8>(expo.name));
internalField.Append(new SignedField<8>(expo.offset, "Offset"));
internalField.Append(new CurveReferenceField(expo.curve, board, version));
internalField.Append(new SpareBitsField<8>());
}
+ else if (IS_ARM(board) && version >= 216) {
+ internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
+ internalField.Append(new UnsignedField<4>(expo.chn, "Channel"));
+ internalField.Append(new BoolField<2>(_curveMode));
+ internalField.Append(new SwitchField<8>(expo.swtch, board, version));
+ internalField.Append(new UnsignedField<16>(expo.phases, "Phases"));
+ internalField.Append(new SignedField<8>(_weight, "Weight"));
+ internalField.Append(new ZCharField<6>(expo.name));
+ internalField.Append(new SignedField<8>(_curveParam));
+ }
else if (IS_ARM(board)) {
internalField.Append(new UnsignedField<8>(expo.mode, "Mode"));
internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
@@ -1008,9 +1085,11 @@ class InputField: public TransformedField {
virtual void afterImport()
{
- if (IS_TARANIS(board) && version < 216) {
- if (expo.mode) {
- expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
+ if (IS_TARANIS(board)) {
+ if (version < 216) {
+ if (expo.mode) {
+ expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
+ }
}
}
@@ -1041,7 +1120,7 @@ class LimitField: public StructField {
LimitField(LimitData & limit, BoardEnum board, unsigned int version):
StructField("Limit")
{
- if (IS_ARM(board) && version >= 216) {
+ if (IS_TARANIS(board) && version >= 216) {
Append(new ConversionField< SignedField<16> >(limit.min, +1000));
Append(new ConversionField< SignedField<16> >(limit.max, -1000));
}
@@ -1808,7 +1887,7 @@ class AvrCustomFunctionField: public TransformedField {
internalField.Append(new UnsignedField<5>(_union_param));
internalField.Append(new UnsignedField<1>(_active));
}
- if (version >= 213) {
+ else if (version >= 213) {
internalField.Append(new SwitchField<8>(fn.swtch, board, version));
internalField.Append(new UnsignedField<3>(_union_param));
internalField.Append(new ConversionField< UnsignedField<5> >((unsigned int &)fn.func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
@@ -2069,7 +2148,7 @@ class FrskyField: public StructField {
else {
Append(new UnsignedField<8>(frsky.voltsSource));
}
- Append(new UnsignedField<8>(frsky.blades));
+ Append(new ConversionField< SignedField<8> >(frsky.blades, -2));
Append(new UnsignedField<8>(frsky.currentSource));
Append(new UnsignedField<1>(frsky.screens[0].type));
@@ -2111,12 +2190,12 @@ class FrskyField: public StructField {
Append(new UnsignedField<1>(frsky.channels[i].alarms[j].greater));
Append(new UnsignedField<2>(frsky.channels[i].multiplier, 0, 3, "Multiplier"));
}
- Append(new UnsignedField<2>(frsky.usrProto));
- Append(new UnsignedField<2>(frsky.blades));
+ Append(new UnsignedField<2>(frsky.usrProto, "USR Proto"));
+ Append(new ConversionField< UnsignedField<2> >((unsigned int &)frsky.blades, -2));
Append(new UnsignedField<1>(frsky.screens[0].type));
Append(new UnsignedField<1>(frsky.screens[1].type));
- Append(new UnsignedField<2>(frsky.voltsSource));
- Append(new SignedField<4>(frsky.varioMin));
+ Append(new UnsignedField<2>(frsky.voltsSource, "Volts Source"));
+ Append(new SignedField<4>(frsky.varioMin, "Vario Min"));
Append(new SignedField<4>(frsky.varioMax));
for (int i=0; i<2; i++) {
Append(new ConversionField< UnsignedField<2> >(frsky.rssiAlarms[i].level, &rssiConversionTable[i], "RSSI level"));
@@ -2165,7 +2244,8 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
board(board),
version(version),
variant(variant),
- protocolsConversionTable(board)
+ protocolsConversionTable(board),
+ throttleSourceConversionTable(board, version)
{
sprintf(name, "Model %s", modelData.name);
@@ -2275,7 +2355,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
internalField.Append(new SignedField<8>(modelData.moduleData[0].ppmFrameLength));
}
- internalField.Append(new UnsignedField<8>(modelData.thrTraceSrc));
+ internalField.Append(new ConversionField< UnsignedField<8> >(modelData.thrTraceSrc, &throttleSourceConversionTable, "Throttle Source"));
if (!afterrelease21March2013) {
internalField.Append(new UnsignedField<8>(modelData.modelId));
@@ -2425,7 +2505,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
generalData(generalData),
board(board),
version(version),
- inputsCount(4 + MAX_POTS(board, version))
+ inputsCount(4 + MAX_POTS(board))
{
generalData.version = version;
generalData.variant = variant;
@@ -2442,12 +2522,18 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
}
}
else {
- for (int i=0; i(generalData.calibMid[i]));
- for (int i=0; i(generalData.calibSpanNeg[i]));
- for (int i=0; i(generalData.calibSpanPos[i]));
+ for (int i=0; i(generalData.calibMid[i]));
+ }
+ for (int i=0; i(generalData.calibSpanNeg[i]));
+ }
+ for (int i=0; i(generalData.calibSpanPos[i]));
+ }
}
internalField.Append(new UnsignedField<16>(chkSum));
@@ -2549,8 +2635,8 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
}
if (IS_TARANIS(board) && version >= 216) {
internalField.Append(new UnsignedField<8>(generalData.hw_uartMode));
- for (int i=0; i<8; i++) {
- internalField.Append(new UnsignedField<1>(generalData.potsType[i]));
+ for (int i=0; i<4; i++) {
+ internalField.Append(new UnsignedField<2>(potsType[i]));
}
}
}
@@ -2569,6 +2655,11 @@ void OpenTxGeneralData::beforeExport()
sum += generalData.calibSpanPos[i];
if (++count == 12) break;
}
+ for (int i=0; i<4; i++) {
+ potsType[i] = generalData.potsType[i];
+ if (i<2 && potsType[i] == 1)
+ potsType[i] = 0;
+ }
}
else {
for (int i=0; i
#include "hexinterface.h"
#include "splash.h"
@@ -20,192 +21,77 @@
int getFileType(const QString &fullFileName)
{
- if(QFileInfo(fullFileName).suffix().toUpper()=="HEX") return FILE_TYPE_HEX;
- if(QFileInfo(fullFileName).suffix().toUpper()=="BIN") return FILE_TYPE_BIN;
- if(QFileInfo(fullFileName).suffix().toUpper()=="EEPM") return FILE_TYPE_EEPM;
- if(QFileInfo(fullFileName).suffix().toUpper()=="EEPE") return FILE_TYPE_EEPE;
- if(QFileInfo(fullFileName).suffix().toUpper()=="XML") return FILE_TYPE_XML;
- return 0;
+ QString suffix = QFileInfo(fullFileName).suffix().toUpper();
+ if (suffix == "HEX")
+ return FILE_TYPE_HEX;
+ else if (suffix == "BIN")
+ return FILE_TYPE_BIN;
+ else if (suffix == "EEPM")
+ return FILE_TYPE_EEPM;
+ else if (suffix == "EEPE")
+ return FILE_TYPE_EEPE;
+ else if (suffix == "XML")
+ return FILE_TYPE_XML;
+ else
+ return 0;
}
-FlashInterface::FlashInterface(QString fileName)
+FlashInterface::FlashInterface(QString fileName):
+ flash(MAX_FSIZE, 0),
+ flash_size(0),
+ isValidFlag(false)
{
- char * temp = (char *)malloc(MAX_FSIZE);
- date = "";
- time = "";
- svn = "";
- build = "";
- isValidFlag = true;
QFile file(fileName);
- flash_size=0;
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
- isValidFlag = false;
- }
- else {
+ if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
QTextStream inputStream(&file);
- flash_size = HexInterface(inputStream).load((uint8_t *)temp, MAX_FSIZE);
+ flash_size = HexInterface(inputStream).load((uint8_t *)flash.data(), MAX_FSIZE);
file.close();
- inputStream.reset();
if (flash_size == 0) {
- QFile file(fileName);
file.open(QIODevice::ReadOnly);
- char * bin_flash = (char *)malloc(MAX_FSIZE);
- flash_size = file.read(bin_flash, MAX_FSIZE);
- flash = QByteArray(bin_flash, flash_size);
- free(bin_flash);
- }
- else {
- flash = QByteArray(temp, flash_size);
+ flash_size = file.read((char *)flash.data(), MAX_FSIZE);
}
if (flash_size > 0) {
- SeekSvn();
- SeekDate();
- SeekTime();
- SeekBuild();
+ svn = seekLabel(SVN_MARK);
+ version = seekLabel(VERS_MARK);
+ date = seekLabel(DATE_MARK);
+ time = seekLabel(TIME_MARK);
+ eeprom = seekLabel(EEPR_MARK);
SeekSplash();
- }
- else {
- isValidFlag = false;
+ isValidFlag = true;
}
}
- free(temp);
}
-QString FlashInterface::getDate(void)
+QString FlashInterface::seekString(const QString & string)
{
- return date;
-}
+ QString result = "";
-QString FlashInterface::getTime(void)
-{
- return time;
-}
-
-QString FlashInterface::getSvn(void)
-{
- return svn;
-}
-
-QString FlashInterface::getBuild(void)
-{
- return build;
-}
-
-int FlashInterface::getSize()
-{
- return flash_size;
-}
-
-void FlashInterface::SeekSvn(void)
-{
- int i, start = -1, end = -1;
- start = flash.indexOf(QString(SVN_MARK));
+ int start = flash.indexOf(string);
if (start > 0) {
- start += QString(SVN_MARK).length();
- for (i = start; i < (start + 20); i++) {
- if (flash.at(i) == 0) {
+ start += string.length();
+ int end = -1;
+ for (int i=start; i 0) {
- svn = QString(flash.mid(start, (end - start))).trimmed();
- }
- else {
- svn = QString("");
+ result = flash.mid(start, (end - start)).trimmed();
}
}
+
+ return result;
}
-void FlashInterface::SeekDate(void)
+QString FlashInterface::seekLabel(const QString & label)
{
- int i, start = -1, end = -1, startsvn=0;
- startsvn = flash.indexOf(QString(SVN_MARK));
- if (startsvn>0) {
- start = flash.indexOf(QString(DATE_MARK),startsvn);
- } else {
- start = flash.indexOf(QString(DATE_MARK));
- }
- if (start > 0) {
- start += QString(DATE_MARK).length();
- for (i = start; i < (start + 20); i++) {
- if (flash.at(i) == 0) {
- end = i;
- break;
- }
- }
- if (end > 0) {
- date = QString(flash.mid(start, (end - start))).trimmed();
- }
- else {
- date = QString("");
- }
- }
-}
+ QString result = seekString(label + "\037\033:");
+ if (!result.isEmpty())
+ return result;
-void FlashInterface::SeekTime(void)
-{
- int i, start = -1, end = -1, startsvn=0;
- startsvn = flash.indexOf(QString(SVN_MARK));
- if (startsvn>0) {
- start = flash.indexOf(QString(TIME_MARK),startsvn);
- } else {
- start = flash.indexOf(QString(TIME_MARK));
- }
- if (start > 0) {
- start += QString(TIME_MARK).length();
- for (i = start; i < (start + 20); i++) {
- if (flash.at(i) == 0) {
- end = i;
- break;
- }
- }
- if (end > 0) {
- time = QString(flash.mid(start, (end - start))).trimmed();
- }
- else {
- time = QString("");
- }
- }
-}
-
-void FlashInterface::SeekBuild(void)
-{
- int i, start = -1, end = -1;
- start = flash.indexOf(QString(BLD_MARK));
- if (start > 0) {
- start += QString(BLD_MARK).length();
- for (i = start; i < (start + 20); i++) {
- if (flash.at(i) == 0) {
- end = i;
- break;
- }
- }
- if (end > 0) {
- build = QString(flash.mid(start, (end - start))).trimmed();
- }
- else {
- build = QString("");
- }
- }
- else {
- start = flash.indexOf(QString(VAR_MARK));
- if (start > 0) {
- start += QString(VAR_MARK).length();
- for (i = start; i < (start + 20); i++) {
- if (flash.at(i) == 0) {
- end = i;
- break;
- }
- }
- if (end > 0) {
- build = QString(flash.mid(start, (end - start))).trimmed();
- }
- else {
- build = QString("");
- }
- }
- }
+ return seekString(label + ":");
}
void FlashInterface::SeekSplash(void)
diff --git a/companion/src/flashinterface.h b/companion/src/flashinterface.h
index eb1459d85..d7f7719b7 100644
--- a/companion/src/flashinterface.h
+++ b/companion/src/flashinterface.h
@@ -14,6 +14,7 @@
#ifndef FLASHINTERFACE_H
#define FLASHINTERFACE_H
+
#include
#include
#include
@@ -32,12 +33,12 @@
#define ERSKY9X_SPS "SPS"
#define ERSKY9X_SPE "SPE"
#define ERSKY9X_OFFSET (7)
-#define VERS_MARK "VERS:"
-#define SVN_MARK "SVN:"
-#define DATE_MARK "DATE:"
-#define TIME_MARK "TIME:"
-#define BLD_MARK "BLD:"
-#define VAR_MARK "EEPR:"
+#define VERS_MARK "VERS"
+#define SVN_MARK "SVN"
+#define DATE_MARK "DATE"
+#define TIME_MARK "TIME"
+#define BLD_MARK "BLD"
+#define EEPR_MARK "EEPR"
#define FILE_TYPE_BIN 1
#define FILE_TYPE_HEX 2
@@ -49,48 +50,46 @@ int getFileType(const QString &fullFileName);
class FlashInterface
{
-public:
- FlashInterface(QString filename);
- QString getDate();
- QString getTime();
- QString getSvn();
- int getSize();
- QString getBuild();
- QImage getSplash();
- bool setSplash(const QImage & newsplash);
- bool hasSplash();
- int getSplashWidth();
- uint getSplashHeight();
- uint getSplashColors();
- QImage::Format getSplashFormat();
- uint saveFlash(QString fileName);
- bool isValid();
+ public:
+ FlashInterface(QString filename);
+ inline QString getDate() { return date; }
+ inline QString getTime() { return time; }
+ inline QString getSvn() { return svn; }
+ int getSize() { return flash_size; }
+ inline QString getVersion() { return version; }
+ inline QString getEEprom() { return eeprom; }
+ QImage getSplash();
+ bool setSplash(const QImage & newsplash);
+ bool hasSplash();
+ int getSplashWidth();
+ uint getSplashHeight();
+ uint getSplashColors();
+ QImage::Format getSplashFormat();
+ uint saveFlash(QString fileName);
+ bool isValid();
-private:
- QByteArray flash;
- void SeekVer();
- void SeekSvn();
- void SeekDate();
- void SeekTime();
- void SeekBuild();
- void SeekSplash();
- QString filename;
- QString date;
- QString time;
- QString svn;
- QString build;
- QByteArray splash;
- uint splash_offset;
- uint splash_type;
- uint splash_size;
- uint splash_width;
- uint splash_height;
- uint splash_colors;
- QImage::Format splash_format;
- uint flash_size;
-
-protected:
- bool isValidFlag;
+ private:
+ QByteArray flash;
+ QString seekString(const QString & string);
+ QString seekLabel(const QString & label);
+ void SeekSplash();
+ QString filename;
+ QString date;
+ QString time;
+ QString svn;
+ QString version;
+ QString eeprom;
+ QByteArray splash;
+ uint splash_offset;
+ uint splash_type;
+ uint splash_size;
+ uint splash_width;
+ uint splash_height;
+ uint splash_colors;
+ QImage::Format splash_format;
+ uint flash_size;
+ bool isValidFlag;
};
+
#endif /* FLASHINTERFACE_H */
diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp
index 8cccc654c..8db6ad4aa 100644
--- a/companion/src/generaledit.cpp
+++ b/companion/src/generaledit.cpp
@@ -2,6 +2,7 @@
#include "ui_generaledit.h"
#include "helpers.h"
#include "appdata.h"
+#include
#include
#define BIT_WARN_THR ( 0x01 )
@@ -78,9 +79,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
}
}
}
-
- QRegExp rx(CHAR_FOR_NAMES_REGEX);
- ui->ownerNameLE->setValidator(new QRegExpValidator(rx, this));
+
switchDefPosEditLock=true;
populateBacklightCB(ui->backlightswCB, g_eeGeneral.backlightMode);
bool voice = current_firmware_variant.id.contains("voice");
@@ -116,18 +115,21 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
ui->bgVolume_label->hide();
ui->wavVolume_SL->hide();
ui->wavVolume_label->hide();
+ ui->varioP0_label->hide();
+ ui->varioP0_SB->hide();
+ ui->varioPMax_label->hide();
+ ui->varioPMax_SB->hide();
+ ui->varioR0_label->hide();
+ ui->varioR0_SB->hide();
} else {
ui->beepVolume_SL->setValue(g_eeGeneral.beepVolume);
ui->varioVolume_SL->setValue(g_eeGeneral.varioVolume);
ui->bgVolume_SL->setValue(g_eeGeneral.backgroundVolume);
ui->wavVolume_SL->setValue(g_eeGeneral.wavVolume);
- }
-
- if (!GetEepromInterface()->getCapability(HasBlInvert)) {
- ui->blinvert_cb->hide();
- ui->blinvert_label->hide();
- } else {
- ui->blinvert_cb->setChecked(g_eeGeneral.blightinv);
+ ui->varioP0_SB->setValue(700+(g_eeGeneral.varioPitch*10));
+ updateVarioPitchRange();
+ ui->varioPMax_SB->setValue(700+(g_eeGeneral.varioPitch*10)+1000+(g_eeGeneral.varioRange*10));
+ ui->varioR0_SB->setValue(500+(g_eeGeneral.varioRepeat*10));
}
if (!GetEepromInterface()->getCapability(HasFAIMode)) {
ui->faimode_CB->hide();
@@ -136,35 +138,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
else {
ui->faimode_CB->setChecked(g_eeGeneral.fai);
}
- ui->ownerNameLE->setText(g_eeGeneral.ownerName);
- if (!GetEepromInterface()->getCapability(OwnerName)) {
- ui->ownerNameLE->setDisabled(true);
- ui->label_ownerName->hide();
- ui->ownerNameLE->hide();
- ui->hideNameOnSplashChkB->setDisabled(true);
- ui->hideNameOnSplashChkB->hide();
- ui->label_hideOwnerName->hide();
- }
- if (!GetEepromInterface()->getCapability(HasInputFilter)) {
- ui->inputfilterCB->hide();
- ui->inputfilterLabel->hide();
- }
- if (!GetEepromInterface()->getCapability(HasStickScroll)) {
- ui->StickScrollChkB->hide();
- ui->StickScrollLB->hide();
- }
- if (!GetEepromInterface()->getCapability(TelemetryInternalAlarm)) {
- ui->frskyintalarmChkB->hide();
- ui->label_frskyintalarm->hide();
- }
- if (!GetEepromInterface()->getCapability(HasCrossTrims)) {
- ui->crosstrimChkB->hide();
- ui->crosstrimLB->hide();
- }
- if (!GetEepromInterface()->getCapability(HasPPMSim)) {
- ui->PPMSimLB->hide();
- ui->PPMSimChkB->hide();
- }
if (!GetEepromInterface()->getCapability( HasPxxCountry)) {
ui->countrycode_label->hide();
ui->countrycode_CB->hide();
@@ -212,9 +185,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
ui->label_CurrentCalib->hide();
}
- if (GetEepromInterface()->getCapability(TelemetryRSSIModel) ) {
- ui->tabWidget->removeTab(2);
- }
ui->tabWidget->setCurrentIndex(0);
if (!GetEepromInterface()->getCapability(SoundMod)) {
@@ -234,14 +204,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
ui->hapticStrengthSB->hide();
ui->label_hapticStrengthSB->hide();
}
-
- if (GetEepromInterface()->getCapability(PerModelTimers)) {
- ui->beepCountDownChkB->hide();
- ui->beepFlashChkB->hide();
- ui->beepMinuteChkB->hide();
- ui->label_timers->hide();
- }
-
if (!GetEepromInterface()->getCapability(HapticMode)) {
ui->hapticmodeCB->setDisabled(true);
@@ -249,66 +211,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
ui->label_hapticmode->hide();
}
- if (!GetEepromInterface()->getCapability(BandgapMeasure)) {
- ui->BandGapEnableChkB->setDisabled(true);
- ui->BandGapEnableChkB->hide();
- ui->label_BandGapEnable->hide();
- }
-
- if (!GetEepromInterface()->getCapability(PotScrolling)) {
- ui->PotScrollEnableChkB->setDisabled(true);
- ui->PotScrollEnableChkB->hide();
- ui->label_PotScrollEnable->hide();
- }
-
- if (!GetEepromInterface()->getCapability(TrainerSwitch)) {
- ui->label_switch->hide();
- ui->swtchCB_1->setDisabled(true);
- ui->swtchCB_2->setDisabled(true);
- ui->swtchCB_3->setDisabled(true);
- ui->swtchCB_4->setDisabled(true);
- ui->swtchCB_1->hide();
- ui->swtchCB_2->hide();
- ui->swtchCB_3->hide();
- ui->swtchCB_4->hide();
- } else {
- populateSwitchCB(ui->swtchCB_1,g_eeGeneral.trainer.mix[0].swtch);
- populateSwitchCB(ui->swtchCB_2,g_eeGeneral.trainer.mix[1].swtch);
- populateSwitchCB(ui->swtchCB_3,g_eeGeneral.trainer.mix[2].swtch);
- populateSwitchCB(ui->swtchCB_4,g_eeGeneral.trainer.mix[3].swtch);
- }
- if (!GetEepromInterface()->getCapability(BLonStickMove)) {
- ui->blOnStickMoveSB->setDisabled(true);
- ui->blOnStickMoveSB->hide();
- ui->label_blOnStickMove->hide();
- } else {
- ui->blOnStickMoveSB->setValue(g_eeGeneral.lightOnStickMove*5);
- }
- if (!GetEepromInterface()->getCapability(gsSwitchMask)) {
- ui->swAILChkB->setDisabled(true);
- ui->swELEChkB->setDisabled(true);
- ui->swTHRChkB->setDisabled(true);
- ui->swRUDChkB->setDisabled(true);
- ui->swGEAChkB->setDisabled(true);
- ui->swID0ChkB->setDisabled(true);
- ui->swID1ChkB->setDisabled(true);
- ui->swID2ChkB->setDisabled(true);
- ui->swAILChkB->hide();
- ui->swELEChkB->hide();
- ui->swTHRChkB->hide();
- ui->swRUDChkB->hide();
- ui->swGEAChkB->hide();
- ui->swID0ChkB->hide();
- ui->swID1ChkB->hide();
- ui->swID2ChkB->hide();
- this->layout()->removeItem(ui->switchMaskLayout);
- } else {
- setSwitchDefPos();
- }
- if (!GetEepromInterface()->getCapability(TelemetryAlarm)) {
- ui->telalarmsChkB->hide();
- ui->label_telalarms->hide();
- }
int renumber=GetEepromInterface()->getCapability(RotaryEncoders);
if (renumber==0) {
ui->re_label->hide();
@@ -316,28 +218,15 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
} else {
populateRotEncCB(ui->re_CB, g_eeGeneral.reNavigation, renumber);
}
- ui->telalarmsChkB->setChecked(g_eeGeneral.enableTelemetryAlarm);
- ui->PotScrollEnableChkB->setChecked(!g_eeGeneral.disablePotScroll);
- ui->BandGapEnableChkB->setChecked(!g_eeGeneral.disableBG);
ui->contrastSB->setValue(g_eeGeneral.contrast);
ui->battwarningDSB->setValue((double)g_eeGeneral.vBatWarn/10);
ui->backlightautoSB->setValue(g_eeGeneral.backlightDelay*5);
ui->inactimerSB->setValue(g_eeGeneral.inactivityTimer);
- ui->crosstrimChkB->setChecked(g_eeGeneral.crosstrim);
- ui->frskyintalarmChkB->setChecked(g_eeGeneral.frskyinternalalarm);
- ui->StickScrollChkB->setChecked(g_eeGeneral.stickScroll);
- ui->PPMSimChkB->setChecked(g_eeGeneral.enablePpmsim);
- ui->inputfilterCB->setCurrentIndex(g_eeGeneral.filterInput);
ui->memwarnChkB->setChecked(!g_eeGeneral.disableMemoryWarning); //Default is zero=checked
ui->alarmwarnChkB->setChecked(!g_eeGeneral.disableAlarmWarning);//Default is zero=checked
- ui->enableTelemetryAlarmChkB->setChecked(g_eeGeneral.enableTelemetryAlarm);
- ui->beepMinuteChkB->setChecked(g_eeGeneral.minuteBeep);
- ui->beepCountDownChkB->setChecked(g_eeGeneral.preBeep);
- ui->beepFlashChkB->setChecked(g_eeGeneral.flashBeep);
ui->splashScreenChkB->setChecked(!g_eeGeneral.splashMode);
- ui->hideNameOnSplashChkB->setChecked(!g_eeGeneral.hideNameOnSplash);
ui->trnMode_1->setCurrentIndex(g_eeGeneral.trainer.mix[0].mode);
ui->trnChn_1->setCurrentIndex(g_eeGeneral.trainer.mix[0].src);
@@ -368,6 +257,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
if (GetEepromInterface()->getCapability(MultiposPots)) {
ui->pot1Type->setCurrentIndex(g_eeGeneral.potsType[0]);
ui->pot2Type->setCurrentIndex(g_eeGeneral.potsType[1]);
+ ui->pot3Type->setCurrentIndex(g_eeGeneral.potsType[2]);
}
else {
ui->potsTypeSeparator->hide();
@@ -375,6 +265,16 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
ui->pot1TypeLabel->hide();
ui->pot2Type->hide();
ui->pot2TypeLabel->hide();
+ ui->pot3Type->hide();
+ ui->pot3TypeLabel->hide();
+ }
+
+ if (IS_TARANIS(eepromInterface->getBoard())) {
+ ui->serialPortMode->setCurrentIndex(g_eeGeneral.hw_uartMode);
+ }
+ else {
+ ui->serialPortMode->hide();
+ ui->serialPortLabel->hide();
}
}
@@ -395,6 +295,18 @@ void GeneralEdit::on_pot2Type_currentIndexChanged(int index)
updateSettings();
}
+void GeneralEdit::on_pot3Type_currentIndexChanged(int index)
+{
+ g_eeGeneral.potsType[2] = index;
+ updateSettings();
+}
+
+void GeneralEdit::on_serialPortMode_currentIndexChanged(int index)
+{
+ g_eeGeneral.hw_uartMode = index;
+ updateSettings();
+}
+
void GeneralEdit::unlockSwitchEdited()
{
int i=0;
@@ -428,9 +340,8 @@ void GeneralEdit::setValues()
ui->speakerPitchSB->setValue(g_eeGeneral.speakerPitch);
ui->hapticStrengthSB->setValue(g_eeGeneral.hapticStrength);
ui->hapticmodeCB->setCurrentIndex(g_eeGeneral.hapticMode+2);
- ui->battcalibDSB->setValue((double)g_eeGeneral.vBatCalib/10);
+ ui->battCalibDSB->setValue((double)g_eeGeneral.vBatCalib/10);
ui->CurrentCalib_SB->setValue((double)g_eeGeneral.currentCalib);
- ui->battCalib->setValue((double)g_eeGeneral.vBatCalib/10);
ui->ana1Neg->setValue(g_eeGeneral.calibSpanNeg[0]);
ui->ana2Neg->setValue(g_eeGeneral.calibSpanNeg[1]);
@@ -466,27 +377,6 @@ void GeneralEdit::setValues()
ui->PPM_MultiplierDSB->setValue((qreal)(g_eeGeneral.PPM_Multiplier+10)/10);
}
-void GeneralEdit::setSwitchDefPos()
-{
- quint8 x = g_eeGeneral.switchWarningStates & 0x38;
- if(x==0x00 || x==0x18 || x== 0x28 || x==0x38 || x==0x30) //illegal states for ID0/1/2
- {
- g_eeGeneral.switchWarningStates &= ~0x38; // turn all off, make sure only one is on
- g_eeGeneral.switchWarningStates |= 0x08;
- }
-
- switchDefPosEditLock = true;
- ui->swTHRChkB->setChecked(g_eeGeneral.switchWarningStates & 0x01);
- ui->swRUDChkB->setChecked(g_eeGeneral.switchWarningStates & 0x02);
- ui->swELEChkB->setChecked(g_eeGeneral.switchWarningStates & 0x04);
- ui->swID0ChkB->setChecked(g_eeGeneral.switchWarningStates & 0x08);
- ui->swID1ChkB->setChecked(g_eeGeneral.switchWarningStates & 0x10);
- ui->swID2ChkB->setChecked(g_eeGeneral.switchWarningStates & 0x20);
- ui->swAILChkB->setChecked(g_eeGeneral.switchWarningStates & 0x40);
- ui->swGEAChkB->setChecked(g_eeGeneral.switchWarningStates & 0x80);
- switchDefPosEditLock = false;
-}
-
void GeneralEdit::updateSettings()
{
radioData.generalSettings = g_eeGeneral;
@@ -505,10 +395,9 @@ void GeneralEdit::on_battwarningDSB_editingFinished()
updateSettings();
}
-void GeneralEdit::on_battcalibDSB_editingFinished()
+void GeneralEdit::on_battCalibDSB_editingFinished()
{
- g_eeGeneral.vBatCalib = ui->battcalibDSB->value()*10;
- ui->battCalib->setValue(ui->battcalibDSB->value());
+ g_eeGeneral.vBatCalib = ui->battCalibDSB->value()*10;
updateSettings();
}
@@ -596,29 +485,12 @@ void GeneralEdit::on_timezoneSB_editingFinished()
updateSettings();
}
-
-void GeneralEdit::on_blOnStickMoveSB_editingFinished()
-{
- int i = ui->blOnStickMoveSB->value()/5;
- if((i*5)!=ui->blOnStickMoveSB->value())
- ui->blOnStickMoveSB->setValue(i*5);
-
- g_eeGeneral.lightOnStickMove = i;
- updateSettings();
-}
-
void GeneralEdit::on_inactimerSB_editingFinished()
{
g_eeGeneral.inactivityTimer = ui->inactimerSB->value();
updateSettings();
}
-void GeneralEdit::on_inputfilterCB_currentIndexChanged(int index)
-{
- g_eeGeneral.filterInput = index;
- updateSettings();
-}
-
void GeneralEdit::on_memwarnChkB_stateChanged(int )
{
g_eeGeneral.disableMemoryWarning = ui->memwarnChkB->isChecked() ? 0 : 1;
@@ -631,12 +503,6 @@ void GeneralEdit::on_alarmwarnChkB_stateChanged(int )
updateSettings();
}
-void GeneralEdit::on_enableTelemetryAlarmChkB_stateChanged(int )
-{
- g_eeGeneral.enableTelemetryAlarm = ui->enableTelemetryAlarmChkB->isChecked();
- updateSettings();
-}
-
void GeneralEdit::on_beeperCB_currentIndexChanged(int index)
{
g_eeGeneral.beeperMode = (BeeperMode)(index-2);
@@ -885,13 +751,6 @@ void GeneralEdit::on_ana8Pos_editingFinished()
updateSettings();
}
-void GeneralEdit::on_battCalib_editingFinished()
-{
- g_eeGeneral.vBatCalib = ui->battCalib->value()*10;
- ui->battcalibDSB->setValue(ui->battCalib->value());
- updateSettings();
-}
-
void GeneralEdit::on_volume_SB_editingFinished()
{
g_eeGeneral.speakerVolume = ui->volume_SB->value();
@@ -934,6 +793,31 @@ void GeneralEdit::on_bgVolume_SL_valueChanged()
updateSettings();
}
+void GeneralEdit::on_varioP0_SB_editingFinished()
+{
+ g_eeGeneral.varioPitch = (ui->varioP0_SB->value()-700)/10;
+ updateVarioPitchRange();
+ updateSettings();
+}
+
+void GeneralEdit::updateVarioPitchRange()
+{
+ ui->varioPMax_SB->setMaximum(700+(g_eeGeneral.varioPitch*10)+1000+800);
+ ui->varioPMax_SB->setMinimum(700+(g_eeGeneral.varioPitch*10)+1000-800);
+}
+
+void GeneralEdit::on_varioPMax_SB_editingFinished()
+{
+ g_eeGeneral.varioRange = (ui->varioPMax_SB->value()-(700+(g_eeGeneral.varioPitch*10))-1000)/10;
+ updateSettings();
+}
+
+void GeneralEdit::on_varioR0_SB_editingFinished()
+{
+ g_eeGeneral.varioRepeat = (ui->varioR0_SB->value()-500)/10;
+ updateSettings();
+}
+
void GeneralEdit::on_PPM1_editingFinished()
{
g_eeGeneral.trainer.calib[0] = ui->PPM1->value();
@@ -963,49 +847,18 @@ void GeneralEdit::on_tabWidget_currentChanged(int index)
g.generalEditTab(index);
}
-
-void GeneralEdit::on_beepMinuteChkB_stateChanged(int )
-{
- g_eeGeneral.minuteBeep = ui->beepMinuteChkB->isChecked() ? 1 : 0;
- updateSettings();
-}
-
-void GeneralEdit::on_beepCountDownChkB_stateChanged(int )
-{
- g_eeGeneral.preBeep = ui->beepCountDownChkB->isChecked() ? 1 : 0;
- updateSettings();
-}
-
-void GeneralEdit::on_beepFlashChkB_stateChanged(int )
-{
- g_eeGeneral.flashBeep = ui->beepFlashChkB->isChecked() ? 1 : 0;
- updateSettings();
-}
-
void GeneralEdit::on_splashScreenChkB_stateChanged(int )
{
g_eeGeneral.splashMode = ui->splashScreenChkB->isChecked() ? 0 : 1;
updateSettings();
}
-void GeneralEdit::on_hideNameOnSplashChkB_stateChanged(int )
-{
- g_eeGeneral.hideNameOnSplash = ui->hideNameOnSplashChkB->isChecked() ? 0 : 1;
- updateSettings();
-}
-
void GeneralEdit::on_PPM_MultiplierDSB_editingFinished()
{
g_eeGeneral.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
updateSettings();
}
-void GeneralEdit::on_ownerNameLE_editingFinished()
-{
- strncpy(g_eeGeneral.ownerName, ui->ownerNameLE->text().toAscii(), 10);
- updateSettings();
-}
-
void GeneralEdit::on_speakerPitchSB_editingFinished()
{
g_eeGeneral.speakerPitch = ui->speakerPitchSB->value();
@@ -1024,18 +877,6 @@ void GeneralEdit::on_soundModeCB_currentIndexChanged(int index)
updateSettings();
}
-void GeneralEdit::on_PotScrollEnableChkB_stateChanged(int )
-{
- g_eeGeneral.disablePotScroll = ui->PotScrollEnableChkB->isChecked() ? false : true;
- updateSettings();
-}
-
-void GeneralEdit::on_blinvert_cb_stateChanged(int )
-{
- g_eeGeneral.blightinv = ui->blinvert_cb->isChecked();
- updateSettings();
-}
-
void GeneralEdit::on_faimode_CB_stateChanged(int )
{
if (ui->faimode_CB->isChecked()) {
@@ -1053,159 +894,6 @@ void GeneralEdit::on_faimode_CB_stateChanged(int )
updateSettings();
}
-void GeneralEdit::on_BandGapEnableChkB_stateChanged(int )
-{
- g_eeGeneral.disableBG = ui->BandGapEnableChkB->isChecked() ? false : true;
- updateSettings();
-}
-
-void GeneralEdit::on_crosstrimChkB_stateChanged(int )
-{
- g_eeGeneral.crosstrim = ui->crosstrimChkB->isChecked() ? true : false;
- updateSettings();
-}
-
-void GeneralEdit::on_frskyintalarmChkB_stateChanged(int )
-{
- g_eeGeneral.frskyinternalalarm = ui->frskyintalarmChkB->isChecked() ? true : false ;
- updateSettings();
-}
-
-void GeneralEdit::on_StickScrollChkB_stateChanged(int )
-{
- g_eeGeneral.stickScroll = ui->StickScrollChkB->isChecked() ? true : false;
- updateSettings();
-}
-
-void GeneralEdit::on_PPMSimChkB_stateChanged(int )
-{
- g_eeGeneral.enablePpmsim = ui->PPMSimChkB->isChecked() ? true : false;
- updateSettings();
-}
-
-void GeneralEdit::on_swtchCB_1_currentIndexChanged(int index)
-{
- g_eeGeneral.trainer.mix[0].swtch = RawSwitch(ui->swtchCB_1->itemData(ui->swtchCB_1->currentIndex()).toInt());
- updateSettings();
-}
-
-void GeneralEdit::on_swtchCB_2_currentIndexChanged(int index)
-{
- g_eeGeneral.trainer.mix[1].swtch = RawSwitch(ui->swtchCB_2->itemData(ui->swtchCB_2->currentIndex()).toInt());
- updateSettings();
-}
-
-void GeneralEdit::on_swtchCB_3_currentIndexChanged(int index)
-{
- g_eeGeneral.trainer.mix[2].swtch = RawSwitch(ui->swtchCB_3->itemData(ui->swtchCB_3->currentIndex()).toInt());
- updateSettings();
-}
-
-void GeneralEdit::on_swtchCB_4_currentIndexChanged(int index)
-{
- g_eeGeneral.trainer.mix[3].swtch = RawSwitch(ui->swtchCB_4->itemData(ui->swtchCB_4->currentIndex()).toInt());
- updateSettings();
-}
-
-void GeneralEdit::getGeneralSwitchDefPos(int i, bool val)
-{
- if(val)
- g_eeGeneral.switchWarningStates |= (1<<(i-1));
- else
- g_eeGeneral.switchWarningStates &= ~(1<<(i-1));
-}
-
-void GeneralEdit::on_swTHRChkB_stateChanged(int )
-{
- if(switchDefPosEditLock) return;
- getGeneralSwitchDefPos(1,ui->swTHRChkB->isChecked());
- updateSettings();
-}
-
-void GeneralEdit::on_telalarmsChkB_stateChanged(int )
-{
- g_eeGeneral.enableTelemetryAlarm=ui->telalarmsChkB->isChecked();
- updateSettings();
-}
-
-void GeneralEdit::on_swRUDChkB_stateChanged(int )
-{
- if(switchDefPosEditLock) return;
- getGeneralSwitchDefPos(2,ui->swRUDChkB->isChecked());
- updateSettings();
-}
-void GeneralEdit::on_swELEChkB_stateChanged(int )
-{
- getGeneralSwitchDefPos(3,ui->swELEChkB->isChecked());
- updateSettings();
-}
-void GeneralEdit::on_swID0ChkB_stateChanged(int )
-{
- if(switchDefPosEditLock) return;
-
- if(ui->swID0ChkB->isChecked())
- {
- switchDefPosEditLock = true;
- ui->swID1ChkB->setChecked(false);
- ui->swID2ChkB->setChecked(false);
- switchDefPosEditLock = false;
- }
- else
- return;
-
- g_eeGeneral.switchWarningStates &= ~0x30; //turn off ID1/2
- getGeneralSwitchDefPos(4,ui->swID0ChkB->isChecked());
- updateSettings();
-}
-void GeneralEdit::on_swID1ChkB_stateChanged(int )
-{
- if(switchDefPosEditLock) return;
-
- if(ui->swID1ChkB->isChecked())
- {
- switchDefPosEditLock = true;
- ui->swID0ChkB->setChecked(false);
- ui->swID2ChkB->setChecked(false);
- switchDefPosEditLock = false;
- }
- else
- return;
-
- g_eeGeneral.switchWarningStates &= ~0x28; //turn off ID0/2
- getGeneralSwitchDefPos(5,ui->swID1ChkB->isChecked());
- updateSettings();
-}
-void GeneralEdit::on_swID2ChkB_stateChanged(int )
-{
- if(switchDefPosEditLock) return;
-
- if(ui->swID2ChkB->isChecked())
- {
- switchDefPosEditLock = true;
- ui->swID0ChkB->setChecked(false);
- ui->swID1ChkB->setChecked(false);
- switchDefPosEditLock = false;
- }
- else
- return;
-
- g_eeGeneral.switchWarningStates &= ~0x18; //turn off ID1/2
- getGeneralSwitchDefPos(6,ui->swID2ChkB->isChecked());
- updateSettings();
-}
-void GeneralEdit::on_swAILChkB_stateChanged(int )
-{
- if(switchDefPosEditLock) return;
- getGeneralSwitchDefPos(7,ui->swAILChkB->isChecked());
- updateSettings();
-}
-void GeneralEdit::on_swGEAChkB_stateChanged(int )
-{
- if(switchDefPosEditLock) return;
- getGeneralSwitchDefPos(8,ui->swGEAChkB->isChecked());
- updateSettings();
-}
-
void GeneralEdit::on_calretrieve_PB_clicked()
{
int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
@@ -1356,6 +1044,9 @@ void GeneralEdit::on_calstore_PB_clicked()
g.profile[profile_id].haptic( QString("%1%2%3").arg(((uint8_t)g_eeGeneral.hapticMode), 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.hapticStrength, 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.hapticLength, 2, 16, QChar('0')));
g.profile[profile_id].speaker( QString("%1%2%3").arg((uint8_t)g_eeGeneral.speakerMode, 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.speakerPitch, 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.speakerVolume, 2, 16, QChar('0')));
g.profile[profile_id].countryCode( QString("%1%2%3").arg((uint8_t)g_eeGeneral.countryCode, 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.imperial, 2, 16, QChar('0')).arg(g_eeGeneral.ttsLanguage));
+
+ QDateTime dateTime = QDateTime::currentDateTime();
+ g.profile[profile_id].timeStamp(dateTime.toString("yyyy-MM-dd hh:mm"));
QMessageBox::information(this, "Companion", tr("Calibration and HW parameters saved."));
}
}
diff --git a/companion/src/generaledit.h b/companion/src/generaledit.h
index ce160dc0b..0f0be0fdc 100644
--- a/companion/src/generaledit.h
+++ b/companion/src/generaledit.h
@@ -27,20 +27,13 @@ private:
bool mavbaudEditLock;
void getGeneralSwitchDefPos(int i, bool val);
void setSwitchDefPos();
+ void updateVarioPitchRange();
signals:
void modelValuesChanged();
private slots:
- void on_ownerNameLE_editingFinished();
- void on_PotScrollEnableChkB_stateChanged(int);
- void on_blinvert_cb_stateChanged(int);
void on_faimode_CB_stateChanged(int );
- void on_BandGapEnableChkB_stateChanged(int);
- void on_crosstrimChkB_stateChanged(int );
- void on_frskyintalarmChkB_stateChanged(int );
- void on_StickScrollChkB_stateChanged(int );
- void on_PPMSimChkB_stateChanged(int );
void on_speakerPitchSB_editingFinished();
void on_timezoneSB_editingFinished();
void on_hapticStrengthSB_editingFinished();
@@ -51,11 +44,7 @@ private slots:
void on_hapticLengthCB_currentIndexChanged(int index);
void on_PPM_MultiplierDSB_editingFinished();
void on_splashScreenChkB_stateChanged(int );
- void on_hideNameOnSplashChkB_stateChanged(int);
- void on_beepCountDownChkB_stateChanged(int );
- void on_beepMinuteChkB_stateChanged(int );
void on_alarmwarnChkB_stateChanged(int );
- void on_enableTelemetryAlarmChkB_stateChanged(int );
void on_gpsFormatCB_currentIndexChanged(int index);
void on_tabWidget_currentChanged(int index);
void on_displayTypeCB_currentIndexChanged(int index);
@@ -65,22 +54,17 @@ private slots:
void on_units_CB_currentIndexChanged(int index);
void on_trnMode_1_currentIndexChanged(int index);
void on_trnChn_1_currentIndexChanged(int index);
- void on_swtchCB_1_currentIndexChanged(int index);
void on_trnWeight_1_editingFinished();
void on_trnMode_2_currentIndexChanged(int index);
void on_trnChn_2_currentIndexChanged(int index);
- void on_swtchCB_2_currentIndexChanged(int index);
void on_trnWeight_2_editingFinished();
void on_trnMode_3_currentIndexChanged(int index);
void on_trnChn_3_currentIndexChanged(int index);
- void on_swtchCB_3_currentIndexChanged(int index);
void on_trnWeight_3_editingFinished();
void on_trnMode_4_currentIndexChanged(int index);
- void on_swtchCB_4_currentIndexChanged(int index);
void on_trnChn_4_currentIndexChanged(int index);
void on_trnWeight_4_editingFinished();
- void on_battCalib_editingFinished();
void on_CurrentCalib_SB_editingFinished();
void on_ana1Neg_editingFinished();
@@ -119,33 +103,27 @@ private slots:
void on_varioVolume_SL_valueChanged();
void on_wavVolume_SL_valueChanged();
+ void on_varioP0_SB_editingFinished();
+ void on_varioPMax_SB_editingFinished();
+ void on_varioR0_SB_editingFinished();
+
void on_pot1Type_currentIndexChanged(int index);
void on_pot2Type_currentIndexChanged(int index);
+ void on_pot3Type_currentIndexChanged(int index);
+ void on_serialPortMode_currentIndexChanged(int index);
void on_stickmodeCB_currentIndexChanged(int index);
void on_channelorderCB_currentIndexChanged(int index);
void on_beeperCB_currentIndexChanged(int index);
void on_memwarnChkB_stateChanged(int );
- void on_telalarmsChkB_stateChanged(int );
- void on_inputfilterCB_currentIndexChanged(int index);
void on_inactimerSB_editingFinished();
void on_backlightautoSB_editingFinished();
void on_backlightswCB_currentIndexChanged(int index);
void on_mavbaud_CB_currentIndexChanged(int index);
void on_voiceLang_CB_currentIndexChanged(int index);
- void on_blOnStickMoveSB_editingFinished();
- void on_battcalibDSB_editingFinished();
+ void on_battCalibDSB_editingFinished();
void on_battwarningDSB_editingFinished();
void on_contrastSB_editingFinished();
- void on_beepFlashChkB_stateChanged(int );
- void on_swTHRChkB_stateChanged(int );
- void on_swRUDChkB_stateChanged(int );
- void on_swELEChkB_stateChanged(int );
- void on_swID0ChkB_stateChanged(int );
- void on_swID1ChkB_stateChanged(int );
- void on_swID2ChkB_stateChanged(int );
- void on_swAILChkB_stateChanged(int );
- void on_swGEAChkB_stateChanged(int );
void on_calretrieve_PB_clicked();
void on_calstore_PB_clicked();
void unlockSwitchEdited();
diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui
index 8f66dcab1..700289578 100644
--- a/companion/src/generaledit.ui
+++ b/companion/src/generaledit.ui
@@ -6,7 +6,7 @@
0
0
- 795
+ 804
912
@@ -106,134 +106,119 @@
These will be relevant for all models in the same EEPROM.
- 3
+ 1
Setup
- -
-
-
+
-
+
+
-
-
- -
-
-
-
- 0
- 0
-
+
+
-
- 23
+
+ Mode selection:
+
+Mode 1:
+ Left stick: Elevator, Rudder
+ Right stick: Throttle, Aileron
+
+Mode 2:
+ Left stick: Throttle, Rudder
+ Right stick: Elevator, Aileron
+
+Mode 3:
+ Left stick: Elevator, Aileron
+ Right stick: Throttle, Rudder
+
+Mode 4:
+ Left stick: Throttle, Aileron
+ Right stick: Elevator, Rudder
+
+
+
+
+ 1
-
-
- -
-
-
-
-
- Country Code
-
-
+
+ Mode 1 (RUD ELE THR AIL)
+
-
-
-
-
-
- America
-
-
- -
-
- Japan
-
-
- -
-
- Europe
-
-
-
+
+ Mode 2 (RUD THR ELE AIL)
+
-
+ -
+
+ Mode 3 (AIL ELE THR RUD)
+
+
+ -
+
+ Mode 4 (AIL THR ELE RUD)
+
+
+
- -
-
+
-
+
+
-
+
+ 4800 Baud
+
+
+ -
+
+ 9600 Baud
+
+
+ -
+
+ 14400 Baud
+
+
+ -
+
+ 19200 Baud
+
+
+ -
+
+ 38400 Baud
+
+
+ -
+
+ 57600 Baud
+
+
+ -
+
+ 76800 Baud
+
+
+ -
+
+ 115200 Baud
+
+
+
+
+ -
+
- MAVLink Baud Rate
+ Haptic Length
- -
-
-
-
-
-
- Voice Language
-
-
-
- -
-
-
-
-
- -
-
-
- Measurement Units
-
-
-
- -
-
-
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Single Beep Every whole Minute</span></p></body></html>
-
-
- Every Minute
-
-
-
- -
-
-
- Beeps at 30, 15, 10, and down from5 seconds
-
-
- Count Down to Zero
-
-
-
- -
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Flash backlight on timer beep</span></p></body></html>
-
-
- Flash on beep
-
-
-
-
-
- -
+
-
-
@@ -329,76 +314,117 @@ p, li { white-space: pre-wrap; }
- -
-
-
- PPMSim
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
+
-
+
+
-
+
+
+ Country Code
+
+
+
+ -
+
+
-
+
+ America
+
+
+ -
+
+ Japan
+
+
+ -
+
+ Europe
+
+
+
+
+
- -
-
-
-
-
- 4800 Baud
-
-
- -
-
- 9600 Baud
-
-
- -
-
- 14400 Baud
-
-
- -
-
- 19200 Baud
-
-
- -
-
- 38400 Baud
-
-
- -
-
- 57600 Baud
-
-
- -
-
- 76800 Baud
-
-
- -
-
- 115200 Baud
-
-
-
-
- -
+
-
Beeper Length
- -
-
+
-
+
- Pot Scrolling Enable
+ Vario pitch at zero
+
+
+
+ -
+
+
+ Vario pitch at max
+
+
+
+ -
+
+
+ MAVLink Baud Rate
+
+
+
+ -
+
+
-
+
+
+ Voice Language
+
+
+
+ -
+
+
+
+
+ -
+
+
+ Speaker Volume
+
+
+
+ -
+
+
+ Readonly Unlock
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 5
+
+
+
+
+ -
+
+
+ Sound Mode
-
-
+
0
@@ -412,332 +438,250 @@ p, li { white-space: pre-wrap; }
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html>
+ If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes.
-
- 10
+
+ min
- 45
+ 120
+
+
+
+ -
+
+
+
+
+
+
+
+
+ Beeper volume
+
+0 - Quiet. No beeps at all.
+1 - No Keys. Normal beeps but menu keys do not beep.
+2 - Normal.
+3 - Loud.
+4 - Extra loud.
+
+
-
+
+ Quiet
+
+
+ -
+
+ Alarms Only
+
+
+ -
+
+ No Keys
+
+
+ -
+
+ All
+
+
+
+
+ -
+
+
-
+
+ Quiet
+
+
+ -
+
+ Only Alarms
+
+
+ -
+
+ No Keys
+
+
+ -
+
+ All
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Haptic Mode
+
+
+
+ -
+
+
+ Stick Mode
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Channel Order (For Templates)
+
+
+
+ -
+
+
-
+
+ Metric
+
+
+ -
+
+ Imperial
+
+
+
+
+ -
+
+
+ -14
+
+
+ 12
- 25
+ 0
- -
-
-
- Haptic Length
-
-
-
- -
-
-
-
-
-
-
-
-
- Mode selection:
-
-Mode 1:
- Left stick: Elevator, Rudder
- Right stick: Throttle, Aileron
-
-Mode 2:
- Left stick: Throttle, Rudder
- Right stick: Elevator, Aileron
-
-Mode 3:
- Left stick: Elevator, Aileron
- Right stick: Throttle, Rudder
-
-Mode 4:
- Left stick: Throttle, Aileron
- Right stick: Elevator, Rudder
-
-
-
-
- 1
-
+
-
+
-
- Mode 1 (RUD ELE THR AIL)
+ X-Short
-
- Mode 2 (RUD THR ELE AIL)
+ Short
-
- Mode 3 (AIL ELE THR RUD)
+ Normal
-
- Mode 4 (AIL THR ELE RUD)
+ Long
+
+
+ -
+
+ X-Long
- -
-
+
-
+
+
-
+
+ Beeper
+
+
+ -
+
+ Speaker
+
+
+ -
+
+ BeeperVoice
+
+
+ -
+
+ SpeakerVoice
+
+
+
+
+ -
+
-
+ Haptic Strength
- -
-
+
-
+
-
-
-
-
- -
-
-
- LCD Display Type
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- 5
-
-
-
- -
-
-
- BackLight On Stick Move
+ FAI Mode
-
-
-
-
-
-
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html>
-
-
- 1
-
-
- 20
-
-
- 1
-
+
+
-
+
+ X-Short
+
+
+ -
+
+ Short
+
+
+ -
+
+ Normal
+
+
+ -
+
+ Long
+
+
+ -
+
+ X-Long
+
+
- -
-
-
- sec
-
-
- 600
-
-
- 5
-
-
-
- -
-
+
-
+
- Beeper Mode
+ Speaker Pitch (spkr only)
- -
-
-
- Timeshift from UTC
-
-
-
- -
-
-
- RotEnc Navigation
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
-
- -
-
-
- FrSky Internal Alarm
-
-
-
- -
-
-
-
-
-
- THR
-
-
-
- -
-
-
- RUD
-
-
-
- -
-
-
- ELE
-
-
-
- -
-
-
- AIL
-
-
-
- -
-
-
- GEA
-
-
-
- -
-
-
- ID0
-
-
-
- -
-
-
- ID1
-
-
-
- -
-
-
- ID2
-
-
-
-
-
- -
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html>
-
-
-
-
-
- true
-
-
-
- -
-
-
-
-
-
- GPS Coordinates
-
-
-
- -
-
-
-
-
- hh° (N/S) mm' ss''.dd
-
-
- -
-
- NMEA
-
-
-
-
-
-
- -
-
-
- If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
-
-
-
-
-
-
- -
+
-
@@ -875,690 +819,124 @@ This is used by the templated to determine which channel goes to what number out
- -
-
+
-
+
+
+ If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
+
- Show Owner Name on Splash
+
- -
-
-
- Speaker Pitch (spkr only)
+
-
+
+
-
+
+
+ GPS Coordinates
+
+
+
+ -
+
+
-
+
+ hh° (N/S) mm' ss''.dd
+
+
+ -
+
+ NMEA
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 23
- -
-
-
- -
-
-
-
-
- X-Short
-
-
- -
-
- Short
-
-
- -
-
- Normal
-
-
- -
-
- Long
-
-
- -
-
- X-Long
-
-
-
-
- -
-
+
-
+
- StickScroll
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+ Measurement Units
- -
-
-
- FAI Mode
+
-
+
+
+
+ 0
+ 0
+
-
-
- -
-
-
- Haptic Strength
+
+ 5
-
-
-
-
-
- Beeper
-
-
- -
-
- Speaker
-
-
- -
-
- BeeperVoice
-
-
- -
-
- SpeakerVoice
-
-
-
-
- -
-
-
-
-
- X-Short
-
-
- -
-
- Short
-
-
- -
-
- Normal
-
-
- -
-
- Long
-
-
- -
-
- X-Long
-
-
-
-
- -
-
-
+
+
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Show Splash Screen on Startup
-
-
-
- -
-
-
+
-
-
- -
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html>
-
-
-
-
- true
-
-
-
- -
-
- -14
+ 1
- 12
+ 20
- 0
-
-
-
- -
-
-
-
-
- Metric
-
-
- -
-
- Imperial
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Channel Order (For Templates)
-
-
-
- -
-
-
- Stick Mode
-
-
-
- -
-
-
- Haptic Mode
+ 1
-
-
-
-
-
+
- Owner Name
+ Beeper Mode
- -
-
+
-
+
- BackLight Invert
+ Timeshift from UTC
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
-
- Standard
-
-
- -
-
- Optrex
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
- Show splash screen on startup
-
-
- Show splash screen on startup
-
-
-
-
-
-
- -
-
-
-
-
- Quiet
-
-
- -
-
- Only Alarms
-
-
- -
-
- No Keys
-
-
- -
-
- All
-
-
-
-
- -
-
-
- 100
-
-
-
- -
-
-
-
-
-
-
-
-
- Beeper volume
-
-0 - Quiet. No beeps at all.
-1 - No Keys. Normal beeps but menu keys do not beep.
-2 - Normal.
-3 - Loud.
-4 - Extra loud.
-
-
-
-
- Quiet
-
-
- -
-
- Alarms Only
-
-
- -
-
- No Keys
-
-
- -
-
- All
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
- If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.
-
-
- sec
-
-
- 600
-
-
- 5
-
-
-
- -
-
-
- 10
-
-
-
- -
-
-
- Timer Beeps
-
-
-
- -
-
-
- BackLight Brightness
-
-
-
- -
-
-
-
-
-
- Contrast
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- BackLight Auto OFF after
-
-
-
- -
-
-
-
-
- Single
-
-
- -
-
- Oversample
-
-
- -
-
- Filter
-
-
-
-
- -
-
-
-
-
-
-
-
-
- This is the switch selectrion for turning on the backlight (if installed).
-
-
-
-
- -1
-
-
-
- -
-
-
- Bandgap Measuring Enable
-
-
-
- -
-
-
- Input Filter
-
-
-
- -
-
-
- CrossTrim
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
- Sound Mode
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 5
-
-
-
-
- -
-
-
- BackLight Switch
-
-
-
- -
-
-
-
-
-
-
-
-
- Battery calibration:
-This value will be added to the measured battery voltage. Use this value to calibrate the meter with an external meter.
-
-
-
-
-
- v
-
-
- 1
-
-
- -9.900000000000000
-
-
- 9.900000000000000
-
-
- 0.100000000000000
-
-
-
- -
-
-
- Battery Calibration
-
-
-
- -
-
-
-
-
-
- Battery Warning
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
- Battery warning voltage.
-This is the threashhold where the battery warning sounds.
-
-Acceptable values are 5v..10v
-
-
-
-
-
- v
-
-
- 1
-
-
- 4.000000000000000
-
-
- 12.000000000000000
-
-
- 0.100000000000000
-
-
- 9.600000000000000
-
-
-
- -
-
-
- Telemetry NO DATA Alarm
-
-
-
- -
-
-
- Readonly Unlock
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
- Speaker Volume
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
- If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes.
-
-
- min
-
-
- 120
-
-
-
- -
-
-
- Inactivity Timer
-
-
-
- -
+
-
QLayout::SetMinimumSize
-
+
0
-
+
0
-
@@ -2078,7 +1456,85 @@ Acceptable values are 5v..10v
- -
+
-
+
+
+ Vario repeat at zero
+
+
+
+ -
+
+
+ Hz
+
+
+ 300
+
+
+ 1100
+
+
+ 10
+
+
+ 700
+
+
+
+ -
+
+
+ Hz
+
+
+ 1300
+
+
+ 2900
+
+
+ 10
+
+
+ 1700
+
+
+
+ -
+
+
+ ms
+
+
+ 200
+
+
+ 1000
+
+
+ 10
+
+
+ 500
+
+
+
+ -
+
+
+ Alarm Warning
+
+
+
+ -
+
+
+ Memory Startup Warning
+
+
+
+ -
@@ -2113,14 +1569,65 @@ p, li { white-space: pre-wrap; }
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
- Alarm Warning
+ Show Splash Screen on Startup
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ Show splash screen on startup
+
+
+ Show splash screen on startup
+
+
+
+
+
+
+ -
+
+
+
+
+
+ Battery Warning
+
+
+
+ -
+
+
+
+
+
+ Contrast
+
+
+
+ -
@@ -2155,10 +1662,191 @@ p, li { white-space: pre-wrap; }
- -
-
+
-
+
- Memory Startup Warning
+ Inactivity Timer
+
+
+
+ -
+
+
-
+
+ Standard
+
+
+ -
+
+ Optrex
+
+
+
+
+ -
+
+
+ BackLight Auto OFF after
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+ If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.
+
+
+ sec
+
+
+ 600
+
+
+ 5
+
+
+
+ -
+
+
+ RotEnc Navigation
+
+
+
+ -
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ LCD Display Type
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html>
+
+
+ 10
+
+
+ 45
+
+
+ 25
+
+
+
+ -
+
+
+ BackLight Brightness
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+ Battery warning voltage.
+This is the threashhold where the battery warning sounds.
+
+Acceptable values are 5v..10v
+
+
+
+
+
+ V
+
+
+ 1
+
+
+ 4.000000000000000
+
+
+ 12.000000000000000
+
+
+ 0.100000000000000
+
+
+ 9.600000000000000
+
+
+
+ -
+
+
+ BackLight Switch
+
+
+
+ -
+
+
+
+
+
+
+
+
+ This is the switch selectrion for turning on the backlight (if installed).
+
+
+
+
+ -1
@@ -2209,17 +1897,16 @@ p, li { white-space: pre-wrap; }
- -
-
-
- Switch
-
-
-
-
+
+
+ 0
+ 0
+
+
- PPM 1
+ Rud
@@ -2315,13 +2002,16 @@ p, li { white-space: pre-wrap; }
- -
-
-
-
+
+
+ 0
+ 0
+
+
- PPM 2
+ Ele
@@ -2456,13 +2146,16 @@ p, li { white-space: pre-wrap; }
- -
-
-
-
+
+
+ 0
+ 0
+
+
- PPM 3
+ Thr
@@ -2500,13 +2193,16 @@ p, li { white-space: pre-wrap; }
- -
-
-
-
+
+
+ 0
+ 0
+
+
- PPM 4
+ Ail
@@ -2602,9 +2298,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
-
@@ -2620,209 +2313,6 @@ p, li { white-space: pre-wrap; }
-
-
- Telemetry
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- RSSI Alarm 1
-
-
-
- -
-
-
-
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
-
-
- 0
-
-
- 256
-
-
- 1
-
-
- 0
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
- ----
-
-
- -
-
- Yellow
-
-
- -
-
- Orange
-
-
- -
-
- Red
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- RSSI Alarm 2
-
-
-
- -
-
-
-
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
-
-
- 0
-
-
- 256
-
-
- 1
-
-
- 0
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
- ----
-
-
- -
-
- Yellow
-
-
- -
-
- Orange
-
-
- -
-
- Red
-
-
-
-
-
-
- -
-
-
- NO DATA Alarm
-
-
-
- -
-
-
- true
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html>
-
-
-
-
-
- false
-
-
-
-
-
Calibration
@@ -3150,7 +2640,7 @@ p, li { white-space: pre-wrap; }
-
-
+
@@ -3520,6 +3010,11 @@ p, li { white-space: pre-wrap; }
3 - Loud.
4 - Extra loud.
+
-
+
+ None
+
+
-
Pot (normal)
@@ -3556,6 +3051,11 @@ p, li { white-space: pre-wrap; }
3 - Loud.
4 - Extra loud.
+
-
+
+ None
+
+
-
Pot (normal)
@@ -3575,6 +3075,76 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ S3 Type
+
+
+
+ -
+
+
+
+
+
+
+
+
+ Beeper volume
+
+0 - Quiet. No beeps at all.
+1 - No Keys. Normal beeps but menu keys do not beep.
+2 - Normal.
+3 - Loud.
+4 - Extra loud.
+
+
-
+
+ None
+
+
+ -
+
+ Pot (normal)
+
+
+ -
+
+ Multipos Switch
+
+
+
+
+ -
+
+
-
+
+ OFF
+
+
+ -
+
+ S-Port Mirror
+
+
+ -
+
+ Debug
+
+
+
+
+ -
+
+
+ Serial Port
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
@@ -3582,40 +3152,19 @@ p, li { white-space: pre-wrap; }
- ownerNameLE
- beepMinuteChkB
- beepCountDownChkB
- beepFlashChkB
- swTHRChkB
- swRUDChkB
- swELEChkB
- swAILChkB
- swGEAChkB
- swID0ChkB
- swID1ChkB
- swID2ChkB
channelorderCB
trnMode_1
trnChn_1
trnWeight_1
- swtchCB_1
trnMode_2
trnChn_2
trnWeight_2
- swtchCB_2
trnMode_3
trnChn_3
trnWeight_3
- swtchCB_3
trnMode_4
trnChn_4
trnWeight_4
- swtchCB_4
- rssiAlarm1SB
- rssiAlarm1CB
- rssiAlarm2SB
- rssiAlarm2CB
- enableTelemetryAlarmChkB
ana1Neg
ana1Mid
ana1Pos
@@ -3628,7 +3177,7 @@ p, li { white-space: pre-wrap; }
ana4Neg
ana4Mid
ana4Pos
- battCalib
+ battCalibDSB
PPM1
PPM2
PPM3
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 536921de1..f5a9af42a 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -4,6 +4,41 @@
#include "simulatordialog.h"
#include "flashinterface.h"
+const QColor colors[C9X_MAX_CURVES] = {
+ QColor(0,0,127),
+ QColor(0,127,0),
+ QColor(127,0,0),
+ QColor(0,127,127),
+ QColor(127,0,127),
+ QColor(127,127,0),
+ QColor(127,127,127),
+ QColor(0,0,255),
+ QColor(0,127,255),
+ QColor(127,0,255),
+ QColor(0,255,0),
+ QColor(0,255,127),
+ QColor(127,255,0),
+ QColor(255,0,0),
+ QColor(255,0,127),
+ QColor(255,127,0),
+ QColor(0,0,127),
+ QColor(0,127,0),
+ QColor(127,0,0),
+ QColor(0,127,127),
+ QColor(127,0,127),
+ QColor(127,127,0),
+ QColor(127,127,127),
+ QColor(0,0,255),
+ QColor(0,127,255),
+ QColor(127,0,255),
+ QColor(0,255,0),
+ QColor(0,255,127),
+ QColor(127,255,0),
+ QColor(255,0,0),
+ QColor(255,0,127),
+ QColor(255,127,0),
+};
+
QString getPhaseName(int val, char * phasename)
{
if (!val) return "---";
@@ -63,27 +98,6 @@ void populateVoiceLangCB(QComboBox *b, QString language)
}
}
-void populateTTraceCB(QComboBox *b, int value)
-{
- const QString strings9x[] = { QObject::tr("THR"), QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3")};
- const QString stringstaranis[] = { QObject::tr("THR"), QObject::tr("S1"), QObject::tr("S2"), QObject::tr("LS"), QObject::tr("RS")};
- b->clear();
- if (IS_TARANIS(GetEepromInterface()->getBoard())) {
- for (int i=0; i< 5; i++) {
- b->addItem(stringstaranis[i]);
- }
- } else {
- for (int i=0; i< 4; i++) {
- b->addItem(strings9x[i]);
- }
- }
- int channels=(IS_ARM(GetEepromInterface()->getBoard()) ? 32 : 16);
- for (int i=1; i<= channels; i++) {
- b->addItem(QObject::tr("CH%1").arg(i, 2, 10, QChar('0')));
- }
- b->setCurrentIndex(value);
-}
-
void populateRotEncCB(QComboBox *b, int value, int renumber)
{
QString strings[] = { QObject::tr("No"), QObject::tr("RotEnc A"), QObject::tr("Rot Enc B"), QObject::tr("Rot Enc C"), QObject::tr("Rot Enc D"), QObject::tr("Rot Enc E")};
@@ -95,31 +109,6 @@ void populateRotEncCB(QComboBox *b, int value, int renumber)
b->setCurrentIndex(value);
}
-void populateCustomScreenFieldCB(QComboBox *b, unsigned int value, bool last=false, int hubproto=0)
-{
- int telem_hub[] = {0,0,0,0,0,0,0,0,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,0,0,2,2,1,1,1,1,1,1};
- b->clear();
-
- b->addItem(RawSource(SOURCE_TYPE_NONE, 0).toString());
-
- for (unsigned int i = 0; i <= (last ? TELEMETRY_SOURCES_DISPLAY_COUNT : TELEMETRY_SOURCES_STATUS_COUNT); i++) {
- b->addItem(RawSource(SOURCE_TYPE_TELEMETRY, i).toString());
- if (!(i>=sizeof(telem_hub)/sizeof(int) || telem_hub[i]==0 || ((telem_hub[i]>=hubproto) && hubproto!=0))) {
- QModelIndex index = b->model()->index(i, 0);
- QVariant v(0);
- b->model()->setData(index, v, Qt::UserRole - 1);
- }
- }
-
- if (value>=sizeof(telem_hub)/sizeof(int))
- b->setCurrentIndex(0);
- else if (telem_hub[value]==0 || ((telem_hub[value]>=hubproto) && hubproto!=0)) {
- b->setCurrentIndex(value);
- }
-
- b->setMaxVisibleItems(10);
-}
-
QString getProtocolStr(const int proto)
{
static const char *strings[] = { "OFF",
@@ -292,7 +281,7 @@ void CurveGroup::update()
if (lastType != curve.type) {
lastType = curve.type;
curveValueCB->clear();
- for (int i=-numcurves; iaddItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString());
}
}
@@ -761,19 +750,6 @@ QString getFrSkyAlarmType(int alarm)
}
}
-QString getFrSkyBlades(int blades)
-{
- switch (blades) {
- case 1:
- return "3";
- case 2:
- return "4";
- default:
- return "2";
- }
-}
-
-
QString getFrSkyUnits(int units)
{
switch(units) {
diff --git a/companion/src/helpers.h b/companion/src/helpers.h
index 857d66749..6d8e61000 100644
--- a/companion/src/helpers.h
+++ b/companion/src/helpers.h
@@ -4,6 +4,8 @@
#include
#include "eeprominterface.h"
+extern const QColor colors[C9X_MAX_CURVES];
+
#define TMR_NUM_OPTION (TMR_VAROFS+2*9+2*GetEepromInterface()->getCapability(LogicalSwitches)-1)
//convert from mode 1 to mode generalSettings.stickMode
@@ -27,7 +29,6 @@
void populateGvSourceCB(QComboBox *b, int value);
void populateVoiceLangCB(QComboBox *b, QString language);
-void populateTTraceCB(QComboBox *b, int value);
void populateRotEncCB(QComboBox *b, int value, int renumber);
void populateBacklightCB(QComboBox *b, const uint8_t value);
@@ -88,7 +89,6 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, unsigned long attr=
void populatePhasesCB(QComboBox *b, int value);
void populateGvarUseCB(QComboBox *b, unsigned int phase);
-void populateCustomScreenFieldCB(QComboBox *b, unsigned int value, bool last, int hubproto);
QString getProtocolStr(const int proto);
QString getPhasesStr(unsigned int phases, ModelData & model);
@@ -120,7 +120,6 @@ QString getCenterBeep(ModelData * g_model);
/* FrSky helpers */
QString getFrSkyAlarmType(int alarm);
-QString getFrSkyBlades(int blades);
QString getFrSkyUnits(int units);
QString getFrSkyProtocol(int protocol);
QString getFrSkyMeasure(int units);
diff --git a/companion/src/images/originals/logotypes/firmware_logo.xcf b/companion/src/images/originals/logotypes/firmware_logo.xcf
new file mode 100644
index 000000000..ced05eb12
Binary files /dev/null and b/companion/src/images/originals/logotypes/firmware_logo.xcf differ
diff --git a/companion/src/images/taranison.png b/companion/src/images/taranison.png
new file mode 100644
index 000000000..61fcbe0be
Binary files /dev/null and b/companion/src/images/taranison.png differ
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 3570dbd34..0be3b9442 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -63,6 +63,7 @@
#include "warnings.h"
#include "helpers.h"
#include "appdata.h"
+#include "taranisnotfound.h"
#include "firmwares/opentx/opentxinterface.h" // TODO get rid of this include
#define DONATE_STR "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"
@@ -222,7 +223,7 @@ void MainWindow::checkForUpdates(bool ignoreSettings, QString & fwId)
if(ignoreSettings) {
downloadDialog_forWait = new downloadDialog(this, tr("Checking for updates"));
- downloadDialog_forWait->show();
+ downloadDialog_forWait->exec();
} else {
downloadDialog_forWait = NULL; // TODO needed?
}
@@ -272,7 +273,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
downloadDialog * dd = new downloadDialog(this, QString(OPENTX_COMPANION_DOWNLOADS C9X_INSTALLER).arg(version), fileName);
installer_fileName = fileName;
connect(dd, SIGNAL(accepted()), this, SLOT(updateDownloaded()));
- dd->show();
+ dd->exec();
}
}
#else
@@ -1024,7 +1025,8 @@ void MainWindow::readEeprom()
if (IS_TARANIS(eepromInterface->getBoard())) {
QString path=FindTaranisPath();
if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify the eeprom disk is connected."));
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
res=false;
} else {
QStringList str;
@@ -1080,7 +1082,8 @@ void MainWindow::writeFileToEeprom()
if (IS_TARANIS(eepromInterface->getBoard())) {
QString path=FindTaranisPath();
if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify the eeprom disk is connected."));
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
return;
} else {
QStringList str;
@@ -1131,7 +1134,8 @@ void MainWindow::writeFileToEeprom()
if (IS_TARANIS(eepromInterface->getBoard())) {
QString path=FindTaranisPath();
if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify the eeprom disk is connected."));
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
return;
} else {
QStringList str;
@@ -1156,7 +1160,8 @@ void MainWindow::writeFileToEeprom()
if (IS_TARANIS(eepromInterface->getBoard())) {
QString path=FindTaranisPath();
if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify the eeprom disk is connected."));
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
return;
}
else {
@@ -1251,15 +1256,16 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString
if ((svnTags.at(0) == "open9x")||(svnTags.at(0) == "opentx")) {
if (revision > 1464) {
- QString fwBuild = flash.getBuild();
- if (fwBuild.contains("-")) {
- QStringList buildTags = fwBuild.split("-", QString::SkipEmptyParts);
+ QString fwEEprom = flash.getEEprom();
+ if (fwEEprom.contains("-")) {
+ QStringList buildTags = fwEEprom.split("-", QString::SkipEmptyParts);
if (buildTags.size() >= 1)
version = buildTags.at(0).toInt();
if (buildTags.size() >= 2)
variant = buildTags.at(1).toInt();
- } else {
- version = fwBuild.toInt(); // TODO changer le nom de la variable
+ }
+ else {
+ version = fwEEprom.toInt();
}
}
else {
@@ -1401,7 +1407,8 @@ void MainWindow::readEepromToFile()
if (IS_TARANIS(eepromInterface->getBoard())) {
QString path=FindTaranisPath();
if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify that the eeprom disk is connected."));
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
return;
}
else {
@@ -1530,18 +1537,20 @@ MdiChild *MainWindow::createMdiChild()
return child;
}
-QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot)
+QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot, QObject *slotObj)
{
QAction * newAction = new QAction( this );
if (!icon.isEmpty())
- newAction->setIcon(CompanionIcon(icon));
+ newAction->setIcon(CompanionIcon(icon));
if (!sName.isEmpty())
newAction->setText(sName);
if (!lName.isEmpty())
newAction->setStatusTip(lName);
if (shortcut != 0)
newAction->setShortcuts(shortcut);
- connect(newAction, SIGNAL(triggered()), this, slot);
+ if (slotObj == NULL)
+ slotObj = this;
+ connect(newAction, SIGNAL(triggered()), slotObj, slot);
return newAction;
}
@@ -1584,7 +1593,7 @@ void MainWindow::createActions()
openAct = addAct("open.png", tr("Open Models+Settings..."), tr("Open Models and Settings file"), QKeySequence::Open, SLOT(openFile()));
saveAct = addAct("save.png", tr("Save Models+Settings..."), tr("Save Models and Settings file"), QKeySequence::Save, SLOT(save()));
saveAsAct = addAct("saveas.png", tr("Save Models+Settings as..."), tr("Save Models and Settings file"), QKeySequence::SaveAs, SLOT(saveAs()));
- exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(newFile()));
+ exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(closeAllWindows()), qApp);
cutAct = addAct("cut.png", tr("Cut Model"), tr("Cut current model to the clipboard"), QKeySequence::Cut, SLOT(cut()));
copyAct = addAct("copy.png", tr("Copy Model..."), tr("Copy current model to the clipboard"), QKeySequence::Copy, SLOT(copy()));
pasteAct = addAct("paste.png", tr("Paste Model..."), tr("Paste model from clipboard"), QKeySequence::Paste, SLOT(paste()));
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index 8bfca1fa8..c3b9ed2e9 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -49,7 +49,7 @@
#include "eeprominterface.h"
#define SPLASH_TIME 5
-#define MAX_RECENT 10
+#define MAX_RECENT 15
#define MAX_PROFILES 15
class MdiChild;
@@ -158,7 +158,7 @@ private slots:
private:
void createActions();
- QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *);
+ QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *, QObject *slotObj=NULL);
QAction * addAct(QActionGroup *, QString, QString, const char *);
QAction * addAct(QString, QString, QString, const char *);
diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
index 659dda7fd..80f086dc7 100644
--- a/companion/src/mdichild.cpp
+++ b/companion/src/mdichild.cpp
@@ -1,720 +1,728 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mdichild.h"
-#include "ui_mdichild.h"
-#include "xmlinterface.h"
-#include "hexinterface.h"
-#include "mainwindow.h"
-#include "modeledit/modeledit.h"
-#include "generaledit.h"
-#include "avroutputdialog.h"
-#include "burnconfigdialog.h"
-#include "printdialog.h"
-#include "burndialog.h"
-#include "helpers.h"
-#include "appdata.h"
-#include "wizarddialog.h"
-#include
-
-#if defined WIN32 || !defined __GNUC__
-#include
-#define sleep(x) Sleep(x*1000)
-#else
-#include
-#endif
-
-MdiChild::MdiChild():
- QWidget(),
- ui(new Ui::mdiChild),
- isUntitled(true),
- fileChanged(false)
-{
- ui->setupUi(this);
- this->setWindowIcon(CompanionIcon("open.png"));
- ui->SimulateTxButton->setIcon(CompanionIcon("simulate.png"));
- setAttribute(Qt::WA_DeleteOnClose);
-
- eepromInterfaceChanged();
-
- if(!(this->isMaximized() || this->isMinimized())) {
- adjustSize();
- }
-}
-
-void MdiChild::qSleep(int ms)
-{
- if (ms<0)
- return;
-
-#if defined WIN32 || !defined __GNUC__
- Sleep(uint(ms));
-#else
- struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 };
- nanosleep(&ts, NULL);
-#endif
-}
-
-void MdiChild::eepromInterfaceChanged()
-{
- ui->modelsList->refreshList();
- ui->SimulateTxButton->setEnabled(GetEepromInterface()->getCapability(Simulation));
- updateTitle();
-}
-
-void MdiChild::cut()
-{
- ui->modelsList->cut();
-}
-
-void MdiChild::copy()
-{
- ui->modelsList->copy();
-}
-
-
-void MdiChild::paste()
-{
- ui->modelsList->paste();
-}
-
-bool MdiChild::hasPasteData()
-{
- return ui->modelsList->hasPasteData();
-}
-
-bool MdiChild::hasSelection()
-{
- return ui->modelsList->hasSelection();
-}
-
-void MdiChild::updateTitle()
-{
- QString title = userFriendlyCurrentFile() + "[*]"+" ("+GetEepromInterface()->getName()+QString(")");
- if (GetEepromInterface()->getBoard() != BOARD_SKY9X)
- title += QString(" - %1 ").arg(EEPromAvail) + tr("free bytes");
- setWindowTitle(title);
-}
-
-void MdiChild::setModified()
-{
- ui->modelsList->refreshList();
- fileChanged = true;
- updateTitle();
- documentWasModified();
-}
-
-void MdiChild::on_SimulateTxButton_clicked()
-{
- startSimulation(this, radioData, -1);
-}
-
-void MdiChild::checkAndInitModel( int row )
-{
- ModelData &model = radioData.models[row - 1];
- if (model.isempty()) {
- model.setDefaultValues(row - 1, radioData.generalSettings);
- setModified();
- }
-}
-
-void MdiChild::generalEdit()
-{
- GeneralEdit *t = new GeneralEdit(radioData, this);
- connect(t, SIGNAL(modelValuesChanged()), this, SLOT(setModified()));
- t->show();
-}
-
-void MdiChild::modelEdit()
-{
- int row = ui->modelsList->currentRow();
-
- if (row == 0){
- generalEdit();
- }
- else {
- checkAndInitModel( row );
- ModelData &model = radioData.models[row - 1];
- ModelEdit *t = new ModelEdit(radioData, (row - 1), false, this);
- t->setWindowTitle(tr("Editing model %1: ").arg(row) + model.name);
- connect(t, SIGNAL(modified()), this, SLOT(setModified()));
- t->show();
- }
-}
-
-void MdiChild::wizardEdit()
-{
- int row = ui->modelsList->currentRow();
- if (row > 0) {
- checkAndInitModel(row);
- WizardDialog * wizard = new WizardDialog(radioData.generalSettings, row, this);
- wizard->exec();
- if (wizard->mix.complete /*TODO rather test the exec() result?*/) {
- radioData.models[row - 1] = wizard->mix;
- setModified();
- }
- }
-}
-
-void MdiChild::openEditWindow()
-{
- int row = ui->modelsList->currentRow();
- if (row == 0){
- generalEdit();
- }
- else{
- ModelData &model = radioData.models[row - 1];
- if (model.isempty()) {
- wizardEdit();
- }
- else {
- modelEdit();
- }
- }
-}
-
-void MdiChild::newFile()
-{
- static int sequenceNumber = 1;
-
- isUntitled = true;
- curFile = QString("document%1.eepe").arg(sequenceNumber++);
- updateTitle();
-}
-
-bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
-{
- QFile file(fileName);
-
- if (!file.exists()) {
- QMessageBox::critical(this, tr("Error"), tr("Unable to find file %1!").arg(fileName));
- return false;
- }
-
- int fileType = getFileType(fileName);
-
- if (fileType==FILE_TYPE_XML) {
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
- QMessageBox::critical(this, tr("Error"),
- tr("Error opening file %1:\n%2.")
- .arg(fileName)
- .arg(file.errorString()));
- return false;
- }
- QTextStream inputStream(&file);
- XmlInterface(inputStream).load(radioData);
- }
- else if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { //read HEX file
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
- QMessageBox::critical(this, tr("Error"),
- tr("Error opening file %1:\n%2.")
- .arg(fileName)
- .arg(file.errorString()));
- return false;
- }
-
- QDomDocument doc(ER9X_EEPROM_FILE_TYPE);
- bool xmlOK = doc.setContent(&file);
- if(xmlOK) {
- if (LoadEepromXml(radioData, doc)){
- ui->modelsList->refreshList();
- if(resetCurrentFile) setCurrentFile(fileName);
- return true;
- }
- }
- file.reset();
-
- QTextStream inputStream(&file);
-
- if (fileType==FILE_TYPE_EEPE) { // read EEPE file header
- QString hline = inputStream.readLine();
- if (hline!=EEPE_EEPROM_FILE_HEADER) {
- file.close();
- return false;
- }
- }
-
- uint8_t eeprom[EESIZE_RLC_MAX];
- int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX);
- if (!eeprom_size) {
- QMessageBox::critical(this, tr("Error"),
- tr("Invalid EEPROM File %1")
- .arg(fileName));
- file.close();
- return false;
- }
-
- file.close();
-
- if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
- QMessageBox::critical(this, tr("Error"),
- tr("Invalid EEPROM File %1")
- .arg(fileName));
- return false;
- }
-
- ui->modelsList->refreshList();
- if(resetCurrentFile) setCurrentFile(fileName);
-
- return true;
- }
- else if (fileType==FILE_TYPE_BIN) { //read binary
- int eeprom_size = file.size();
-
- if (!file.open(QFile::ReadOnly)) { //reading binary file - TODO HEX support
- QMessageBox::critical(this, tr("Error"),
- tr("Error opening file %1:\n%2.")
- .arg(fileName)
- .arg(file.errorString()));
- return false;
- }
- uint8_t *eeprom = (uint8_t *)malloc(eeprom_size);
- memset(eeprom, 0, eeprom_size);
- long result = file.read((char*)eeprom, eeprom_size);
- file.close();
-
- if (result != eeprom_size) {
- QMessageBox::critical(this, tr("Error"),
- tr("Error reading file %1:\n%2.")
- .arg(fileName)
- .arg(file.errorString()));
-
- return false;
- }
-
- if (!LoadEeprom(radioData, eeprom, eeprom_size) && !LoadBackup(radioData, eeprom, eeprom_size, 0)) {
- QMessageBox::critical(this, tr("Error"),
- tr("Invalid binary EEPROM File %1")
- .arg(fileName));
- return false;
- }
-
- ui->modelsList->refreshList();
- if(resetCurrentFile) setCurrentFile(fileName);
-
- free(eeprom);
- return true;
- }
-
- return false;
-}
-
-bool MdiChild::save()
-{
- if (isUntitled) {
- return saveAs(true);
- }
- else {
- return saveFile(curFile);
- }
-}
-
-bool MdiChild::saveAs(bool isNew)
-{
- QString fileName;
- if (GetEepromInterface()->getBoard() == BOARD_SKY9X) {
- curFile.replace(".eepe", ".bin");
- QFileInfo fi(curFile);
-#ifdef __APPLE__
- fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
-#else
- fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(BIN_FILES_FILTER));
-#endif
- }
- else {
- QFileInfo fi(curFile);
-#ifdef __APPLE__
- fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
-#else
- fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER));
-#endif
- }
- if (fileName.isEmpty())
- return false;
- if (fileName.contains("rev4a")) {
- g.rev4aSupport( true );
- }
- if (fileName.contains("norev4a")) {
- g.rev4aSupport( false );
- }
- g.eepromDir( QFileInfo(fileName).dir().absolutePath() );
- if (isNew)
- return saveFile(fileName);
- else
- return saveFile(fileName,true);
-}
-
-bool MdiChild::saveFile(const QString &fileName, bool setCurrent)
-{
- QString myFile;
- myFile = fileName;
- if (GetEepromInterface()->getBoard() == BOARD_SKY9X) {
- myFile.replace(".eepe", ".bin");
- }
- QFile file(myFile);
-
- int fileType = getFileType(myFile);
-
- uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
- int eeprom_size = 0;
-
- if (fileType != FILE_TYPE_XML) {
- eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmwareVariant(), 0/*last version*/);
- if (!eeprom_size) {
- QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
- return false;
- }
- }
-
- if (!file.open(fileType == FILE_TYPE_BIN ? QIODevice::WriteOnly : (QIODevice::WriteOnly | QIODevice::Text))) {
- QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
- return false;
- }
-
- QTextStream outputStream(&file);
-
- if (fileType==FILE_TYPE_XML) {
- if (!XmlInterface(outputStream).save(radioData)) {
- QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
- file.close();
- return false;
- }
- }
- else if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { // write hex
- if (fileType==FILE_TYPE_EEPE)
- outputStream << EEPE_EEPROM_FILE_HEADER << "\n";
-
- if (!HexInterface(outputStream).save(eeprom, eeprom_size)) {
- QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
- file.close();
- return false;
- }
- }
- else if (fileType==FILE_TYPE_BIN) // write binary
- {
- long result = file.write((char*)eeprom, eeprom_size);
- if(result!=eeprom_size) {
- QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg(file.errorString()));
- return false;
- }
- }
- else {
- QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg("Unknown format"));
- return false;
- }
-
- free(eeprom); // TODO free in all cases ...
- file.close();
- if(setCurrent) setCurrentFile(myFile);
-
- return true;
-}
-
-QString MdiChild::userFriendlyCurrentFile()
-{
- return strippedName(curFile);
-}
-
-void MdiChild::closeEvent(QCloseEvent *event)
-{
- if (maybeSave()) {
- event->accept();
- }
- else {
- event->ignore();
- }
-}
-
-void MdiChild::documentWasModified()
-{
- setWindowModified(fileChanged);
-}
-
-bool MdiChild::maybeSave()
-{
- if (fileChanged) {
- QMessageBox::StandardButton ret;
- ret = QMessageBox::warning(this, tr("Companion"),
- tr("%1 has been modified.\n"
- "Do you want to save your changes?").arg(userFriendlyCurrentFile()),
- QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-
- if (ret == QMessageBox::Save)
- return save();
- else if (ret == QMessageBox::Cancel)
- return false;
- }
- return true;
-}
-
-void MdiChild::setCurrentFile(const QString &fileName)
-{
- curFile = QFileInfo(fileName).canonicalFilePath();
- isUntitled = false;
- fileChanged = false;
- setWindowModified(false);
- updateTitle();
- int MaxRecentFiles = g.historySize();
- QStringList files = g.recentFiles();
- files.removeAll(fileName);
- files.prepend(fileName);
- while (files.size() > MaxRecentFiles)
- files.removeLast();
-
- g.recentFiles( files );
-}
-
-QString MdiChild::strippedName(const QString &fullFileName)
-{
- return QFileInfo(fullFileName).fileName();
-}
-
-void MdiChild::writeEeprom() // write to Tx
-{
- bool backupEnable=g.enableBackup();
- QString backupPath=g.backupDir();
- if (!backupPath.isEmpty()) {
- if (!QDir(backupPath).exists()) {
- if (backupEnable) {
- QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
- }
- backupEnable=false;
- }
- } else {
- backupEnable=false;
- }
- QString stickCal=g.profile[g.id()].stickPotCalib();
- burnConfigDialog bcd;
- QString tempDir = QDir::tempPath();
- QString tempFile = tempDir + "/temp.bin";
- saveFile(tempFile, false);
- if(!QFileInfo(tempFile).exists()) {
- QMessageBox::critical(this,tr("Error"), tr("Cannot write temporary file!"));
- return;
- }
- EEPROMInterface *eepromInterface = GetEepromInterface();
- bool backup=false;
- burnDialog *cd = new burnDialog(this, 1, &tempFile, &backup,strippedName(curFile));
- cd->exec();
- if (!tempFile.isEmpty()) {
- if (backup) {
- if (backupEnable) {
- QString backupFile=backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-HHmmss")+".bin";
- if (IS_TARANIS(eepromInterface->getBoard())) {
- QString path=((MainWindow *)this->parent())->FindTaranisPath();
- if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify the eeprom disk is connected."));
- return;
- }
- else {
- QStringList str;
- str << path << backupFile;
- avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Backup EEPROM From Tx")); //, AVR_DIALOG_KEEP_OPEN);
- ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
- ad->exec();
- delete ad;
- sleep(1);
- }
- }
- else {
- QStringList str = ((MainWindow *)this->parent())->GetReceiveEEpromCommand(backupFile);
- avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, tr("Backup EEPROM From Tx"));
- ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
- ad->exec();
- delete ad;
- sleep(1);
- }
- }
- int oldrev=((MainWindow *)this->parent())->getEpromVersion(tempFile);
- QString tempFlash=tempDir + "/flash.bin";
- QStringList str = ((MainWindow *)this->parent())->GetReceiveFlashCommand(tempFlash);
- avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, "Read Flash From Tx");
- ad->setWindowIcon(CompanionIcon("read_flash.png"));
- ad->exec();
- delete ad;
- sleep(1);
- QString restoreFile = tempDir + "/compat.bin";
- if (!((MainWindow *)this->parent())->convertEEPROM(tempFile, restoreFile, tempFlash)) {
- int ret = QMessageBox::question(this, tr("Error"), tr("Cannot check eeprom compatibility! Continue anyway?"), QMessageBox::Yes | QMessageBox::No);
- if (ret == QMessageBox::No)
- return;
- }
- else {
- int rev=((MainWindow *)this->parent())->getEpromVersion(restoreFile);
- if ((rev/100)!=(oldrev/100)) {
- QMessageBox::warning(this,tr("Warning"), tr("Firmware in radio is of a different family of eeprom written, check file and preferences!"));
- }
- if (revgetBoard())) {
- QString path=((MainWindow *)this->parent())->FindTaranisPath();
- if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify the eeprom disk is connected."));
- return;
- }
- else {
- QFile::copy(path,backupFile);
- }
- }
- else {
- QStringList str = ((MainWindow *)this->parent())->GetReceiveEEpromCommand(backupFile);
- avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, tr("Backup EEPROM From Tx"));
- ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
- ad->exec();
- delete ad;
- sleep(1);
- }
- }
- }
-
- if (IS_TARANIS(eepromInterface->getBoard())) {
- QString path=((MainWindow *)this->parent())->FindTaranisPath();
- if (path.isEmpty()) {
- QMessageBox::warning(this, tr("Taranis radio not found"), tr("Impossible to identify the radio on your system, please verify the eeprom disk is connected."));
- return;
- }
- else {
- QStringList str;
- str << tempFile << path;
- avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Write EEPROM To Tx"), AVR_DIALOG_SHOW_DONE); //, AVR_DIALOG_KEEP_OPEN);
- ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
- ad->exec();
- delete ad;
- sleep(1);
- }
- }
- else {
- QStringList str = ((MainWindow *)this->parent())->GetSendEEpromCommand(tempFile);
- avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, "Write EEPROM To Tx", AVR_DIALOG_SHOW_DONE);
- ad->setWindowIcon(CompanionIcon("write_eeprom.png"));
- ad->exec();
- delete ad;
- }
- }
-}
-
-void MdiChild::simulate()
-{
- if (ui->modelsList->currentRow() >= 1) {
- startSimulation(this, radioData, ui->modelsList->currentRow()-1);
- }
-}
-
-void MdiChild::print(int model, QString filename)
-{
- if (model>=0 && !filename.isEmpty()) {
-
- printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[model], filename);
- pd->show();
- } else {
- if(ui->modelsList->currentRow()<1) return;
- printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]);
- pd->show();
- }
-}
-
-void MdiChild::viableModelSelected(bool viable)
-{
- emit copyAvailable(viable);
-}
-
-void MdiChild::setEEpromAvail(int eavail)
-{
- EEPromAvail=eavail;
-}
-
-bool MdiChild::loadBackup()
-{
- QString fileName = QFileDialog::getOpenFileName(this, tr("Open backup Models and Settings file"), g.eepromDir(),tr(EEPROM_FILES_FILTER));
- if (fileName.isEmpty())
- return false;
- QFile file(fileName);
-
- if (!file.exists()) {
- QMessageBox::critical(this, tr("Error"), tr("Unable to find file %1!").arg(fileName));
- return false;
- }
- if(ui->modelsList->currentRow()<1) return false;
- int index=ui->modelsList->currentRow()-1;
-
- int eeprom_size = file.size();
- if (!file.open(QFile::ReadOnly)) { //reading binary file - TODO HEX support
- QMessageBox::critical(this, tr("Error"),
- tr("Error opening file %1:\n%2.")
- .arg(fileName)
- .arg(file.errorString()));
- return false;
- }
- uint8_t *eeprom = (uint8_t *)malloc(eeprom_size);
- memset(eeprom, 0, eeprom_size);
- long result = file.read((char*)eeprom, eeprom_size);
- file.close();
-
- if (result != eeprom_size) {
- QMessageBox::critical(this, tr("Error"),
- tr("Error reading file %1:\n%2.")
- .arg(fileName)
- .arg(file.errorString()));
-
- return false;
- }
-
- if (!LoadBackup(radioData, eeprom, eeprom_size, index)) {
- QMessageBox::critical(this, tr("Error"),
- tr("Invalid binary backup File %1")
- .arg(fileName));
- return false;
- }
-
- ui->modelsList->refreshList();
- free(eeprom);
- return true;
-}
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "mdichild.h"
+#include "ui_mdichild.h"
+#include "xmlinterface.h"
+#include "hexinterface.h"
+#include "mainwindow.h"
+#include "modeledit/modeledit.h"
+#include "generaledit.h"
+#include "avroutputdialog.h"
+#include "burnconfigdialog.h"
+#include "printdialog.h"
+#include "burndialog.h"
+#include "helpers.h"
+#include "appdata.h"
+#include "wizarddialog.h"
+#include "taranisnotfound.h"
+#include
+
+#if defined WIN32 || !defined __GNUC__
+#include
+#define sleep(x) Sleep(x*1000)
+#else
+#include
+#endif
+
+MdiChild::MdiChild():
+ QWidget(),
+ ui(new Ui::mdiChild),
+ isUntitled(true),
+ fileChanged(false)
+{
+ ui->setupUi(this);
+
+ this->setWindowIcon(CompanionIcon("open.png"));
+ ui->SimulateTxButton->setIcon(CompanionIcon("simulate.png"));
+ setAttribute(Qt::WA_DeleteOnClose);
+
+ eepromInterfaceChanged();
+
+ if(!(this->isMaximized() || this->isMinimized())) {
+ adjustSize();
+ }
+}
+
+void MdiChild::qSleep(int ms)
+{
+ if (ms<0)
+ return;
+
+#if defined WIN32 || !defined __GNUC__
+ Sleep(uint(ms));
+#else
+ struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 };
+ nanosleep(&ts, NULL);
+#endif
+}
+
+void MdiChild::eepromInterfaceChanged()
+{
+ ui->modelsList->refreshList();
+ ui->SimulateTxButton->setEnabled(GetEepromInterface()->getCapability(Simulation));
+ updateTitle();
+}
+
+void MdiChild::cut()
+{
+ ui->modelsList->cut();
+}
+
+void MdiChild::copy()
+{
+ ui->modelsList->copy();
+}
+
+
+void MdiChild::paste()
+{
+ ui->modelsList->paste();
+}
+
+bool MdiChild::hasPasteData()
+{
+ return ui->modelsList->hasPasteData();
+}
+
+bool MdiChild::hasSelection()
+{
+ return ui->modelsList->hasSelection();
+}
+
+void MdiChild::updateTitle()
+{
+ QString title = userFriendlyCurrentFile() + "[*]"+" ("+GetEepromInterface()->getName()+QString(")");
+ if (GetEepromInterface()->getBoard() != BOARD_SKY9X)
+ title += QString(" - %1 ").arg(EEPromAvail) + tr("free bytes");
+ setWindowTitle(title);
+}
+
+void MdiChild::setModified()
+{
+ ui->modelsList->refreshList();
+ fileChanged = true;
+ updateTitle();
+ documentWasModified();
+}
+
+void MdiChild::on_SimulateTxButton_clicked()
+{
+ startSimulation(this, radioData, -1);
+}
+
+void MdiChild::checkAndInitModel( int row )
+{
+ ModelData &model = radioData.models[row - 1];
+ if (model.isempty()) {
+ model.setDefaultValues(row - 1, radioData.generalSettings);
+ setModified();
+ }
+}
+
+void MdiChild::generalEdit()
+{
+ GeneralEdit *t = new GeneralEdit(radioData, this);
+ connect(t, SIGNAL(modelValuesChanged()), this, SLOT(setModified()));
+ t->show();
+}
+
+void MdiChild::modelEdit()
+{
+ int row = ui->modelsList->currentRow();
+
+ if (row == 0){
+ generalEdit();
+ }
+ else {
+ checkAndInitModel( row );
+ ModelData &model = radioData.models[row - 1];
+ ModelEdit *t = new ModelEdit(radioData, (row - 1), false, this);
+ t->setWindowTitle(tr("Editing model %1: ").arg(row) + model.name);
+ connect(t, SIGNAL(modified()), this, SLOT(setModified()));
+ t->show();
+ }
+}
+
+void MdiChild::wizardEdit()
+{
+ int row = ui->modelsList->currentRow();
+ if (row > 0) {
+ checkAndInitModel(row);
+ WizardDialog * wizard = new WizardDialog(radioData.generalSettings, row, this);
+ wizard->exec();
+ if (wizard->mix.complete /*TODO rather test the exec() result?*/) {
+ radioData.models[row - 1] = wizard->mix;
+ setModified();
+ }
+ }
+}
+
+void MdiChild::openEditWindow()
+{
+ QApplication::setOverrideCursor(Qt::WaitCursor);
+ int row = ui->modelsList->currentRow();
+ if (row == 0){
+ generalEdit();
+ }
+ else{
+ ModelData &model = radioData.models[row - 1];
+ if (model.isempty()) {
+ wizardEdit();
+ }
+ else {
+ modelEdit();
+ }
+ }
+ QApplication::restoreOverrideCursor();
+}
+
+void MdiChild::newFile()
+{
+ static int sequenceNumber = 1;
+
+ isUntitled = true;
+ curFile = QString("document%1.eepe").arg(sequenceNumber++);
+ updateTitle();
+}
+
+bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
+{
+ QFile file(fileName);
+
+ if (!file.exists()) {
+ QMessageBox::critical(this, tr("Error"), tr("Unable to find file %1!").arg(fileName));
+ return false;
+ }
+
+ int fileType = getFileType(fileName);
+
+ if (fileType==FILE_TYPE_XML) {
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
+ QMessageBox::critical(this, tr("Error"),
+ tr("Error opening file %1:\n%2.")
+ .arg(fileName)
+ .arg(file.errorString()));
+ return false;
+ }
+ QTextStream inputStream(&file);
+ XmlInterface(inputStream).load(radioData);
+ }
+ else if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { //read HEX file
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
+ QMessageBox::critical(this, tr("Error"),
+ tr("Error opening file %1:\n%2.")
+ .arg(fileName)
+ .arg(file.errorString()));
+ return false;
+ }
+
+ QDomDocument doc(ER9X_EEPROM_FILE_TYPE);
+ bool xmlOK = doc.setContent(&file);
+ if(xmlOK) {
+ if (LoadEepromXml(radioData, doc)){
+ ui->modelsList->refreshList();
+ if(resetCurrentFile) setCurrentFile(fileName);
+ return true;
+ }
+ }
+ file.reset();
+
+ QTextStream inputStream(&file);
+
+ if (fileType==FILE_TYPE_EEPE) { // read EEPE file header
+ QString hline = inputStream.readLine();
+ if (hline!=EEPE_EEPROM_FILE_HEADER) {
+ file.close();
+ return false;
+ }
+ }
+
+ uint8_t eeprom[EESIZE_RLC_MAX];
+ int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX);
+ if (!eeprom_size) {
+ QMessageBox::critical(this, tr("Error"),
+ tr("Invalid EEPROM File %1")
+ .arg(fileName));
+ file.close();
+ return false;
+ }
+
+ file.close();
+
+ if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
+ QMessageBox::critical(this, tr("Error"),
+ tr("Invalid EEPROM File %1")
+ .arg(fileName));
+ return false;
+ }
+
+ ui->modelsList->refreshList();
+ if(resetCurrentFile) setCurrentFile(fileName);
+
+ return true;
+ }
+ else if (fileType==FILE_TYPE_BIN) { //read binary
+ int eeprom_size = file.size();
+
+ if (!file.open(QFile::ReadOnly)) { //reading binary file - TODO HEX support
+ QMessageBox::critical(this, tr("Error"),
+ tr("Error opening file %1:\n%2.")
+ .arg(fileName)
+ .arg(file.errorString()));
+ return false;
+ }
+ uint8_t *eeprom = (uint8_t *)malloc(eeprom_size);
+ memset(eeprom, 0, eeprom_size);
+ long result = file.read((char*)eeprom, eeprom_size);
+ file.close();
+
+ if (result != eeprom_size) {
+ QMessageBox::critical(this, tr("Error"),
+ tr("Error reading file %1:\n%2.")
+ .arg(fileName)
+ .arg(file.errorString()));
+
+ return false;
+ }
+
+ if (!LoadEeprom(radioData, eeprom, eeprom_size) && !LoadBackup(radioData, eeprom, eeprom_size, 0)) {
+ QMessageBox::critical(this, tr("Error"),
+ tr("Invalid binary EEPROM File %1")
+ .arg(fileName));
+ return false;
+ }
+
+ ui->modelsList->refreshList();
+ if(resetCurrentFile) setCurrentFile(fileName);
+
+ free(eeprom);
+ return true;
+ }
+
+ return false;
+}
+
+bool MdiChild::save()
+{
+ if (isUntitled) {
+ return saveAs(true);
+ }
+ else {
+ return saveFile(curFile);
+ }
+}
+
+bool MdiChild::saveAs(bool isNew)
+{
+ QString fileName;
+ if (GetEepromInterface()->getBoard() == BOARD_SKY9X) {
+ curFile.replace(".eepe", ".bin");
+ QFileInfo fi(curFile);
+#ifdef __APPLE__
+ fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
+#else
+ fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(BIN_FILES_FILTER));
+#endif
+ }
+ else {
+ QFileInfo fi(curFile);
+#ifdef __APPLE__
+ fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
+#else
+ fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER));
+#endif
+ }
+ if (fileName.isEmpty())
+ return false;
+ if (fileName.contains("rev4a")) {
+ g.rev4aSupport( true );
+ }
+ if (fileName.contains("norev4a")) {
+ g.rev4aSupport( false );
+ }
+ g.eepromDir( QFileInfo(fileName).dir().absolutePath() );
+ if (isNew)
+ return saveFile(fileName);
+ else
+ return saveFile(fileName,true);
+}
+
+bool MdiChild::saveFile(const QString &fileName, bool setCurrent)
+{
+ QString myFile;
+ myFile = fileName;
+ if (GetEepromInterface()->getBoard() == BOARD_SKY9X) {
+ myFile.replace(".eepe", ".bin");
+ }
+ QFile file(myFile);
+
+ int fileType = getFileType(myFile);
+
+ uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
+ int eeprom_size = 0;
+
+ if (fileType != FILE_TYPE_XML) {
+ eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmwareVariant(), 0/*last version*/);
+ if (!eeprom_size) {
+ QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
+ return false;
+ }
+ }
+
+ if (!file.open(fileType == FILE_TYPE_BIN ? QIODevice::WriteOnly : (QIODevice::WriteOnly | QIODevice::Text))) {
+ QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
+ return false;
+ }
+
+ QTextStream outputStream(&file);
+
+ if (fileType==FILE_TYPE_XML) {
+ if (!XmlInterface(outputStream).save(radioData)) {
+ QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
+ file.close();
+ return false;
+ }
+ }
+ else if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { // write hex
+ if (fileType==FILE_TYPE_EEPE)
+ outputStream << EEPE_EEPROM_FILE_HEADER << "\n";
+
+ if (!HexInterface(outputStream).save(eeprom, eeprom_size)) {
+ QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
+ file.close();
+ return false;
+ }
+ }
+ else if (fileType==FILE_TYPE_BIN) // write binary
+ {
+ long result = file.write((char*)eeprom, eeprom_size);
+ if(result!=eeprom_size) {
+ QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg(file.errorString()));
+ return false;
+ }
+ }
+ else {
+ QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg("Unknown format"));
+ return false;
+ }
+
+ free(eeprom); // TODO free in all cases ...
+ file.close();
+ if(setCurrent) setCurrentFile(myFile);
+
+ return true;
+}
+
+QString MdiChild::userFriendlyCurrentFile()
+{
+ return strippedName(curFile);
+}
+
+void MdiChild::closeEvent(QCloseEvent *event)
+{
+ if (maybeSave()) {
+ event->accept();
+ }
+ else {
+ event->ignore();
+ }
+}
+
+void MdiChild::documentWasModified()
+{
+ setWindowModified(fileChanged);
+}
+
+bool MdiChild::maybeSave()
+{
+ if (fileChanged) {
+ QMessageBox::StandardButton ret;
+ ret = QMessageBox::warning(this, tr("Companion"),
+ tr("%1 has been modified.\n"
+ "Do you want to save your changes?").arg(userFriendlyCurrentFile()),
+ QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+
+ if (ret == QMessageBox::Save)
+ return save();
+ else if (ret == QMessageBox::Cancel)
+ return false;
+ }
+ return true;
+}
+
+void MdiChild::setCurrentFile(const QString &fileName)
+{
+ curFile = QFileInfo(fileName).canonicalFilePath();
+ isUntitled = false;
+ fileChanged = false;
+ setWindowModified(false);
+ updateTitle();
+ int MaxRecentFiles = g.historySize();
+ QStringList files = g.recentFiles();
+ files.removeAll(fileName);
+ files.prepend(fileName);
+ while (files.size() > MaxRecentFiles)
+ files.removeLast();
+
+ g.recentFiles( files );
+}
+
+QString MdiChild::strippedName(const QString &fullFileName)
+{
+ return QFileInfo(fullFileName).fileName();
+}
+
+void MdiChild::writeEeprom() // write to Tx
+{
+ bool backupEnable=g.enableBackup();
+ QString backupPath=g.backupDir();
+ if (!backupPath.isEmpty()) {
+ if (!QDir(backupPath).exists()) {
+ if (backupEnable) {
+ QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
+ }
+ backupEnable=false;
+ }
+ }
+ else {
+ backupEnable=false;
+ }
+ QString stickCal=g.profile[g.id()].stickPotCalib();
+ burnConfigDialog bcd;
+ QString tempDir = QDir::tempPath();
+ QString tempFile = tempDir + "/temp.bin";
+ saveFile(tempFile, false);
+ if(!QFileInfo(tempFile).exists()) {
+ QMessageBox::critical(this,tr("Error"), tr("Cannot write temporary file!"));
+ return;
+ }
+ EEPROMInterface *eepromInterface = GetEepromInterface();
+ bool backup=false;
+ burnDialog *cd = new burnDialog(this, 1, &tempFile, &backup,strippedName(curFile));
+ cd->exec();
+ if (!tempFile.isEmpty()) {
+ if (backup) {
+ if (backupEnable) {
+ QString backupFile=backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-HHmmss")+".bin";
+ if (IS_TARANIS(eepromInterface->getBoard())) {
+ QString path=((MainWindow *)this->parent())->FindTaranisPath();
+ if (path.isEmpty()) {
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
+ return;
+ }
+ else {
+ QStringList str;
+ str << path << backupFile;
+ avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Backup EEPROM From Tx")); //, AVR_DIALOG_KEEP_OPEN);
+ ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
+ ad->exec();
+ delete ad;
+ sleep(1);
+ }
+ }
+ else {
+ QStringList str = ((MainWindow *)this->parent())->GetReceiveEEpromCommand(backupFile);
+ avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, tr("Backup EEPROM From Tx"));
+ ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
+ ad->exec();
+ delete ad;
+ sleep(1);
+ }
+ }
+ int oldrev=((MainWindow *)this->parent())->getEpromVersion(tempFile);
+ QString tempFlash=tempDir + "/flash.bin";
+ QStringList str = ((MainWindow *)this->parent())->GetReceiveFlashCommand(tempFlash);
+ avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, "Read Flash From Tx");
+ ad->setWindowIcon(CompanionIcon("read_flash.png"));
+ ad->exec();
+ delete ad;
+ sleep(1);
+ QString restoreFile = tempDir + "/compat.bin";
+ if (!((MainWindow *)this->parent())->convertEEPROM(tempFile, restoreFile, tempFlash)) {
+ int ret = QMessageBox::question(this, tr("Error"), tr("Cannot check eeprom compatibility! Continue anyway?"), QMessageBox::Yes | QMessageBox::No);
+ if (ret == QMessageBox::No)
+ return;
+ }
+ else {
+ int rev=((MainWindow *)this->parent())->getEpromVersion(restoreFile);
+ if ((rev/100)!=(oldrev/100)) {
+ QMessageBox::warning(this,tr("Warning"), tr("Firmware in radio is of a different family of eeprom written, check file and preferences!"));
+ }
+ if (revgetBoard())) {
+ QString path=((MainWindow *)this->parent())->FindTaranisPath();
+ if (path.isEmpty()) {
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
+ return;
+ }
+ else {
+ QFile::copy(path,backupFile);
+ }
+ }
+ else {
+ QStringList str = ((MainWindow *)this->parent())->GetReceiveEEpromCommand(backupFile);
+ avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, tr("Backup EEPROM From Tx"));
+ ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
+ ad->exec();
+ delete ad;
+ sleep(1);
+ }
+ }
+ }
+
+ if (IS_TARANIS(eepromInterface->getBoard())) {
+ QString path=((MainWindow *)this->parent())->FindTaranisPath();
+ if (path.isEmpty()) {
+ taranisNotFoundDialog *tnfd = new taranisNotFoundDialog(this);
+ tnfd->exec();
+ return;
+ }
+ else {
+ QStringList str;
+ str << tempFile << path;
+ avrOutputDialog *ad = new avrOutputDialog(this,"", str, tr("Write EEPROM To Tx"), AVR_DIALOG_SHOW_DONE); //, AVR_DIALOG_KEEP_OPEN);
+ ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
+ ad->exec();
+ delete ad;
+ sleep(1);
+ }
+ }
+ else {
+ QStringList str = ((MainWindow *)this->parent())->GetSendEEpromCommand(tempFile);
+ avrOutputDialog *ad = new avrOutputDialog(this, ((MainWindow *)this->parent())->GetAvrdudeLocation(), str, "Write EEPROM To Tx", AVR_DIALOG_SHOW_DONE);
+ ad->setWindowIcon(CompanionIcon("write_eeprom.png"));
+ ad->exec();
+ delete ad;
+ }
+ }
+}
+
+void MdiChild::simulate()
+{
+ if (ui->modelsList->currentRow() >= 1) {
+ startSimulation(this, radioData, ui->modelsList->currentRow()-1);
+ }
+}
+
+void MdiChild::print(int model, QString filename)
+{
+ if (model>=0 && !filename.isEmpty()) {
+
+ printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[model], filename);
+ pd->show();
+ }
+ else {
+ if(ui->modelsList->currentRow()<1) return;
+ printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]);
+ pd->show();
+ }
+}
+
+void MdiChild::viableModelSelected(bool viable)
+{
+ emit copyAvailable(viable);
+}
+
+void MdiChild::setEEpromAvail(int eavail)
+{
+ EEPromAvail=eavail;
+}
+
+bool MdiChild::loadBackup()
+{
+ QString fileName = QFileDialog::getOpenFileName(this, tr("Open backup Models and Settings file"), g.eepromDir(),tr(EEPROM_FILES_FILTER));
+ if (fileName.isEmpty())
+ return false;
+ QFile file(fileName);
+
+ if (!file.exists()) {
+ QMessageBox::critical(this, tr("Error"), tr("Unable to find file %1!").arg(fileName));
+ return false;
+ }
+ if(ui->modelsList->currentRow()<1) return false;
+ int index=ui->modelsList->currentRow()-1;
+
+ int eeprom_size = file.size();
+ if (!file.open(QFile::ReadOnly)) { //reading binary file - TODO HEX support
+ QMessageBox::critical(this, tr("Error"),
+ tr("Error opening file %1:\n%2.")
+ .arg(fileName)
+ .arg(file.errorString()));
+ return false;
+ }
+ QByteArray eeprom(eeprom_size, 0);
+ long result = file.read((char*)eeprom.data(), eeprom_size);
+ file.close();
+
+ if (result != eeprom_size) {
+ QMessageBox::critical(this, tr("Error"),
+ tr("Error reading file %1:\n%2.")
+ .arg(fileName)
+ .arg(file.errorString()));
+
+ return false;
+ }
+
+ if (!LoadBackup(radioData, (uint8_t *)eeprom.data(), eeprom_size, index)) {
+ QMessageBox::critical(this, tr("Error"),
+ tr("Invalid binary backup File %1")
+ .arg(fileName));
+ return false;
+ }
+
+ ui->modelsList->refreshList();
+
+ return true;
+}
diff --git a/companion/src/modeledit/channels.cpp b/companion/src/modeledit/channels.cpp
index 070a0fcdc..119c320ae 100644
--- a/companion/src/modeledit/channels.cpp
+++ b/companion/src/modeledit/channels.cpp
@@ -10,18 +10,24 @@ Channels::Channels(QWidget * parent, ModelData & model):
ModelPanel(parent, model)
{
QGridLayout * gridLayout = new QGridLayout(this);
+ bool minimize = false;
int col = 1;
if (GetEepromInterface()->getCapability(ChannelsName))
+ {
+ minimize=true;
addLabel(gridLayout, tr("Name"), col++);
- addLabel(gridLayout, tr("Offset"), col++);
- addLabel(gridLayout, tr("Min"), col++);
- addLabel(gridLayout, tr("Max"), col++);
- addLabel(gridLayout, tr("Invert"), col++);
+ }
+ addLabel(gridLayout, tr("Offset"), col++, minimize);
+ addLabel(gridLayout, tr("Min"), col++, minimize);
+ addLabel(gridLayout, tr("Max"), col++, minimize);
+ addLabel(gridLayout, tr("Invert"), col++, minimize);
+ if (IS_TARANIS(GetEepromInterface()->getBoard()))
+ addLabel(gridLayout, tr("Curve"), col++, minimize);
if (GetEepromInterface()->getCapability(PPMCenter))
- addLabel(gridLayout, tr("Center"), col++);
+ addLabel(gridLayout, tr("Center"), col++, minimize);
if (GetEepromInterface()->getCapability(SYMLimits))
- addLabel(gridLayout, tr("Sym"), col++);
+ addLabel(gridLayout, tr("Sym"), col++, true);
for (int i=0; igetCapability(Outputs); i++) {
col = 0;
@@ -29,6 +35,7 @@ Channels::Channels(QWidget * parent, ModelData & model):
// Channel label
QLabel *label = new QLabel(this);
label->setText(tr("Channel %1").arg(i+1));
+ label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
gridLayout->addWidget(label, i+1, col++, 1, 1);
// Channel name
@@ -88,6 +95,19 @@ Channels::Channels(QWidget * parent, ModelData & model):
connect(invCB, SIGNAL(currentIndexChanged(int)), this, SLOT(invEdited()));
gridLayout->addWidget(invCB, i+1, col++, 1, 1);
+ // Curve
+ if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+ QComboBox * curveCB = new QComboBox(this);
+ curveCB->setProperty("index", i);
+ int numcurves = GetEepromInterface()->getCapability(NumCurves);
+ for (int j=-numcurves; j<=numcurves; j++) {
+ curveCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, j).toString(), j);
+ }
+ curveCB->setCurrentIndex(model.limitData[i].curve.value+numcurves);
+ connect(curveCB, SIGNAL(currentIndexChanged(int)), this, SLOT(curveEdited()));
+ gridLayout->addWidget(curveCB, i+1, col++, 1, 1);
+ }
+
// PPM center
if (GetEepromInterface()->getCapability(PPMCenter)) {
QSpinBox * center = new QSpinBox(this);
@@ -110,6 +130,8 @@ Channels::Channels(QWidget * parent, ModelData & model):
gridLayout->addWidget(symlimits, i+1, col++, 1, 1);
}
}
+ // Push the rows up
+ addVSpring(gridLayout, 0,GetEepromInterface()->getCapability(Outputs)+1);
}
Channels::~Channels()
@@ -168,6 +190,14 @@ void Channels::invEdited()
emit modified();
}
+void Channels::curveEdited()
+{
+ QComboBox *cb = qobject_cast(sender());
+ int index = cb->property("index").toInt();
+ model.limitData[index].curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, cb->itemData(cb->currentIndex()).toInt());
+ emit modified();
+}
+
void Channels::ppmcenterEdited()
{
QSpinBox *sb = qobject_cast(sender());
diff --git a/companion/src/modeledit/channels.h b/companion/src/modeledit/channels.h
index ee372ecd7..1d44db8bd 100644
--- a/companion/src/modeledit/channels.h
+++ b/companion/src/modeledit/channels.h
@@ -18,6 +18,7 @@ class Channels : public ModelPanel
void minEdited();
void maxEdited();
void invEdited();
+ void curveEdited();
void ppmcenterEdited();
};
diff --git a/companion/src/modeledit/curvedialog.ui b/companion/src/modeledit/curvedialog.ui
deleted file mode 100644
index f8ccccba3..000000000
--- a/companion/src/modeledit/curvedialog.ui
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
- Dialog
-
-
-
- 0
- 0
- 400
- 300
-
-
-
- Dialog
-
-
- -
-
-
-
-
-
- Curve type
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- -100
-
-
- 100
-
-
-
- -
-
-
- Coefficient
-
-
-
- -
-
-
-
-
- Both
-
-
- -
-
- x>0
-
-
- -
-
- x<0
-
-
-
-
- -
-
-
- Y at X=0
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- -100
-
-
- 100
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- -100
-
-
- 100
-
-
-
- -
-
-
- Side
-
-
-
- -
-
-
- Y at X=-100
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- -100
-
-
- 100
-
-
-
- -
-
-
- Y at X=100
-
-
-
- -
-
-
-
-
- Linear
-
-
- -
-
- Single Expo
-
-
- -
-
- Symmetrical f(x)=-f(-x)
-
-
- -
-
- Symmetrical f(x)=f(-x)
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
- buttonBox
- accepted()
- Dialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- Dialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/companion/src/modeledit/curves.cpp b/companion/src/modeledit/curves.cpp
index 1112b1dde..34d1d5d93 100644
--- a/companion/src/modeledit/curves.cpp
+++ b/companion/src/modeledit/curves.cpp
@@ -10,24 +10,87 @@
#define GFX_MARGIN 16
-static const QColor colors[C9X_MAX_CURVES] = {
- QColor(0,0,127),
- QColor(0,127,0),
- QColor(127,0,0),
- QColor(0,127,127),
- QColor(127,0,127),
- QColor(127,127,0),
- QColor(127,127,127),
- QColor(0,0,255),
- QColor(0,127,255),
- QColor(127,0,255),
- QColor(0,255,0),
- QColor(0,255,127),
- QColor(127,255,0),
- QColor(255,0,0),
- QColor(255,0,127),
- QColor(255,127,0),
-};
+#define CURVE_COEFF_ENABLE 1
+#define CURVE_YMID_ENABLE 2
+#define CURVE_YMIN_ENABLE 4
+
+float curveLinear(float x, float coeff, float yMin, float yMid, float yMax)
+{
+ float a = (yMax-yMin) / 200.0;
+ return yMin + a * (x+100.0);
+}
+
+float c9xexpou(float point, float coeff)
+{
+ float x = point*1024.0/100.0;
+ float k = coeff*256.0/100.0;
+ return ((k*x*x*x/(1024*1024) + x*(256-k) + 128) / 256) / 1024.0 * 100;
+}
+
+float curveExpo(float x, float coeff, float yMin, float yMid, float yMax)
+{
+ float a = (yMax-yMin) / 100.0;
+
+ x += 100.0;
+ x /= 2.0;
+
+ if (coeff >= 0) {
+ return round(c9xexpou(x, coeff)*a + yMin);
+ }
+ else {
+ coeff = -coeff;
+ x = 100 - x;
+ return round((100.0 - c9xexpou(x, coeff))*a + yMin);
+ }
+}
+
+float curveSymmetricalY(float x, float coeff, float yMin, float yMid, float yMax)
+{
+ bool invert;
+ if (x<0) {
+ x = -x;
+ invert = 1;
+ }
+ else {
+ invert = 0;
+ }
+
+ float y;
+ if (coeff >= 0) {
+ y = round(c9xexpou(x, coeff) * (yMax/100.0));
+ }
+ else {
+ coeff = -coeff;
+ x = 100.0 - x;
+ y = round((100.0-c9xexpou(x, coeff)) * (yMax/100.0));
+ }
+
+ if (invert) {
+ y = -y;
+ }
+
+ return y;
+}
+
+float curveSymmetricalX(float x, float coeff, float yMin, float yMid, float yMax)
+{
+ float a = (yMax-yMid) / 100.0;
+
+ if (x<0)
+ x = -x;
+
+ float y;
+ if (coeff >= 0) {
+ y = round(c9xexpou(x, coeff) * a + yMid);
+ }
+ else {
+ coeff = -coeff;
+ x = 100-x;
+ y = round((100.0-c9xexpou(x, coeff)) * a + yMid);
+ }
+
+ return y;
+}
#if 0
#ifdef __APPLE__
@@ -145,6 +208,11 @@ Curves::Curves(QWidget * parent, ModelData & model):
}
}
+ addTemplate(tr("Linear"), CURVE_YMIN_ENABLE, curveLinear);
+ addTemplate(tr("Single Expo"), CURVE_COEFF_ENABLE | CURVE_YMIN_ENABLE, curveExpo);
+ addTemplate(tr("Symmetrical f(x)=-f(-x)"), CURVE_COEFF_ENABLE, curveSymmetricalY);
+ addTemplate(tr("Symmetrical f(x)=f(-x)"), CURVE_COEFF_ENABLE | CURVE_YMID_ENABLE, curveSymmetricalX);
+
lock = false;
}
@@ -189,41 +257,16 @@ void Curves::update()
ui->curveName->setText(model.curves[currentCurve].name);
}
- int count = model.curves[currentCurve].count;
- for (int i=0; ishow();
- spny[i]->setValue(model.curves[currentCurve].points[i].y);
- if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
- spnx[i]->show();
- if (i==0 || i==model.curves[currentCurve].count-1) {
- spnx[i]->setDisabled(true);
- spnx[i]->setMaximum(+100);
- spnx[i]->setMinimum(-100);
- }
- else {
- spnx[i]->setMaximum(model.curves[currentCurve].points[i+1].x);
- spnx[i]->setMinimum(model.curves[currentCurve].points[i-1].x);
- }
- spnx[i]->setValue(model.curves[currentCurve].points[i].x);
- }
- else {
- spnx[i]->hide();
- }
- }
- for (int i=count; ihide();
- spnx[i]->hide();
- }
-
updateCurveType();
updateCurve();
+ updateCurvePoints();
lock = false;
}
void Curves::setCurrentCurve(int index)
{
- currentCurve = index;
+ currentCurve = index;
}
void Curves::updateCurveType()
@@ -253,6 +296,8 @@ void Curves::updateCurveType()
void Curves::updateCurve()
{
+ lock = true;
+
Node * nodel = 0;
Node * nodex = 0;
QColor color;
@@ -317,18 +362,51 @@ void Curves::updateCurve()
scene->addItem(nodex);
if (i>0) scene->addItem(new Edge(nodel, nodex));
}
+
+ lock = false;
+}
+
+void Curves::updateCurvePoints()
+{
+ lock = true;
+
+ int count = model.curves[currentCurve].count;
+ for (int i=0; ishow();
+ spny[i]->setValue(model.curves[currentCurve].points[i].y);
+ if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
+ spnx[i]->show();
+ if (i==0 || i==model.curves[currentCurve].count-1) {
+ spnx[i]->setDisabled(true);
+ spnx[i]->setMaximum(+100);
+ spnx[i]->setMinimum(-100);
+ }
+ else {
+ spnx[i]->setMaximum(model.curves[currentCurve].points[i+1].x);
+ spnx[i]->setMinimum(model.curves[currentCurve].points[i-1].x);
+ }
+ spnx[i]->setValue(model.curves[currentCurve].points[i].x);
+ }
+ else {
+ spnx[i]->hide();
+ }
+ }
+ for (int i=count; ihide();
+ spnx[i]->hide();
+ }
+
+ lock = false;
}
void Curves::onPointEdited()
{
if (!lock) {
- lock = true;
int index = sender()->property("index").toInt();
model.curves[currentCurve].points[index].x = spnx[index]->value();
model.curves[currentCurve].points[index].y = spny[index]->value();
updateCurve();
emit modified();
- lock = false;
}
}
@@ -390,7 +468,7 @@ void Curves::on_curvePoints_currentIndexChanged(int index)
// TODO something better + reuse!
for (int i=0; i= model.curves[currentCurve].count-1 ? +100 : -100 + (200*i)/(numpoints-1));
+ model.curves[currentCurve].points[i].x = (i >= numpoints-1 ? +100 : -100 + (200*i)/(numpoints-1));
model.curves[currentCurve].points[i].y = 0;
}
@@ -413,7 +491,7 @@ void Curves::on_curveCustom_currentIndexChanged(int index)
// TODO something better + reuse!
for (int i=0; i= model.curves[currentCurve].count-1 ? +100 : -100 + (200*i)/(numpoints-1));
+ model.curves[currentCurve].points[i].x = (i >= numpoints-1 ? +100 : -100 + (200*i)/(numpoints-1));
model.curves[currentCurve].points[i].y = 0;
}
@@ -444,213 +522,72 @@ void Curves::resizeEvent(QResizeEvent *event)
QRect qr = ui->curvePreview->contentsRect();
ui->curvePreview->scene()->setSceneRect(GFX_MARGIN, GFX_MARGIN, qr.width()-GFX_MARGIN*2, qr.height()-GFX_MARGIN*2);
updateCurve();
-
ModelPanel::resizeEvent(event);
}
-#if 0
-void ModelEdit::on_ca_ctype_CB_currentIndexChanged()
+void Curves::on_curveType_currentIndexChanged()
{
- int index=ui->ca_ctype_CB->currentIndex();
- switch (index) {
+ int index = ui->curveType->currentIndex();
+ unsigned int flags = templates[index].flags;
+ ui->curveCoeffLabel->setVisible(flags & CURVE_COEFF_ENABLE);
+ ui->curveCoeff->setVisible(flags & CURVE_COEFF_ENABLE);
+ ui->yMax->setValue(100);
+ ui->yMidLabel->setVisible(flags & CURVE_YMID_ENABLE);
+ ui->yMid->setVisible(flags & CURVE_YMID_ENABLE);
+ ui->yMid->setValue(0);
+ ui->yMinLabel->setVisible(flags & CURVE_YMIN_ENABLE);
+ ui->yMin->setVisible(flags & CURVE_YMIN_ENABLE);
+ ui->yMin->setValue(-100);
+}
+
+void Curves::addTemplate(QString name, unsigned int flags, curveFunction function)
+{
+ CurveCreatorTemplate tmpl;
+ tmpl.name = name;
+ tmpl.flags = flags;
+ tmpl.function = function;
+ templates.append(tmpl);
+ ui->curveType->addItem(name);
+}
+
+void Curves::on_curveApply_clicked()
+{
+ int index = ui->curveType->currentIndex();
+ int numpoints = model.curves[currentCurve].count;
+
+ for (int i=0; icurveSide->currentIndex()) {
case 0:
- ui->ca_coeff_SB->hide();
- ui->ca_coeff_label->hide();
- ui->ca_ymid_SB->hide();
- ui->ca_ymid_label->hide();
- ui->ca_ymin_SB->show();
- ui->ca_ymin_label->show();
- ui->ca_ymin_SB->setValue(-100);
- ui->ca_ymax_SB->setValue(100);
+ apply = true;
break;
case 1:
- ui->ca_coeff_SB->show();
- ui->ca_coeff_label->show();
- ui->ca_ymid_SB->hide();
- ui->ca_ymid_label->hide();
- ui->ca_ymin_SB->show();
- ui->ca_ymin_label->show();
- ui->ca_ymin_SB->setValue(-100);
- ui->ca_ymax_SB->setValue(100);
+ if (x>=0)
+ apply = true;
break;
case 2:
- ui->ca_coeff_SB->show();
- ui->ca_coeff_label->show();
- ui->ca_ymid_SB->hide();
- ui->ca_ymid_label->hide();
- ui->ca_ymin_SB->hide();
- ui->ca_ymin_label->hide();
- ui->ca_ymax_SB->setValue(100);
- break;
- case 3:
- ui->ca_coeff_SB->show();
- ui->ca_coeff_label->show();
- ui->ca_ymid_SB->show();
- ui->ca_ymid_label->show();
- ui->ca_ymin_SB->hide();
- ui->ca_ymin_label->hide();
- ui->ca_ymid_SB->setValue(0);
- ui->ca_ymax_SB->setValue(100);
+ if (x<0)
+ apply = true;
break;
}
-}
-float c9xexpou(float point, float coeff)
-{
- float x=point*1024.0/100.0;
- float k=coeff*256.0/100.0;
- return ((k*x*x*x/(1024*1024) + x*(256-k) + 128) / 256)/1024.0*100;
-}
-
-void ModelEdit::on_ca_apply_PB_clicked()
-{
- int index=ui->ca_ctype_CB->currentIndex();
- float x;
- int y;
- int invert=0;
- float a;
- if (index==0) {
- a=(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/200.0;
- int numpoints=model.curves[currentCurve].count;
- for (int i=0; ica_ymin_SB->value()+a*x;
- switch (ui->ca_side_CB->currentIndex()) {
- case 0:
- model.curves[currentCurve].points[i].y=y;
- break;
- case 1:
- if (x>=100) {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- case 2:
- if (x<100) {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- }
- }
- } else if (index==1) {
- int numpoints=model.curves[currentCurve].count;
- for (int i=0; ica_coeff_SB->value();
- if (a>=0) {
- y=round(c9xexpou(x,a)*(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/100.0+ui->ca_ymin_SB->value());
- } else {
- a=-a;
- x=100-x;
- y=round((100.0-c9xexpou(x,a))*(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/100.0+ui->ca_ymin_SB->value());
- }
- switch (ui->ca_side_CB->currentIndex()) {
- case 0:
- model.curves[currentCurve].points[i].y=y;
- break;
- case 1:
- if (x>=50) {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- case 2:
- if (x<50) {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- }
- }
- } else if (index==2) {
- int numpoints=model.curves[currentCurve].count;
- for (int i=0; ica_coeff_SB->value();
- if (x<0) {
- x=-x;
- invert=1;
- } else {
- invert=0;
- }
- if (a>=0) {
- y=round(c9xexpou(x,a)*(ui->ca_ymax_SB->value()/100.0));
- } else {
- a=-a;
- x=100-x;
- y=round((100.0-c9xexpou(x,a))*(ui->ca_ymax_SB->value()/100.0));
- }
- switch (ui->ca_side_CB->currentIndex()) {
- case 0:
- if (invert==1) {
- model.curves[currentCurve].points[i].y=-y;
- } else {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- case 1:
- if (invert==0) {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- case 2:
- if (invert==1) {
- model.curves[currentCurve].points[i].y=-y;
- }
- break;
- }
- }
- } else if (index==3) {
- int numpoints=model.curves[currentCurve].count;
- for (int i=0; i=0);
- a=ui->ca_coeff_SB->value();
- if (x<0) {
- x=-x;
- }
- if (a>=0) {
- y=round(c9xexpou(x,a)*((ui->ca_ymax_SB->value()-ui->ca_ymid_SB->value())/100.0)+ui->ca_ymid_SB->value());
- } else {
- a=-a;
- x=100-x;
- y=round((100.0-c9xexpou(x,a))*((ui->ca_ymax_SB->value()-ui->ca_ymid_SB->value())/100.0)+ui->ca_ymid_SB->value());
- }
- switch (ui->ca_side_CB->currentIndex()) {
- case 0:
- model.curves[currentCurve].points[i].y=y;
- break;
- case 1:
- if (pos) {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- case 2:
- if (!pos) {
- model.curves[currentCurve].points[i].y=y;
- }
- break;
- }
- }
+ if (apply) {
+ model.curves[currentCurve].points[i].y = templates[index].function(x, ui->curveCoeff->value(), ui->yMin->value(), ui->yMid->value(), ui->yMax->value());
}
- updateSettings();
- setCurrentCurve(currentCurve);
- drawCurve();
+ }
+
+ updateCurve();
+ updateCurvePoints();
+ emit modified();
}
+#if 0
void ModelEdit::clearCurves(bool ask)
{
if (ask) {
diff --git a/companion/src/modeledit/curves.h b/companion/src/modeledit/curves.h
index e8915cf65..69e0bd0f8 100644
--- a/companion/src/modeledit/curves.h
+++ b/companion/src/modeledit/curves.h
@@ -8,6 +8,14 @@ namespace Ui {
class Curves;
}
+typedef float (*curveFunction) (float x, float coeff, float yMin, float yMid, float yMax);
+
+struct CurveCreatorTemplate {
+ QString name;
+ unsigned int flags;
+ curveFunction function;
+};
+
class Curves : public ModelPanel
{
Q_OBJECT
@@ -30,9 +38,12 @@ class Curves : public ModelPanel
void onNodeMoved(int x, int y);
void onNodeFocus();
void onNodeUnfocus();
+ void on_curveType_currentIndexChanged();
+ void on_curveApply_clicked();
protected:
virtual void resizeEvent(QResizeEvent *event);
+ void addTemplate(QString name, unsigned int flags, curveFunction function);
private:
Ui::Curves *ui;
@@ -40,10 +51,13 @@ class Curves : public ModelPanel
bool visibleCurves[C9X_MAX_CURVES];
QSpinBox * spnx[C9X_MAX_POINTS];
QSpinBox * spny[C9X_MAX_POINTS];
+ QVector templates;
void setCurrentCurve(int index);
void updateCurve();
void updateCurveType();
+ void updateCurvePoints();
bool allowCurveType(int points, CurveData::CurveType type);
+ void setPointY(int i, int x, int y);
};
diff --git a/companion/src/modeledit/curves.ui b/companion/src/modeledit/curves.ui
index ed9800e89..7c08f5a3f 100644
--- a/companion/src/modeledit/curves.ui
+++ b/companion/src/modeledit/curves.ui
@@ -1,161 +1,344 @@
-
-
- Curves
-
-
-
- 0
- 0
- 638
- 587
-
-
-
- Form
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- 0
-
-
-
-
-
- -
-
-
-
-
- Standard
-
-
- -
-
- Custom
-
-
-
-
- -
-
-
-
-
- Lines
-
-
- -
-
- Smooth
-
-
-
-
-
-
- -
-
-
- Curve type
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Curve name
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- 6
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 400
- 400
-
-
-
- Qt::AlignCenter
-
-
-
-
-
- -
-
-
- 0
-
-
- 2
-
-
- 0
-
-
- 0
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::MinimumExpanding
-
-
-
- 20
- 0
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Curves
+
+
+
+ 0
+ 0
+ 718
+ 539
+
+
+
+ Form
+
+
+ -
+
+
+ -
+
+
+ 10
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 400
+ 400
+
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+ Curve name
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ -
+
+
-
+
+ Standard
+
+
+ -
+
+ Custom
+
+
+
+
+ -
+
+
-
+
+ Lines
+
+
+ -
+
+ Smooth
+
+
+
+
+
+
+ -
+
+
+ 6
+
+
+
+ -
+
+
+ Curve type
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ 0
+
+
+ 2
+
+
+ 0
+
+
+ 0
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ false
+
+
+ Curve Creator
+
+
+
-
+
+
+ Y at X=0
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ -100
+
+
+ 100
+
+
+
+ -
+
+
+ Y at X=100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ -100
+
+
+ 100
+
+
+
+ -
+
+
-
+
+ Both
+
+
+ -
+
+ x>0
+
+
+ -
+
+ x<0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ -100
+
+
+ 100
+
+
+
+ -
+
+
+ Apply
+
+
+
+ -
+
+
+ Side
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ -100
+
+
+ 100
+
+
+
+ -
+
+
+ -
+
+
+ Curve type
+
+
+
+ -
+
+
+ Y at X=-100
+
+
+
+ -
+
+
+ Coefficient
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp
index b1805df46..035a6ba6e 100644
--- a/companion/src/modeledit/customfunctions.cpp
+++ b/companion/src/modeledit/customfunctions.cpp
@@ -54,11 +54,11 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
{
QGridLayout * gridLayout = new QGridLayout(this);
- int col = 1;
- addLabel(gridLayout, tr("Switch"), col++);
- addLabel(gridLayout, tr("Action"), col++);
- addLabel(gridLayout, tr("Parameters"), col++);
- addLabel(gridLayout, tr("Enable"), col++);
+ addLabel(gridLayout, tr("Switch"), 1);
+ addLabel(gridLayout, tr("Action"), 2);
+ addLabel(gridLayout, tr("Parameters"), 3);
+ addLabel(gridLayout, tr("Enable"), 4, true );
+ addEmptyLabel(gridLayout, 5 );
lock = true;
int num_fsw = GetEepromInterface()->getCapability(CustomFunctions);
@@ -104,13 +104,15 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
label->setContextMenuPolicy(Qt::CustomContextMenu);
label->setMouseTracking(true);
label->setProperty("index", i);
- label->setText(tr("CF%1").arg(i+1));
- gridLayout->addWidget(label, i+1, 0);
+ label->setText(tr("SF%1").arg(i+1));
+ label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint)));
+ gridLayout->addWidget(label, i+1, 0);
// The switch
fswtchSwtch[i] = new QComboBox(this);
fswtchSwtch[i]->setProperty("index", i);
+ fswtchSwtch[i]->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
connect(fswtchSwtch[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
gridLayout->addWidget(fswtchSwtch[i], i+1, 1);
populateSwitchCB(fswtchSwtch[i], model.funcSw[i].swtch, POPULATE_ONOFF);
@@ -161,6 +163,12 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
#ifdef PHONON
+ phononLock=false;
+ clickObject = new Phonon::MediaObject(this);
+ clickOutput = new Phonon::AudioOutput(Phonon::NoCategory, this);
+ Phonon::createPath(clickObject, clickOutput);
+ connect(clickObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(mediaPlayer_state(Phonon::State,Phonon::State)));
+
playBT[i] = new QPushButton(this);
playBT[i]->setProperty("index", i);
playBT[i]->setProperty("state", "play");
@@ -178,11 +186,13 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
fswtchEnable[i] = new QCheckBox(this);
fswtchEnable[i]->setProperty("index", i);
fswtchEnable[i]->setText(tr("ON"));
+ fswtchEnable[i]->setFixedWidth( 50 );
repeatLayout->addWidget(fswtchEnable[i], i+1);
fswtchEnable[i]->setChecked(model.funcSw[i].enabled);
connect(fswtchEnable[i], SIGNAL(stateChanged(int)), this, SLOT(customFunctionEdited()));
}
-
+ // Push rows upward
+ addDoubleSpring(gridLayout, 5, num_fsw+1);
lock = false;
}
@@ -203,6 +213,7 @@ void CustomFunctionsPanel::mediaPlayer_state(Phonon::State newState, Phonon::Sta
clickObject->clearQueue();
clickObject->clear();
for (int i=0; igetCapability(CustomFunctions); i++) {
+ playBT[i]->setProperty("state", "play");
playBT[i]->setObjectName(QString("play_%1").arg(i));
playBT[i]->setIcon(CompanionIcon("play.png"));
}
diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
index 71be86c88..ca77d3f94 100644
--- a/companion/src/modeledit/expodialog.cpp
+++ b/companion/src/modeledit/expodialog.cpp
@@ -1,13 +1,13 @@
#include "expodialog.h"
#include "ui_expodialog.h"
-#include "eeprominterface.h"
#include "helpers.h"
-ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, int stickMode) :
+ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, int stickMode, char * inputName) :
QDialog(parent),
ui(new Ui::ExpoDialog),
model(model),
- ed(expoData)
+ ed(expoData),
+ inputName(inputName)
{
ui->setupUi(this);
QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
@@ -45,8 +45,6 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
}
if (GetEepromInterface()->getCapability(VirtualInputs)) {
- ui->sideLabel->hide();
- ui->sideCB->hide();
ui->inputName->setMaxLength(4);
populateSourceCB(ui->sourceCB, ed->srcRaw, model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS | POPULATE_TELEMETRY);
ui->sourceCB->removeItem(0);
@@ -76,7 +74,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
}
ui->inputName->setValidator(new QRegExpValidator(rx, this));
- ui->inputName->setText(model.inputNames[ed->chn]);
+ ui->inputName->setText(inputName);
ui->lineName->setValidator(new QRegExpValidator(rx, this));
ui->lineName->setText(ed->name);
@@ -93,6 +91,9 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
for (int i=0; i<9; i++) {
connect(cb_fp[i], SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
}
+ if (GetEepromInterface()->getCapability(VirtualInputs))
+ connect(ui->inputName, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
+
QTimer::singleShot(0, this, SLOT(shrink()));
}
@@ -137,7 +138,7 @@ void ExpoDialog::valuesChanged()
ed->mode = ui->sideCB->currentIndex() + 1;
strcpy(ed->name, ui->lineName->text().toAscii().data());
- strcpy(model.inputNames[ed->chn], ui->inputName->text().toAscii().data());
+ strcpy(inputName, ui->inputName->text().toAscii().data());
ed->phases=0;
for (int i=8; i>=0 ; i--) {
diff --git a/companion/src/modeledit/expodialog.h b/companion/src/modeledit/expodialog.h
index 2d96b130a..ddb3d750c 100644
--- a/companion/src/modeledit/expodialog.h
+++ b/companion/src/modeledit/expodialog.h
@@ -14,7 +14,7 @@ namespace Ui {
class ExpoDialog : public QDialog {
Q_OBJECT
public:
- ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, int stickMode);
+ ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, int stickMode, char * inputName);
~ExpoDialog();
protected:
@@ -28,6 +28,7 @@ class ExpoDialog : public QDialog {
Ui::ExpoDialog * ui;
ModelData & model;
ExpoData * ed;
+ char * inputName;
GVarGroup * gvGroup;
CurveGroup * curveGroup;
};
diff --git a/companion/src/modeledit/flightmode.ui b/companion/src/modeledit/flightmode.ui
index 6ed3d8769..15158c258 100644
--- a/companion/src/modeledit/flightmode.ui
+++ b/companion/src/modeledit/flightmode.ui
@@ -165,7 +165,7 @@
-
-
+
-
@@ -299,7 +299,7 @@
-
-
+
-
@@ -423,6 +423,19 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
diff --git a/companion/src/modeledit/flightmodes.cpp b/companion/src/modeledit/flightmodes.cpp
index a5cd400a0..dffb391aa 100644
--- a/companion/src/modeledit/flightmodes.cpp
+++ b/companion/src/modeledit/flightmodes.cpp
@@ -194,33 +194,29 @@ void FlightMode::update()
for (int i=0; isetText(model.gvars_names[i]);
- if (phase.gvars[i] < 1024) {
- gvValues[i]->setValue(phase.gvars[i]);
- gvValues[i]->setDisabled(false);
- }
- else {
- int idx = phase.gvars[i] - 1025;
- if (idx >= i) idx++;
- // TODO no!!!!
- PhaseData *phasegvar = &model.phaseData[idx];
- gvValues[i]->setValue(phasegvar->gvars[i]);
- gvValues[i]->setDisabled(true);
+ gvValues[i]->setDisabled(false);
+ int idx = phase.gvars[i];
+ PhaseData *phasegvar = &phase;
+ while (idx >= 1024) {
+ idx -= 1025;
+ phasegvar = &model.phaseData[idx];
+ idx = phasegvar->gvars[i];
+ gvValues[i]->setDisabled(true);
}
+ gvValues[i]->setValue(phasegvar->gvars[i]);
}
- for (int i=0; isetValue(phase.rotaryEncoders[i]);
- reValues[i]->setDisabled(false);
- }
- else {
- int idx = phase.rotaryEncoders[i] - 1025;
- if (idx >= i) idx++;
- // TODO no!!!!
- PhaseData *phasere = &model.phaseData[idx];
- reValues[i]->setValue(phasere->rotaryEncoders[i]);
+ for (int i=0; isetDisabled(false);
+ int idx = phase.rotaryEncoders[i];
+ PhaseData *phasere = &phase;
+ while (idx >= 1024) {
+ idx -= 1025;
+ phasere = &model.phaseData[idx];
+ idx = phasere->rotaryEncoders[i];
reValues[i]->setDisabled(true);
}
+ reValues[i]->setValue(phasere->rotaryEncoders[i]);
}
}
@@ -311,21 +307,12 @@ void FlightMode::phaseGVUse_currentIndexChanged(int index)
QComboBox *comboBox = qobject_cast(sender());
int gvar = comboBox->property("index").toInt();
if (index == 0) {
- int value = phase.gvars[gvar];
- if (value>1024) {
- value=0;
- }
- gvValues[gvar]->setValue(value);
- gvValues[gvar]->setEnabled(true);
- phase.gvars[gvar]=value;
+ phase.gvars[gvar]=0;
}
else {
phase.gvars[gvar] = 1024+index;
- // TOTO it's wrong!!!
- int value = model.phaseData[index + (index>phaseIdx ? 0 :-1)].gvars[gvar];
- gvValues[gvar]->setValue(value);
- gvValues[gvar]->setDisabled(true);
}
+ update();
emit modified();
lock = false;
}
@@ -348,21 +335,12 @@ void FlightMode::phaseREUse_currentIndexChanged(int index)
QComboBox *comboBox = qobject_cast(sender());
int re = comboBox->property("index").toInt();
if (index == 0) {
- // TODO no!!!
- int value = phase.rotaryEncoders[re];
- if (value > 1024) {
- value = 0;
- }
- reValues[re]->setValue(value);
- reValues[re]->setEnabled(true);
- phase.rotaryEncoders[re] = value;
+ phase.rotaryEncoders[re] = 0;
}
else {
- phase.rotaryEncoders[re] = 1024 + index;
- int value = model.phaseData[index + (index>phaseIdx ? 0 :-1)].rotaryEncoders[re];
- reValues[re]->setValue(value);
- reValues[re]->setDisabled(true) ;
+ phase.rotaryEncoders[re] = 1024 + index; ;
}
+ update();
lock = false;
emit modified();
}
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index a6e1f6eac..e828c52cc 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -98,12 +98,11 @@ void InputsPanel::update()
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
}
}
- else {
- switch (md->mode) {
- case (1): str += " <-"; break;
- case (2): str += " ->"; break;
- default: str += " "; break;
- };
+
+ switch (md->mode) {
+ case (1): str += " <-"; break;
+ case (2): str += " ->"; break;
+ default: str += " "; break;
}
str += " " + tr("Weight(%1)").arg(getGVarString(md->weight));
@@ -169,12 +168,18 @@ void InputsPanel::gm_openExpo(int index)
if(index<0 || index>=C9X_MAX_EXPOS) return;
ExpoData mixd(model.expoData[index]);
+ char inputName[4+1];
emit modified();
update();
+
+ if (GetEepromInterface()->getCapability(VirtualInputs))
+ strcpy(inputName, model.inputNames[mixd.chn]);
- ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings.stickMode);
+ ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings.stickMode, inputName);
if (g->exec()) {
model.expoData[index] = mixd;
+ if (GetEepromInterface()->getCapability(VirtualInputs))
+ strcpy(model.inputNames[mixd.chn], inputName);
emit modified();
update();
}
diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp
index 1902a76ae..5ccb5ba21 100644
--- a/companion/src/modeledit/logicalswitches.cpp
+++ b/companion/src/modeledit/logicalswitches.cpp
@@ -28,12 +28,10 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model):
// The label
QLabel * label = new QLabel(this);
label->setProperty("index", i);
- if (i < 9)
- label->setText(tr("LS%1").arg(i+1));
- else
- label->setText(tr("LS%1").arg(QChar('A'+i-9)));
+ label->setText(tr("L%1").arg(i+1));
label->setContextMenuPolicy(Qt::CustomContextMenu);
label->setMouseTracking(true);
+ label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(csw_customContextMenuRequested(QPoint)));
gridLayout->addWidget(label, i+1, 0);
@@ -60,10 +58,11 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model):
cswitchValue[i]->setVisible(false);
// V2
+ QHBoxLayout *v2Layout = new QHBoxLayout();
cswitchSource2[i] = new QComboBox(this);
cswitchSource2[i]->setProperty("index", i);
connect(cswitchSource2[i], SIGNAL(currentIndexChanged(int)), this, SLOT(v2Edited(int)));
- gridLayout->addWidget(cswitchSource2[i], i+1, 3);
+ v2Layout->addWidget(cswitchSource2[i]);
cswitchSource2[i]->setVisible(false);
cswitchOffset[i] = new QDoubleSpinBox(this);
cswitchOffset[i]->setProperty("index",i);
@@ -72,8 +71,18 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model):
cswitchOffset[i]->setAccelerated(true);
cswitchOffset[i]->setDecimals(0);
connect(cswitchOffset[i], SIGNAL(editingFinished()), this, SLOT(edited()));
- gridLayout->addWidget(cswitchOffset[i], i+1, 3);
cswitchOffset[i]->setVisible(false);
+ v2Layout->addWidget(cswitchOffset[i]);
+ cswitchOffset2[i] = new QDoubleSpinBox(this);
+ cswitchOffset2[i]->setProperty("index",i);
+ cswitchOffset2[i]->setMaximum(125);
+ cswitchOffset2[i]->setMinimum(-125);
+ cswitchOffset2[i]->setAccelerated(true);
+ cswitchOffset2[i]->setDecimals(0);
+ connect(cswitchOffset2[i], SIGNAL(editingFinished()), this, SLOT(edited()));
+ cswitchOffset2[i]->setVisible(false);
+ v2Layout->addWidget(cswitchOffset2[i]);
+ gridLayout->addLayout(v2Layout, i+1, 3);
// AND
cswitchAnd[i] = new QComboBox(this);
@@ -105,7 +114,8 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model):
gridLayout->addWidget(cswitchDelay[i], i+1, 6);
}
}
-
+ // Push rows upward
+ addVSpring(gridLayout,0,GetEepromInterface()->getCapability(LogicalSwitches)+1);
lock = false;
}
@@ -205,19 +215,19 @@ void LogicalSwitchesPanel::edited()
switch (model.customSw[i].getFunctionFamily())
{
case LS_FAMILY_VOFS:
- {
- source = RawSource(model.customSw[i].val1, &model);
- RawSourceRange range = source.getRange();
- if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
- model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
- cswitchOffset[i]->setValue(model.customSw[i].val2*range.step);
- }
- else {
- model.customSw[i].val2 = ((cswitchOffset[i]->value()-range.offset)/range.step)/* TODO - source.getRawOffset(model)*/;
- cswitchOffset[i]->setValue((model.customSw[i].val2 /* + TODO source.getRawOffset(model)*/)*range.step+range.offset);
- }
+ {
+ source = RawSource(model.customSw[i].val1, &model);
+ RawSourceRange range = source.getRange();
+ if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
+ model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
+ cswitchOffset[i]->setValue(model.customSw[i].val2*range.step);
+ }
+ else {
+ model.customSw[i].val2 = ((cswitchOffset[i]->value()-range.offset)/range.step)/* TODO - source.getRawOffset(model)*/;
+ cswitchOffset[i]->setValue((model.customSw[i].val2 /* + TODO source.getRawOffset(model)*/)*range.step+range.offset);
}
break;
+ }
case LS_FAMILY_TIMER:
model.customSw[i].val1 = TimToVal(cswitchValue[i]->value());
model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value());
@@ -225,8 +235,14 @@ void LogicalSwitchesPanel::edited()
updateTimerParam(cswitchOffset[i], model.customSw[i].val2);
break;
case LS_FAMILY_STAY:
- model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value());
- updateTimerParam(cswitchOffset[i], model.customSw[i].val2, true);
+ if (sender() == cswitchOffset[i]) {
+ model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value());
+ updateTimerParam(cswitchOffset[i], model.customSw[i].val2, true);
+ }
+ else {
+ model.customSw[i].val3 = TimToVal(cswitchOffset2[i]->value()) - model.customSw[i].val2;
+ }
+ updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, true);
break;
default:
break;
@@ -243,92 +259,98 @@ void LogicalSwitchesPanel::updateTimerParam(QDoubleSpinBox *sb, int timer, bool
sb->setMinimum(allowZero ? 0.0 : 0.1);
sb->setMaximum(175);
float value = ValToTim(timer);
- if (value>60)
+ if (value>=60)
sb->setSingleStep(1);
- else if (value>2)
+ else if (value>=2)
sb->setSingleStep(0.5);
else
sb->setSingleStep(0.1);
sb->setValue(value);
}
+#define SOURCE1_VISIBLE 0x1
+#define SOURCE2_VISIBLE 0x2
+#define VALUE1_VISIBLE 0x4
+#define VALUE2_VISIBLE 0x8
+#define VALUE3_VISIBLE 0x10
+
void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
{
lock = true;
- RawSource source = RawSource(model.customSw[i].val1, &model);
- RawSourceRange range = source.getRange();
+ unsigned int mask = 0;
+ RawSource source = RawSource(model.customSw[i].val1, &model);
+ RawSourceRange range = source.getRange();
- switch (model.customSw[i].getFunctionFamily())
- {
- case LS_FAMILY_VOFS:
- cswitchSource1[i]->setVisible(true);
- cswitchSource2[i]->setVisible(false);
- cswitchValue[i]->setVisible(false);
- cswitchOffset[i]->setVisible(true);
- populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
- cswitchOffset[i]->setDecimals(range.decimals);
- cswitchOffset[i]->setSingleStep(range.step);
- if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
- cswitchOffset[i]->setMinimum(range.step*-127);
- cswitchOffset[i]->setMaximum(range.step*127);
- cswitchOffset[i]->setValue(range.step*model.customSw[i].val2);
- }
- else {
- cswitchOffset[i]->setMinimum(range.min);
- cswitchOffset[i]->setMaximum(range.max);
- cswitchOffset[i]->setValue(range.step*(model.customSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset);
- }
- break;
- case LS_FAMILY_VBOOL:
- case LS_FAMILY_STICKY:
- cswitchSource1[i]->setVisible(true);
- cswitchSource2[i]->setVisible(true);
- cswitchValue[i]->setVisible(false);
- cswitchOffset[i]->setVisible(false);
- populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1));
- populateSwitchCB(cswitchSource2[i], RawSwitch(model.customSw[i].val2));
- break;
- case LS_FAMILY_STAY:
- cswitchSource1[i]->setVisible(true);
- cswitchSource2[i]->setVisible(false);
- cswitchValue[i]->setVisible(false);
- populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1));
- updateTimerParam(cswitchOffset[i], model.customSw[i].val2, true);
- break;
- case LS_FAMILY_VCOMP:
- cswitchSource1[i]->setVisible(true);
- cswitchSource2[i]->setVisible(true);
- cswitchValue[i]->setVisible(false);
- cswitchOffset[i]->setVisible(false);
- populateSourceCB(cswitchSource1[i], RawSource(model.customSw[i].val1), model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
- populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_TRIMS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
- break;
- case LS_FAMILY_TIMER:
- cswitchSource1[i]->setVisible(false);
- cswitchSource2[i]->setVisible(false);
- updateTimerParam(cswitchValue[i], model.customSw[i].val1);
- updateTimerParam(cswitchOffset[i], model.customSw[i].val2);
- break;
- }
+ switch (model.customSw[i].getFunctionFamily())
+ {
+ case LS_FAMILY_VOFS:
+ mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE;
+ populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+ cswitchOffset[i]->setDecimals(range.decimals);
+ cswitchOffset[i]->setSingleStep(range.step);
+ if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
+ cswitchOffset[i]->setMinimum(range.step*-127);
+ cswitchOffset[i]->setMaximum(range.step*127);
+ cswitchOffset[i]->setValue(range.step*model.customSw[i].val2);
+ }
+ else {
+ cswitchOffset[i]->setMinimum(range.min);
+ cswitchOffset[i]->setMaximum(range.max);
+ cswitchOffset[i]->setValue(range.step*(model.customSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset);
+ }
+ break;
+ case LS_FAMILY_VBOOL:
+ case LS_FAMILY_STICKY:
+ mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE;
+ populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1));
+ populateSwitchCB(cswitchSource2[i], RawSwitch(model.customSw[i].val2));
+ break;
+ case LS_FAMILY_STAY:
+ mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE | VALUE3_VISIBLE;
+ populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1));
+ updateTimerParam(cswitchOffset[i], model.customSw[i].val2, true);
+ updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, true);
+ break;
+ case LS_FAMILY_VCOMP:
+ mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE;
+ populateSourceCB(cswitchSource1[i], RawSource(model.customSw[i].val1), model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+ populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_TRIMS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+ break;
+ case LS_FAMILY_TIMER:
+ updateTimerParam(cswitchValue[i], model.customSw[i].val1);
+ updateTimerParam(cswitchOffset[i], model.customSw[i].val2);
+ break;
+ }
- lock = false;
+ cswitchSource1[i]->setVisible(mask & SOURCE1_VISIBLE);
+ cswitchSource2[i]->setVisible(mask & SOURCE2_VISIBLE);
+ cswitchValue[i]->setVisible(mask & VALUE1_VISIBLE);
+ cswitchOffset[i]->setVisible(mask & VALUE2_VISIBLE);
+ cswitchOffset2[i]->setVisible(mask & VALUE3_VISIBLE);
+
+ lock = false;
+}
+
+void LogicalSwitchesPanel::updateLine(int i)
+{
+ lock = true;
+ populateCSWCB(csw[i], model.customSw[i].func);
+ lock = true;
+ setSwitchWidgetVisibility(i);
+ lock = true;
+ populateAndSwitchCB(cswitchAnd[i], RawSwitch(model.customSw[i].andsw));
+ if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
+ cswitchDuration[i]->setValue(model.customSw[i].duration/10.0);
+ cswitchDelay[i]->setValue(model.customSw[i].delay/10.0);
+ }
+ lock = false;
}
void LogicalSwitchesPanel::update()
{
for (int i=0; igetCapability(LogicalSwitches); i++) {
- lock = true;
- populateCSWCB(csw[i], model.customSw[i].func);
- lock = false;
- setSwitchWidgetVisibility(i);
- lock = true;
- populateAndSwitchCB(cswitchAnd[i], RawSwitch(model.customSw[i].andsw));
- if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
- cswitchDuration[i]->setValue(model.customSw[i].duration/10.0);
- cswitchDelay[i]->setValue(model.customSw[i].delay/10.0);
- }
- lock = false;
+ updateLine(i);
}
}
@@ -338,36 +360,27 @@ void LogicalSwitchesPanel::cswPaste()
const QMimeData *mimeData = clipboard->mimeData();
if (mimeData->hasFormat("application/x-companion-csw")) {
QByteArray cswData = mimeData->data("application/x-companion-csw");
-
LogicalSwitchData *csw = &model.customSw[selectedSwitch];
memcpy(csw, cswData.mid(0, sizeof(LogicalSwitchData)).constData(), sizeof(LogicalSwitchData));
emit modified();
- updateSelectedSwitch();
+ updateLine(selectedSwitch);
}
}
void LogicalSwitchesPanel::cswDelete()
{
- model.customSw[selectedSwitch].clear();
- emit modified();
- updateSelectedSwitch();
+ model.customSw[selectedSwitch].clear();
+ emit modified();
+ updateLine(selectedSwitch);
}
void LogicalSwitchesPanel::cswCopy()
{
- QByteArray cswData;
- cswData.append((char*)&model.customSw[selectedSwitch],sizeof(LogicalSwitchData));
- QMimeData *mimeData = new QMimeData;
- mimeData->setData("application/x-companion-csw", cswData);
- QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
-}
-
-void LogicalSwitchesPanel::updateSelectedSwitch()
-{
- lock = true;
- populateCSWCB(csw[selectedSwitch], model.customSw[selectedSwitch].func);
- setSwitchWidgetVisibility(selectedSwitch);
- lock = false;
+ QByteArray cswData;
+ cswData.append((char*)&model.customSw[selectedSwitch],sizeof(LogicalSwitchData));
+ QMimeData *mimeData = new QMimeData;
+ mimeData->setData("application/x-companion-csw", cswData);
+ QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
}
void LogicalSwitchesPanel::cswCut()
diff --git a/companion/src/modeledit/logicalswitches.h b/companion/src/modeledit/logicalswitches.h
index ef7945afd..d563f1308 100644
--- a/companion/src/modeledit/logicalswitches.h
+++ b/companion/src/modeledit/logicalswitches.h
@@ -32,6 +32,7 @@ class LogicalSwitchesPanel : public ModelPanel
QComboBox * csw[C9X_NUM_CSW];
QDoubleSpinBox * cswitchValue[C9X_NUM_CSW];
QDoubleSpinBox * cswitchOffset[C9X_NUM_CSW];
+ QDoubleSpinBox * cswitchOffset2[C9X_NUM_CSW];
QComboBox * cswitchAnd[C9X_NUM_CSW];
QDoubleSpinBox * cswitchDuration[C9X_NUM_CSW];
QDoubleSpinBox * cswitchDelay[C9X_NUM_CSW];
@@ -40,8 +41,7 @@ class LogicalSwitchesPanel : public ModelPanel
void setSwitchWidgetVisibility(int i);
int selectedSwitch;
- void updateSelectedSwitch();
- void updateV2(int index);
+ void updateLine(int index);
void updateTimerParam(QDoubleSpinBox *sb, int timer, bool allowZero=false);
};
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index 7ef03fdca..a2e2757af 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -27,12 +27,6 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, i
gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, md->weight, 100, -limit, limit);
gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, md->sOffset, 0, -limit, limit);
-
- if (GetEepromInterface()->getCapability(VirtualInputs)) {
- ui->trimLabel->hide();
- ui->trimCB->hide();
- }
-
curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, md->curve);
ui->MixDR_CB->setChecked(md->noExpo==0);
@@ -41,10 +35,13 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, i
ui->label_MixDR->hide();
}
- ui->trimCB->addItem(tr("Rud"), 1);
- ui->trimCB->addItem(tr("Ele"), 2);
- ui->trimCB->addItem(tr("Thr"), 3);
- ui->trimCB->addItem(tr("Ail"), 4);
+ if (!GetEepromInterface()->getCapability(VirtualInputs)) {
+ ui->trimCB->addItem(tr("Rud"));
+ ui->trimCB->addItem(tr("Ele"));
+ ui->trimCB->addItem(tr("Thr"));
+ ui->trimCB->addItem(tr("Ail"));
+ }
+
ui->trimCB->setCurrentIndex(1 - md->carryTrim);
int namelength = GetEepromInterface()->getCapability(HasMixerNames);
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
index df92f5ecb..2f1e48ab5 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -43,6 +43,29 @@ MixesPanel::~MixesPanel()
{
}
+QString MixesPanel::getChannelLabel(int curDest)
+{
+ QString str;
+ int outputs = GetEepromInterface()->getCapability(Outputs);
+ if (curDest > outputs) {
+ str = QObject::tr("X%1 ").arg(curDest-outputs);
+ }
+ else {
+ str = QObject::tr("CH%1").arg(curDest);
+ str.append(" ");
+ str = str.left(4);
+ if (GetEepromInterface()->getCapability(HasChNames)) {
+ QString name = model.limitData[curDest-1].name;
+ if (!name.isEmpty()) {
+ name = QString("(") + name + QString(")");
+ }
+ name.append(" ");
+ str += name.left(8);
+ }
+ }
+ return str;
+}
+
void MixesPanel::update()
{
// curDest -> destination channel4
@@ -52,26 +75,13 @@ void MixesPanel::update()
unsigned int curDest = 0;
int i;
unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
- int showNames = false; // TODO in a menu ui->showNames_Ckb->isChecked();
for (i=0; igetCapability(Mixes); i++) {
MixData *md = &model.mixData[i];
if ((md->destCh==0) || (md->destCh>outputs+(unsigned int)GetEepromInterface()->getCapability(ExtraChannels))) continue;
QString str = "";
- while (curDest<(md->destCh-1)) {
+ while (curDest < md->destCh-1) {
curDest++;
- if (curDest > outputs) {
- str = tr("X%1 ").arg(curDest-outputs);
- }
- else {
- str = tr("CH%1%2").arg(curDest/10).arg(curDest%10);
- if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
- QString name=model.limitData[curDest-1].name;
- if (!name.isEmpty()) {
- name.append(" ");
- str=name.left(6);
- }
- }
- }
+ str = getChannelLabel(curDest);
qba.clear();
qba.append((quint8)-curDest);
QListWidgetItem *itm = new QListWidgetItem(str);
@@ -79,23 +89,12 @@ void MixesPanel::update()
MixerlistWidget->addItem(itm);
}
- if (md->destCh > outputs) {
- str = tr("X%1 ").arg(md->destCh-outputs);
- }
- else {
- str = tr("CH%1%2").arg(md->destCh/10).arg(md->destCh%10);
- str.append(" ");
- if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
- QString name=model.limitData[md->destCh-1].name;
- if (!name.isEmpty()) {
- name.append(" ");
- str=name.left(6);
- }
- }
- }
+ str = getChannelLabel(md->destCh);
+
if (curDest != md->destCh) {
curDest = md->destCh;
- } else {
+ }
+ else {
str.fill(' ');
}
@@ -116,13 +115,11 @@ void MixesPanel::update()
str += " " + tr("Switch(%1)").arg(md->swtch.toString());
}
- if (!GetEepromInterface()->getCapability(VirtualInputs)) {
- if (md->carryTrim>0) {
- str += " " + tr("No Trim");
- }
- else if (md->carryTrim<0) {
- str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
- }
+ if (md->carryTrim>0) {
+ str += " " + tr("No Trim");
+ }
+ else if (md->carryTrim<0) {
+ str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
}
if (md->noExpo) str += " " + tr("No DR/Expo");
@@ -154,21 +151,7 @@ void MixesPanel::update()
while(curDestgetCapability(ExtraChannels)) {
curDest++;
- QString str;
-
- if (curDest > outputs) {
- str = tr("X%1 ").arg(curDest-outputs);
- }
- else {
- str = tr("CH%1%2").arg(curDest/10).arg(curDest%10);
- if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
- QString name=model.limitData[curDest-1].name;
- if (!name.isEmpty()) {
- name.append(" ");
- str=name.left(6);
- }
- }
- }
+ QString str = getChannelLabel(curDest);
qba.clear();
qba.append((quint8)-curDest);
QListWidgetItem *itm = new QListWidgetItem(str);
diff --git a/companion/src/modeledit/mixes.h b/companion/src/modeledit/mixes.h
index 5e5dc4e80..1fbbe9da7 100644
--- a/companion/src/modeledit/mixes.h
+++ b/companion/src/modeledit/mixes.h
@@ -50,7 +50,7 @@ class MixesPanel : public ModelPanel
void mixersDeleteList(QList list);
QList createMixListFromSelected();
void setSelectedByMixList(QList list);
-
+ QString getChannelLabel(int curDest);
};
#endif // MIXES_H
diff --git a/companion/src/modeledit/modeledit.cpp b/companion/src/modeledit/modeledit.cpp
index efc953736..bb035c4f9 100644
--- a/companion/src/modeledit/modeledit.cpp
+++ b/companion/src/modeledit/modeledit.cpp
@@ -22,6 +22,7 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
generalSettings(radioData.generalSettings)
{
ui->setupUi(this);
+ setWindowIcon(CompanionIcon("edit.png"));
restoreGeometry(g.modelEditGeo());
ui->pushButton->setIcon(CompanionIcon("simulate.png"));
addTab(new Setup(this, model), tr("Setup"));
@@ -32,7 +33,7 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
addTab(new Channels(this, model), tr("Channels"));
addTab(new LogicalSwitchesPanel(this, model), tr("Logical Switches"));
if (GetEepromInterface()->getCapability(CustomFunctions))
- addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Switch Assignment"));
+ addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Special Functions"));
addTab(new Curves(this, model), tr("Curves"));
if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY)
addTab(new TelemetryPanel(this, model), tr("Telemetry"));
diff --git a/companion/src/modeledit/modelpanel.cpp b/companion/src/modeledit/modelpanel.cpp
index b4c257aba..ed4424773 100644
--- a/companion/src/modeledit/modelpanel.cpp
+++ b/companion/src/modeledit/modelpanel.cpp
@@ -16,15 +16,42 @@ void ModelPanel::update()
{
}
-void ModelPanel::addLabel(QGridLayout * gridLayout, QString text, int col)
+void ModelPanel::addLabel(QGridLayout * gridLayout, QString text, int col, bool minimize)
{
QLabel *label = new QLabel(this);
label->setFrameShape(QFrame::Panel);
label->setFrameShadow(QFrame::Raised);
label->setMidLineWidth(0);
label->setAlignment(Qt::AlignCenter);
- label->setMargin(3);
+ label->setMargin(5);
label->setText(text);
+ if (!minimize)
+ label->setMinimumWidth(100);
gridLayout->addWidget(label, 0, col, 1, 1);
}
+void ModelPanel::addEmptyLabel(QGridLayout * gridLayout, int col)
+{
+ QLabel *label = new QLabel(this);
+ label->setText("");
+ gridLayout->addWidget(label, 0, col, 1, 1);
+}
+
+void ModelPanel::addHSpring(QGridLayout * gridLayout, int col, int row)
+{
+ QSpacerItem * spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ gridLayout->addItem(spacer, row, col);
+}
+
+void ModelPanel::addVSpring(QGridLayout * gridLayout, int col, int row)
+{
+ QSpacerItem * spacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
+ gridLayout->addItem(spacer, row, col);
+}
+
+void ModelPanel::addDoubleSpring(QGridLayout * gridLayout, int col, int row)
+{
+ QSpacerItem * spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding );
+ gridLayout->addItem(spacer, row, col);
+}
+
diff --git a/companion/src/modeledit/modelpanel.h b/companion/src/modeledit/modelpanel.h
index 8e37010dd..ebe4f73a0 100644
--- a/companion/src/modeledit/modelpanel.h
+++ b/companion/src/modeledit/modelpanel.h
@@ -22,8 +22,11 @@ class ModelPanel : public QWidget
protected:
ModelData & model;
bool lock;
- void addLabel(QGridLayout * gridLayout, QString text, int col);
-
+ void addLabel(QGridLayout * gridLayout, QString text, int col, bool mimimize=false);
+ void addEmptyLabel(QGridLayout * gridLayout, int col);
+ void addHSpring(QGridLayout *, int col, int row);
+ void addVSpring(QGridLayout *, int col, int row);
+ void addDoubleSpring(QGridLayout *, int col, int row);
};
#endif // CHANNELS_H
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 6dd46c3e0..8c1f6b671 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -112,11 +112,15 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
else {
ui->label_trainerMode->hide();
ui->trainerMode->hide();
- if (moduleIdx == 0)
- label = tr("Internal Radio System");
- else
- label = tr("External Radio Module");
-
+ if (GetEepromInterface()->getCapability(NumModules) > 1) {
+ if (moduleIdx == 0)
+ label = tr("Internal Radio System");
+ else
+ label = tr("External Radio Module");
+ }
+ else {
+ label = tr("Radio System");
+ }
}
ui->label_module->setText(label);
@@ -351,14 +355,13 @@ Setup::Setup(QWidget *parent, ModelData & model):
QString path = g.profile[g.id()].sdPath();
path.append("/BMP/");
QDir qd(path);
- int vml = GetEepromInterface()->getCapability(VoicesMaxLength)+4;
if (qd.exists()) {
QStringList filters;
filters << "*.bmp" << "*.bmp";
foreach ( QString file, qd.entryList(filters, QDir::Files) ) {
QFileInfo fi(file);
QString temp = fi.completeBaseName();
- if (!items.contains(temp) && temp.length() <= vml) {
+ if (!items.contains(temp) && temp.length() <= 10+4) {
items.append(temp);
}
}
@@ -500,8 +503,10 @@ void Setup::on_trimIncrement_currentIndexChanged(int index)
void Setup::on_throttleSource_currentIndexChanged(int index)
{
- model.thrTraceSrc = index;
- emit modified();
+ if (!lock) {
+ model.thrTraceSrc = ui->throttleSource->itemData(index).toInt();
+ emit modified();
+ }
}
void Setup::on_name_editingFinished()
@@ -514,8 +519,8 @@ void Setup::on_name_editingFinished()
void Setup::on_image_currentIndexChanged(int index)
{
if (!lock) {
- strncpy(model.bitmap, ui->image->currentText().toAscii(), GetEepromInterface()->getCapability(VoicesMaxLength));
- QString path=g.profile[g.id()].sdPath();
+ strncpy(model.bitmap, ui->image->currentText().toAscii(), 10);
+ QString path = g.profile[g.id()].sdPath();
path.append("/BMP/");
QDir qd(path);
if (qd.exists()) {
@@ -530,7 +535,7 @@ void Setup::on_image_currentIndexChanged(int index)
image.load(fileName);
}
if (!image.isNull()) {
- ui->imagePreview->setPixmap(QPixmap::fromImage(image.scaled( 64,32)));;
+ ui->imagePreview->setPixmap(QPixmap::fromImage(image.scaled(64, 32)));;
}
else {
ui->imagePreview->clear();
@@ -543,12 +548,45 @@ void Setup::on_image_currentIndexChanged(int index)
}
}
+void Setup::populateThrottleSourceCB()
+{
+ const QString sources9x[] = { QObject::tr("THR"), QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3")};
+ const QString sourcesTaranis[] = { QObject::tr("THR"), QObject::tr("S1"), QObject::tr("S2"), QObject::tr("S3"), QObject::tr("LS"), QObject::tr("RS")};
+
+ unsigned int i;
+
+ lock = true;
+
+ if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+ for (i=0; i<6; i++) {
+ ui->throttleSource->addItem(sourcesTaranis[i], i);
+ }
+ }
+ else {
+ for (i=0; i<4; i++) {
+ ui->throttleSource->addItem(sources9x[i], i);
+ }
+ }
+
+ if (model.thrTraceSrc < i)
+ ui->throttleSource->setCurrentIndex(model.thrTraceSrc);
+
+ int channels = (IS_ARM(GetEepromInterface()->getBoard()) ? 32 : 16);
+ for (int i=0; ithrottleSource->addItem(QObject::tr("CH%1").arg(i+1, 2, 10, QChar('0')), THROTTLE_SOURCE_FIRST_CHANNEL+i);
+ if (model.thrTraceSrc == unsigned(THROTTLE_SOURCE_FIRST_CHANNEL+i))
+ ui->throttleSource->setCurrentIndex(ui->throttleSource->count()-1);
+ }
+
+ lock = false;
+}
+
void Setup::update()
{
ui->name->setText(model.name);
ui->throttleReverse->setChecked(model.throttleReversed);
- populateTTraceCB(ui->throttleSource, model.thrTraceSrc);
+ populateThrottleSourceCB();
ui->throttleWarning->setChecked(!model.disableThrottleWarning);
//trim inc, thro trim, thro expo, instatrim
diff --git a/companion/src/modeledit/setup.h b/companion/src/modeledit/setup.h
index b785e2750..6880c363f 100644
--- a/companion/src/modeledit/setup.h
+++ b/companion/src/modeledit/setup.h
@@ -6,6 +6,7 @@
#include
#include
#include
+#include
#include
namespace Ui {
@@ -104,6 +105,7 @@ class Setup : public ModelPanel
void updateStartupSwitches();
void updatePotWarnings();
void updateBeepCenter();
+ void populateThrottleSourceCB();
};
#endif // SETUP_H
diff --git a/companion/src/modeledit/setup.ui b/companion/src/modeledit/setup.ui
index 29753cdb3..f91f79a07 100644
--- a/companion/src/modeledit/setup.ui
+++ b/companion/src/modeledit/setup.ui
@@ -6,8 +6,8 @@
0
0
- 787
- 727
+ 840
+ 520
@@ -16,175 +16,88 @@
-
-
-
-
+
-
+
-
-
-
- -
-
-
-
- 0
- 0
-
+
+
+ Reverse throttle operation.
+If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
+
+
-
-
- 64
- 32
-
-
-
-
- 64
- 32
-
-
-
- QFrame::Panel
-
-
- QFrame::Raised
+
+ Qt::LeftToRight
-
-
-
- true
+ Reverse Throttle
- -
-
-
- Qt::Horizontal
+
-
+
+
+ Qt::LeftToRight
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
- Model Image
+ Extended Limits
-
-
+
0
0
-
- 10
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ Extended Trims
-
-
- -
-
-
- Model Name
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Timer2
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Timer1
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Throttle Source
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Switch Warnings
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Center beep
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- -
-
-
- Trim Increment
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
+
-
+
+
+ Qt::LeftToRight
+
+
+ Throttle Trim
+
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ Throttle Warning
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
@@ -219,173 +132,393 @@
- -
-
-
- Qt::RightToLeft
-
-
- Extended Limits
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Extended Trims
-
-
-
- -
+
-
- Qt::RightToLeft
+ Qt::LeftToRight
Display Checklist
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Throttle Trim
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Throttle Warning
-
-
-
- -
-
-
- Reverse throttle operation.
-If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
-
-
-
-
- Qt::RightToLeft
-
-
- Reverse Throttle
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- QLayout::SetMinimumSize
-
-
- 0
-
-
- 6
-
-
- 6
-
-
-
- -
-
-
- true
+
-
+
+
+
+ 50
+ false
+
- Pot Warnings
+ Timer2
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- -
-
-
-
-
-
-
-
- OFF
-
-
- -
-
- Manual
-
-
- -
-
- Auto
-
-
+ -
+
+
+
+ 50
+ false
+
+
+
+ Timer1
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
-
+
+
+
+ 50
+ false
+
+
+
+ Throttle Source
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ Trim Increment
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ Center beep
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ 10
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
+ -
+
+
+ Model Image
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 64
+ 32
+
+
+
+
+ 64
+ 32
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Raised
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Warnings
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
-
+
+
-
+
+
+ Switch Warnings
+
+
+
+ -
+
+
+ QLayout::SetMinimumSize
+
+
+ 0
+
+
+ 6
+
+
+ 6
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Pot Warnings
+
+
+
+ -
+
+
-
+
+
-
+
+ OFF
+
+
+ -
+
+ Manual
+
+
+ -
+
+ Auto
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Model
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
-
-
-
+
Qt::Vertical
diff --git a/companion/src/modeledit/setup_module.ui b/companion/src/modeledit/setup_module.ui
index 406488f96..a8434e858 100644
--- a/companion/src/modeledit/setup_module.ui
+++ b/companion/src/modeledit/setup_module.ui
@@ -6,14 +6,46 @@
0
0
- 694
- 340
+ 628
+ 300
Form
+
+ 6
+
+
+ 0
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Label
+
+
+
-
@@ -35,7 +67,41 @@
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
+
+ 0
+
+
+ 6
+
+
-
+
+
+
+ 125
+ 16777215
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ ch
+
+
+ 1
+
+
+ 32
+
+
+ 1
+
+
+ 1
+
+
+
+ -
@@ -56,7 +122,7 @@
- -
+
-
@@ -72,7 +138,7 @@
- -
+
-
@@ -88,7 +154,7 @@
- -
+
-
@@ -98,7 +164,7 @@
- -
+
-
@@ -114,7 +180,7 @@
- -
+
-
@@ -142,7 +208,7 @@
- -
+
-
@@ -168,23 +234,7 @@
- -
-
-
-
- 16777215
- 16777215
-
-
-
- RX Number
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
+
-
@@ -210,7 +260,7 @@
- -
+
-
@@ -226,7 +276,7 @@
- -
+
-
@@ -242,38 +292,7 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- 125
- 16777215
-
-
-
-
-
-
- 1
-
-
- 125
-
-
- 1
-
-
- 1
-
-
-
- -
+
-
@@ -307,33 +326,7 @@
- -
-
-
-
- 16777215
- 16777215
-
-
-
- PPM Frame Length
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- font-weight: bold;
-
-
- Label
-
-
-
- -
+
-
@@ -361,35 +354,23 @@
- -
-
+
-
+
- 125
+ 16777215
16777215
+
+ PPM Frame Length
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
- ch
-
-
- 1
-
-
- 32
-
-
- 1
-
-
- 1
-
- -
+
-
@@ -411,7 +392,7 @@
- -
+
-
@@ -440,9 +421,14 @@
No Pulses
+ -
+
+ Receiver
+
+
- -
+
-
@@ -458,20 +444,7 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
+
-
@@ -487,6 +460,79 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 125
+ 16777215
+
+
+
+
+
+
+ 1
+
+
+ 125
+
+
+ 1
+
+
+ 1
+
+
+
+ -
+
+
+
+ 16777215
+ 16777215
+
+
+
+ RX Number
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index e06fe96a3..14405c4db 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/companion/src/modeledit/telemetry.cpp
@@ -28,10 +28,20 @@ TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog):
update();
ui->UnitCB->setCurrentIndex(analog.type);
- ui->alarm1LevelCB->setCurrentIndex(analog.alarms[0].level);
- ui->alarm1GreaterCB->setCurrentIndex(analog.alarms[0].greater);
- ui->alarm2LevelCB->setCurrentIndex(analog.alarms[1].level);
- ui->alarm2GreaterCB->setCurrentIndex(analog.alarms[1].greater);
+ if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
+ ui->alarm1LevelCB->setCurrentIndex(analog.alarms[0].level);
+ ui->alarm1GreaterCB->setCurrentIndex(analog.alarms[0].greater);
+ ui->alarm2LevelCB->setCurrentIndex(analog.alarms[1].level);
+ ui->alarm2GreaterCB->setCurrentIndex(analog.alarms[1].greater);
+ }
+ else {
+ ui->alarm1LevelCB->hide();
+ ui->alarm2LevelCB->hide();
+ ui->alarm1GreaterCB->hide();
+ ui->alarm2GreaterCB->hide();
+ ui->alarm1Label->setText(tr("Low Alarm"));
+ ui->alarm2Label->setText(tr("Critical Alarm"));
+ }
if (!(GetEepromInterface()->getCapability(Telemetry) & TM_HASOFFSET)) {
ui->CalibSB->hide();
@@ -281,7 +291,7 @@ TelemetryCustomScreen::TelemetryCustomScreen(QWidget *parent, ModelData & model,
for (int c=0; cgetCapability(TelemetryCustomScreensFieldsPerLine); c++) {
fieldsCB[l][c] = new QComboBox(this);
fieldsCB[l][c]->setProperty("index", c + (l<<8));
- populateCustomScreenFieldCB(fieldsCB[l][c], screen.body.lines[l].source[c], (l<4), model.frsky.usrProto);
+ populateTelemetrySourceCB(fieldsCB[l][c], screen.body.lines[l].source[c], l==3, model.frsky.usrProto);
ui->screenNumsLayout->addWidget(fieldsCB[l][c], l, c, 1, 1);
connect(fieldsCB[l][c], SIGNAL(currentIndexChanged(int)), this, SLOT(customFieldChanged(int)));
}
@@ -290,7 +300,7 @@ TelemetryCustomScreen::TelemetryCustomScreen(QWidget *parent, ModelData & model,
for (int l=0; l<4; l++) {
barsCB[l] = new QComboBox(this);
barsCB[l]->setProperty("index", l);
- populateCustomScreenFieldCB(barsCB[l], screen.body.bars[l].source, false, model.frsky.usrProto);
+ populateTelemetrySourceCB(barsCB[l], screen.body.bars[l].source, false, model.frsky.usrProto);
connect(barsCB[l], SIGNAL(currentIndexChanged(int)), this, SLOT(barSourceChanged(int)));
ui->screenBarsLayout->addWidget(barsCB[l], l, 0, 1, 1);
@@ -316,6 +326,31 @@ TelemetryCustomScreen::TelemetryCustomScreen(QWidget *parent, ModelData & model,
update();
}
+void TelemetryCustomScreen::populateTelemetrySourceCB(QComboBox *b, unsigned int value, bool last, int hubproto)
+{
+ int telem_hub[] = {0,0,0,0,0,0,0,0,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,0,0,2,2,1,1,1,1,1,1};
+ b->clear();
+
+ b->addItem(RawSource(SOURCE_TYPE_NONE, 0).toString());
+
+ for (unsigned int i = 0; i < (last ? TELEMETRY_SOURCES_STATUS_COUNT : TELEMETRY_SOURCES_DISPLAY_COUNT); i++) {
+ b->addItem(RawSource(SOURCE_TYPE_TELEMETRY, i).toString());
+ if (!(i>=sizeof(telem_hub)/sizeof(int) || telem_hub[i]==0 || ((telem_hub[i]>=hubproto) && hubproto!=0))) {
+ QModelIndex index = b->model()->index(i, 0);
+ QVariant v(0);
+ b->model()->setData(index, v, Qt::UserRole - 1);
+ }
+ }
+
+ if (value>=sizeof(telem_hub)/sizeof(int))
+ b->setCurrentIndex(0);
+ else if (telem_hub[value]==0 || ((telem_hub[value]>=hubproto) && hubproto!=0)) {
+ b->setCurrentIndex(value);
+ }
+
+ b->setMaxVisibleItems(10);
+}
+
TelemetryCustomScreen::~TelemetryCustomScreen()
{
delete ui;
@@ -347,6 +382,8 @@ void TelemetryCustomScreen::update()
void TelemetryCustomScreen::updateBar(int line)
{
+ lock = true;
+
int index = screen.body.bars[line].source;
barsCB[line]->setCurrentIndex(index);
if (index) {
@@ -372,6 +409,8 @@ void TelemetryCustomScreen::updateBar(int line)
minSB[line]->setDisabled(true);
maxSB[line]->setDisabled(true);
}
+
+ lock = false;
}
void TelemetryCustomScreen::on_screenType_currentIndexChanged(int index)
@@ -393,13 +432,15 @@ void TelemetryCustomScreen::customFieldChanged(int value)
void TelemetryCustomScreen::barSourceChanged(int index)
{
- QComboBox * cb = qobject_cast(sender());
- int line = cb->property("index").toInt();
- screen.body.bars[line].source = index;
- screen.body.bars[line].barMin = 0;
- screen.body.bars[line].barMax = 0;
- updateBar(line);
- emit modified();
+ if (!lock) {
+ QComboBox * cb = qobject_cast(sender());
+ int line = cb->property("index").toInt();
+ screen.body.bars[line].source = index;
+ screen.body.bars[line].barMin = 0;
+ screen.body.bars[line].barMax = 0;
+ updateBar(line);
+ emit modified();
+ }
}
void TelemetryCustomScreen::barMinChanged(double value)
@@ -447,6 +488,10 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model):
ui->customScreens->addTab(tab, tr("Telemetry screen %1").arg(i+1));
}
+ if (IS_ARM(GetEepromInterface()->getBoard())) {
+ ui->bladesCount->setMinimum(1);
+ }
+
setup();
}
@@ -467,8 +512,16 @@ void TelemetryPanel::setup()
}
ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
- ui->rssiAlarm1CB->setCurrentIndex(model.frsky.rssiAlarms[0].level);
- ui->rssiAlarm2CB->setCurrentIndex(model.frsky.rssiAlarms[1].level);
+ if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
+ ui->rssiAlarm1CB->setCurrentIndex(model.frsky.rssiAlarms[0].level);
+ ui->rssiAlarm2CB->setCurrentIndex(model.frsky.rssiAlarms[1].level);
+ }
+ else {
+ ui->rssiAlarm1CB->hide();
+ ui->rssiAlarm2CB->hide();
+ ui->rssiAlarm1Label->setText(tr("Low Alarm"));
+ ui->rssiAlarm2Label->setText(tr("Critical Alarm"));
+ }
if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
ui->AltitudeGPS_ChkB->hide();
@@ -585,7 +638,7 @@ void TelemetryPanel::setup()
ui->frskyProtoCB->setCurrentIndex(model.frsky.usrProto);
ui->frskyUnitsCB->setCurrentIndex(model.frsky.imperial);
- ui->frskyBladesCB->setCurrentIndex(model.frsky.blades);
+ ui->bladesCount->setValue(model.frsky.blades);
ui->frskyCurrentCB->setCurrentIndex(model.frsky.currentSource);
ui->frskyVoltCB->setCurrentIndex(model.frsky.voltsSource);
@@ -599,13 +652,13 @@ void TelemetryPanel::onAnalogModified()
void TelemetryPanel::on_frskyUnitsCB_currentIndexChanged(int index)
{
- model.frsky.imperial=index;
+ model.frsky.imperial = index;
emit modified();
}
-void TelemetryPanel::on_frskyBladesCB_currentIndexChanged(int index)
+void TelemetryPanel::on_bladesCount_editingFinished()
{
- model.frsky.blades=index;
+ model.frsky.blades = ui->bladesCount->value();
emit modified();
}
diff --git a/companion/src/modeledit/telemetry.h b/companion/src/modeledit/telemetry.h
index 44233f79c..3f44f3261 100644
--- a/companion/src/modeledit/telemetry.h
+++ b/companion/src/modeledit/telemetry.h
@@ -61,6 +61,9 @@ class TelemetryCustomScreen : public ModelPanel
void barMinChanged(double value);
void barMaxChanged(double value);
+ protected:
+ void populateTelemetrySourceCB(QComboBox *b, unsigned int value, bool last, int hubproto);
+
private:
void updateBar(int line);
Ui::TelemetryCustomScreen * ui;
@@ -86,7 +89,7 @@ class TelemetryPanel : public ModelPanel
void onAnalogModified();
void on_frskyProtoCB_currentIndexChanged(int index);
void on_frskyUnitsCB_currentIndexChanged(int index);
- void on_frskyBladesCB_currentIndexChanged(int index);
+ void on_bladesCount_editingFinished();
void on_frskyCurrentCB_currentIndexChanged(int index);
void on_frskyVoltCB_currentIndexChanged(int index);
void on_AltitudeToolbar_ChkB_toggled(bool checked);
diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui
index 6a3a6d618..0f1de8a2c 100644
--- a/companion/src/modeledit/telemetry.ui
+++ b/companion/src/modeledit/telemetry.ui
@@ -6,16 +6,19 @@
0
0
- 692
+ 757
457
Form
-
+
+
+ 0
+
-
-
+
QLayout::SetMinimumSize
@@ -33,37 +36,86 @@
-
- A1
-
false
+
+ 0
+
- 1
+ 0
+
+
+ 3
- 1
+ 3
+
-
+
+
+
+ 75
+ true
+
+
+
+ A1
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
-
-
- A2
+
+ false
+
+ 0
+
- 1
+ 0
+
+
+ 3
- 1
+ 3
+
-
+
+
+
+ 75
+ true
+
+
+
+ A2
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
-
@@ -72,14 +124,52 @@
0
-
- RSSI
+
+ false
-
-
-
+
+ 0
+
+
+ 0
+
+
+ 3
+
+
+ 3
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+ -
+
-
+
0
0
@@ -98,7 +188,7 @@
- -
+
-
@@ -128,7 +218,7 @@
- -
+
-
true
@@ -156,10 +246,10 @@
- -
-
+
-
+
-
+
0
0
@@ -175,7 +265,7 @@
- -
+
-
@@ -205,7 +295,7 @@
- -
+
-
true
@@ -233,18 +323,18 @@
- -
-
-
- Qt::Vertical
+
-
+
+
+
+ 75
+ true
+
-
-
- 20
- 0
-
+
+ RSSI
-
+
@@ -252,7 +342,17 @@
-
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ 0
+
QLayout::SetMinimumSize
@@ -264,19 +364,31 @@
0
-
- Serial Protocol
-
+
+ 0
+
+
+ 0
+
- 1
+ 0
+
+
+ 3
- 1
+ 3
-
-
-
+
+ 9
+
+
+ 0
+
+
-
@@ -289,7 +401,7 @@
- -
+
-
@@ -309,7 +421,7 @@
- -
+
-
@@ -328,7 +440,7 @@
- -
+
-
@@ -347,7 +459,7 @@
- -
+
-
@@ -377,7 +489,7 @@
- -
+
-
@@ -397,7 +509,7 @@
- -
+
-
@@ -427,32 +539,7 @@
- -
-
-
-
- 0
- 0
-
-
-
-
-
- 2
-
-
- -
-
- 3
-
-
- -
-
- 4
-
-
-
-
- -
+
-
@@ -471,7 +558,7 @@
- -
+
-
@@ -484,11 +571,53 @@
+ -
+
+
+
+ 75
+ true
+
+
+
+ Serial Protocol
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 0
+
+
+ 2.000000000000000
+
+
+ 5.000000000000000
+
+
+ 2.000000000000000
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
-
@@ -497,19 +626,28 @@
0
-
- Altimetry / Vario
-
+
+ 0
+
- 1
+ 0
+
+
+ 3
- 1
+ 3
+
+
+ 0
-
-
-
-
+
+
+ 9
+
+
-
@@ -544,7 +682,7 @@
- -
+
-
-
@@ -558,7 +696,7 @@
Sink Max
- Qt::AlignCenter
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
@@ -681,7 +819,7 @@
Climb Max
- Qt::AlignCenter
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
@@ -697,7 +835,7 @@
Sink Min
- Qt::AlignCenter
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
@@ -713,27 +851,27 @@
Climb Min
- Qt::AlignCenter
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
- -
+
-
Vario source
- -
+
-
Vario limits
- -
+
-
-
@@ -763,6 +901,19 @@
+ -
+
+
+
+ 75
+ true
+
+
+
+ Altimetry
+
+
+
@@ -770,6 +921,13 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
-
@@ -778,19 +936,38 @@
0
-
- Various
-
+
+ 0
+
- 1
+ 0
+
+
+ 3
- 1
+ 9
+
+
+ 0
-
-
-
+
+ 6
+
+
+ 0
+
+
-
+
+
+ mAh count
+
+
+
+ -
@@ -803,34 +980,7 @@
- -
-
-
- mAh count
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- FAS Offset
-
-
-
- -
-
-
- Persistent mAh
-
-
-
- -
+
-
@@ -852,7 +1002,27 @@
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+ FAS Offset
+
+
+
+ -
+
+
+ Persistent mAh
+
+
+
+ -
Qt::Horizontal
@@ -865,6 +1035,25 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Various
+
+
+
diff --git a/companion/src/modeledit/telemetry_analog.ui b/companion/src/modeledit/telemetry_analog.ui
index d8b713105..a28c2ea82 100644
--- a/companion/src/modeledit/telemetry_analog.ui
+++ b/companion/src/modeledit/telemetry_analog.ui
@@ -6,7 +6,7 @@
0
0
- 272
+ 276
118
@@ -14,6 +14,21 @@
Form
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
-
@@ -43,7 +58,7 @@
-
-
+
0
@@ -106,7 +121,7 @@
-
-
+
0
@@ -260,7 +275,7 @@
- -
+
-
diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp
index 88ce9ac9d..e658c757c 100644
--- a/companion/src/modelslist.cpp
+++ b/companion/src/modelslist.cpp
@@ -277,10 +277,7 @@ void ModelsListWidget::refreshList()
clear();
int msize;
div_t divresult;
- QString name = radioData->generalSettings.ownerName;
- if(!name.isEmpty())
- name.prepend(" - ");
- addItem(tr("General Settings") + name);
+ addItem(tr("General Settings"));
EEPROMInterface *eepromInterface = GetEepromInterface();
int availableEEpromSize = eepromInterface->getEEpromSize()-64; //let's consider fat
diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp
index 215771347..05a0cb276 100644
--- a/companion/src/printdialog.cpp
+++ b/companion/src/printdialog.cpp
@@ -42,7 +42,8 @@ printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QS
if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
gvars=1;
}
- } else {
+ }
+ else {
gvars=1;
}
@@ -519,23 +520,6 @@ void printDialog::printCurves()
int i,r,g,b,c,count;
char buffer[16];
QPen pen(Qt::black, 2, Qt::SolidLine);
- QColor * qplot_color[16];
- qplot_color[0]=new QColor(0,0,127);
- qplot_color[1]=new QColor(0,127,0);
- qplot_color[2]=new QColor(127,0,0);
- qplot_color[3]=new QColor(0,127,127);
- qplot_color[4]=new QColor(127,0,127);
- qplot_color[5]=new QColor(127,127,0);
- qplot_color[6]=new QColor(127,127,127);
- qplot_color[7]=new QColor(0,0,255);
- qplot_color[8]=new QColor(0,127,255);
- qplot_color[9]=new QColor(127,0,255);
- qplot_color[10]=new QColor(0,255,0);
- qplot_color[11]=new QColor(0,255,127);
- qplot_color[12]=new QColor(127,255,0);
- qplot_color[13]=new QColor(255,0,0);
- qplot_color[14]=new QColor(255,0,127);
- qplot_color[15]=new QColor(255,127,0);
QString str = "
";
str.append(tr("Curves"));
@@ -552,16 +536,18 @@ void printDialog::printCurves()
painter.drawRect(0,0,ISIZEW,ISIZEW);
str.append(""+QString("![](\"%1\") | ").arg(curvefile5));
for(i=0; igetRgb(&r,&g,&b);
+ colors[i].getRgb(&r,&g,&b);
c=r;
c*=256;
c+=g;
c*=256;
c+=b;
sprintf(buffer,"%06x",c);
- str.append(QString("| ").arg(buffer)+tr("Curve")+QString(" %1 | ").arg(i+1));
+ if(i%2 == 0) str.append("");
+ str.append(QString("| ").arg(buffer)+tr("Curve")+QString(" %1 | ").arg(i+1));
+ if(i%2) str.append(" ");
}
str.append(" | ");
str.append("");
@@ -576,9 +562,9 @@ void printDialog::printCurves()
str.append(doTC(tr("pt %1").arg(i+1), "", true));
str.append(" ");
for(i=0; igetRgb(&r,&g,&b);
+ colors[i].getRgb(&r,&g,&b);
c=r;
c*=256;
c+=g;
@@ -697,7 +683,7 @@ void printDialog::printFSwitches()
{
int sc=0;
QString str = "";
- str.append(""+tr("Switch Assignments")+" | ");
+ str.append(""+tr("Special Functions")+" | ");
str.append("");
str.append(doTC(tr("Switch"), "", true));
str.append(doTL(tr("Function"), "", true));
@@ -767,7 +753,7 @@ void printDialog::printFrSky()
str.append(" | ");
str.append("| "+tr("Frsky serial protocol")+" | "+getFrSkyProtocol(fd->usrProto)+" | ");
str.append("| "+tr("System of units")+" | "+getFrSkyMeasure(fd->imperial)+" | ");
- str.append("| "+tr("Propeller blades")+" | "+getFrSkyBlades(fd->blades)+" | ");
+ str.append("| "+tr("Blades")+" | "+fd->blades+" | ");
str.append(" |
");
#if 0
if (GetEepromInterface()->getCapability(TelemetryBars) || (GetEepromInterface()->getCapability(TelemetryCSFields))) {
diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index 597edfe35..dca3c90ee 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -364,7 +364,7 @@ void SimulatorDialog9X::setLightOn(bool enable)
list << "bl" << "gr" << "rd" << "or" << "yl";
bg = QString("-") + list[backLight];
}
- ui->top->setStyleSheet(QString("background:url(:/images/9xdt.png%1);").arg(bg));
+ ui->top->setStyleSheet(QString("background:url(:/images/9xdt%1.png);").arg(bg));
ui->bottom->setStyleSheet(QString("background:url(:/images/9xdb%1.png);").arg(bg));
ui->left->setStyleSheet(QString("background:url(:/images/9xdl%1.png);").arg(bg));
ui->right->setStyleSheet(QString("background:url(:/images/9xdr%1.png);").arg(bg));
@@ -515,6 +515,7 @@ void SimulatorDialogTaranis::getValues()
{
-ui->dialP_1->value(),
ui->dialP_2->value(),
+ 0,
-ui->dialP_3->value(),
ui->dialP_4->value()
},
diff --git a/companion/src/simulation/simulatorimport.h b/companion/src/simulation/simulatorimport.h
index 4890a6281..ab1f83c6d 100644
--- a/companion/src/simulation/simulatorimport.h
+++ b/companion/src/simulation/simulatorimport.h
@@ -14,6 +14,10 @@
*
*/
+#if !defined(NUM_LOGICAL_SWITCH) && defined(NUM_CSW)
+#define NUM_LOGICAL_SWITCH NUM_CSW
+#endif
+
#ifdef INIT_IMPORT
#undef INIT_IMPORT
#ifdef FRSKY
@@ -49,7 +53,7 @@ if (inputs.rotenc) PIOB->PIO_PDSR &= ~0x40; else PIOB->PIO_PDSR |= 0x40;
#undef GETVALUES_IMPORT
memset(outputs.chans, 0, sizeof(outputs.chans));
memcpy(outputs.chans, g_chans512, sizeof(g_chans512));
-for (int i=0; i 1 && !strcmp(argv[1], "taranis")) {
+ QMessageBox msgBox;
+ msgBox.setWindowTitle("Radio type");
+ msgBox.setText("Which radio type do you want to simulate?");
+ msgBox.setIcon(QMessageBox::Question);
+ QAbstractButton *taranisButton = msgBox.addButton("Taranis", QMessageBox::ActionRole);
+ msgBox.addButton("9X", QMessageBox::ActionRole);
+ QPushButton *exitButton = msgBox.addButton(QMessageBox::Close);
+
+ msgBox.exec();
+
+ if (msgBox.clickedButton() == exitButton)
+ return 0;
+ else if (msgBox.clickedButton() == taranisButton) {
current_firmware_variant = GetFirmwareVariant("opentx-taranis-en");
+ eepromFileName = "eeprom-taranis.bin";
dialog = new SimulatorDialogTaranis();
}
else {
+ eepromFileName = "eeprom-9x.bin";
dialog = new SimulatorDialog9X();
}
dialog->show();
- dialog->start("eeprom.bin");
+ dialog->start(eepromFileName);
int result = app.exec();
diff --git a/companion/src/taranisnotfound.cpp b/companion/src/taranisnotfound.cpp
new file mode 100644
index 000000000..aa01ca84e
--- /dev/null
+++ b/companion/src/taranisnotfound.cpp
@@ -0,0 +1,19 @@
+#include "taranisnotfound.h"
+#include "ui_taranisnotfound.h"
+
+taranisNotFoundDialog::taranisNotFoundDialog(QWidget *parent) :
+ QDialog(parent),
+ ui(new Ui::taranisNotFoundDialog)
+{
+ ui->setupUi(this);
+}
+
+taranisNotFoundDialog::~taranisNotFoundDialog()
+{
+ delete ui;
+}
+
+void taranisNotFoundDialog::on_OK_clicked()
+{
+ accept();
+}
diff --git a/companion/src/taranisnotfound.h b/companion/src/taranisnotfound.h
new file mode 100644
index 000000000..8b4d964b9
--- /dev/null
+++ b/companion/src/taranisnotfound.h
@@ -0,0 +1,22 @@
+#ifndef TARANISNOTFOUNDDIALOG_H
+#define TARANISNOTFOUNDDIALOG_H
+
+#include
+
+namespace Ui {
+ class taranisNotFoundDialog;
+}
+
+class taranisNotFoundDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ explicit taranisNotFoundDialog(QWidget *parent = 0);
+ ~taranisNotFoundDialog();
+private:
+ Ui::taranisNotFoundDialog *ui;
+private slots:
+ void on_OK_clicked();
+};
+
+#endif // TARANISNOTFOUNDDIALOG_H
diff --git a/companion/src/taranisnotfound.ui b/companion/src/taranisnotfound.ui
new file mode 100644
index 000000000..2e84ab038
--- /dev/null
+++ b/companion/src/taranisnotfound.ui
@@ -0,0 +1,117 @@
+
+
+ taranisNotFoundDialog
+
+
+
+ 0
+ 0
+ 367
+ 350
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 367
+ 350
+
+
+
+
+ 367
+ 350
+
+
+
+ No Taranis Radio Found
+
+
+ -
+
+
-
+
+
+ <html><head/><body><p>No Taranis Radio was found!</p><p>Make sure that you hold the lower trim buttons towards the center while you turn it on.</p><p>Then connect the USB wire.</p></body></html>
+
+
+ Qt::RichText
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QFrame::Box
+
+
+
+
+
+ :/images/taranison.png
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ OK
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
+
+
diff --git a/companion/src/translations/companion_fi.ts b/companion/src/translations/companion_fi.ts
index 96023cc65..e7516fdcc 100644
--- a/companion/src/translations/companion_fi.ts
+++ b/companion/src/translations/companion_fi.ts
@@ -4,409 +4,297 @@
Channels
-
Name
-
+ Nimi
-
Offset
-
+ Tasoitus
-
Min
-
+ Min
-
Max
-
+ Max
-
Invert
-
+ Käänteinen
-
Center
-
+ Keski
-
Sym
-
+ Sym
-
Channel %1
-
+ Kanava %1
-
---
-
+ ---
-
INV
-
+ KÄÄNT
CurveGroup
-
Diff
-
+ Ero
-
Expo
-
+ Expo
-
Func
-
+ Toiminto
-
Curve
-
+ Käyrä
Curves
-
Form
-
+ Käyrät
-
Standard
-
+ Vakio
-
Custom
-
+ Omat
-
Lines
-
+ Viivat
-
Smooth
-
+ Pehmeä
-
Curve type
-
+ Käyrän tyyppi
-
Curve name
-
+ Käyrän nimi
-
Curve %1
-
+ Käyräi %1
-
%1 points
-
+ %1 pisteet
-
Are you sure you want to reset curve %1 ?
-
+ Oletko varma että haluat palauttaa käyrän %1 ?
-
Editing curve %1
-
+ Muutetaan käyrää %1
-
Not enough free points in EEPROM to store the curve.
-
+ Ei vapaata tilaa EEPROMissa tallentaa käyrää.
CustomFunctionsPanel
-
Switch
-
+ Kytkin
-
Action
-
+ Toiminto
-
Parameters
-
+ Parametrit
-
Enable
-
+ Päälle
-
CF%1
-
+ OF%1
-
ON
-
+ ON
-
Error
-
+ Virhe
-
Unable to find sound file %1!
-
+ Äänitiedostoa ei löydy %1!
-
&Delete
-
+ &Poista
-
Delete
-
+ Poista
-
&Copy
-
+ &Kopio
-
Ctrl+C
-
+ Ctrl+C
-
&Cut
-
+ &Leikkaa
-
Ctrl+X
-
+ Ctrl+X
-
&Paste
-
+ &Liitä
-
Ctrl+V
-
+ Ctrl+V
Dialog
-
Dialog
-
+ Käyrä
-
Curve type
-
+ Tyyppi
-
Coefficient
-
+ Vaikutus
-
Both
-
+ Molemmat
-
x>0
-
+ x>0
-
x<0
-
+ x<0
-
Y at X=0
-
+ Y suhde X =0
-
Side
-
+ Sivu
-
Y at X=-100
-
+ Y suhde X =-100
-
Y at X=100
-
+ Y suhde X =100
-
Linear
-
+ Suora
-
Single Expo
-
+ yks expo
-
Symmetrical f(x)=-f(-x)
-
+ Symmetrinen f(x)=-f(-x)
-
Symmetrical f(x)=f(-x)
-
+ Symmetrinen f(x)=f(-x)
ExpoDialog
-
- The source for the mixer
-
-
-
-
- Input name
-
-
-
-
- Weight
-
-
-
-
-
- GV
-
-
-
-
- Phase used by the input.
-
-
-
-
- Flight modes
-
-
-
-
0
-
+ 0
-
1
-
+ 1
-
2
-
+ 2
-
3
-
+ 3
-
4
-
+ 4
-
5
-
+ 5
-
6
-
+ 6
-
7
-
+ 7
-
8
-
+ 8
-
Switch
-
+ Kytkin
-
- Switch used by the input.
-If blank then the input is considered to be "ON" all the time.
-
-
-
-
- Stick Side
-
-
-
-
NEG
-
+ NEG
-
POS
-
+ POS
-
ALL
-
+ Kaikki
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -418,70 +306,100 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -> the value states the number of seconds it takes to transit from -100 to 100.</p></body></html>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -> the value states the number of seconds it takes to transit from -100 to 100.</p></body></html>
+
+
+ No
+ Ei
+
+
+ Yes
+ Kyllä
+
+
+ Curve
+ Käyrä
+
+
+ Source
+ Lähde
+
+
+ The source for the mixer
+
+
+
+ Input name
+
+
+
+ Weight
+
+
+
+ GV
+
+
+
+ Phase used by the input.
+
+
+
+ Flight modes
+
+
+
+ Switch used by the input.
+If blank then the input is considered to be "ON" all the time.
+
+
+
+ Stick Side
-
Scale
-
Include Trim
-
- No
-
-
-
-
- Yes
-
-
-
-
- Curve
-
-
-
-
The curve used by the input
-
- Source
-
-
-
-
Line name
-
Edit %1
-
Rud
-
Ele
-
Thr
-
Ail
@@ -489,77 +407,62 @@ p, li { white-space: pre-wrap; }
FlightMode
-
Form
-
Fade In
-
Fade Out
-
Name
-
+ Nimi
-
Switch
-
+ Kytkin
-
trim1
-
trim2
-
trim4
-
trim3
-
Rud
-
Ele
-
Thr
-
Ail
-
Rotary Encoder %1
-
GVAR%1
@@ -567,338 +470,123 @@ p, li { white-space: pre-wrap; }
FlightModes
-
Flight Mode %1
-
+ Lentotila %1
-
(%1)
-
+ (%1)
-
(default)
-
+ (oletus)
GeneralEdit
-
General Edit
-
+ Yleiset muutokset
-
- Retrieve calib. and hw settings from profile
-
-
-
-
- Store calib. and hw settings in selected profile
-
-
-
-
- General settings used throught the transmitter.
-These will be relevant for all models in the same EEPROM.
-
-
-
-
Setup
-
+ Asetukset
-
Country Code
-
+ Maa koodi
-
America
-
+ Amerikka
-
Japan
-
+ Japani
-
Europe
-
+ Eurooppa
-
- MAVLink Baud Rate
-
-
-
-
Voice Language
-
+ Äänen kieli
-
- Measurement Units
-
-
-
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Single Beep Every whole Minute</span></p></body></html>
-
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Single Beep Every whole Minute</span></p></body></html>
-
Every Minute
-
+ Joka minuutti
-
- Beeps at 30, 15, 10, and down from5 seconds
-
-
-
-
- Count Down to Zero
-
-
-
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Flash backlight on timer beep</span></p></body></html>
-
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Flash backlight on timer beep</span></p></body></html>
-
- Flash on beep
-
-
-
-
- Beep volume
-
-
-
-
- Wav volume
-
-
-
-
- Vario volume
-
-
-
-
- Background volume
-
-
-
-
- PPMSim
-
-
-
-
4800 Baud
-
+ 4800 Baudia
-
9600 Baud
-
+ 9600 Baudia
-
14400 Baud
-
+ 14400 Baudia
-
19200 Baud
-
+ 19200 Baudia
-
38400 Baud
-
+ 38400 Baudia
-
57600 Baud
-
+ 57600 Baudia
-
76800 Baud
-
+ 76800 Baudia
-
115200 Baud
-
+ 115200 Baudia
-
- Beeper Length
-
-
-
-
- Pot Scrolling Enable
-
-
-
-
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html>
-
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html>
-
- Haptic Length
-
-
-
-
- Mode selection:
-
-Mode 1:
- Left stick: Elevator, Rudder
- Right stick: Throttle, Aileron
-
-Mode 2:
- Left stick: Throttle, Rudder
- Right stick: Elevator, Aileron
-
-Mode 3:
- Left stick: Elevator, Aileron
- Right stick: Throttle, Rudder
-
-Mode 4:
- Left stick: Throttle, Aileron
- Right stick: Elevator, Rudder
-
-
-
-
-
-
- Mode 1 (RUD ELE THR AIL)
-
-
-
-
- Mode 2 (RUD THR ELE AIL)
-
-
-
-
- Mode 3 (AIL ELE THR RUD)
-
-
-
-
- Mode 4 (AIL THR ELE RUD)
-
-
-
-
- LCD Display Type
-
-
-
-
- BackLight On Stick Move
-
-
-
-
-
- sec
-
-
-
-
- Beeper Mode
-
-
-
-
- Timeshift from UTC
-
-
-
-
- RotEnc Navigation
-
-
-
-
- FrSky Internal Alarm
-
-
-
-
- THR
-
-
-
-
- RUD
-
-
-
-
- ELE
-
-
-
-
- AIL
-
-
-
-
- GEA
-
-
-
-
- ID0
-
-
-
-
- ID1
-
-
-
-
- ID2
-
-
-
-
-
-
-
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -910,5719 +598,4736 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html>
-
-
-
-
- GPS Coordinates
-
-
-
-
- hh° (N/S) mm' ss''.dd
-
-
-
-
- NMEA
-
-
-
-
- If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
-
-
-
-
- Channel order
-
-This is used by the templated to determine which channel goes to what number output.
-
-
-
-
- R E T A
-
-
-
-
- R E A T
-
-
-
-
- R T E A
-
-
-
-
- R T A E
-
-
-
-
- R A E T
-
-
-
-
- R A T E
-
-
-
-
- E R T A
-
-
-
-
- E R A T
-
-
-
-
- E T R A
-
-
-
-
- E T A R
-
-
-
-
- E A R T
-
-
-
-
- E A T R
-
-
-
-
- T R E A
-
-
-
-
- T R A E
-
-
-
-
- T E R A
-
-
-
-
- T E A R
-
-
-
-
- T A R E
-
-
-
-
- T A E R
-
-
-
-
- A R E T
-
-
-
-
- A R T E
-
-
-
-
- A E R T
-
-
-
-
- A E T R
-
-
-
-
- A T R E
-
-
-
-
- A T E R
-
-
-
-
- Show Owner Name on Splash
-
-
-
-
- Speaker Pitch (spkr only)
-
-
-
-
-
- X-Short
-
-
-
-
-
- Short
-
-
-
-
-
- Normal
-
-
-
-
-
- Long
-
-
-
-
-
- X-Long
-
-
-
-
- StickScroll
-
-
-
-
- FAI Mode
-
-
-
-
- Haptic Strength
-
-
-
-
- Beeper
-
-
-
-
- Speaker
-
-
-
-
- BeeperVoice
-
-
-
-
- SpeakerVoice
-
-
-
-
- Show Splash Screen on Startup
-
-
-
-
- Metric
-
-
-
-
- Imperial
-
-
-
-
- Channel Order (For Templates)
-
-
-
-
- Stick Mode
-
-
-
-
- Haptic Mode
-
-
-
-
- Owner Name
-
-
-
-
- BackLight Invert
-
-
-
-
- Standard
-
-
-
-
- Optrex
-
-
-
-
-
- Show splash screen on startup
-
-
-
-
-
- Quiet
-
-
-
-
- Only Alarms
-
-
-
-
-
- No Keys
-
-
-
-
-
- All
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Beeper volume
-
-0 - Quiet. No beeps at all.
-1 - No Keys. Normal beeps but menu keys do not beep.
-2 - Normal.
-3 - Loud.
-4 - Extra loud.
-
-
-
-
- Alarms Only
-
-
-
-
- If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.
-
-
-
-
- Timer Beeps
-
-
-
-
- BackLight Brightness
-
-
-
-
- Contrast
-
-
-
-
- BackLight Auto OFF after
-
-
-
-
- Single
-
-
-
-
- Oversample
-
-
-
-
- Filter
-
-
-
-
- This is the switch selectrion for turning on the backlight (if installed).
-
-
-
-
-
-
- Bandgap Measuring Enable
-
-
-
-
- Input Filter
-
-
-
-
- CrossTrim
-
-
-
-
- Sound Mode
-
-
-
-
- BackLight Switch
-
-
-
-
- Battery calibration:
-This value will be added to the measured battery voltage. Use this value to calibrate the meter with an external meter.
-
-
-
-
- Battery Calibration
-
-
-
-
- Battery Warning
-
-
-
-
- Battery warning voltage.
-This is the threashhold where the battery warning sounds.
-
-Acceptable values are 5v..10v
-
-
-
-
- Telemetry NO DATA Alarm
-
-
-
-
- Readonly Unlock
-
-
-
-
- Speaker Volume
-
-
-
-
- If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes.
-
-
-
-
- min
-
-
-
-
- Inactivity Timer
-
-
-
-
- SC
-
-
-
-
- SE
-
-
-
-
- SA
-
-
-
-
- SF
-
-
-
-
- SH
-
-
-
-
- SD
-
-
-
-
- SB
-
-
-
-
- SG
-
-
-
-
- Alarm Warning
-
-
-
-
- Memory Startup Warning
-
-
-
-
- Trainer
-
-
-
-
- Mode
-
-
-
-
- Input
-
-
-
-
- Weight
-
-
-
-
- Switch
-
-
-
-
-
- PPM 1
-
-
-
-
-
-
-
- Off
-
-
-
-
-
-
-
- += (Sum)
-
-
-
-
-
-
-
- := (Replace)
-
-
-
-
-
-
-
- chn1
-
-
-
-
-
-
-
- chn2
-
-
-
-
-
-
-
- chn3
-
-
-
-
-
-
-
- chn4
-
-
-
-
-
- PPM 2
-
-
-
-
-
- PPM 3
-
-
-
-
-
- PPM 4
-
-
-
-
- Telemetry
-
-
-
-
- RSSI Alarm 1
-
-
-
-
-
- ----
-
-
-
-
-
- Yellow
-
-
-
-
-
- Orange
-
-
-
-
-
- Red
-
-
-
-
- RSSI Alarm 2
-
-
-
-
- NO DATA Alarm
-
-
-
-
- Calibration
-
-
-
-
- POT 4
-
-
-
-
- POT 3
-
-
-
-
- POT 2
-
-
-
-
- POT 1
-
-
-
-
- STICK 3
-
-
-
-
-
- Negative span
-
-
-
-
-
- Mid value
-
-
-
-
-
- Positive span
-
-
-
-
- STICK 1
-
-
-
-
- STICK 2
-
-
-
-
- STICK 4
-
-
-
-
- Battery
-
-
-
-
- v
-
-
-
-
- PPM Multiplier
-
-
-
-
- Current
-
-
-
-
-
- Pot (normal)
-
-
-
-
-
- Multipos Switch
-
-
-
-
- S1 Type
-
-
-
-
- S2 Type
-
-
-
-
- If you enable FAI, you loose the vario, the play functions, the telemetry screen.
-This function cannot be disabled by the radio.
-Are you sure ?
-
-
-
-
-
- Warning
-
-
-
-
- Wrong data in profile, radio calibration was not retrieved
-
-
-
-
- Wrong data in profile, hw related parameters were not retrieved
-
-
-
-
- Do you want to store calibration in %1 profile<br>overwriting existing calibration?
-
-
-
-
- Calibration and HW parameters saved.
-
-
-
-
- Heli
-
-
- Form
-
-
-
-
- Invert Elevator
-
-
-
-
- Invert Aileron
-
-
-
-
- Invert Collective
-
-
-
-
- Invert
-
-
-
-
- Off
-
-
-
-
- 120
-
-
-
-
- 120X
-
-
-
-
- 140
-
-
-
-
- 90
-
-
-
-
- Collective
-
-
-
-
- Swash Type
-
-
-
-
- Swash Ring
-
-
-
-
- InputsPanel
-
-
-
- Move Up
-
-
-
-
-
- Ctrl+Up
-
-
-
-
-
- Move Down
-
-
-
-
-
- Ctrl+Down
-
-
-
-
- Clear All Settings
-
-
-
-
- Source(%1)
-
-
-
-
- No Trim
-
-
-
-
- Weight(%1)
-
-
-
-
- Switch(%1)
-
-
-
-
- Not enough available inputs!
-
-
-
-
- Delete Selected Inputs?
-
-
-
-
- &Add
-
-
-
-
- Ctrl+A
-
-
-
-
- &Edit
-
-
-
-
- Enter
-
-
-
-
- &Delete
-
-
-
-
- Delete
-
-
-
-
- &Copy
-
-
-
-
- Ctrl+C
-
-
-
-
- &Cut
-
-
-
-
- Ctrl+X
-
-
-
-
- &Paste
-
-
-
-
- Ctrl+V
-
-
-
-
- Du&plicate
-
-
-
-
- Ctrl+U
-
-
-
-
- Clear Inputs?
-
-
-
-
- Really clear all the inputs?
-
-
-
-
- LogicalSwitchesPanel
-
-
- Condition
-
-
-
-
- V1
-
-
-
-
- V2
-
-
-
-
- AND
-
-
-
-
- Duration
-
-
-
-
- Delay
-
-
-
-
-
- LS%1
-
-
-
-
- &Delete
-
-
-
-
- Delete
-
-
-
-
- &Copy
-
-
-
-
- Ctrl+C
-
-
-
-
- &Cut
-
-
-
-
- Ctrl+X
-
-
-
-
- &Paste
-
-
-
-
- Ctrl+V
-
-
-
-
- MainWindow
-
-
-
-
-
- File loaded
-
-
-
-
- Display previous warning again at startup ?
-
-
-
-
- Display previous message again at startup ?
-
-
-
-
- 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
-
-
-
-
- A new release of Companion is available please check the OpenTX website!
-
-
-
-
-
- No updates available at this time.
-
-
-
-
- Would you like to launch the installer?
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Error
-
-
-
-
-
-
-
-
- Error opening file %1:
-%2.
-
-
-
-
- Firmware does not longer fit in the Tx, due to selected firmware options
-
-
-
-
- Compilation server temporary failure, try later
-
-
-
-
-
- Compilation server too busy, try later
-
-
-
-
-
- Compilation server requires registration, please check OpenTX web site
-
-
-
-
-
- Unknown server failure, try later
-
-
-
-
- Firmware does not fit in the Tx, due to selected firmware options
-
-
-
-
- Compilation server termporary failure, try later
-
-
-
-
- Do you want to write the firmware to the transmitter now ?
-
-
-
-
- Firmware %1 does not seem to have ever been downloaded.
-Version %2 is available.
-Do you want to download it now ?
-
-
-
-
-
- Yes
-
-
-
-
-
- No
-
-
-
-
-
- Release Notes
-
-
-
-
-
- Do you want to download release %1 now ?
-
-
-
-
- A new version of %1 firmware is available (current %2 - newer %3).
-Do you want to download it now ?
-
-
-
-
- Ignore this version (r%1)?
-
-
-
-
- Release notes contain very important informations. Do you want to see them now ?
-
-
-
-
- The selected language will be used the next time you start Companion.
-
-
-
-
-
-
- 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
-
-
-
-
-
- File saved
-
-
-
-
- Firmware updates
-
-
-
-
- Current firmware does not provide release notes informations.
-
-
-
-
- Cannot write file %1:
-%2.
-
-
-
-
-
-
-
-
- Taranis radio not found
-
-
-
-
-
-
-
- Impossible to identify the radio on your system, please verify the eeprom disk is connected.
-
-
-
-
-
-
-
-
- Read Models and Settings From Tx
-
-
-
-
- Write Models and settings from %1 to the Tx?
-
-
-
-
- The file %1
-has not been recognized as a valid Models and Settings file
-Write anyway ?
-
-
-
-
-
-
- Backup is impossible
-
-
-
-
-
-
- The backup dir set in preferences does not exist
-
-
-
-
-
-
-
-
-
- Backup Models and Settings From Tx
-
-
-
-
- Cannot check Models and Settings compatibility! Continue anyway?
-
-
-
-
-
- Warning
-
-
-
-
- The transmitter firmware belongs to another product family, check file and preferences!
-
-
-
-
- The transmitter firmware is outdated, please upgrade!
-
-
-
-
-
- Write Models and Settings To Tx
-
-
-
-
-
- Write Firmware To Tx
-
-
-
-
- Conversion failed
-
-
-
-
- Cannot convert Models and Settings for use with this firmware, original data will be used
-
-
-
-
- Restore Models and Settings To Tx
-
-
-
-
- Restore failed
-
-
-
-
- Could not restore Models and Settings to TX. The models and settings data file can be found at: %1
-
-
-
-
- Firmware write failed
-
-
-
-
- Could not write firmware to to transmitter. The models and settings data file can be found at: %1
-
-
-
-
- Backup failed
-
-
-
-
- Cannot backup existing Models and Settings from TX. Firmware write process aborted
-
-
-
-
- Save transmitter Models and Settings to File
-
-
-
-
- Impossible to identify the radio on your system, please verify that the eeprom disk is connected.
-
-
-
-
- Read Tx Firmware to File
-
-
-
-
- OpenTX Home Page: <a href='%1'>%1</a>
-
-
-
-
- The OpenTX Companion project was originally forked from <a href='%2'>eePe</a>
-
-
-
-
- If you've found this program useful, please support by <a href='%1'>donating</a>
-
-
-
-
- Version %1, %3
-
-
-
-
- Copyright
-
-
-
-
- About Companion
- Noin Companion
-
-
-
- OpenTX Companion - FW: %1 - Profile: %2
-
-
-
-
-
- New
-
-
-
-
- Create a new file
-
-
-
-
- Open...
-
-
-
-
- Open an existing file
-
-
-
-
- Save...
-
-
-
-
-
- Save the document to disk
-
-
-
-
- Save As...
-
-
-
-
- Exit
-
-
-
-
- Exit the application
-
-
-
-
- Cut
-
-
-
-
- Cut current selection to the clipboard
-
-
-
-
- Copy...
-
-
-
-
- Copy current selection to the clipboard
-
-
-
-
- Paste...
-
-
-
-
- Paste clipboard into current selection
-
-
-
-
- Classical
-
-
-
-
- The classical Companion icon theme
-
-
-
-
- The new Companion 2 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
-
-
-
-
- French
-
-
-
-
- Use French in menus
-
-
-
-
- Italian
-
-
-
-
- Use Italian in menus
-
-
-
-
- Hebrew
-
-
-
-
- Use Hebrew in menus
-
-
-
-
- Polish
-
-
-
-
- Use Polish in menus
-
-
-
-
- Portuguese
-
-
-
-
- Use Portuguese in menus
-
-
-
-
- Swedish
-
-
-
-
- Use Swedish in menus
-
-
-
-
- Russian
-
-
-
-
- Use Russian in menus
-
-
-
-
- About
- Noin
-
-
-
- Show the application's About box
-
-
-
-
- Print
-
-
-
-
- Print current model
-
-
-
-
- Simulate
-
-
-
-
- Simulate selected model
-
-
-
-
- loadBackup...
-
-
-
-
- Load backup from file
-
-
-
-
- Logs
-
-
-
-
- Open log file
-
-
-
-
- Setting...
-
-
-
-
- Edit Settings
-
-
-
-
- Downloads...
-
-
-
-
- Download firmware and voice files
-
-
-
-
- Check for updates...
-
-
-
-
- Check OpenTX and Companion updates
-
-
-
-
- ChangeLog...
-
-
-
-
- Show Companion changelog
-
-
-
-
- Firmware ChangeLog...
-
-
-
-
- Show firmware changelog
-
-
-
-
- Compare...
-
-
-
-
- Compare models
-
-
-
-
- Edit Tx Splash Image...
-
-
-
-
- edit the splash screen of your TX
-
-
-
-
- List programmers
-
-
-
-
- List available programmers
-
-
-
-
- Fuses...
-
-
-
-
- Show fuses dialog
-
-
-
-
- Read Firmware
-
-
-
-
- Read firmware from transmitter
-
-
-
-
- Write Firmware
-
-
-
-
- Write firmware to transmitter
-
-
-
-
- New 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 transmitter
-
-
-
-
- Read Models and Settings from transmitter
-
-
-
-
- Configure connection software...
-
-
-
-
- Configure software for reading from and writing to the transmitter
-
-
-
-
- Write Models and Settings from file to Tx
-
-
-
-
- Write Models and Settings from file to transmitter
-
-
-
-
- Save Tx Models and Settings to file
-
-
-
-
- Save the Models and Settings from the transmitter to a file
-
-
-
-
- Contributors
-
-
-
-
- A tribute to those who have contributed to OpenTX and Companion
-
-
-
-
-
- Recent Files
-
-
-
-
- Set Menu Language
-
-
-
-
- Set Icon Theme
-
-
-
-
- Set Icon Size
-
-
-
-
-
- File
-
-
-
-
-
- Edit
-
-
-
-
- Settings
-
-
-
-
- Read/Write
-
-
-
-
-
- Help
-
-
-
-
- Radio Settings Profiles
-
-
-
-
- Show a selection list of recent documents
-
-
-
-
- Radio Profiles
-
-
-
-
- Show a selection list of radio settings profiles
-
-
-
-
- Write
-
-
-
-
- Ready
-
-
-
-
-
- &%1 %2
-
-
-
-
- Unable to find file %1!
-
-
-
-
-
- Invalid Models and Settings File %1
-
-
-
-
- Error reading file %1:
-%2.
-
-
-
-
- Invalid binary Models and Settings File %1
-
-
-
-
- MdiChild
-
-
- free bytes
-
-
-
-
-
-
- Companion
-
-
-
-
- Do you want to use model wizard?
-
-
-
-
- Ask this question again ?
-
-
-
-
- Editing model %1:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Error
-
-
-
-
-
- Unable to find file %1!
-
-
-
-
-
-
-
- Error opening file %1:
-%2.
-
-
-
-
-
- Invalid EEPROM File %1
-
-
-
-
-
- Error reading file %1:
-%2.
-
-
-
-
- Invalid binary EEPROM File %1
-
-
-
-
-
-
-
- Save As
-
-
-
-
-
-
-
- Cannot write file %1:
-%2.
-
-
-
-
-
- Error writing file %1:
-%2.
-
-
-
-
- %1 has been modified.
-Do you want to save your changes?
-
-
-
-
- Backup is impossible
-
-
-
-
- The backup dir set in preferences does not exist
-
-
-
-
- Cannot write temporary file!
-
-
-
-
-
-
- Taranis radio not found
-
-
-
-
-
-
- Impossible to identify the radio on your system, please verify the eeprom disk is connected.
-
-
-
-
-
-
- Backup EEPROM From Tx
-
-
-
-
- Cannot check eeprom compatibility! Continue anyway?
-
-
-
-
-
- Warning
-
-
-
-
- Firmware in radio is of a different family of eeprom written, check file and preferences!
-
-
-
-
- Firmware in flash is outdated, please upgrade!
-
-
-
-
- Write EEPROM To Tx
-
-
-
-
- Open
-
-
-
-
- Invalid binary backup File %1
-
-
-
-
- MixerDialog
-
-
- Dialog
-
-
-
-
- Delay
-
-
-
-
- Slow
-
-
-
-
- Up
-
-
-
-
- Down
-
-
-
-
-
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -> the value states the number of seconds it takes to transit from -100 to 100.</p></body></html>
-
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html>
-
- Include Trim
-
+ RSSI Alarm 1
+ RSSI häly 1
-
- Offset
-
-
-
-
- Weight
-
-
-
-
- 0
-
-
-
-
- 1
-
-
-
-
- 2
-
-
-
-
- 3
-
-
-
-
- 4
-
-
-
-
- 5
-
-
-
-
- 6
-
-
-
-
- 7
-
-
-
-
- 8
-
-
-
-
- Name
-
-
-
-
- Source
-
-
-
-
- Multiplex
-
-
-
-
- Warning
-
-
-
-
- The curve used by the mix
-
-
-
-
- Include DR/Expo
-
-
-
-
- Flight modes
-
-
-
-
- Switch
-
-
-
-
- Mixer warning.
-Setting this value will cause a beep to be emmitted when this value is active.
-
-
-
-
- OFF
-
-
-
-
- 1 Beep
-
-
-
-
- 2 Beep
-
-
-
-
- 3 Beep
-
-
-
-
- No
-
-
-
-
- Yes
-
-
-
-
-
-
- GV
-
-
-
-
-
-
-
- The source for the mixer
-
-
-
-
- Multiplexer
-
-This determines how mixer values are added.
-
-"+" means the value of the current mix is added to the previous mixes in the same channel.
-"*" means the value of the current mix is amultiplied with the previous mixes in the same channel.
-"R" means the value replaces the previous values. If the switch is off the value will be ignored.
-
-
-
-
- ADD
-
-
-
-
- MULTIPLY
-
-
-
-
- REPLACE
-
-
-
-
- Curve
-
-
-
-
- Switch used by the mix.
-If blank then the mix is considered to be "ON" all the time.
-
-
-
-
- DEST -> X%1
-
-
-
-
- DEST -> CH%1%2
-
-
-
-
- Rud
-
-
-
-
- Ele
-
-
-
-
- Thr
-
-
-
-
- Ail
-
-
-
-
- MixesPanel
-
-
-
- Move Up
-
-
-
-
-
- Ctrl+Up
-
-
-
-
-
- Move Down
-
-
-
-
-
- Ctrl+Down
-
-
-
-
- Clear Mixes
-
-
-
-
-
-
- X%1
-
-
-
-
-
-
- CH%1%2
-
-
-
-
- Weight(%1)
-
-
-
-
- Switch(%1)
-
-
-
-
- No Trim
-
-
-
-
- No DR/Expo
-
-
-
-
- Offset(%1)
-
-
-
-
- Delay(u%1:d%2)
-
-
-
-
- Slow(u%1:d%2)
-
-
-
-
- Warn(%1)
-
-
-
-
- Not enough available mixers!
-
-
-
-
- Delete Selected Mixes?
-
-
-
-
- &Add
-
-
-
-
- Ctrl+A
-
-
-
-
- &Edit
-
-
-
-
- Enter
-
-
-
-
- &Delete
-
-
-
-
- Delete
-
-
-
-
- &Copy
-
-
-
-
- Ctrl+C
-
-
-
-
- &Cut
-
-
-
-
- Ctrl+X
-
-
-
-
- &Paste
-
-
-
-
- Ctrl+V
-
-
-
-
- Du&plicate
-
-
-
-
- Ctrl+U
-
-
-
-
- Clear Mixes?
-
-
-
-
- Really clear all the mixes?
-
-
-
-
- ModelEdit
-
-
- Dialog
-
-
-
-
- Simulate
-
-
-
-
- Clear Curves?
-
-
-
-
- Really clear all the curves?
-
-
-
-
- Setup
-
-
-
-
- Heli
-
-
-
-
- Flight Modes
-
-
-
-
- Inputs
-
-
-
-
- Mixes
-
-
-
-
- Channels
-
-
-
-
- Logical Switches
-
-
-
-
- Switch Assignment
-
-
-
-
- Curves
-
-
-
-
- Telemetry
-
-
-
-
- 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
-
-
-
-
- Alt+R
-
-
-
-
- &Simulate model
-
-
-
-
- Alt+S
-
-
-
-
- General Settings
-
-
-
-
- Delete Selected Models?
-
-
-
-
-
- Cannot delete default model.
-
-
-
-
- Cannot cut default model.
-
-
-
-
- Do you want to overwrite TX general settings?
-
-
-
-
- You are pasting on an not empty model, are you sure?
-
-
-
-
- No free slot available, cannot duplicate
-
-
-
-
- Module
-
-
- Form
-
-
-
-
- Failsafe Mode
-
-
-
-
- Start
-
-
-
-
- PPM delay
-
-
-
-
- usec
-
-
-
-
- Negative
-
-
-
-
- Positive
-
-
-
-
- RX Number
-
-
-
-
- Master
-
-
-
-
- Slave
-
-
-
-
- Polarity
-
-
-
-
- Trainer Mode
-
-
-
-
- mSec
-
-
-
-
- PPM Frame Length
-
-
-
-
- Label
-
-
-
-
-
- ch
-
-
-
-
- Channels
-
-
-
-
- Hold
-
-
-
-
- Custom
-
-
-
-
- No Pulses
-
-
-
-
- Failsafe Positions
-
-
-
-
- Protocol
-
-
-
-
- ModulePanel
-
-
- Trainer Output
-
-
-
-
- Internal Radio System
-
-
-
-
- External Radio Module
-
-
-
-
- QObject
-
-
- FW: %1
-
-
-
-
- Pict: %1
-
-
-
-
- Profile image
-
-
-
-
-
- Rud
-
-
-
-
-
- Ele
-
-
-
-
-
- Thr
-
-
-
-
-
- Ail
-
-
-
-
-
-
- P1
-
-
-
-
-
-
- P2
-
-
-
-
-
-
- P3
-
-
-
-
-
- S1
-
-
-
-
-
- S2
-
-
-
-
-
- LS
-
-
-
-
-
- RS
-
-
-
-
-
-
- REa
-
-
-
-
-
-
- REb
-
-
-
-
- TrmR
-
-
-
-
- TrmE
-
-
-
-
- TrmT
-
-
-
-
- TrmA
-
-
-
-
- Batt
-
-
-
-
-
-
-
- Timer1
-
-
-
-
-
-
-
- Timer2
-
-
-
-
- SWR
-
-
-
-
- Tx
-
-
-
-
- RSSI
-
-
-
-
- Rx
-
-
-
-
- A1
-
-
-
-
- A2
-
-
-
-
- Alt
-
-
-
-
- Rpm
-
-
-
-
- Fuel
-
-
-
-
- T1
-
-
-
-
- T2
-
-
-
-
- Speed
-
-
-
-
- Dist
-
-
-
-
- GPS Alt
-
-
-
-
- Cell
-
-
-
-
- Cels
-
-
-
-
- Vfas
-
-
-
-
- Curr
-
-
-
-
- Cnsp
-
-
-
-
- Powr
-
-
-
-
- AccX
-
-
-
-
- AccY
-
-
-
-
- AccZ
-
-
-
-
- HDG
-
-
-
-
- VSpd
-
-
-
-
- ASpd
-
-
-
-
- dTE
-
-
-
-
- A1-
-
-
-
-
- A2-
-
-
-
-
- Alt-
-
-
-
-
- Alt+
-
-
-
-
- Rpm+
-
-
-
-
- T1+
-
-
-
-
- T2+
-
-
-
-
- Spd+
-
-
-
-
- Dst+
-
-
-
-
- Cel-
-
-
-
-
- Vfs-
-
-
-
-
- Cur+
-
-
-
-
- Pwr+
-
-
-
-
- ACC
-
-
-
-
- Time
-
-
-
-
-
- LS1
-
-
-
-
-
- LS2
-
-
-
-
-
- LS3
-
-
-
-
-
- LS4
-
-
-
-
-
- LS5
-
-
-
-
-
- LS6
-
-
-
-
-
- LS7
-
-
-
-
-
- LS8
-
-
-
-
-
- LS9
-
-
-
-
-
- LSA
-
-
-
-
-
- LSB
-
-
-
-
-
- LSC
-
-
-
-
-
- LSD
-
-
-
-
-
- LSE
-
-
-
-
-
- LSF
-
-
-
-
-
- LSG
-
-
-
-
-
- LSH
-
-
-
-
-
- LSI
-
-
-
-
-
- LSJ
-
-
-
-
-
- LSK
-
-
-
-
-
- LSL
-
-
-
-
-
- LSM
-
-
-
-
-
- LSN
-
-
-
-
-
- LSO
-
-
-
-
-
- LSP
-
-
-
-
-
- LSQ
-
-
-
-
-
- LSR
-
-
-
-
-
- LSS
-
-
-
-
-
- LST
-
-
-
-
-
- LSU
-
-
-
-
-
- LSV
-
-
-
-
-
- LSW
-
-
-
-
-
-
-
----
-
+ ----
-
- Input %1
-
-
-
-
- MAX
-
-
-
-
- CYC%1
-
-
-
-
- PPM%1
-
-
-
-
- CH%1%2
-
-
-
-
- X%1
-
-
-
-
-
-
- GV%1
-
-
-
-
- S11
-
-
-
-
- S12
-
-
-
-
- S13
-
-
-
-
- S14
-
-
-
-
- S15
-
-
-
-
- S16
-
-
-
-
- S21
-
-
-
-
- S22
-
-
-
-
- S23
-
-
-
-
- S24
-
-
-
-
- S25
-
-
-
-
- S26
-
-
-
-
- RudTrim Left
-
-
-
-
- RudTrim Right
-
-
-
-
- EleTrim Down
-
-
-
-
- EleTrim Up
-
-
-
-
- ThrTrim Down
-
-
-
-
- ThrTrim Up
-
-
-
-
- AilTrim Left
-
-
-
-
- AilTrim Right
-
-
-
-
-
-
- OFF
-
-
-
-
- ABS
-
-
-
-
- THs
-
-
-
-
- TH%
-
-
-
-
- THt
-
-
-
-
-
- ON
-
-
-
-
- ???
-
-
-
-
- Diff(%1)
-
-
-
-
- Expo(%1)
-
-
-
-
- Function(%1)
-
-
-
-
- Curve(%1)
-
-
-
-
- !Curve(%1)
-
-
-
-
-
-
- ---
-
-
-
-
- a>x
-
-
-
-
- a<x
-
-
-
-
- |a|>x
-
-
-
-
- |a|<x
-
-
-
-
- AND
-
-
-
-
- OR
-
-
-
-
- XOR
-
-
-
-
- a=b
-
-
-
-
- a!=b
-
-
-
-
- a>b
-
-
-
-
- a<b
-
-
-
-
- a>=b
-
-
-
-
- a<=b
-
-
-
-
- d>=x
-
-
-
-
- |d|>=x
-
-
-
-
- a~x
-
-
-
-
- Timer
-
-
-
-
- Sticky
-
-
-
-
- Stay
-
-
-
-
- Unknown
-
-
-
-
- STAY(%1, [%2:%3])
-
-
-
-
- STICKY(%1, %2)
-
-
-
-
- TIMER(%1, %2)
-
-
-
-
- Delay %1 sec
-
-
-
-
- Duration %1 sec
-
-
-
-
-
-
-
-
-
- <font color=red><b>Inconsistent parameter</b></font>
-
-
-
-
-
-
- All
-
-
-
-
-
-
- Telemetry
-
-
-
-
-
- Value
-
-
-
-
-
- Decr:
-
-
-
-
-
- Incr:
-
-
-
-
- Safety %1
-
-
-
-
- Trainer
-
-
-
-
- Trainer RUD
-
-
-
-
- Trainer ELE
-
-
-
-
- Trainer THR
-
-
-
-
- Trainer AIL
-
-
-
-
- Instant Trim
-
-
-
-
- Play Sound
-
-
-
-
- Play Haptic
-
-
-
-
- Reset
-
-
-
-
- Set Timer %1
-
-
-
-
- Vario
-
-
-
-
- Play Track
-
-
-
-
- Play Both
-
-
-
-
- Play Value
-
-
-
-
- Start Logs
-
-
-
-
- Volume
-
-
-
-
- Backlight
-
-
-
-
- Background Music
-
-
-
-
- Background Music Pause
-
-
-
-
- Adjust GV%1
-
-
-
-
-
- No repeat
-
-
-
-
- %1 sec
-
-
-
-
- th9x
-
-
-
-
- er9x
-
-
-
-
- ersky9x
-
-
-
-
-
- Simultaneous usage of expo and curves is no longer supported
-
-
-
-
- Simultaneous usage of expo and curves is no longer supported in open9x
-
-
-
-
- openTx only accepts %1 points in all curves
-
-
-
-
-
-
-
- OpenTX on this board doesn't accept this function
-
-
-
-
-
- OpenTX doesn't accept this 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
-
-
-
-
- Possibility to enable FAI MODE at field
-
-
-
-
- FAI MODE always enabled
-
-
-
-
- OpenTX for 9X board
-
-
-
-
-
-
-
-
- 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
-
-
-
-
-
-
-
-
-
-
-
- PPM values displayed in us
-
-
-
-
-
-
-
-
-
- Global variables
-
-
-
-
-
-
-
-
-
- Symetrical Limits
-
-
-
-
-
- SmartieParts 2.2 Backlight support
-
-
-
-
-
-
-
-
-
- In model setup menus automatically set source by moving some of them
-
-
-
-
-
-
-
-
-
- In model setup menus automatically set switch by moving some of them
-
-
-
-
-
-
-
- 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
-
-
-
-
-
-
-
-
-
-
-
- Use alternative SQT5 font
-
-
-
-
-
-
-
- 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
-
-
-
-
- OpenTX for M128 / 9X board
-
-
-
-
-
-
-
- EEprom write Progress bar
-
-
-
-
- OpenTX for 9XR
-
-
-
-
- OpenTX for 9XR with M128 chip
-
-
-
-
- OpenTX for Gruvin9x board / 9X
-
-
-
-
- Support for SD memory card
-
-
-
-
- Support of FrSky PXX protocol
-
-
-
-
- Support for DSM2 modules using ppm instead of true serial
-
-
-
-
- OpenTX for Sky9x board / 9X
-
-
-
-
- Enable HELI menu and cyclic mix support
-
-
-
-
- Use FrSky Taranis sticks in a 9X/9XR
-
-
-
-
- Bluetooth interface
-
-
-
-
- OpenTX for FrSky Taranis
-
-
-
-
-
- Disable HELI menu and cyclic mix support
-
-
-
-
-
- Disable TEMPLATES menu
-
-
-
-
-
- Disable Global variables
-
-
-
-
- OpenTX for FrSky Taranis Rev4a
-
-
-
-
- th9x on this board doesn't have Rotary Encoders
-
-
-
-
-
- FM%1
-
-
-
-
- Input%1
-
-
-
-
- Rud Trim
-
-
-
-
- Ele Trim
-
-
-
-
- Thr Trim
-
-
-
-
- Ail Trim
-
-
-
-
- Rot Enc
-
-
-
-
- English
-
-
-
-
- French
-
-
-
-
- Italian
-
-
-
-
- German
-
-
-
-
- Czech
-
-
-
-
- Slovak
-
-
-
-
- Spanish
-
-
-
-
- Polish
-
-
-
-
- Portuguese
-
-
-
-
- Swedish
-
-
-
-
-
- THR
-
-
-
-
- CH%1
-
-
-
-
- No
-
-
-
-
- RotEnc A
-
-
-
-
- Rot Enc B
-
-
-
-
- Rot Enc C
-
-
-
-
- Rot Enc D
-
-
-
-
- Rot Enc E
-
-
-
-
- !Flight mode %1
-
-
-
-
- Flight mode %1
-
-
-
-
- Own value
-
-
-
-
- Flight mode %1 value
-
-
-
-
- Keys
-
-
-
-
- Sticks
-
-
-
-
- Keys + Sticks
-
-
-
-
-
- -GV%1
-
-
-
-
Yellow
-
+ Kelt
-
Orange
-
+ Orans
-
Red
-
-
-
-
- Winged Shadow How High
-
-
-
-
- Winged Shadow How High (not supported)
-
-
-
-
- FrSky Sensor Hub
-
-
-
-
-
- None
-
-
-
-
- Imperial
-
-
-
-
- Metric
-
-
-
-
- Extra Fine
-
-
-
-
- Fine
-
-
-
-
- Medium
-
-
-
-
- Coarse
-
-
-
-
- Exponential
-
-
-
-
- Count Up
-
-
-
-
- Count Down
-
-
-
-
- %1:%2,
-
-
-
-
- : %1 Channels, %2usec Delay
-
-
-
-
- Flight modes(%1)
-
-
-
-
- Flight mode(%1)
-
-
-
-
- Rudder
-
-
-
-
- Elevator
-
-
-
-
- Throttle
-
-
-
-
- Aileron
-
-
-
-
-
-
- Simulator for this firmware is not yet available
-
-
-
-
- Played once, not during startup
-
-
-
-
- %1s
-
-
-
-
- Value
-
-
-
-
- Source
-
-
-
-
- GVAR
-
-
-
-
- Increment
-
-
-
-
- Rotary Encoder
-
-
-
-
- Trim disabled
-
-
-
-
- Own Trim
-
-
-
-
- Use Trim from Flight mode %1
-
-
-
-
- Use Trim from Flight mode %1 + Own Trim as an offset
-
-
-
-
- Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
-
-We are really appreciative for that!
-
-The OpenTX/Companion Team.
-
-
-
-
- Setup
-
-
- Form
-
-
-
-
- Model Image
-
-
-
-
- Model Name
-
-
-
-
- Timer2
-
-
-
-
- Timer1
-
-
-
-
- Throttle Source
-
-
-
-
- Switch Warnings
-
-
-
-
- Center beep
-
-
-
-
- Trim Increment
-
-
-
-
- Exponential
-
-
-
-
- Extra Fine
-
-
-
-
- Fine
-
-
-
-
- Medium
-
-
-
-
- Coarse
-
-
-
-
- Extended Limits
-
-
-
-
- Extended Trims
-
-
-
-
- Display Checklist
-
-
-
-
- Throttle Trim
-
-
-
-
- Throttle Warning
-
-
-
-
- Reverse throttle operation.
-If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
-
-
-
-
-
-
- Reverse Throttle
-
-
-
-
- Pot Warnings
-
-
-
-
- OFF
-
-
-
-
- Manual
-
-
-
-
- Auto
-
-
-
-
- Telemetry
-
-
- Form
-
-
-
-
-
-
-
- A1
-
-
-
-
-
-
-
- A2
-
-
-
-
- RSSI
-
-
-
-
- Alarm 1
-
-
-
-
-
- ----
-
-
-
-
-
- Yellow
-
-
-
-
-
- Orange
-
-
-
-
-
- Red
-
-
-
-
- Alarm 2
-
-
-
-
- Serial Protocol
-
-
-
-
- Volt source
-
-
-
-
- Metric
-
-
-
-
- Imperial
-
-
-
-
- Current source
-
-
-
-
- Protocol
-
-
-
-
- NONE
-
-
-
-
-
- FAS
-
-
-
-
- None
-
-
-
-
- FrSky Sensor Hub
-
-
-
-
- CEL
-
-
-
-
- 2
-
-
-
-
- 3
-
-
-
-
- 4
-
-
-
-
- Units
-
+ Pun
-
- Blades
-
+ RSSI Alarm 2
+ RSSI häly 2
-
- Altimetry / Vario
-
+ Battery
+ Akku
-
- Alti
-
-
-
-
- Alti+
-
-
-
-
- Vario
-
-
-
-
- Sink Max
-
-
-
-
- Off
-
-
-
-
- Climb Max
-
-
-
-
- Sink Min
-
-
-
-
- Climb Min
-
-
-
-
- Vario source
-
-
-
-
- Vario limits
-
-
-
-
- Use GPS as altitude source
-
-
-
-
- Display altitude in toolbar
-
-
-
-
- Various
-
+ v
+ v
-
- mAh count
-
-
-
-
- FAS Offset
-
-
-
-
- Persistent mAh
-
-
-
-
- TelemetryAnalog
-
-
- Form
-
-
-
-
- Unit
-
-
-
-
- Max Value
-
-
-
-
- Alarm 1
-
-
-
-
-
- ----
-
-
-
-
-
- Yellow
-
-
-
-
-
- Orange
-
-
-
-
-
- Red
-
-
-
-
-
- <
-
-
-
-
-
- >
-
-
-
-
- Alarm 2
-
-
-
-
- Min Value
-
-
-
-
- Volts (V)
-
-
-
-
- Amps (A)
-
-
-
-
- Speed (m/s or ft/s)
-
-
-
-
- Raw (-)
-
-
-
-
- Speed (km/h or miles/h)
-
-
-
-
- Meters (m or ft)
-
-
-
-
- Temp (°)
-
-
-
-
- Fuel (%)
-
-
-
-
- mAmps (mA)
-
-
-
-
- Range
-
-
-
-
- TelemetryCustomScreen
-
-
- Form
-
-
-
-
- Custom Screen Type
-
-
-
-
- Nums
-
-
-
-
- Bars
-
-
-
-
- Min
-
-
-
-
- Source
-
-
-
-
- Gauge
-
-
-
-
- Max
-
-
-
-
- TelemetryPanel
-
-
- Telemetry screen %1
-
-
-
-
- Winged Shadow How High
-
-
-
-
- Winged Shadow How High (not supported)
-
-
-
-
- Timer
-
-
- Form
-
-
-
-
- mm:ss
-
-
-
-
- Countdown
-
-
-
-
- MinuteBeep
-
-
-
-
- Persistent
-
-
-
-
- (00:00:00)
-
-
-
-
- TimerPanel
-
-
- None
-
-
-
-
- Beeps
-
-
-
-
- Countdown
-
-
-
-
- appPreferencesDialog
-
-
- Edit Settings
-
-
-
-
- Application Settings
-
-
-
-
- Automatic Backup Folder
-
-
-
-
- User Splash Screens
-
-
-
-
- Include companion splashes
-
-
-
-
- Only user defined splashes
-
-
-
-
- Google Earth Executable
-
-
-
-
- Automatic check for OpenTX firmware updates
-
-
-
-
-
-
-
- Open Folder
-
-
-
-
- Find Executable
-
-
-
-
- Files to keep
-
-
-
-
- Splash Screen Library
-
-
-
-
- Enable automatic backup before writing firmware
-
-
-
-
- Automatic check for Companion updates
-
+ Current
+ Virta
-
- Offer to use wizard for new models
+ Retrieve calib. and hw settings from profile
-
- Show splash screen when Companion starts
+ Store calib. and hw settings in selected profile
-
- Simulator Settings
+ General settings used throught the transmitter.
+These will be relevant for all models in the same EEPROM.
-
- Simulator BackLight
+ MAVLink Baud Rate
-
- Enable
+ Measurement Units
-
- Blue
+ Beeps at 30, 15, 10, and down from5 seconds
-
- Green
+ Count Down to Zero
-
- Red
+ Flash on beep
-
- Orange
+ Beep volume
-
- Yellow
+ Wav volume
-
- Joystick
+ Vario volume
-
- Only capture to clipboard
+ Background volume
-
- Calibrate
+ PPMSim
-
- Remember simulator switch values
+ Beeper Length
-
- Simulator capture folder
+ Pot Scrolling Enable
-
- Radio Settings
+ Haptic Length
+
+
+
+ Mode selection:
+
+Mode 1:
+ Left stick: Elevator, Rudder
+ Right stick: Throttle, Aileron
+
+Mode 2:
+ Left stick: Throttle, Rudder
+ Right stick: Elevator, Aileron
+
+Mode 3:
+ Left stick: Elevator, Aileron
+ Right stick: Throttle, Rudder
+
+Mode 4:
+ Left stick: Throttle, Aileron
+ Right stick: Elevator, Rudder
+
+
+
+
+
+ Mode 1 (RUD ELE THR AIL)
+
+
+
+ Mode 2 (RUD THR ELE AIL)
+
+
+
+ Mode 3 (AIL ELE THR RUD)
+
+
+
+ Mode 4 (AIL THR ELE RUD)
+
+
+
+ LCD Display Type
+
+
+
+ BackLight On Stick Move
+
+
+
+ sec
+
+
+
+ Beeper Mode
+
+
+
+ Timeshift from UTC
+
+
+
+ RotEnc Navigation
+
+
+
+ FrSky Internal Alarm
+
+
+
+ THR
+ KAA
+
+
+ RUD
+ PER
+
+
+ ELE
+ KOR
+
+
+ AIL
+ SII
+
+
+ GEA
+ REN
+
+
+ ID0
+ ID0
+
+
+ ID1
+ ID1
+
+
+ ID2
+ ID2
+
+
+ GPS Coordinates
+
+
+
+ hh° (N/S) mm' ss''.dd
+
+
+
+ NMEA
+
+
+
+ If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
+
+
+
+ Channel order
+
+This is used by the templated to determine which channel goes to what number output.
+
+
+
+ R E T A
+
+
+
+ R E A T
+
+
+
+ R T E A
+
+
+
+ R T A E
+
+
+
+ R A E T
+
+
+
+ R A T E
+
+
+
+ E R T A
+
+
+
+ E R A T
+
+
+
+ E T R A
+
+
+
+ E T A R
+
+
+
+ E A R T
+
+
+
+ E A T R
+
+
+
+ T R E A
+
+
+
+ T R A E
+
+
+
+ T E R A
+
+
+
+ T E A R
+
+
+
+ T A R E
+
+
+
+ T A E R
+
+
+
+ A R E T
+
+
+
+ A R T E
+
+
+
+ A E R T
+
+
+
+ A E T R
+
+
+
+ A T R E
+
+
+
+ A T E R
+
+
+
+ Show Owner Name on Splash
+
+
+
+ Speaker Pitch (spkr only)
+
+
+
+ X-Short
+
+
+
+ Short
+
+
+
+ Normal
+
+
+
+ Long
+
+
+
+ X-Long
+
+
+
+ StickScroll
+
+
+
+ FAI Mode
+
+
+
+ Haptic Strength
+
+
+
+ Beeper
+
+
+
+ Speaker
+
+
+
+ BeeperVoice
+
+
+
+ SpeakerVoice
+
+
+
+ Show Splash Screen on Startup
+
+
+
+ Metric
+ Metrit
+
+
+ Imperial
+ Imperiaali
+
+
+ Channel Order (For Templates)
+
+
+
+ Stick Mode
+
+
+
+ Haptic Mode
+
+
+
+ Owner Name
+
+
+
+ BackLight Invert
+
+
+
+ Standard
+ Vakio
+
+
+ Optrex
+
+
+
+ Show splash screen on startup
+
+
+
+ Quiet
+
+
+
+ Only Alarms
+
+
+
+ No Keys
+
+
+
+ All
+
+
+
+ Beeper volume
+
+0 - Quiet. No beeps at all.
+1 - No Keys. Normal beeps but menu keys do not beep.
+2 - Normal.
+3 - Loud.
+4 - Extra loud.
+
+
+
+ Alarms Only
+
+
+
+ If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.
+
+
+
+ Timer Beeps
+
+
+
+ BackLight Brightness
+
+
+
+ Contrast
+
+
+
+ BackLight Auto OFF after
+
+
+
+ Single
+
+
+
+ Oversample
+
+
+
+ Filter
+
+
+
+ This is the switch selectrion for turning on the backlight (if installed).
+
+
+
+
+
+ Bandgap Measuring Enable
+
+
+
+ Input Filter
+
+
+
+ CrossTrim
+
+
+
+ Sound Mode
+
+
+
+ BackLight Switch
+
+
+
+ Battery calibration:
+This value will be added to the measured battery voltage. Use this value to calibrate the meter with an external meter.
+
+
+
+ Battery Calibration
+
+
+
+ Battery Warning
+
+
+
+ Battery warning voltage.
+This is the threashhold where the battery warning sounds.
+
+Acceptable values are 5v..10v
+
+
+
+ Telemetry NO DATA Alarm
+
+
+
+ Readonly Unlock
+
+
+
+ Speaker Volume
+
+
+
+ If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes.
+
+
+
+ min
+
+
+
+ Inactivity Timer
+
+
+
+ SC
+ SC
+
+
+ SE
+ SE
+
+
+ SA
+ SA
+
+
+ SF
+ SF
+
+
+ SH
+ SH
+
+
+ SD
+ SD
+
+
+ SB
+ SB
+
+
+ SG
+ SG
+
+
+ Alarm Warning
+
+
+
+ Memory Startup Warning
+
+
+
+ Trainer
+
+
+
+ Mode
+
+
+
+ Input
+
+
+
+ Weight
+
+
+
+ Switch
+ Kytkin
+
+
+ PPM 1
+
+
+
+ Off
+ Pois
+
+
+ += (Sum)
+
+
+
+ := (Replace)
+
+
+
+ chn1
+
+
+
+ chn2
+
+
+
+ chn3
+
+
+
+ chn4
+
+
+
+ PPM 2
+
+
+
+ PPM 3
+
+
+
+ PPM 4
+
+
+
+ Telemetry
+ Telemetria
+
+
+ NO DATA Alarm
+
+
+
+ Calibration
+
+
+
+ POT 4
+
+
+
+ POT 3
+
+
+
+ POT 2
+
+
+
+ POT 1
+
+
+
+ STICK 3
+
+
+
+ Negative span
+
+
+
+ Mid value
+
+
+
+ Positive span
+
+
+
+ STICK 1
+
+
+
+ STICK 2
+
+
+
+ STICK 4
+
+
+
+ PPM Multiplier
+
+
+
+ Pot (normal)
+
+
+
+ Multipos Switch
+
+
+
+ S1 Type
+
+
+
+ S2 Type
+
+
+
+ If you enable FAI, you loose the vario, the play functions, the telemetry screen.
+This function cannot be disabled by the radio.
+Are you sure ?
+
+
+
+ Warning
+ Varoitus
+
+
+ Wrong data in profile, radio calibration was not retrieved
+
+
+
+ Wrong data in profile, hw related parameters were not retrieved
+
+
+
+ Do you want to store calibration in %1 profile<br>overwriting existing calibration?
+
+
+
+ Calibration and HW parameters saved.
+
+
+
+
+ Heli
+
+ Form
+ Kopteri
+
+
+ Invert Elevator
+ Käänt kork
+
+
+ Invert Aileron
+ Käänt siiv
+
+
+ Invert Collective
+ Käänt koll
+
+
+ Invert
+ Käänteinen
+
+
+ Off
+ Pois
+
+
+ 120
+ 120
+
+
+ 120X
+ 120X
+
+
+ 140
+ 140
+
+
+ 90
+ 90
+
+
+ Collective
+
+
+
+ Swash Type
+
+
+
+ Swash Ring
+
+
+
+
+ InputsPanel
+
+ Move Up
+ Siirrä ylös
+
+
+ Ctrl+Up
+ Ctrl+Ylös
+
+
+ Move Down
+ Siirrä alas
+
+
+ Ctrl+Down
+ Ctrl+Alas
+
+
+ Clear All Settings
+ Tyhjennä kaikki asetukset
+
+
+ Source(%1)
+ Lähde(%1)
+
+
+ No Trim
+ Ei trimmiä
+
+
+ Weight(%1)
+ Paino(%1)
+
+
+ Switch(%1)
+ Kytkin(%1)
+
+
+ Not enough available inputs!
+ Ei vapaita tuloja vapaana!
+
+
+ Delete Selected Inputs?
+ Poista valitut tulot?
+
+
+ &Add
+ &Lisää
+
+
+ Ctrl+A
+ Ctrl+A
+
+
+ &Edit
+ &Muuta
+
+
+ Enter
+ Entteri
+
+
+ &Delete
+ &Poista
+
+
+ Delete
+ Poista
+
+
+ &Copy
+ &Kopio
+
+
+ Ctrl+C
+ Ctrl+C
+
+
+ &Cut
+ &Leikkaa
+
+
+ Ctrl+X
+ Ctrl+X
+
+
+ &Paste
+ &Liitä
+
+
+ Ctrl+V
+ Ctrl+V
+
+
+ Du&plicate
+ Jäl&jennä
+
+
+ Ctrl+U
+ Ctrl+U
+
+
+ Clear Inputs?
+ Tyhjennä tulot?
+
+
+ Really clear all the inputs?
+ Varmasti tyhjennä kaikki tulot?
+
+
+
+ LogicalSwitchesPanel
+
+ Condition
+ Tila
+
+
+ V1
+ V1
+
+
+ V2
+ V2
+
+
+ AND
+ JA
+
+
+ Duration
+ Kesto
+
+
+ Delay
+ Viive
+
+
+ LS%1
+ LS%1
+
+
+ &Delete
+ &Poista
+
+
+ Delete
+ Poista
+
+
+ &Copy
+ &Kopio
+
+
+ Ctrl+C
+ Ctrl+C
+
+
+ &Cut
+ &Leikkaa
+
+
+ Ctrl+X
+ Ctrl+X
+
+
+ &Paste
+ &Liitä
+
+
+ Ctrl+V
+ Ctrl+V
+
+
+
+ MainWindow
+
+ File loaded
+ Tiedosto ladattu
+
+
+ Save As
+ Tallenna nimellä
+
+
+ Error
+ Virhe
+
+
+ Yes
+ Kyllä
+
+
+ No
+ Ei
+
+
+ OK
+ Ok
+
+
+ Open
+ Avaa
+
+
+ Warning
+ Varoitus
+
+
+ About Companion
+ Tietoja Companionista
+
+
+ Save...
+ Tallenna...
+
+
+ About
+ Tietoja
+
+
+ Print
+ Tulosta
+
+
+ Logs
+ Logit
+
+
+ Open log file
+ Avaa logi tiedosto
+
+
+ Setting...
+ Asetukset...
+
+
+ File
+ Tiedosto
+
+
+ Edit
+ Muuta
+
+
+ Settings
+ Asetukset
+
+
+ Read/Write
+ Lue/Kirjoita
+
+
+ Help
+ Apu
+
+
+ Write
+ Kirjoita
+
+
+ Ready
+ Valmis
+
+
+ Display previous warning again at startup ?
+
+
+
+ Display previous message again at startup ?
+
+
+
+ Checking for updates
+
+
+
+ Unable to check for updates.
+
+
+
+ A new version of Companion is available (version %1)<br>Would you like to download it?
+
+
+
+ Executable (*.exe)
+
+
+
+ New release available
+
+
+
+ A new release of Companion is available please check the OpenTX website!
+
+
+
+ No updates available at this time.
+
+
+
+ Would you like to launch the installer?
+
+
+
+ Error opening file %1:
+%2.
+
+
+
+ Firmware does not longer fit in the Tx, due to selected firmware options
+
+
+
+ Compilation server temporary failure, try later
+
+
+
+ Compilation server too busy, try later
+
+
+
+ Compilation server requires registration, please check OpenTX web site
+
+
+
+ Unknown server failure, try later
+
+
+
+ Firmware does not fit in the Tx, due to selected firmware options
+
+
+
+ Compilation server termporary failure, try later
+
+
+
+ Do you want to write the firmware to the transmitter now ?
+
+
+
+ Firmware %1 does not seem to have ever been downloaded.
+Version %2 is available.
+Do you want to download it now ?
+
+
+
+ Release Notes
+
+
+
+ Do you want to download release %1 now ?
+
+
+
+ A new version of %1 firmware is available (current %2 - newer %3).
+Do you want to download it now ?
+
+
+
+ Ignore this version (r%1)?
+
+
+
+ Release notes contain very important informations. Do you want to see them 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.
+
+
+
+ Cannot write file %1:
+%2.
+
+
+
+ Taranis radio not found
+ Taranis radiota ei löydy
+
+
+ Impossible to identify the radio on your system, please verify the eeprom disk is connected.
+
+
+
+ Read Models and Settings From Tx
+
+
+
+ Write Models and settings from %1 to the Tx?
+
+
+
+ The file %1
+has not been recognized as a valid Models and Settings file
+Write anyway ?
+
+
+
+ Backup is impossible
+
+
+
+ The backup dir set in preferences does not exist
+
+
+
+ Backup Models and Settings From Tx
+
+
+
+ Cannot check Models and Settings compatibility! Continue anyway?
+
+
+
+ The transmitter firmware belongs to another product family, check file and preferences!
+
+
+
+ The transmitter firmware is outdated, please upgrade!
+
+
+
+ Write Models and Settings To Tx
+
+
+
+ Write Firmware To Tx
+
+
+
+ Conversion failed
+
+
+
+ Cannot convert Models and Settings for use with this firmware, original data will be used
+
+
+
+ Restore Models and Settings To Tx
+
+
+
+ Restore failed
+
+
+
+ Could not restore Models and Settings to TX. The models and settings data file can be found at: %1
+
+
+
+ Firmware write failed
+
+
+
+ Could not write firmware to to transmitter. The models and settings data file can be found at: %1
+
+
+
+ Backup failed
+
+
+
+ Cannot backup existing Models and Settings from TX. Firmware write process aborted
+
+
+
+ Save transmitter Models and Settings to File
+
+
+
+ Impossible to identify the radio on your system, please verify that the eeprom disk is connected.
+
+
+
+ Read Tx Firmware to File
+
+
+
+ OpenTX Home Page: <a href='%1'>%1</a>
+
+
+
+ The OpenTX Companion project was originally forked from <a href='%2'>eePe</a>
+
+
+
+ If you've found this program useful, please support by <a href='%1'>donating</a>
+
+
+
+ Version %1, %3
+
+
+
+ Copyright
+
+
+
+ OpenTX Companion - FW: %1 - Profile: %2
+
+
+
+ New Models+Settings
+
+
+
+ Create a new Models and Settings file
+
+
+
+ Open Models+Settings...
+
+
+
+ Save Models+Settings...
+
+
+
+ Save Models and Settings file
+
+
+
+ Save Models+Settings as...
+
+
+
+ Exit
+
+
+
+ Exit the application
+
+
+
+ Cut Model
+
+
+
+ Cut current model to the clipboard
+
+
+
+ Copy Model...
+
+
+
+ Copy current model to the clipboard
+
+
+
+ Paste Model...
+
+
+
+ Paste model from clipboard
+
+
+
+ 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
+
+
+
+ Hebrew
+
+
+
+ Use Hebrew in menus
+
+
+
+ Polish
+
+
+
+ Use Polish in menus
+
+
+
+ Portuguese
+
+
+
+ Use Portuguese in menus
+
+
+
+ Swedish
+
+
+
+ Use Swedish in menus
+
+
+
+ Russian
+
+
+
+ Use Russian in menus
+
+
+
+ About...
+
+
+
+ Show the application's About box
+
+
+
+ Print...
+
+
+
+ Print current model
+
+
+
+ Simulate...
+
+
+
+ Simulate current model
+
+
+
+ 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 Tx Splash Image...
+
+
+
+ Edit the splash image of your TX
+
+
+
+ List programmers...
+
+
+
+ List available programmers
+
+
+
+ Fuses...
+
+
+
+ Show fuses dialog
+
+
+
+ Read Firmware
+
+
+
+ Read firmware from transmitter
+
+
+
+ Write Firmware
+
+
+
+ Write firmware to transmitter
+
+
+
+ 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 transmitter
+
+
+
+ Read Models and Settings from transmitter
+
+
+
+ Configure Communications...
+
+
+
+ Configure software for communicating with the transmitter
+
+
+
+ Write Models and Settings from file to Tx
+
+
+
+ Write Models and Settings from file to transmitter
+
+
+
+ Save Tx Models and Settings to file
+
+
+
+ Save the Models and Settings from the transmitter to a file
+
+
+
+ Contributors...
+
+
+
+ A tribute to those who have contributed to OpenTX and Companion
+
+
+
+ Recent Models+Settings
+
+
+
+ Set Menu Language
+
+
+
+ Set Icon Theme
+
+
+
+ Set Icon Size
+
+
+
+ Radio Settings Profile
+
+
+
+ Show recent Models+Settings documents
+
+
+
+ Show a selection list of radio settings profiles
+
+
+
+ %2
+
+
+
+ Unable to find file %1!
+
+
+
+ Invalid Models and Settings File %1
+
+
+
+ Error reading file %1:
+%2.
+
+
+
+ Invalid binary Models and Settings File %1
+
+
+
+
+ MdiChild
+
+ free bytes
+ Vapaata tilaa
+
+
+ Companion
+ Companion
+
+
+ Error
+ Virhe
+
+
+ Save As
+ Tallenna nimellä
+
+
+ Taranis radio not found
+ Taranis radiota ei löydy
+
+
+ Warning
+ Varoitus
+
+
+ Open
+ Avaa
+
+
+ Do you want to use model wizard?
+
+
+
+ Ask this question again ?
+
+
+
+ Editing model %1:
+
+
+
+ Unable to find file %1!
+
+
+
+ Error opening file %1:
+%2.
+
+
+
+ Invalid EEPROM File %1
+
+
+
+ Error reading file %1:
+%2.
+
+
+
+ Invalid binary EEPROM File %1
+
+
+
+ Cannot write file %1:
+%2.
+
+
+
+ Error writing file %1:
+%2.
+
+
+
+ %1 has been modified.
+Do you want to save your changes?
+
+
+
+ Backup is impossible
+
+
+
+ The backup dir set in preferences does not exist
+
+
+
+ Cannot write temporary file!
+
+
+
+ Impossible to identify the radio on your system, please verify the eeprom disk is connected.
+
+
+
+ Backup EEPROM From Tx
+
+
+
+ Cannot check eeprom compatibility! Continue anyway?
+
+
+
+ Firmware in radio is of a different family of eeprom written, check file and preferences!
+
+
+
+ Firmware in flash is outdated, please upgrade!
+
+
+
+ Write EEPROM To Tx
+
+
+
+ Open backup Models and Settings file
+
+
+
+ Invalid binary backup File %1
+
+
+
+
+ MixerDialog
+
+ Dialog
+
+
+
+ Delay
+ Viive
+
+
+ Slow
+
+
+
+ Up
+
+
+
+ Down
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -> the value states the number of seconds it takes to transit from -100 to 100.</p></body></html>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -> the value states the number of seconds it takes to transit from -100 to 100.</p></body></html>
+
+
+ Include Trim
+
+
+
+ Offset
+ Tasoitus
+
+
+ Weight
+
+
+
+ 0
+ 0
+
+
+ 1
+ 1
+
+
+ 2
+ 2
+
+
+ 3
+ 3
+
+
+ 4
+ 4
+
+
+ 5
+ 5
+
+
+ 6
+ 6
+
+
+ 7
+ 7
+
+
+ 8
+ 8
+
+
+ Name
+ Nimi
+
+
+ Source
+ Lähde
+
+
+ Multiplex
+
+
+
+ Warning
+ Varoitus
+
+
+ The curve used by the mix
+
+
+
+ Include DR/Expo
+
+
+
+ Flight modes
+
+
+
+ Switch
+ Kytkin
+
+
+ Mixer warning.
+Setting this value will cause a beep to be emmitted when this value is active.
+
+
+
+ OFF
+ Pois
+
+
+ 1 Beep
+
+
+
+ 2 Beep
+
+
+
+ 3 Beep
+
+
+
+ No
+ Ei
+
+
+ Yes
+ Kyllä
+
+
+ GV
+
+
+
+ The source for the mixer
+
+
+
+ Multiplexer
+
+This determines how mixer values are added.
+
+"+" means the value of the current mix is added to the previous mixes in the same channel.
+"*" means the value of the current mix is amultiplied with the previous mixes in the same channel.
+"R" means the value replaces the previous values. If the switch is off the value will be ignored.
+
+
+
+ ADD
+
+
+
+ MULTIPLY
+
+
+
+ REPLACE
+
+
+
+ Curve
+ Käyrä
+
+
+ Switch used by the mix.
+If blank then the mix is considered to be "ON" all the time.
+
+
+
+ DEST -> X%1
+
+
+
+ DEST -> CH%1%2
+
+
+
+ Rud
+
+
+
+ Ele
+
+
+
+ Thr
+
+
+
+ Ail
+
+
+
+
+ MixesPanel
+
+ Move Up
+ Siirrä ylös
+
+
+ Ctrl+Up
+ Ctrl+Ylös
+
+
+ Move Down
+ Siirrä alas
+
+
+ Ctrl+Down
+ Ctrl+Alas
+
+
+ Clear Mixes
+ Tyhjennä mikserit
+
+
+ X%1
+ X%1
+
+
+ CH%1%2
+ CH%1%2
+
+
+ Weight(%1)
+ Paino(%1)
+
+
+ Switch(%1)
+ Kytkin(%1)
+
+
+ No Trim
+ Ei trimmiä
+
+
+ &Add
+ &Lisää
+
+
+ Ctrl+A
+ Ctrl+A
+
+
+ &Edit
+ &Muuta
+
+
+ Enter
+ Entteri
+
+
+ &Delete
+ &Poista
+
+
+ Delete
+ Poista
+
+
+ &Copy
+ &Kopio
+
+
+ Ctrl+C
+ Ctrl+C
+
+
+ &Cut
+ &Leikkaa
+
+
+ Ctrl+X
+ Ctrl+X
+
+
+ &Paste
+ &Liitä
+
+
+ Ctrl+V
+ Ctrl+V
+
+
+ Du&plicate
+ Jäl&jennä
+
+
+ Ctrl+U
+ Ctrl+U
+
+
+ Clear Mixes?
+ Tyhjennä mikserit?
+
+
+ Really clear all the mixes?
+ Varmasti tyhjennä kaikki mikserit?
+
+
+ No DR/Expo
+
+
+
+ Offset(%1)
+
+
+
+ Delay(u%1:d%2)
+
+
+
+ Slow(u%1:d%2)
+
+
+
+ Warn(%1)
+
+
+
+ Not enough available mixers!
+
+
+
+ Delete Selected Mixes?
+
+
+
+
+ ModelEdit
+
+ Dialog
+ Mallin editori
+
+
+ Simulate
+ Simuloi
+
+
+ Clear Curves?
+ Tyhjennä käyrät?
+
+
+ Really clear all the curves?
+ Varmasti tyhjennä kaikki käyrät?
+
+
+ Setup
+ Asetukset
+
+
+ Heli
+ Kopteri
+
+
+ Flight Modes
+ Lento tilat
+
+
+ Inputs
+ Tulot
+
+
+ Mixes
+ Mikserit
+
+
+ Channels
+ Kanavat
+
+
+ Logical Switches
+ Loogiset kytkimet
+
+
+ Switch Assignment
+ Kytkimien asettelu
+
+
+ Curves
+ Käyrät
+
+
+ Telemetry
+ Telemetria
+
+
+
+ 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
+
+
+ Alt+R
+ 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 TX general settings?
+ 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
+
+
+
+ Module
+
+ Form
+ Moduuli
+
+
+ Failsafe Mode
+ Turvatila
+
+
+ Start
+ Aloitus
+
+
+ PPM delay
+ PPM viive
+
+
+ usec
+ usec
+
+
+ Negative
+ Negatiivinen
+
+
+ Positive
+ Positiivinen
+
+
+ RX Number
+ RX numero
+
+
+ Master
+ Masteri
+
+
+ Slave
+ Orja
+
+
+ Polarity
+ Napaisuus
+
+
+ Trainer Mode
+ Harjoitus tila
+
+
+ mSec
+ mSec
+
+
+ PPM Frame Length
+ PPM läh pituus
+
+
+ Label
+ Lappu
+
+
+ ch
+ ch
+
+
+ Channels
+ Kanavat
+
+
+ Hold
+ Pidä
+
+
+ Custom
+ Omat
+
+
+ No Pulses
+ Ei pulsseja
+
+
+ Failsafe Positions
+ Turvatila asennot
+
+
+ Protocol
+ Protokolla
+
+
+
+ ModulePanel
+
+ Trainer Output
+ Opetus ulostulo
+
+
+ Internal Radio System
+ Sisäinen radio systeemi
+
+
+ External Radio Module
+ Ulkoinen radio systeemi
+
+
+
+ QObject
+
+ FW: %1
+
+
+
+ Pict: %1
+
+
+
+ Profile image
+
+
+
+ -GV%1
+
+
+
+ GV%1
+
+
+
+ Rud
+
+
+
+ Ele
+
+
+
+ Thr
+
+
+
+ Ail
+
+
+
+ P1
+ P1
+
+
+ P2
+ P2
+
+
+ P3
+ P3
+
+
+ S1
+ S1
+
+
+ S2
+ S2
+
+
+ S3
+ S3
+
+
+ LS
+ LS
+
+
+ RS
+ RS
+
+
+ REa
+
+
+
+ REb
+
+
+
+ TrmR
+
+
+
+ TrmE
+
+
+
+ TrmT
+
+
+
+ TrmA
+
+
+
+ Batt
+
+
+
+ Timer1
+ Ajastin 1
+
+
+ Timer2
+ Ajastin 2
+
+
+ SWR
+
+
+
+ RSSI Tx
+
+
+
+ RSSI Rx
+
+
+
+ Rx Batt
+
+
+
+ A1
+ A1
+
+
+ A2
+ A2
+
+
+ A3
+
+
+
+ A4
+
+
+
+ Alt
+
+
+
+ Rpm
+
+
+
+ Fuel
+
+
+
+ T1
+
+
+
+ T2
+
+
+
+ Speed
+
+
+
+ Dist
+
+
+
+ GPS Alt
+
+
+
+ Cell
+
+
+
+ Cels
+
+
+
+ Vfas
+
+
+
+ Curr
+
+
+
+ Cnsp
+
+
+
+ Powr
+
+
+
+ AccX
+
+
+
+ AccY
+
+
+
+ AccZ
+
+
+
+ HDG
+
+
+
+ VSpd
+
+
+
+ ASpd
+
+
+
+ dTE
+
+
+
+ A1-
+
+
+
+ A2-
+
+
+
+ A3-
+
+
+
+ A4-
+
+
+
+ Alt-
+
+
+
+ Alt+
+
+
+
+ Rpm+
+
+
+
+ T1+
+
+
+
+ T2+
+
+
+
+ Spd+
+
+
+
+ Dst+
+
+
+
+ Cel-
+
+
+
+ Cels-
+
+
+
+ Vfs-
+
+
+
+ Cur+
+
+
+
+ Pwr+
+
+
+
+ ACC
+
+
+
+ Time
+
+
+
+ LS1
+ LS1
+
+
+ LS2
+ LS2
+
+
+ LS3
+ LS3
+
+
+ LS4
+ LS4
+
+
+ LS5
+ LS5
+
+
+ LS6
+ LS6
+
+
+ LS7
+ LS7
+
+
+ LS8
+ LS8
+
+
+ LS9
+ LS9
+
+
+ LSA
+ LSA
+
+
+ LSB
+ LSB
+
+
+ LSC
+ LSC
+
+
+ LSD
+ LSD
+
+
+ LSE
+ LSE
+
+
+ LSF
+ LSF
+
+
+ LSG
+ LSG
+
+
+ LSH
+ LSH
+
+
+ LSI
+ LSI
+
+
+ LSJ
+ LSJ
+
+
+ LSK
+ LSK
+
+
+ LSL
+ LSL
+
+
+ LSM
+ LSM
+
+
+ LSN
+ LSN
+
+
+ LSO
+ LSO
+
+
+ LSP
+ LSP
+
+
+ LSQ
+ LSQ
+
+
+ LSR
+ LSR
+
+
+ LSS
+ LSS
+
+
+ LST
+ LST
+
+
+ LSU
+ LSU
+
+
+ LSV
+ LSV
+
+
+ LSW
+ LSW
+
+
+ ----
+ ----
+
+
+ [I%1]
+
+
+
+ MAX
+
+
+
+ CYC%1
+
+
+
+ PPM%1
+
+
+
+ CH%1%2
+ CH%1%2
+
+
+ X%1
+
+
+
+ S11
+ S11
+
+
+ S12
+ S12
+
+
+ S13
+ S13
+
+
+ S14
+ S14
+
+
+ S15
+ S15
+
+
+ S16
+ S16
+
+
+ S21
+ S21
+
+
+ S22
+ S22
+
+
+ S23
+ S23
+
+
+ S24
+ S24
+
+
+ S25
+ S25
+
+
+ S26
+ S26
+
+
+ S31
+ S31
+
+
+ S32
+ S32
+
+
+ S33
+ S33
+
+
+ S34
+ S34
+
+
+ S35
+ S35
+
+
+ S36
+ S36
+
+
+ RudTrim Left
+
+
+
+ RudTrim Right
+
+
+
+ EleTrim Down
+
+
+
+ EleTrim Up
+
+
+
+ ThrTrim Down
+
+
+
+ ThrTrim Up
+
+
+
+ AilTrim Left
+
+
+
+ AilTrim Right
+
+
+
+ OFF
+ Pois
+
+
+ ABS
+
+
+
+ THs
+
+
+
+ TH%
+
+
+
+ THt
+
+
+
+ ON
+ ON
+
+
+ ???
+
+
+
+ Diff(%1)
+
+
+
+ Expo(%1)
+
+
+
+ Function(%1)
+
+
+
+ Curve(%1)
+
+
+
+ !Curve(%1)
+
+
+
+ ---
+ ---
+
+
+ a>x
+
+
+
+ a<x
+
+
+
+ |a|>x
+
+
+
+ |a|<x
+
+
+
+ AND
+ JA
+
+
+ OR
+
+
+
+ XOR
+
+
+
+ a=b
+
+
+
+ a!=b
+
+
+
+ a>b
+
+
+
+ a<b
+
+
+
+ a>=b
+
+
+
+ a<=b
+
+
+
+ d>=x
+
+
+
+ |d|>=x
+
+
+
+ a=x
+
+
+
+ a~x
+
+
+
+ Timer
+
+
+
+ Sticky
+
+
+
+ Stay
+
+
+
+ Unknown
+
+
+
+ STAY(%1, [%2:%3])
+
+
+
+ STICKY(%1, %2)
+
+
+
+ TIMER(%1, %2)
+
+
+
+ Delay %1 sec
+
+
+
+ Duration %1 sec
+
+
+
+ <font color=red><b>Inconsistent parameter</b></font>
+
+
+
+ All
+
+
+
+ Telemetry
+ Telemetria
+
+
+ Value
+
+
+
+ Decr:
+
+
+
+ Incr:
+
+
+
+ Safety %1
+
+
+
+ Trainer
+
+
+
+ Trainer RUD
+
+
+
+ Trainer ELE
+
+
+
+ Trainer THR
+
+
+
+ Trainer AIL
+
+
+
+ Instant Trim
+
+
+
+ Play Sound
+
+
+
+ Play Haptic
+
+
+
+ Reset
+
+
+
+ Set Timer %1
+
+
+
+ Vario
+ Alti+
+
+
+ Play Track
+
+
+
+ Play Both
+
+
+
+ Play Value
+
+
+
+ Start Logs
+
+
+
+ Volume
+
+
+
+ Backlight
+
+
+
+ Background Music
+
+
+
+ Background Music Pause
+
+
+
+ Adjust GV%1
+
+
+
+ No repeat
+
+
+
+ %1 sec
+
+
+
+ Simultaneous usage of expo and curves is no longer supported
+
+
+
+ Simultaneous usage of expo and curves is no longer supported in open9x
+
+
+
+ OpenTX only accepts %1 points in all curves
+
+
+
+ OpenTX on this board doesn't accept this function
+
+
+
+ OpenTX doesn't accept this 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
+ Varoitus
+
+
+ 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
+
+
+
+ Possibility to enable FAI MODE at field
+
+
+
+ FAI MODE always enabled
+
+
+
+ OpenTX for 9X board
+
+
+
+ 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
+
+
+
+ PPM values displayed in us
+
+
+
+ Global variables
+
+
+
+ Symetrical Limits
+
+
+
+ SmartieParts 2.2 Backlight support
+
+
+
+ In model setup menus automatically set source by moving some of them
+
+
+
+ In model setup menus automatically set switch by moving some of them
+
+
+
+ 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
+
+
+
+ Use alternative SQT5 font
+
+
+
+ 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
+
+
+
+ OpenTX for M128 / 9X board
+
+
+
+ EEprom write Progress bar
+
+
+
+ OpenTX for 9XR
+
+
+
+ OpenTX for 9XR with M128 chip
+
+
+
+ OpenTX for Gruvin9x board / 9X
+
+
+
+ Support for SD memory card
+
+
+
+ Support of FrSky PXX protocol
+
+
+
+ Support for DSM2 modules using ppm instead of true serial
+
+
+
+ OpenTX for Sky9x board / 9X
+
+
+
+ Enable HELI menu and cyclic mix support
+
+
+
+ Use FrSky Taranis sticks in a 9X/9XR
+
+
+
+ Bluetooth interface
+
+
+
+ OpenTX for FrSky Taranis
+
+
+
+ Disable HELI menu and cyclic mix support
+
+
+
+ Disable TEMPLATES menu
+
+
+
+ Disable Global variables
+
+
+
+ OpenTX for FrSky Taranis Rev4a
+
+
+
+ th9x on this board doesn't have Rotary Encoders
+
+
+
+ FM%1
+
+
+
+ Input%1
+
+
+
+ Rud Trim
+
+
+
+ Ele Trim
+
+
+
+ Thr Trim
+
+
+
+ Ail Trim
+
+
+
+ Rot Enc
+
+
+
+ English
+
+
+
+ Finnish
+
+
+
+ French
+
+
+
+ Italian
+
+
+
+ German
+
+
+
+ Czech
+
+
+
+ Slovak
+
+
+
+ Spanish
+
+
+
+ Polish
+
+
+
+ Portuguese
+
+
+
+ Swedish
+
+
+
+ THR
+ KAA
+
+
+ CH%1
+
+
+
+ No
+ Ei
+
+
+ RotEnc A
+
+
+
+ Rot Enc B
+
+
+
+ Rot Enc C
+
+
+
+ Rot Enc D
+
+
+
+ Rot Enc E
+
+
+
+ !Flight mode %1
+
+
+
+ Flight mode %1
+
+
+
+ Own value
+
+
+
+ Flight mode %1 value
+
+
+
+ Keys
+
+
+
+ Sticks
+
+
+
+ Keys + Sticks
+
+
+
+ Yellow
+ Kelt
+
+
+ Orange
+ Orans
+
+
+ Red
+ Pun
+
+
+ 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
+
+
+ Fine
+ Hieno
+
+
+ Medium
+ Keski
+
+
+ Coarse
+ Karkea
+
+
+ Exponential
+ Expo
+
+
+ Count Up
+
+
+
+ Count Down
+
+
+
+ %1:%2,
+
+
+
+ : %1 Channels, %2usec Delay
+
+
+
+ Flight modes(%1)
+
+
+
+ Flight mode(%1)
+
+
+
+ Rudder
+
+
+
+ Elevator
+
+
+
+ Throttle
+
+
+
+ Aileron
+
+
+
+ Simulator for this firmware is not yet available
+
+
+
+ Played once, not during startup
+
+
+
+ %1s
+
+
+
+ Value
+
+
+
+ Source
+ Lähde
+
+
+ GVAR
+
+
+
+ Increment
+
+
+
+ Rotary Encoder
+
+
+
+ Trim disabled
+
+
+
+ Own Trim
+
+
+
+ Use Trim from Flight mode %1
+
+
+
+ Use Trim from Flight mode %1 + Own Trim as an offset
+
+
+
+ Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
+
+We are really appreciative for that!
+
+The OpenTX/Companion Team.
+
+
+
+
+ Setup
+
+ Form
+
+
+Asetukset
+
+
+ Model Image
+ Mallin kuva
+
+
+ Model Name
+ Mallin nimi
+
+
+ Timer2
+ Ajastin 2
+
+
+ Timer1
+ Ajastin 1
+
+
+ Throttle Source
+ Kaasun lähde
+
+
+ Switch Warnings
+ Kytkin varoitukset
+
+
+ Center beep
+ Keski piippaus
+
+
+ Trim Increment
+ Trimmin säätö
+
+
+ Exponential
+ Expo
+
+
+ Extra Fine
+ Eri hieno
+
+
+ Fine
+ Hieno
+
+
+ Medium
+ Keski
+
+
+ Coarse
+ Karkea
+
+
+ Extended Limits
+ Laajemman rajat
+
+
+ Extended Trims
+ Laajemmat trimmit
+
+
+ Display Checklist
+ Näytä teht.lista
+
+
+ Throttle Trim
+ Kaasu trimmi
+
+
+ Throttle Warning
+ Kaasu varoitus
+
+
+ Reverse throttle operation.
+If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
+
+
+ Käänteinen kaasu
+Jos tämä valittuna, kaasu toimii käänteisesti. Tyhjäkäynti on ylhäällä, myös trimmi on käänteinen. Myös kaasu varoitus käänteinen.
+
+
+
+ Reverse Throttle
+ Käänteinen kaasu
+
+
+ Pot Warnings
+ Potikka varoitus
+
+
+ OFF
+ Pois
+
+
+ Manual
+ Käsin
+
+
+ Auto
+ Autom
+
+
+
+ SimulatorDialog
+
+ Warning
+ Varoitus
+
+
+ Joystick enabled but not configured correctly
+
+
+
+ Cannot open joystick, joystick disabled
+
+
+
+ Simulating Tx (%1)
+
+
+
+ Firmware %1 error: %2
+
+
+
+
+ SimulatorDialog9X
+
+ Companion Simulator
+ Companion simulaattori
+
+
+ Right Double Click to Reset
+
+
+
+ THR
+ KAA
+
+
+ RUD
+ PER
+
+
+ ELE
+ KOR
+
+
+ AIL
+ SII
+
+
+ Hold X
+ Pidä X
+
+
+ Fix X
+
+
+
+ Fix Y
+
+
+
+ Hold Y
+ Pidä Y
+
+
+ TextLabel
+
+
+
+ TRN
+ TRN
+
+
+ GEA
+ REN
+
+
+ ID0
+ ID0
+
+
+ ID1
+ ID1
+
+
+ ID2
+ ID2
+
+
+ BEEP
+ PIIP
+
+
+ P1
+ P1
+
+
+ 0 %
+ 0 %
+
+
+ P2
+ P2
+
+
+ P3
+ P3
+
+
+ 9x Simulator
+ 9x simulaattori
+
+
+ Outputs
+
+
+
+
+ SimulatorDialogTaranis
+
+ Companion Simulator
+ Companion simulaattori
+
+
+ Hold Y
+ Pidä Y
+
+
+ Fix Y
+
+
+
+ Fix X
+
+
+
+ Hold X
+ Pidä X
+
+
+ SD
+ SD
+
+
+ SC
+ SC
+
+
+ Right Double Click to Reset
+
+
+
+ S2
+ S2
+
+
+ SG
+ SG
+
+
+ RS
+ RS
+
+
+ SH
+ SH
+
+
+ TextLabel
+
+
+
+ S1
+ S1
+
+
+ SB
+ SB
+
+
+ SA
+ SA
+
+
+ SE
+ SE
+
+
+ SF
+ SF
+
+
+ LS
+ LS
+
+
+ Taranis Simulator
+ Taranis simulaattori
+
+
+ Outputs
+
+
+
+
+ Telemetry
+
+ Form
+ Telemetria
+
+
+ A1
+ A1
+
+
+ A2
+ A2
+
+
+ RSSI
+ RSSI
+
+
+ Alarm 1
+ Varoitus 1
+
+
+ ----
+ ----
+
+
+ Yellow
+ Kelt
+
+
+ Orange
+ Orans
+
+
+ Red
+ Puna
+
+
+ Alarm 2
+ Varoitus 2
+
+
+ Serial Protocol
+ Sarja protokolla
+
+
+ Volt source
+ Voltti lähde
+
+
+ Metric
+ Metrit
+
+
+ Imperial
+ Imperiaali
+
+
+ Current source
+ Virran lähde
+
+
+ Protocol
+ Protokolla
+
+
+ NONE
+ EI MITÄÄN
+
+
+ FAS
+ FAS
+
+
+ None
+ Ei mitään
+
+
+ FrSky Sensor Hub
+ FrSky:n hubi
+
+
+ CEL
+ CEL
+
+
+ 2
+ 2
+
+
+ 3
+ 3
+
+
+ 4
+ 4
+
+
+ Units
+ Asteikko
+
+
+ Blades
+ Prop lavat
+
+
+ Altimetry / Vario
+ Korkeusm / Variometri
+
+
+ Alti
+ Alti
+
+
+ Alti+
+ Kork+
+
+
+ Vario
+ Alti+
+
+
+ Sink Max
+ Maksimi vajoama
+
+
+ Off
+ Pois
+
+
+ Climb Max
+ Maksimi nousu
+
+
+ Sink Min
+ Minimi vajoama
+
+
+ Climb Min
+ Minimi nousu
+
+
+ Vario source
+ Variom lähde
+
+
+ Vario limits
+ Varionm asetukset
+
+
+ Use GPS as altitude source
+ Käytä GPS:sää kork. lähteenä
+
+
+ Display altitude in toolbar
+ Näytä korkeus työkalupalkissa
+
+
+ Various
+ Useat
+
+
+ mAh count
+ mAh laskuri
+
+
+ FAS Offset
+ FAS asetus
+
+
+ Persistent mAh
+ Yhtm. mAh
+
+
+
+ TelemetryAnalog
+
+ Form
+ Telemetria
+
+
+ Unit
+ Yksikkö
+
+
+ Max Value
+ Maks arvo
+
+
+ Alarm 1
+ Hälytys 1
+
+
+ ----
+ ----
+
+
+ Yellow
+ Kelt
+
+
+ Orange
+ Orans
+
+
+ Red
+ Pun
+
+
+ <
+ <
+
+
+ >
+ >
+
+
+ Alarm 2
+ Hälytys 2
+
+
+ Min Value
+ Pienin arvo
+
+
+ Volts (V)
+ Voltit ( V )
+
+
+ Amps (A)
+ Amp ( A )
+
+
+ Speed (m/s or ft/s)
+ Nopeus ( m/s tai jalk/s )
+
+
+ Raw (-)
+ Raaka ( - )
+
+
+ Speed (km/h or miles/h)
+ Nopeus ( km/h tai mailia/h )
+
+
+ Meters (m or ft)
+ Metrit (m tai jalkaa )
+
+
+ Temp (°)
+ Lämpöt (c)
+
+
+ Fuel (%)
+ Bensa (%)
+
+
+ mAmps (mA)
+ mAmp (mA)
+
+
+ Range
+ Matka
+
+
+
+ TelemetryCustomScreen
+
+ Form
+ Telemetria oma ruutu
+
+
+ Custom Screen Type
+ Oman ruudun tyyppi
+
+
+ Nums
+ Numerot
+
+
+ Bars
+ Palkit
+
+
+ Min
+ Min
+
+
+ Source
+ Lähde
+
+
+ Gauge
+ Mittari
+
+
+ Max
+ Max
+
+
+
+ TelemetryPanel
+
+ Telemetry screen %1
+ Telemetria ruutu %1
+
+
+ Winged Shadow How High
+ erikoistoiminto korkea
+
+
+ Winged Shadow How High (not supported)
+ erikoistoiminto korkea (ei tuettu)
+
+
+
+ Timer
+
+ Form
+ Ajastin
+
+
+ mm:ss
+ mm:ss
+
+
+ Countdown
+ Laskuri
+
+
+ MinuteBeep
+ Minutti piippaus
+
+
+ Persistent
+ Yhtämittainen
+
+
+ (00:00:00)
+ (00:00:00)
+
+
+
+ TimerPanel
+
+ None
+ Ei mitään
+
+
+ Beeps
+ Piipit
+
+
+ Countdown
+ Laskuri
+
+
+
+ appPreferencesDialog
+
+ Edit Settings
+
+
+
+ Application Settings
+
+
+
+ Automatic Backup Folder
+
+
+
+ User Splash Screens
+
+
+
+ Only show user splash images
+
+
+
+ Show user and companion splash images
+
+
+
+ Google Earth Executable
+
+
+
+ Automatic check for OpenTX firmware updates
+
+
+
+ Open Folder
+
+
+
+ Find Executable
+
+
+
+ Files to keep
+
+
+
+ Splash Screen Library
+
+
+
+ Enable automatic backup before writing firmware
+
+
+
+ Automatic check for Companion updates
+
+
+
+ Offer to use wizard for new models
+
+
+
+ Show splash screen when Companion starts
+
+
+
+ Simulator Settings
+
+
+
+ Simulator BackLight
+
+
+
+ Enable
+ Päälle
+
+
+ Blue
+
+
+
+ Green
+
+
+
+ Red
+ Puna
+
+
+ Orange
+ Orans
+
+
+ Yellow
+ Kelt
+
+
+ Joystick
+
+
+
+ Only capture to clipboard
+
+
+
+ Calibrate
+
+
+
+ Remember simulator switch values
+
+
+
+ Simulator capture folder
+
+
+
+ Radio Settings Profile
-
Mode selection:
Mode 1:
@@ -6645,255 +5350,236 @@ Mode 4:
-
Mode 1 (RUD ELE THR AIL)
-
Mode 2 (RUD THR ELE AIL)
-
Mode 3 (AIL ELE THR RUD)
-
Mode 4 (AIL THR ELE RUD)
-
Channel order
This is used by the templated to determine which channel goes to what number output.
-
R E T A
-
R E A T
-
R T E A
-
R T A E
-
R A E T
-
R A T E
-
E R T A
-
E R A T
-
E T R A
-
E T A R
-
E A R T
-
E A T R
-
T R E A
-
T R A E
-
T E R A
-
T E A R
-
T A R E
-
T A E R
-
A R E T
-
A R T E
-
A E R T
-
A E T R
-
A T R E
-
A T E R
-
Default Stick Mode
-
- Settings Profile
+ Profile Name
-
Splash Screen
-
Channel Order
-
Append version number to FW file name
-
SD Structure path
-
Offer to write FW to Tx after download
-
Remove Profile
-
- Firmware
-
-
-
-
Select Image
-
+ Radio Type
+
+
+
Clear Image
-
+ 9X
+
+
+
+ 9X with m128
+
+
+
+ 9XR
+
+
+
+ 9XR with m128
+
+
+
+ Gruvin9x Board
+
+
+
+ Sky9x Board
+
+
+
+ Taranis
+
+
+
+ My Radio
+
+
+
Select your snapshot folder
-
-
No joysticks found
-
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)
@@ -6901,149 +5587,117 @@ This is used by the templated to determine which channel goes to what number out
avrOutputDialog
-
Dialog
-
Show Details
-
result
-
executable not found
-
-
Error
-
+ Virhe
-
Cannot open source file
-
Cannot write destination
-
Writing file:
-
ie: OpenTX for 9X board or OpenTX for 9XR board
-
ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip
-
ie: OpenTX for Gruvin9X board
-
Your radio uses a %1 CPU!!!
Please check advanced burn options to set the correct cpu type.
-
Your radio uses a %1 CPU!!!
Please select an appropriate firmware type to program it.
-
You are currently using:
%1
-
-
Writing
-
-
Reading
-
-
Verifying
-
done - exit code %1
-
done with errors
-
-
done - SUCCESSFUL
-
did not finish correctly
-
did not finish correctly!
Do you want some help ?
-
Copy did not finish correctly
-
finished correctly
-
Copy finished correctly
-
Started
-
FUSES: Low=%1 High=%2 Ext=%3
@@ -7051,78 +5705,55 @@ Do you want some help ?
burnConfigDialog
-
Programmer Configuration
-
-
Location of sam-ba executable
-
-
-
-
The location of the AVRDUDE executable.
-
DFU-Util Location
-
Location of AVRDUDE executable
-
-
-
Use this button to browse and look for the AVRDUDE executable file.
-
-
-
Browse...
-
Programmer
-
Programmer used for communicating with the controller.
Please consult the programmer's documentation and the AVRDUDE documentation to select the appropriate programmer.
-
List all available programmers.
-
List Available
-
-
Extra arguments that will be passed to AVRDUDE on every call
-
-
Extra arguments used in AVRDUDE.
This can be used for providing extra information to AVRDUDE.
@@ -7130,116 +5761,89 @@ Please only use this if you know what you are doing. There are no error checks
-
Extra Arguments
-
Show AVRDUDE help
-
Show Help
-
Communication port to the programmer.
-
-
Port
-
AVRDUDE Location
-
MCU
-
-
CPU of your TX
-
-
CPU present on your 9x radio
Should be m64 for stock radios
m2560 for v4.1 boards
-
SAM-BA Location
-
ARM MCU
-
sam-ba serial port
-
Alternate device
-
Use advanced controls
-
DFU-UTIL Configuration
-
SAM-BA Configuration
-
AVRDUDE Configuration
-
-
-
Select Location
-
-
Companion
-
+ Companion
-
<b><u>WARNING!</u></b><br>This will reset the fuses of %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue?
-
<b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent.
@@ -7247,252 +5851,193 @@ m2560 for v4.1 boards
burnDialog
-
+ Cancel
+ Peruuta
+
+
+ SVN
+ SVN
+
+
+ Open
+ Avaa
+
+
+ Warning
+ Varoitus
+
+
+ Error
+ Virhe
+
+
Customize Splash
-
- Cancel
-
-
-
-
-
Write to TX
-
<html><head/><body><p>Modify calibration parameters using settings from current profile</p></body></html>
-
Patch calibration setting from profile
-
<html><head/><body><p>Modify HW parameters using settings from current profile</p></body></html>
-
Patch HW setting from profile
-
- Date & Time
-
-
-
-
- SVN
-
-
-
-
Variant
-
-
+ Date & Time
+
+
+
Browse for file
-
Allows Companion to write to older version of the firmware
-
Check Firmware compatibility
-
Backup and restore Models and Settings
-
Current Profile
-
- Invert Color
+ Use firmware start screen
-
- Use image in settings
+ Use another start screen
-
- Substitute image in firmware
+ Use profile start screen
-
- Load Image
+ Use library start screen
-
- Open Splash Library
-
-
-
-
- ...
-
-
-
-
Write firmware to TX
-
Write Models and Settings to TX
-
Write Models and Settings in %1 to TX
-
Current profile
-
- Open
+ Open Firmware File
-
Choose file to load Models and Settings from
-
-
-
-
-
-
- Warning
+ %1 may not be a valid firmware file
-
- %1 is not a known firmware
-
-
-
-
- Burn anyway !
-
-
-
-
-
-
-
-
-
-
-
-
-
- Error
-
-
-
-
Unable to find file %1!
-
-
-
Error opening file %1:
%2.
-
-
-
Invalid binary Models and Settings File %1, Proceed anyway ?
-
Error reading file %1:
%2.
-
- Open Image to load
+ The firmware file is not valid.
+
+
+
+ There is no start screen image in the firmware file.
+
+
+
+ The profile image %1 does not contain an image.
+
+
+
+ Open image file to use as Tx start screen
-
Images (%1)
-
-
- Cannot load %1.
+ Image could not be loaded from %1
+
+
+
+ The library image could not be loaded
-
Cannot save customized firmware
-
Custom image not found
-
No firmware selected
-
Wrong radio calibration data in profile, Settings not patched
-
Wrong radio setting data in profile, Settings not patched
-
-
Cannot write file %1:
%2.
-
Error writing file %1:
%2.
@@ -7501,513 +6046,322 @@ m2560 for v4.1 boards
compareDialog
-
- Dialog
+ Compare Models
-
Drag first model here
-
Drag second model here
-
Close
-
Print
-
+ Tulosta
-
Print to file
-
-
No name
-
General Model Settings
-
-
-
Name
-
+ Nimi
-
-
EEprom Size
-
-
Timer1
-
+ Ajastin 1
-
-
Timer2
-
+ Ajastin 2
-
-
Protocol
-
+ Protokolla
-
-
Pulse Polarity
-
-
Throttle Trim
-
+ Kaasu trimmi
-
-
-
-
Enabled
-
-
-
-
Disabled
-
-
Throttle Expo
-
-
Trim Increment
-
+ Trimmin säätö
-
-
Center Beep
-
Flight modes Settings
-
-
Fades
-
-
Trims
-
-
-
-
-
-
-
-
Switch
-
+ Kytkin
-
-
-
-
Flight mode name
-
-
IN
-
-
OUT
-
-
-
-
-
-
-
-
-
-
FM
-
-
Gvars
-
-
Rot. Enc.
-
Limits
-
-
-
-
-
-
-
Offset
-
+ Tasoitus
-
-
-
-
-
Min
-
+ Min
-
-
-
-
-
Max
-
+ Max
-
-
-
Invert
-
+ Käänteinen
-
-
-
-
-
CH
-
-
INV
-
+ KÄÄNT
-
-
NOR
-
Global Variables
-
-
GV
-
Expo/Dr Settings
-
-
Weight
-
-
-
-
Flight modes
-
-
-
-
Flight mode
-
-
-
-
DISABLED
-
Mixers
-
-
noTrim
-
-
Delay(u%1:d%2)
-
-
Slow(u%1:d%2)
-
-
Warn
-
Curves
-
+ Käyrät
-
5 Points Curves
-
-
-
-
pt %1
-
-
Curve
-
+ Käyrä
-
9 Points Curves
-
Logical Switches
-
+ Loogiset kytkimet
-
-
LS
-
+ LS
-
Switch Assignment
-
+ Kytkimien asettelu
-
-
Function
-
-
Param
-
-
Repeat
-
-
Enable
-
+ Päälle
-
CF
-
Telemetry Settings
-
-
Analog
-
-
Unit
-
+ Yksikkö
-
-
Scale
-
-
-
-
A%1
-
-
Alarm 1
-
+ Varoitus 1
-
-
Alarm 2
-
-
-
-
Type
-
-
-
-
Condition
-
+ Tila
-
-
-
-
Value
-
-
RSSI Alarm
-
-
Custom Telemetry View
-
-
Telemetry Bars
-
-
Bar Number
-
-
Source
-
+ Lähde
-
Print Document
-
Select PDF output file
@@ -8015,167 +6369,125 @@ m2560 for v4.1 boards
contributorsDialog
-
Dialog
-
+ Kehittäjät
-
People who have contributed to this project
-
+ Henkilöt jotka on tehnyt töitä projektin eteen
-
Coders
-
+ Koodaajat
-
Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)
-
+ Kiitokset: Rafal Tomczak(RadioClone), Thomas Husterer (th9x) sekä Eriz Raviv (er9x ja eePe)
-
Thank you all !!!
-
+ Kiitokset kaikille !!!
-
Contributors
-
+ Avustajat
-
Companion Release Notes
-
+ Companion muistiinpanot
-
OpenTX Release Notes
-
+ OpenTX muistiinpanot
customizeSplashDialog
-
Transmitter Splash Screen Editor
-
-
Invert
-
+ Käänteinen
-
-
Open Splash Library
-
-
-
-
...
-
+ ...
-
-
Load Profile
-
-
Load FW
-
-
Load Pict
-
-
Save
-
- Open
+ Open Firmware File
-
-
-
-
Error
+ Virhe
+
+
+ Can not load embedded image from firmware file %1.
-
- Cannot load embedded FW image from %1.
-
-
-
-
Open Image to load
-
Images (%1)
-
Cannot load the image file %1.
-
Cannot load the profile image %1.
-
Cannot load the library image %1.
-
File Saved
-
The image was saved to the file %1
-
Image Refresh Error
-
Failed to refresh image from file %1
-
File Save Error
-
Failed to write image to %1
@@ -8183,35 +6495,29 @@ m2560 for v4.1 boards
downloadDialog
-
Downloading:
-
+ Ladataan:
-
Unable to save the file %1: %2.
-
+ Ei voida tallentaa tiedstoa %1: %2.
-
Companion
-
+ Companion
-
Download failed: %1.
-
+ Lataus epäonnistui %1.
fusesDialog
-
Fuses
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -8228,12 +6534,10 @@ p, li { white-space: pre-wrap; }
-
Read Fuses
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -8252,13 +6556,11 @@ p, li { white-space: pre-wrap; }
-
Reset Fuses
EEPROM - PROTECT
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -8277,13 +6579,11 @@ p, li { white-space: pre-wrap; }
-
Reset Fuses
EEPROM - DELETE
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -8298,119 +6598,63 @@ p, li { white-space: pre-wrap; }
fwPreferencesDialog
-
Downloads
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
CheckBox
-
Menu Language
-
Firmware Type
-
Check for updates
-
Voice Language
-
+ Äänen kieli
-
Set language of voice.
May be different from firmware language
-
Download Voice
-
Download FW
-
Options
-
Processor ID
-
FwInfo
-
Last downloaded release: %1
-
The selected firmware has never been downloaded by Companion.
-
The selected firmware cannot be downloaded by Companion.
@@ -8418,221 +6662,127 @@ May be different from firmware language
joystickDialog
-
Configure Joystick
-
Ch2
-
-
-
-
-
-
-
-
Not Assigned
-
-
-
-
-
-
-
-
Right Vertical
-
-
-
-
-
-
-
-
Right Horizontal
-
-
-
-
-
-
-
-
Left Vertical
-
-
-
-
-
-
-
-
Left Horizontal
-
-
-
-
-
-
-
-
P1
-
+ P1
-
-
-
-
-
-
-
-
P2
-
+ P2
-
-
-
-
-
-
-
-
P3/LS
-
-
-
-
-
-
-
-
RS
-
+ RS
-
Ch1
-
Ch4
-
Ch6
-
Ch3
-
Ch5
-
Ch7
-
Ch8
-
Instructions
-
Cancel
-
+ Peruuta
-
Next
-
Ok
-
Move sticks and pots in every direction making full movement
Press next when finished
-
-
Error
-
+ Virhe
-
Cannot open joystick.
-
Place sticks and pots in middle position.
Press next when done
-
Map joystick channels to controls using comboboxes.
Press next when done
-
Check inversion checkbox to get maximum at top-right position.
Press next when done
-
Press ok to save configuration
Press cancel to abort joystick calibration
-
Duplicated stick assignement
@@ -8640,73 +6790,59 @@ Press cancel to abort joystick calibration
logsDialog
-
Companion Log Viewer
-
Filename
-
Open LogFile
-
Zoom
-
X
-
Y
-
Fly sessions
-
Telemetry logs
-
Time
-
Error
-
+ Virhe
-
Cannot write file %1:
%2.
-
Select your log file
-
Available fields
-
The selected logfile contains %1 invalid lines out of %2 total lines
@@ -8714,444 +6850,301 @@ Press cancel to abort joystick calibration
mdiChild
-
Simulate Tx
-
+ Simuloi Tx
modelConfigDialog
-
Model Configuration Wizard
-
Engine
-
Model Type
-
Airplane
-
Helicopter
-
Glider
-
Wing
-
Aileron controls
-
No Ailerons
-
1 Servo (or Y)
-
-
-
2 Servos
-
Flaps controls
-
No Flaps
-
1 Servo (or inverting Y)
-
Spoilers
-
No Spoilers/Airbrakes
-
1 Servo (or Y or inverting Y)
-
Swash Plate
-
Swash plate
-
90° / Fixed / Coax
-
120°
-
120X°
-
140°
-
FlyBarLess
-
Tail
-
Tail controls
-
1 Servo Elevator / 1 Servo Rudder
-
V Tail
-
2 Servos Elevator / 1 Servo Rudder
-
Gyroscope
-
NoGyro
-
Switch control
-
Pot control
-
Channel style
-
Open9x Style
-
Futaba Style
-
2
-
+ 2
-
3
-
+ 3
-
4
-
+ 4
-
5
-
+ 5
-
6
-
+ 6
-
7
-
+ 7
-
8
-
+ 8
-
9
-
+ 9
-
1
-
+ 1
-
10
-
+ 10
-
Ele2
-
Use advanced controls
-
Spoiler2
-
Flap2
-
Flap1
-
Rud2
-
-
-
-
-
-
-
AUTO
-
-
-
-
-
-
-
CH01
-
+ CH01
-
-
-
-
-
-
-
CH02
-
+ CH02
-
-
-
-
-
-
-
CH03
-
+ CH03
-
-
-
-
-
-
-
CH04
-
+ CH04
-
-
-
-
-
-
-
CH05
-
+ CH05
-
-
-
-
-
-
-
CH06
-
+ CH06
-
-
-
-
-
-
-
CH07
-
+ CH07
-
-
-
-
-
-
-
CH08
-
+ CH08
-
-
-
-
-
-
-
CH09
-
+ CH09
-
-
-
-
-
-
-
CH10
-
+ CH10
-
Ail2
-
Spoiler 1
-
Delta wing
-
-
Not present
-
Present
-
Rudder
-
Single rudder
-
Dual rudder (with 2 servos)
-
Apply configuration ?
-
Apply configuration deleting existing model ?
@@ -9159,144 +7152,94 @@ Press cancel to abort joystick calibration
preferencesDialog
-
-
Preferences
-
-
Simu BackLight
-
-
Simulator capture folder
-
-
Joystick
-
Remember simulator switches
-
-
Enable
-
+ Päälle
-
-
Use clipboard only
-
-
Calibrate
-
-
Blue
-
-
Green
-
-
Red
-
-
Orange
-
+ Orans
-
-
Yellow
-
+ Kelt
-
-
-
-
-
-
Open Folder
-
-
Personal splash library
-
-
Include companion splashes
-
-
Only user defined splashes
-
-
Splash library behaviour
-
-
Custom TX splash screen
-
-
Open Image
-
-
-
-
...
-
+ ...
-
-
Invert Pixels
-
Mode selection:
Mode 1:
@@ -9319,877 +7262,556 @@ Mode 4:
-
Mode 1 (RUD ELE THR AIL)
-
Mode 2 (RUD THR ELE AIL)
-
Mode 3 (AIL ELE THR RUD)
-
Mode 4 (AIL THR ELE RUD)
-
auto backup before write
-
Automatic Backup Folder
-
Show Splash At Start
-
Ask use of wizard for new models
-
Remember switches in simulator
-
Channel order
This is used by the templated to determine which channel goes to what number output.
-
R E T A
-
R E A T
-
R T E A
-
R T A E
-
R A E T
-
R A T E
-
E R T A
-
E R A T
-
E T R A
-
E T A R
-
E A R T
-
E A T R
-
T R E A
-
T R A E
-
T E R A
-
T E A R
-
T A R E
-
T A E R
-
A R E T
-
A R T E
-
A E R T
-
A E T R
-
A T R E
-
A T E R
-
FwInfo
-
Check for updates
-
Ask for flashing after Download
-
Export Profile
-
Save Profile
-
Import Profile
-
Profile Name
-
Default Stick Mode
-
Default Channel Order
-
Profile slot
-
Automatically add version number to the filename after download
-
Voice
-
-
Download
-
Set language of voice.
May be different from firmware language
-
Language
-
Firmware
-
SD Structure path
-
Processor ID
-
Recent History Size
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
CheckBox
-
Check for updates on startup
-
Check for selected Fw updates
-
Google Earth Executable
-
Find Executable
-
-
- Last downloaded release: %1
-
-
-
-
- The selected firmware has never been downloaded by Companion.
-
-
-
-
- The selected firmware cannot be downloaded by Companion.
-
-
-
-
- Image stored in settings
-
-
-
-
-
- No joysticks found
-
-
-
-
- Select your library folder
-
-
-
-
- Select your snapshot folder
-
-
-
-
- Select your Models and Settings backup folder
-
-
-
-
- Select Google Earth executable
-
-
-
-
-
- Error
-
-
-
-
-
- Cannot load %1.
-
-
-
-
- Select the folder replicating your SD structure
-
-
-
-
- Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ?
-
-
-
-
- Export profile As
-
-
-
-
- Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ?
-
-
-
-
- Open Profile to import
-
-
-
-
- Open Image to load
-
-
-
-
- Images (%1)
-
-
printDialog
-
Dialog
-
Close
-
Print
-
+ Tulosta
-
Print to file
-
Setup for:
-
printed on: %1
-
General Model Settings
-
-
-
-
Name
-
+ Nimi
-
EEprom Size
-
Timer1
-
+ Ajastin 1
-
Timer2
-
+ Ajastin 2
-
Protocol
-
+ Protokolla
-
Pulse Polarity
-
Throttle Trim
-
+ Kaasu trimmi
-
-
-
Enabled
-
-
Disabled
-
Throttle Expo
-
Trim Increment
-
+ Trimmin säätö
-
Center Beep
-
Flight modes Settings
-
Fades
-
Trims
-
Gvars
-
Rot.Enc.
-
-
-
-
Switch
-
+ Kytkin
-
Flight mode name
-
IN
-
OUT
-
-
-
-
FM
-
Expo/Dr Settings
-
Weight
-
-
Flight modes
-
-
Flight mode
-
-
DISABLED
-
Mixers
-
-
-
-
CH
-
noTrim
-
-
-
-
-
Offset
-
+ Tasoitus
-
Delay(u%1:d%2)
-
Slow(u%1:d%2)
-
Warn
-
Limits
-
-
-
-
Min
-
+ Min
-
-
-
-
Max
-
+ Max
-
-
-
Invert
-
+ Käänteinen
-
-
-
INV
-
+ KÄÄNT
-
-
-
NOR
-
Curves
-
+ Käyrät
-
-
-
Curve
-
+ Käyrä
-
pt %1
-
Logical Switches
-
+ Loogiset kytkimet
-
-
LS
-
+ LS
-
Global Variables
-
GV
-
Switch Assignments
-
Function
-
Parameter
-
Repeat
-
Telemetry Settings
-
-
Alarm 1
-
+ Varoitus 1
-
-
Alarm 2
-
Analog
-
Unit
-
+ Yksikkö
-
Scale
-
-
-
-
Type
-
-
-
-
Condition
-
+ Tila
-
-
-
-
Value
-
A%1
-
RSSI Alarm
-
Frsky serial protocol
-
System of units
-
Propeller blades
-
-
Custom Telemetry View
-
Telemetry Bars
-
Bar Number
-
Source
-
+ Lähde
-
Print Document
-
Select PDF output file
-
ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*)
@@ -10197,888 +7819,658 @@ May be different from firmware language
simulatorDialog
-
Companion Simulator
-
+ Companion simulaattori
-
-
-
-
Right Double Click to Reset
-
+ Tuplaklikkaa oikea resetoi
-
THR
-
+ KAA
-
RUD
-
+ PER
-
ELE
-
+ KOR
-
AIL
-
+ SII
-
-
Hold X
-
+ Pidä X
-
-
Fix X
-
+ Kesk X
-
-
Fix Y
-
+ Kesk Y
-
-
Hold Y
-
+ Pidä Y
-
-
-
-
TextLabel
-
+ Tekstilappu
-
TRN
-
+ TRN
-
GEA
-
+ REN
-
ID0
-
+ ID0
-
ID1
-
+ ID1
-
ID2
-
+ ID2
-
BEEP
-
+ PIIP
-
P1
-
+ P1
-
-
-
0 %
-
+ 0 %
-
P2
-
+ P2
-
P3
-
+ P3
-
9x Simulator
-
+ 9x simulaattori
-
Outputs
-
+ Ulostulot
-
LS1
-
+ LS1
-
LS2
-
+ LS2
-
LS3
-
+ LS3
-
LS4
-
+ LS4
-
LS5
-
+ LS5
-
LS6
-
+ LS6
-
LS7
-
+ LS7
-
LS8
-
+ LS8
-
LS9
-
+ LS9
-
LSA
-
+ LSA
-
LSB
-
+ LSB
-
LSC
-
+ LSC
-
LSD
-
+ LSD
-
LSE
-
+ LSE
-
LSF
-
+ LSF
-
LSG
-
+ LSG
-
LSH
-
+ LSH
-
LSI
-
+ LSI
-
LSJ
-
+ LSJ
-
LSK
-
+ LSK
-
LSL
-
+ LSL
-
LSM
-
+ LSM
-
LSN
-
+ LSN
-
LSO
-
+ LSO
-
LSP
-
+ LSP
-
LSQ
-
+ LSQ
-
LSR
-
+ LSR
-
LSS
-
+ LSS
-
LST
-
+ LST
-
LSU
-
+ LSU
-
LSV
-
+ LSV
-
LSW
-
+ LSW
-
CH1
-
+ CH1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-100.1
-
+ -100.1
-
CH9
-
+ CH9
-
CH2
-
+ CH2
-
CH10
-
+ CH10
-
CH3
-
+ CH3
-
CH11
-
+ CH11
-
CH4
-
+ CH4
-
CH12
-
+ CH12
-
CH5
-
+ CH5
-
CH13
-
+ CH13
-
CH6
-
+ CH6
-
CH14
-
+ CH14
-
CH7
-
+ CH7
-
CH15
-
+ CH15
-
CH8
-
+ CH8
-
CH16
-
+ CH16
-
-
Warning
-
+ Varoitus
-
Joystick enabled but not configured correctly
-
+ Joystick päällä mutta väärin aseteltu
-
Cannot open joystick, joystick disabled
-
+ Joystickia ei voi avata, pois päältä
-
Firmware %1 error: %2
-
+ Firmware %1 virhe: %2
-
- Flight mode: %1(%2)
-
+ - Lentotila: %1(%2)
-
Simulating Tx (%1)
-
+ Simuloi TX (%1)
-
Simulating
-
+ Simuloi
splashLibrary
-
-
...
-
+ ...
-
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
xsimulatorDialog
-
Companion Simulator
-
+ Companion simulaattori
-
-
Hold Y
-
+ Pidä Y
-
-
Fix Y
-
+ Kesk X
-
-
Fix X
-
+ Kesk Y
-
-
Hold X
-
+ Pidä X
-
-
SD
-
+ SD
-
-
SC
-
+ SC
-
-
-
-
Right Double Click to Reset
-
+ Tyhjäys, tuplaklikkaa oikeaa
-
-
S2
-
+ S2
-
-
SG
-
+ SG
-
-
RS
-
+ RS
-
-
SH
-
+ SH
-
-
-
-
TextLabel
-
+ Simulaattori
-
-
S1
-
+ S1
-
-
SB
-
+ SB
-
-
SA
-
+ SA
-
-
SE
-
+ SE
-
-
-
SF
-
+ SF
-
-
LS
-
+ LS
-
Taranis Simulator
-
+ Taranis simulaattori
-
Outputs
-
+ Lähdöt
-
CH1
-
+ CH1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-100.1
-
+ -100.1
-
CH9
-
+ CH9
-
CH2
-
+ CH2
-
CH10
-
+ CH10
-
CH3
-
+ CH3
-
CH11
-
+ CH11
-
CH4
-
+ CH4
-
CH12
-
+ CH12
-
CH5
-
+ CH5
-
CH13
-
+ CH13
-
CH6
-
+ CH6
-
CH14
-
+ CH14
-
CH7
-
+ CH7
-
CH15
-
+ CH15
-
CH8
-
+ CH8
-
CH16
-
+ CH16
-
LSK
-
+ LSK
-
LSC
-
+ LSC
-
LSD
-
+ LSD
-
LS7
-
+ LS7
-
LSL
-
+ LSL
-
LSB
-
+ LSB
-
LS1
-
+ LS1
-
LSH
-
+ LSH
-
LSG
-
+ LSG
-
LSE
-
+ LSE
-
LSF
-
+ LSF
-
LS8
-
+ LS8
-
LS9
-
+ LS9
-
LSA
-
+ LSA
-
LSM
-
+ LSM
-
LSJ
-
+ LSJ
-
LSI
-
+ LSI
-
LS4
-
+ LS4
-
LS5
-
+ LS5
-
LS2
-
+ LS2
-
LS3
-
+ LS3
-
LS6
-
+ LS6
-
LSN
-
+ LSN
-
LSO
-
+ LSO
-
LSP
-
+ LSP
-
LSQ
-
+ LSQ
-
LSR
-
+ LSR
-
LSS
-
+ LSS
-
LST
-
+ LST
-
LSU
-
+ LSU
-
LSV
-
+ LSV
-
LSW
-
+ LSW
-
-
Warning
-
+ Varoitus
-
Joystick enabled but not configured correctly
-
+ Joystick päällä, mutta konfiguraatio ongelma
-
Cannot open joystick, joystick disabled
-
+ Ei voi avata joystickia, joystick pois käytöstä
-
Firmware %1 error: %2
-
+ Firmware %1 virhe %2
-
- Flight mode: %1(%2)
-
+ - Lennätystila %1(%2)
-
Simulating Tx (%1)
-
+ Simuloi Tx(%1)
-
Simulating
-
+ Simuloidaan
diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts
index ab649090f..b824924a3 100644
--- a/companion/src/translations/companion_pl.ts
+++ b/companion/src/translations/companion_pl.ts
@@ -4,52 +4,57 @@
Channels
-
+
Name
Nazwa
-
+
Offset
Wyrównanie
-
+
Min
Min
-
+
Max
Maks
-
+
Invert
Odwróć
-
+
+ Curve
+ Krzywa
+
+
+
Center
Centrowanie
-
+
Sym
Sym
-
+
Channel %1
Kanały %1
-
+
---
---
-
+
INV
Odwr
@@ -57,22 +62,22 @@
CurveGroup
-
+
Diff
Róźnicowość
-
+
Expo
Expo
-
+
Func
Funkcja
-
+
Curve
Krzywa
@@ -97,12 +102,12 @@
Lines
- Linie
+ Łamana
Smooth
- Gładkie
+ Gładka
@@ -115,27 +120,27 @@
Nazwa krzywej
-
+
Curve %1
Krzywa %1
-
+
%1 points
%1 punktowa
-
+
Are you sure you want to reset curve %1 ?
Jesteś pewien by zresetować krzywą %1 ?
-
+
Editing curve %1
Edycja krzywej k%1
-
+
Not enough free points in EEPROM to store the curve.
Za mało wolnych punktów w eepromie by zapamiętać krzywą.
@@ -143,82 +148,86 @@
CustomFunctionsPanel
-
+
Switch
Przełącznik
-
+
Action
Akcja
-
+
Parameters
Parametry
-
+
Enable
Włączone
-
CF%1
- FS%1
+ FS%1
-
+
+ SF%1
+ SF%1
+
+
+
ON
Włącz
-
+
Error
Błąd
-
+
Unable to find sound file %1!
Nie mogę odnaleźć pliku dźwiękowego %1!
-
+
&Delete
&Wykasuj
-
+
Delete
Wykasuj
-
+
&Copy
&Kopiuj
-
+
Ctrl+C
Ctrl+C
-
+
&Cut
&Wytnij
-
+
Ctrl+X
Ctrl+X
-
+
&Paste
&Wklej
-
+
Ctrl+V
Ctrl+V
@@ -471,27 +480,27 @@ p, li { white-space: pre-wrap; }
Wszystkie
-
+
Edit %1
Edycja %1
-
+
Rud
SK
-
+
Ele
SW
-
+
Thr
Gaz
-
+
Ail
Lotki
@@ -577,17 +586,17 @@ p, li { white-space: pre-wrap; }
FlightModes
-
+
Flight Mode %1
Faza lotu %1
-
+
(%1)
(%1)
-
+
(default)
(bazowa)
@@ -622,27 +631,25 @@ Będą one obowiązywać dla wszystkich modeli w tym samym EEPROM-ie.Ustawienia
-
Timer Beeps
- Pikanie timerów
+ Pikanie timerów
-
+
Contrast
Kontrast
-
+
Channel Order (For Templates)
Kolejność kanałów (dla szablonów)
-
Owner Name
- Imię użytkownika
+ Imię użytkownika
-
+
Mode selection:
Mode 1:
@@ -683,167 +690,160 @@ Mode 4:
-
+
Mode 1 (RUD ELE THR AIL)
Mod 1 (SK.SW.Gaz.Lot)
-
+
Mode 2 (RUD THR ELE AIL)
Mod 2 (SK.Gaz.SW.Lot)
-
+
Mode 3 (AIL ELE THR RUD)
Mod 3 (Lot.SW.Gaz.SK)
-
+
Mode 4 (AIL THR ELE RUD)
Mod 4 (Lot.Gaz.SW.SK)
-
-
+
+
Quiet
Cichy
-
+
Only Alarms
Tylko Alarmy
-
-
+
+
No Keys
Bez przycisków
-
-
+
+
All
Wszystkie
-
+
MAVLink Baud Rate
Prędkość przesyłu MAVLink
-
+
4800 Baud
4800 bps
-
+
9600 Baud
9600 bps
-
+
14400 Baud
14400 bps
-
+
19200 Baud
19200 bps
-
+
38400 Baud
38400 bps
-
+
57600 Baud
57600 bps
-
+
76800 Baud
76800 bps
-
+
115200 Baud
115200 bps
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Single Beep Every whole Minute</span></p></body></html>
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Jedno piknięcie co każdą pełną minutę</span></p></body></html>
-
Every Minute
- Co minutę
+ Co minutę
-
Beeps at 30, 15, 10, and down from5 seconds
- Sygnały w 30s, 15s, 10s i odliczanie od 5 sekund do 0
+ Sygnały w 30s, 15s, 10s i odliczanie od 5 sekund do 0
-
Count Down to Zero
- Odliczanie do zera
+ Odliczanie do zera
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Flash backlight on timer beep</span></p></body></html>
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Błyśnij podświetlaniem przy piknięciu timera</span></p></body></html>
-
Flash on beep
- Błyskanie w czasie sygnału
+ Błyskanie w czasie sygnału
-
+
If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.
Jeśli ta wartość jest różna od 0, każde naciśnięcie klawisza włączy podświetlenie, które zgaśnie po ustalonej liczbie sekund.
-
-
+
sec
s
-
Input Filter
- Wprowadź filtr
+ Wprowadź filtr
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Beeper volume
0 - Quiet. No beeps at all.
@@ -860,16 +860,13 @@ p, li { white-space: pre-wrap; }
4 - Bardzo głośna.
-
+
Alarms Only
Tylko alarmy
-
-
-
-
-
+
+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -894,21 +891,21 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ostrzeżenie cichej pracy - będzie ostrzegało gdy pikanie jest ustawione na cicho(0)</p></body></html>
-
+
Beeper Mode
Tryb pikania
-
-
-
-
+
+
+
+
Off
Wyłączony
-
-
+
+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -923,42 +920,42 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Wartości z zakresu 20-45</span></p></body></html>
-
+
Memory Startup Warning
Ostrzeżenie o małym zapasie pamięci
-
-
+
+
X-Short
Bardzo krótka
-
-
+
+
Short
Krótka
-
-
+
+
Normal
Normalna
-
-
+
+
Long
Długa
-
-
+
+
X-Long
Bardzo długa
-
+
Battery warning voltage.
This is the threashhold where the battery warning sounds.
@@ -969,160 +966,126 @@ Ustala próg ostrzeżenia.
Dopuszczalne wartości 5v-10v
-
+
Battery Warning
Ostrzeżenie o zasilaniu
-
THR
- Gaz
+ Gaz
-
RUD
- SK
+ SK
-
ELE
- SW
+ SW
-
AIL
- Lotki
+ Lotki
-
- GEA
-
-
-
-
- ID0
-
-
-
-
- ID1
-
-
-
-
- ID2
-
-
-
-
+
Sound Mode
Tryb dźwiękowy
-
Pot Scrolling Enable
- Przewijanie potencjometrem włączone
+ Przewijanie potencjometrem włączone
-
Battery Calibration
- Kalibracja zasilania
+ Kalibracja zasilania
-
+
If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes.
Radio zasygnalizuje dźwiękiem brak aktywności po określonej liczbie minut. 0- wyłącza tę funkcję.
-
+
min
Min
-
-
+
+
Show splash screen on startup
Pokazuj ekran startowy z logo
-
Battery calibration:
This value will be added to the measured battery voltage. Use this value to calibrate the meter with an external meter.
- Kalibracja zasilania:
+ Kalibracja zasilania:
Ta wartość będzie dodana do zmierzonej wartości napięcia zasilania. Użyj tej wartości w celu kalibracji wyświetlanego napięcia aby było zgodne z napięciem wskazywanym przez miernik.
-
Single
- Pojedynczy
+ Pojedynczy
-
- Oversample
-
-
-
-
Filter
- Filtr
+ Filtr
-
+
Show Splash Screen on Startup
Pokazuj ekran startowy z logo
-
+
Inactivity Timer
Timer bezczynności
-
+
Beeper
Pikanie
-
+
Speaker
Głośnik
-
+
BeeperVoice
Pikanie i głosy
-
+
SpeakerVoice
Głośnik i głosy
-
+
Beeper Length
Długość piknięcia
-
+
GPS Coordinates
Koordynaty GPS
-
+
hh° (N/S) mm' ss''.dd
hh° (N/S) mm' ss''.dd
-
+
NMEA
-
+
Timeshift from UTC
Strefa czasowa względem UTC
-
+
Channel order
This is used by the templated to determine which channel goes to what number output.
@@ -1131,610 +1094,660 @@ This is used by the templated to determine which channel goes to what number out
To ustawienie jest używane przez szablony, określa jakie wyjście przypisane jest do kanału.
-
+
Speaker Pitch (spkr only)
Wysokość tonów (tylko dźwięki)
-
+
Haptic Mode
Tryb wibracji
-
+
Stick Mode
Mod drążków
-
Show Owner Name on Splash
- Pokaż imię pilota na ekranie
+ Pokaż imię pilota na ekranie
-
Telemetry NO DATA Alarm
- Telemetria: Alarm braku danych
+ Telemetria: Alarm braku danych
-
+
LCD Display Type
Typ ekranu LCD
-
+
Standard
Standard
-
+
Optrex
-
+
This is the switch selectrion for turning on the backlight (if installed).
To jest przełącznik do włączenia podświetlenia (jeśli zainstalowane).
-
+
Speaker Volume
Głośność dźwięków
-
+
Haptic Length
Długość wibracji
-
+
Haptic Strength
Siła wibracji
-
+
BackLight Brightness
Jasność podświetlenia
-
+
Alarm Warning
Ostrzeżenie alarmowe
-
+
BackLight Auto OFF after
Podświetlenie. Automatyczne wyłącznie po
-
Bandgap Measuring Enable
- Włączone pomiary pasma
+ Włączone pomiary pasma
-
+
RotEnc Navigation
Nawigacja pokrętłem
-
+
BackLight Switch
Przełącznik podświetlania
-
BackLight On Stick Move
- Podświetlenie włączone przy ruchu drążka
+ Podświetlenie włączone przy ruchu drążka
-
BackLight Invert
- Odwróć podświetlanie
+ Odwróć podświetlanie
-
+
Country Code
Kod kraju
-
+
Europe
Europa
-
+
Japan
Japonia
-
+
America
Ameryka
-
+
Metric
Metryczne
-
+
Imperial
Imperialne
-
+
Measurement Units
Jednostki miar
-
FrSky Internal Alarm
- Wewnętrzny alarm FrSky
+ Wewnętrzny alarm FrSky
-
StickScroll
- Przewijanie drążkiem
+ Przewijanie drążkiem
-
- PPMSim
-
-
-
-
+
Voice Language
Język komunikatów
-
CrossTrim
- Trymery krzyżowe
+ Trymery krzyżowe
-
+
Beep volume
Głośność sygnałów
-
+
Wav volume
Głośność WAV
-
+
Vario volume
Głośność wariometru
-
+
Background volume
Głośność tła
-
+
FAI Mode
Tryb FAI
-
+
If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
Jeśli uaktywnisz tryb FAI, utracisz informacje o wariometrze, funkcje odtwarzania i ekrany telemetrii. Ten tryb nie może być dezaktywowany.
-
+
R E T A
K W G L
-
+
+ Vario pitch at zero
+ Ton Wario dla zera
+
+
+
+ Vario pitch at max
+ Ton Wario dla maks
+
+
+
R E A T
K W L G
-
+
R T E A
K G W L
-
+
R T A E
K G L W
-
+
R A E T
K L W G
-
+
R A T E
K L G W
-
+
E R T A
W K G L
-
+
E R A T
W K L G
-
+
E T R A
W G K L
-
+
E T A R
W G L K
-
+
E A R T
W L K G
-
+
E A T R
W L G K
-
+
T R E A
G K W L
-
+
T R A E
G K L W
-
+
T E R A
G W K L
-
+
T E A R
G W L K
-
+
T A R E
G L K W
-
+
T A E R
G L W K
-
+
A R E T
L K W G
-
+
A R T E
L R G W
-
+
A E R T
L W K G
-
+
A E T R
L W G K
-
+
A T R E
L G K W
-
+
A T E R
L G W K
-
+
+ OFF
+ Wyłącz
+
+
+
+ S-Port Mirror
+ Lustro S-Port
+
+
+
+ Debug
+ Debugowanie
+
+
+
+ Serial Port
+ Port szeregowy
+
+
+
Readonly Unlock
Odblokuj "Tylko do odczytu"
-
+
SC
-
+
SE
-
+
SA
-
+
SF
-
+
SH
-
+
SD
-
+
SB
-
+
SG
-
+
+ Vario repeat at zero
+ Powtarzanie dla Wario zero
+
+
+
+
+ Hz
+ Hz
+
+
+
+ ms
+ ms
+
+
+
Trainer
Trener
-
+
Mode
Tryb
-
+
Input
Wejście
-
+
Weight
Waga
-
Switch
- Przełącznik
+ Przełącznik
-
-
+
PPM 1
PPM 1
-
-
-
-
+
+
+
+
chn1
Kanał 01
-
-
-
-
+
+ Rud
+ SK
+
+
+
+
+
+
chn2
Kanał 02
-
-
-
-
+
+
+
+
chn3
Kanał 03
-
-
-
-
+
+
+
+
chn4
Kanał 04
-
-
+
+ Ele
+ SW
+
+
+
+ Thr
+ Gaz
+
+
+
+ Ail
+ Lotki
+
+
+
PPM 2
PPM 2
-
-
+
PPM 3
PPM 3
-
-
+
PPM 4
PPM 4
-
Telemetry
- Telemetria
+ Telemetria
-
RSSI Alarm 1
- Alarm RSSI 1
+ Alarm RSSI 1
-
-
----
- ----
+ ----
-
-
Yellow
- Żółty
+ Żółty
-
-
Orange
- Pomarańczowy
+ Pomarańczowy
-
-
Red
- Czerwony
+ Czerwony
-
RSSI Alarm 2
- Alarm RSSI 2
+ Alarm RSSI 2
-
NO DATA Alarm
- Alarm braku danych
+ Alarm braku danych
-
+
Calibration
Kalibracja
-
+
POT 4
Potencjometr 04
-
+
STICK 3
Drążek 03
-
-
+
+
Negative span
Ujemny zakres
-
-
+
+
Mid value
Wartość środkowa
-
-
+
+
Positive span
Dodatni zakres
-
+
STICK 1
Drążek 01
-
+
STICK 2
Drążek 02
-
+
STICK 4
Drążek 04
-
-
+
+
+
+ None
+ Żaden
+
+
+
+
+
Pot (normal)
Potencjometr (std)
-
-
+
+
+
Multipos Switch
Przeł. wielopoz
-
+
S1 Type
Typ P1
-
+
S2 Type
Typ P2
-
+
+ S3 Type
+ Typ P3
+
+
+
POT 1
Potencjometr 01
-
+
POT 2
Potencjometr 02
-
+
POT 3
Potencjometr 03
-
-
-
-
+
+
+
+
+= (Sum)
+= (Suma)
-
-
-
-
+
+
+
+
:= (Replace)
:= (Zastąpienie)
-
+
Battery
Zasilanie
-
+
v
V
-
+
PPM Multiplier
Mnożnik PPM
-
+
Current
Natężenie
-
+
If you enable FAI, you loose the vario, the play functions, the telemetry screen.
This function cannot be disabled by the radio.
Are you sure ?
@@ -1743,28 +1756,28 @@ funkcje odtwarzania i ekrany telemetrii. Ten tryb nie może być dezaktywowany.
Jesteś pewien ?
-
-
+
+
Warning
Ostrzeżenie
-
+
Wrong data in profile, radio calibration was not retrieved
Błędne dane w profilu, kalibracja nie została odzyskana
-
+
Wrong data in profile, hw related parameters were not retrieved
Błędne dane w profilu, parametry HW nie zostały odzyskana
-
+
Do you want to store calibration in %1 profile<br>overwriting existing calibration?
Chcesz zapamiętać dane kalibracji profilu %1<br> Zastąpią one aktualne dane kalibracji?
-
+
Calibration and HW parameters saved.
Kalibracja i parametry HW zapamiętane.
@@ -1841,25 +1854,25 @@ Jesteś pewien ?
InputsPanel
-
+
Move Up
W górę
-
+
Ctrl+Up
Ctrl+Up
-
+
Move Down
W dół
-
+
Ctrl+Down
Ctrl+Down
@@ -1879,102 +1892,102 @@ Jesteś pewien ?
Bez trymera
-
+
Weight(%1)
Waga(%1)
-
+
Switch(%1)
Przełącznik(%1)
-
+
Not enough available inputs!
Za mało dostępnych wejść!
-
+
Delete Selected Inputs?
Skasować Wybrane Wejścia?
-
+
&Add
&Dodaj
-
+
Ctrl+A
Ctrl+A
-
+
&Edit
&Edycja
-
+
Enter
Enter
-
+
&Delete
&Wykasuj
-
+
Delete
Wykasuj
-
+
&Copy
&Kopiuj
-
+
Ctrl+C
Ctrl+C
-
+
&Cut
&Wytnij
-
+
Ctrl+X
Ctrl+X
-
+
&Paste
&Wklej
-
+
Ctrl+V
Ctrl+V
-
+
Du&plicate
&Zduplikuj
-
+
Ctrl+U
Ctrl+U
-
+
Clear Inputs?
Wyczyść Wejścia?
-
+
Really clear all the inputs?
Czy na pewno wyczyścić wszystkie wejścia?
@@ -1982,78 +1995,81 @@ Jesteś pewien ?
LogicalSwitchesPanel
-
+
Condition
Warunek
-
+
V1
Wartość 1
-
+
V2
Wartość 2
-
+
AND
I (logiczne)
-
+
Duration
Czas trwania
-
+
Delay
Opóźnienie
-
-
LS%1
- PL%1
+ PL%1
-
+
+ L%1
+ L%1
+
+
+
&Delete
&Wykasuj
-
+
Delete
Wykasuj
-
+
&Copy
&Kopiuj
-
+
Ctrl+C
Ctrl+C
-
+
&Cut
&Wytnij
-
+
Ctrl+X
Ctrl+X
-
+
&Paste
&Wklej
-
+
Ctrl+V
Ctrl+V
@@ -2061,119 +2077,119 @@ Jesteś pewien ?
MainWindow
-
-
+
+
-
+
File loaded
Plik załadowany
-
+
Display previous warning again at startup ?
Wyświetlić poprzednie ostrzeżenie przy uruchomieniu?
-
+
Checking for updates
Sprawdź aktualizacje
-
-
-
-
-
+
+
+
+
+
Unable to check for updates.
Nie mogę sprawdzić aktualizacji.
-
-
-
-
-
+
+
+
+
+
Save As
Zapisz jako
-
+
Executable (*.exe)
Wykonywalny (*.exe)
-
+
New release available
Dostępne jest nowe wydanie
-
-
+
+
No updates available at this time.
Brak aktualizacji dostępnych teraz.
-
+
Would you like to launch the installer?
Chcesz uruchomić instalator?
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Error
Błąd
-
-
-
-
-
+
+
+
+
+
Error opening file %1:
%2.
Błąd otwarcia pliku %1:
%2.
-
+
Compilation server termporary failure, try later
Serwer kompilacji chwilowo nieczynny, spróbuj później
-
+
Display previous message again at startup ?
Czy ponownie wyświetlić poprzednią informację przy uruchomieniu?
-
+
Compilation server temporary failure, try later
Serwer kompilacji chwilowo nieczynny, spróbuj później
-
-
+
+
Compilation server too busy, try later
Serwer kompilacji zbyt zajęty, spróbuj później
-
-
+
+
Unknown server failure, try later
Nieznany błąd serwera, spróbuj później
-
+
Firmware %1 does not seem to have ever been downloaded.
Version %2 is available.
Do you want to download it now ?
@@ -2183,31 +2199,31 @@ Pobrać teraz?
-
-
+
+
Yes
Tak
-
-
+
+
No
Nie
-
-
+
+
Release Notes
Informacje o wydaniu
-
-
+
+
Do you want to download release %1 now ?
Chcesz pobrać wydanie %1 teraz?
-
+
A new version of %1 firmware is available (current %2 - newer %3).
Do you want to download it now ?
Jest dostępna nowa wersja firmware %1
@@ -2215,72 +2231,63 @@ Do you want to download it now ?
Chcesz pobrać teraz?
-
+
Ignore this version (r%1)?
Zignorować wersję (r%1)?
-
+
Release notes contain very important informations. Do you want to see them now ?
Opis wydania zawiera bardzo ważne informacje. Chcesz je przeczytać teraz?
-
-
+
+
File saved
Plik zapisany
-
+
Firmware updates
Aktualizacja firmware
-
+
Current firmware does not provide release notes informations.
Aktualny firmware nie zawiera opisu wydania.
-
+
Cannot write file %1:
%2.
Nie mogę zapisać pliku %1:
%2.
-
-
-
-
-
Taranis radio not found
- Nie znaleziono Radia Taranis
+ Nie znaleziono Radia Taranis
-
-
-
-
Impossible to identify the radio on your system, please verify the eeprom disk is connected.
- Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom.
+ Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom.
-
+
Backup is impossible
Backup jest niemożliwy do wykonania
-
+
The backup dir set in preferences does not exist
Brak ustawień ścieżki backupu
-
+
Warning
Ostrzeżenie
@@ -2300,448 +2307,448 @@ Chcesz pobrać teraz?
Backup nieudany
-
+
Copyright
-
+
OpenTX Companion - FW: %1 - Profile: %2
OpenTX Companion - FW: %1 - Profil: %2
-
+
About...
O aplikacji...
-
+
Print...
Drukuj...
-
+
Simulate...
Symulacja...
-
+
Simulate current model
Symulacja aktualnego modelu
-
+
Load Backup...
Załaduj backup...
-
+
View Log File...
Obejrzyj plik logów...
-
+
Open and view log file
Otwórz i obejrzyj plik logów
-
+
Edit Settings
Edycja Ustawień
-
+
Settings...
Ustawienia...
-
+
Download firmware and voice files
Pobierz firmware i pliki dźwiękowe
-
+
Create a new Radio Setting Profile
Utwórz nowy Profil Ustawień Radia
-
+
A monochrome black icon theme
Monochromatyczny czarny wygląd ikon
-
-
+
+
Open Models and Settings file
Otwórz plik Modeli i Ustawień
-
+
New Models+Settings
Nowe Modele+Ustawienia
-
+
Create a new Models and Settings file
Utwórz nowy plik Modeli i Ustawień
-
+
Open Models+Settings...
Otwórz Modele i Ustawienia...
-
+
Save Models+Settings...
Zapisz Modele i Ustawienia...
-
-
+
+
Save Models and Settings file
Zapisz plik Modeli i Ustawień
-
+
Save Models+Settings as...
Zapisz Modele+Ustawienia jako...
-
+
Cut Model
Wytnij Model
-
+
Cut current model to the clipboard
Wytnij aktualny model do schowka
-
+
Copy Model...
Kopiuj Model...
-
+
Copy current model to the clipboard
Wytnij aktualny model do schowka
-
+
Paste Model...
Wklej Model...
-
+
Paste model from clipboard
Wklaj Model ze schowka
-
+
The classic companion9x icon theme
Klasyczny zestaw ikon Companion
-
+
A monochrome white icon theme
Monochromatyczny biały wygląd ikon
-
+
A monochrome blue icon theme
Monochromatyczny niebieski wygląd ikon
-
+
Small
Małe
-
+
Use small toolbar icons
Użyj małych ikon paska narzędzi
-
+
Use normal size toolbar icons
Użyj normalnych ikon paska narzędzi
-
+
Normal
Normalne
-
+
Use big toolbar icons
Użyj dużych ikon paska narzędzi
-
+
Big
Duże
-
+
Use huge toolbar icons
Użyj olbrzymich ikon paska narzędzi
-
+
Huge
Olbrzymie
-
+
Czech
Czeski
-
+
Use Czech in menus
Użyj Czeskiego w menu
-
+
German
Niemiecki
-
+
Use German in menus
Użyj Niemieckiego w menu
-
+
English
Angielski
-
+
Use English in menus
Użyj Angielskiego w menu
-
+
Finnish
Fiński
-
+
Use Finnish in menus
Użyj Fińskiego w menu
-
+
French
Francuski
-
+
Use French in menus
Użyj Francuskiego w menu
-
+
Italian
Włoski
-
+
Use Italian in menus
Użyj Włoskiego w menu
-
+
Hebrew
Hebrajski
-
+
Use Hebrew in menus
Użyj Hebrajskiego w menu
-
+
Polish
Polski
-
+
Use Polish in menus
Użyj Polskiego w menu
-
+
Portuguese
Portugalski
-
+
Use Portuguese in menus
Użyj Portualskiego w menu
-
+
Swedish
Szwedzki
-
+
Use Swedish in menus
Użyj Szwedzkiego w menu
-
+
Russian
Rosyjski
-
+
Use Russian in menus
Użyj Rosyjskiego w menu
-
-
+
+
Radio Settings Profile
Profil Ustawień Radia
-
+
Show recent Models+Settings documents
Pokaż ostatanie dokumenty Modeli i Ustawień
-
+
Print current model
Drukuj aktualny model
-
+
Check OpenTX and Companion updates
Sprawdź aktualizacje OpenTX i Companion
-
+
Edit Tx Splash Image...
Edytor erkanu startowego radia...
-
+
Fuses...
Bezpieczniki...
-
+
Manuals and other Documents
Podręcznik i dokumentacja
-
+
Open the OpenTX document page in a web browser
Otwórz stronę dokumentacji OpenTX w przeglądarce
-
+
Save Tx Models and Settings to file
Zapisz modele radia i ustawienia do pliku
-
+
A tribute to those who have contributed to OpenTX and Companion
Hołd dla tych, którzy przyczynili się do rozwoju OpenTX i Companion
-
+
Contributors...
Współpracownicy...
-
-
+
+
Recent Models+Settings
Ostatnie Modele+Ustawienia
-
+
Set Icon Theme
Ustaw wygląd ikon
-
+
Set Icon Size
Ustaw wielkość ikon
-
+
A new version of Companion is available (version %1)<br>Would you like to download it?
Dostępna jest nowy Companion (wersja %1)<br>Chcesz ją pobrać ?
-
+
A new release of Companion is available please check the OpenTX website!
Nowe wydanie Companion jest dostępne, proszę sprawdzić stronę OpenTX!
-
+
Firmware does not longer fit in the Tx, due to selected firmware options
Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry
-
-
+
+
Compilation server requires registration, please check OpenTX web site
Serwer kompilacji wymaga rejestracji, proszę odwiedzić stronę OpenTX
-
+
Firmware does not fit in the Tx, due to selected firmware options
Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry
-
+
Do you want to write the firmware to the transmitter now ?
Chcesz wgrać firmware do radia teraz?
-
+
The selected language will be used the next time you start Companion.
Wybrany język będzie użyty po ponownym uruchomieniu Comapnion.
-
-
-
+
+
+
OK
OK
-
+
The new theme will be loaded the next time you start Companion.
Wybrany wygląd będzie użyty po ponownym uruchomieniu Comapnion.
-
+
The icon size will be used the next time you start Companion.
Wybrana wiekość ikon będzie użyta po ponownym uruchomieniu Comapnion.
-
-
-
-
-
+
+
+
+
+
Read Models and Settings From Tx
Wczytaj Modele i Ustawienia z radia
-
+
Write Models and settings from %1 to the Tx?
Czy zapisać Modele i Ustawienia z %1 do radia ?
-
+
The file %1
has not been recognized as a valid Models and Settings file
Write anyway ?
@@ -2750,33 +2757,33 @@ nie został rozpoznany jako prawidłowy pli Modeli i Ustawień.
Czy mimo wszystko zapisać?
-
-
-
-
+
+
+
+
Backup Models and Settings From Tx
Zbakupuj Modele i Ustawienia z radia
-
+
Cannot check Models and Settings compatibility! Continue anyway?
Nie mogę potwierdzić kompatybilności Modeli i Ustawień. Kontynuować?
-
+
The transmitter firmware belongs to another product family, check file and preferences!
Firmwqare radia nalezy do innej rodziny produktów, sprawdź plik i preferencje !
-
+
The transmitter firmware is outdated, please upgrade!
Firmware radia jest przestarzały, proszę zaktualizować!
-
-
+
+
Write Models and Settings To Tx
Zapisz Modele i Ustawienia do radia
@@ -2822,291 +2829,290 @@ Czy mimo wszystko zapisać?
Zapisz Modele i Ustawienia z radia do pliku
-
Impossible to identify the radio on your system, please verify that the eeprom disk is connected.
- Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom.
+ Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom.
-
+
Read Tx Firmware to File
Odczytaj firmware z radia do pliku
-
+
OpenTX Home Page: <a href='%1'>%1</a>
Strona domowa OpenTX: <a href='%1'>%1</a>
-
+
The OpenTX Companion project was originally forked from <a href='%2'>eePe</a>
Projekt Companion odłączony z oryginalnego <a href='%2'>eePe</a>
-
+
If you've found this program useful, please support by <a href='%1'>donating</a>
Jeśli uważasz, że ten program jest użyteczny, wesprzyj poprzez <a href='%1'>donację</a>
-
+
Version %1, %3
Wersja %1, %3
-
+
About Companion
O aplikacji Companion
-
+
Load backup from file
Załaduj backup z pliku
-
+
Write Models and Settings to transmitter
Zapisz Modele i Ustawienia do radia
-
+
Read Models and Settings from transmitter
Wczytaj Modele i Ustawienia z radia
-
+
Write Firmware
Zapisz firmware
-
+
Exit
Zakończ
-
+
Monochrome
Monochromatyczny
-
+
MonoWhite
MonoBiały
-
+
MonoBlue
MonoNiebieski
-
+
System language
Język systemu
-
+
Use system language in menus
Użyj języka systemu w menu
-
+
Download...
Pobieranie...
-
+
Check for Updates...
Sprawdź aktualizacje...
-
+
Companion Changes...
Zmiany w Companion...
-
+
Show Companion change log
Pokaż log zmian Companion
-
+
Firmware Changes...
Zmiany w Firmware...
-
+
Show firmware change log
Pokaż log zmian Firmware
-
+
Compare Models...
Porównaj modele...
-
+
Edit the splash image of your TX
Edytuj ekran startowy swojego radia
-
+
List programmers...
Lista programistów...
-
+
Write firmware to transmitter
Zapisz firmware do radia
-
+
Add Radio Profile
Dodaj profil radia
-
+
Configure Communications...
Ustaw komunikację...
-
+
Configure software for communicating with the transmitter
Ustaw oprogramowanie komunikacyjne z radiem
-
+
Write Models and Settings from file to Tx
Zapisz Modele i Ustawienia z pliku do radia
-
+
Write Models and Settings from file to transmitter
Zapisz Modele i Ustawienia z pliku do radia
-
+
Save the Models and Settings from the transmitter to a file
Zapisz Modele i Ustawienia z radia do pliku
-
+
Read Firmware
Wczytaj Firmware
-
+
Yerico
-
+
Yellow round honey sweet icon theme
Żółty zaokrąglony miodiowy motyw ikon
-
+
Read firmware from transmitter
Wczytaj Firmware z radia
-
+
Write
Zapis
-
+
%2
%2
-
-
+
+
Invalid Models and Settings File %1
Błędny plik %1 Modeli i Ustawień
-
+
Invalid binary Models and Settings File %1
Błędny binarny plik %1 Modeli i Ustawień
-
+
Compare models
Porównaj modele
-
+
Exit the application
Zakończ aplikację companion9x
-
+
List available programmers
Lista dostępnych programatorów
-
+
Show fuses dialog
Pokaż okno ustawień mikro-kontrolera
-
+
Show the application's About box
O aplikacji companion9x
-
+
Classical
Klasyczny
-
+
Set Menu Language
Ustaw język menu
-
-
+
+
File
Plik
-
-
+
+
Edit
Edycja
-
+
Settings
Ustawienia
-
+
Read/Write
Odczyt/Zapis
-
-
+
+
Help
Pomoc
-
+
Show a selection list of radio settings profiles
Pokaż listę wyboru profili ustawiań radia
-
+
Ready
Gotowe
-
+
Unable to find file %1!
Nie mogę znaleźć pliku %1!
-
+
Error reading file %1:
%2.
Błąd odczytu pliku %1:
@@ -3116,193 +3122,187 @@ Czy mimo wszystko zapisać?
MdiChild
-
+
free bytes
wolna pamięć[B]
-
+
Editing model %1:
Edycja modelu %1:
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Error
Błąd
-
-
+
+
Unable to find file %1!
Nie mogę odnaleźć pliku %1!
-
-
-
-
+
+
+
+
Error opening file %1:
%2.
Błąd otwarcia pliku %1:
%2.
-
-
+
+
Invalid EEPROM File %1
Zły plik EEPROM %1
-
+
Invalid binary EEPROM File %1
Nieprawidłowy plik binarny EEPROM %1
-
-
+
-
+
+
Save As
Zapisz jako
-
-
-
+
+
+
Cannot write file %1:
%2.
Nie mogę zapisać pliku %1:
%2.
-
-
+
+
Error writing file %1:
%2.
Błąd zapisu pliku %1:
%2.
-
+
Do you want to use model wizard?
Czy chcesz użyć konfiguratora modelu?
-
-
-
+
+
+
Companion
Companion
-
+
Ask this question again ?
Czy ponownie zapytać ?
-
-
+
+
Error reading file %1:
%2.
Błąd odczytu pliku %1:
%2.
-
+
%1 has been modified.
Do you want to save your changes?
%1 został zmieniony.
Zapisać?
-
+
Backup is impossible
Backup jest niemożliwy
-
+
The backup dir set in preferences does not exist
Ustawienia preferencji katalogu backupu nie istnieją
-
+
Cannot write temporary file!
Nie mogę zapisać pliku tymczasowego!
-
-
-
Taranis radio not found
- Nie odnaleziono Radia Taranis
+ Nie odnaleziono Radia Taranis
-
-
-
Impossible to identify the radio on your system, please verify the eeprom disk is connected.
- Identyfikacja radia w Twoim systemie nie jest możliwa, sprawdź dysk eeprom podpięty do komputera.
+ Identyfikacja radia w Twoim systemie nie jest możliwa, sprawdź dysk eeprom podpięty do komputera.
-
-
-
+
+
+
Backup EEPROM From Tx
Backup EEPROM z radia
-
+
Cannot check eeprom compatibility! Continue anyway?
Nie mogę sprawdzić kompatybilności EEprom! Kontynuować ?
-
-
+
+
Warning
Ostrzeżenie
-
+
Firmware in radio is of a different family of eeprom written, check file and preferences!
Firmware w radiu jest różny od zapisanego eepromu, sprawdź plik i ustawienia!
-
+
Firmware in flash is outdated, please upgrade!
Firmware w radiu jest przestarzały. Proszę zaktualizować!
-
+
Write EEPROM To Tx
Zapis EEPROM do radia
-
+
Open backup Models and Settings file
Otwórz plik backupu Modeli i Ustawień
-
+
Invalid binary backup File %1
nieprawidłowy binarny plik %1
@@ -3569,22 +3569,22 @@ p, li { white-space: pre-wrap; }
Cel -> KAN%1%2
-
+
Rud
SK
-
+
Ele
SW
-
+
Thr
Gaz
-
+
Ail
Lotki
@@ -3593,25 +3593,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
@@ -3621,146 +3621,140 @@ p, li { white-space: pre-wrap; }
Wyczyść miksery
-
-
-
X%1
- X%1
+ X%1
-
-
-
CH%1%2
- Kan %1%2
+ Kan %1%2
-
+
Weight(%1)
Waga(%1)
-
+
Switch(%1)
Przełącznik(%1)
-
+
No Trim
Bez trymera
-
+
No DR/Expo
Bez DR/Expo
-
+
Offset(%1)
Wyrównanie(%1)
-
+
Delay(u%1:d%2)
Opóźnienie(u%1:d%2)
-
+
Slow(u%1:d%2)
Spowolnienie(u%1:d%2)
-
+
Warn(%1)
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
-
+
&Delete
&Wykasuj
-
+
Delete
Wykasuj
-
+
&Copy
&Kopiuj
-
+
Ctrl+C
Ctrl+C
-
+
&Cut
&Wytnij
-
+
Ctrl+X
Ctrl+X
-
+
&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?
@@ -3778,62 +3772,66 @@ p, li { white-space: pre-wrap; }
Symulacja
-
+
Setup
Ustawienia
-
+
Heli
Heli
-
+
Inputs
Wejścia
-
+
Logical Switches
- Przełączniki Logiczne
+ Przełączniki logiczne
-
Switch Assignment
- Przypisanie Przełączników
+ Funkcje specjalne
-
+
Channels
Kanały
-
+
Mixes
Miksery
-
+
Flight Modes
Fazy lotu
+ Special Functions
+ Funkcje Specjalne
+
+
+
Curves
Krzywe
-
+
Telemetry
Telemetria
-
+
Clear Curves?
Wyczyść krzywe?
-
+
Really clear all the curves?
Czy na pewno wyczyścić wszystkie krzywe?
@@ -3931,38 +3929,38 @@ p, li { white-space: pre-wrap; }
-
+
General Settings
Główne ustawienia
-
+
Delete Selected Models?
Skasować wybrane modele?
-
-
+
+
Cannot delete default model.
Nie mogę wykasować bazowego modelu.
-
+
Cannot cut default model.
Nie mogę wyciąć bazowego modelu.
-
+
Do you want to overwrite TX general settings?
Chcesz nadpisać generalne ustawienia radia?
-
+
You are pasting on an not empty model, are you sure?
Wklejasz na niepustym modelu, jesteś pewien?
-
+
No free slot available, cannot duplicate
Brak wolnych miejsc, nie mogę zduplikować
@@ -3975,108 +3973,113 @@ p, li { white-space: pre-wrap; }
Formularz
-
+
Failsafe Mode
Tryb Failsafe
-
+
Start
Start
-
+
PPM delay
Opóźnienie PPM
-
+
usec
us
-
+
Negative
Ujemna
-
+
Positive
Dodatnia
-
+
RX Number
Numer Odbiornika
-
+
Master
Trener
-
+
Slave
Uczeń
-
+
Polarity
Polaryzacja
-
+
Trainer Mode
Tryb trenera
-
+
mSec
ms
-
+
PPM Frame Length
Długość ramki PPM
-
+
Label
Etykieta
-
-
+
+
ch
kanał
-
+
Channels
Kanały
-
+
Hold
Utrzymuj
-
+
Custom
Ustawienia Własne
-
+
No Pulses
Brak sygnałów
-
+
+ Receiver
+ Odbiornik
+
+
+
Failsafe Positions
Pozycja Failsave
-
+
Protocol
Protokół
@@ -4089,985 +4092,647 @@ p, li { white-space: pre-wrap; }
Wyjśćie Trenera
-
+
Internal Radio System
Wenętrzny moduł radiowy
-
+
External Radio Module
External Radio Module - Internal Radio System - zaznaczyć by opisać spójność nazw angielskich
Zewnętrzny moduł radiowy
+
+
+ Radio System
+ System Radia
+
QObject
-
-
+
+
Rud
SK
-
-
+
+
Ele
SW
-
-
+
+
Thr
Gaz
-
-
+
+
Ail
Lotki
-
-
-
+
+
+
P1
Potencjometr 1
-
-
-
+
+
+
P2
Potencjometr 2
-
-
-
+
+
+
P3
Potencjometr 3
-
-
+
+
S1
Potencjometr 1
-
-
+
+
S2
Potencjometr 2
-
-
+
+
LS
Lewy suwak
-
-
+
+
RS
Prawy suwak
-
+
TrmR
Trymer SK
-
+
TrmE
Trymer SW
-
+
TrmT
Trymer gazu
-
+
TrmA
Trymer lotek
-
-
-
+
+
+
REa
Pokrętło :a
-
-
-
+
+
+
REb
Pokrętło :b
-
+
Batt
Bateria
-
+
A1
Sygnał telemetrii A1
-
+
A2
Sygnał telemetrii A2
-
+
Alt
Wysokość
-
+
Rpm
Obroty
-
+
Fuel
Paliwo
-
+
T1
-
- Tx
-
-
-
-
- Rx
-
-
-
-
+
SWR
SWR
-
- RSSI
-
-
-
-
+
T2
-
+
Speed
Prędkość
-
+
Dist
Odległość
-
+
GPS Alt
Wysokość GPS
-
+
Cell
Cela
-
Cels
- Cele
+ Cele
-
+
Vfas
-
+
Curr
Natężenie
-
+
Cnsp
-
+
Powr
Moc
-
+
+ Cells
+ Cele
+
+
+
AccX
-
+
AccY
-
+
AccZ
-
+
HDG
-
+
VSpd
-
+
A1-
-
+
A2-
-
+
Alt-
-
+
Alt+
-
+
Rpm+
-
+
T1+
-
+
T2+
-
- Spd+
-
-
-
-
- Dst+
-
-
-
-
- Cur+
-
-
-
-
- ACC
-
-
-
-
+
Time
-
- Pwr+
-
-
-
-
-
LS1
- PL1
+ PL1
-
-
LS2
- PL2
+ PL2
-
-
LS3
- PL3
+ PL3
-
-
LS4
- PL4
+ PL4
-
-
LS5
- PL5
+ PL5
-
-
LS6
- PL6
+ PL6
-
-
LS7
- PL7
+ PL7
-
-
LS8
- PL8
+ PL8
-
-
LS9
- PL9
+ PL9
-
-
LSA
- PLA
+ PLA
-
-
LSB
- PLB
+ PLB
-
-
LSC
- PLC
+ PLC
-
-
LSD
- PLD
+ PLD
-
-
LSE
- PLE
+ PLE
-
-
LSF
- PLF
+ PLF
-
-
LSG
- PLG
+ PLG
-
-
LSH
- PLH
+ PLH
-
-
LSI
- PLI
+ PLI
-
-
LSJ
- PLJ
+ PLJ
-
-
LSK
- PLK
+ PLK
-
-
LSL
- PLL
+ PLL
-
-
LSM
- PLM,
+ PLM,
-
-
LSN
- PLN
+ PLN
-
-
LSO
- PLO
+ PLO
-
-
LSP
- PLP
+ PLP
-
-
LSQ
- PLQ
+ PLQ
-
-
LSR
- PLR
+ PLR
-
-
LSS
- PLS
+ PLS
-
-
LST
- PLT
+ PLT
-
-
LSU
- PLU
+ PLU
-
-
LSV
- PLV
+ PLV
-
-
LSW
- PLW
+ PLW
-
Input %1
- Wejście %1
+ Wejście %1
-
+
MAX
-
+
S11
P11
-
+
S12
P12
-
+
S13
P13
-
+
S14
P14
-
+
S15
P15
-
+
S16
P16
-
+
S21
P21
-
+
S22
P22
-
+
S23
P23
-
+
S24
P24
-
+
S25
P25
-
+
S26
P26
-
+
CYC%1
-
- PPM%1
-
-
-
-
+
CH%1%2
Kan %1%2
-
+
X%1
-
-
-
-
+
+
+
+
----
-
-
+
+
THR
THR
-
-
+
+
ON
Włącz
-
-
-
+
+
+
OFF
Wyłącz
-
+
Diff(%1)
Róźnicowość(%1)
-
+
Expo(%1)
Expo(%1)
-
+
Function(%1)
Funkcja(%1)
-
+
Curve(%1)
Krzywa(%1)
-
+
!Curve(%1)
!Krzywa(%1)
-
-
+
+
Support for frsky telemetry mod
Wsparcie dla telemetrii FrSky
-
-
+
+
Support for jeti telemetry mod
Wsparcie telemetrii JETI
-
-
+
+
Support for receiving ardupilot data
Wsparcie dla otrzymywania danych ardupilota
-
-
+
+
Support for receiving NMEA data
Wsparcie dla otrzymywania danych NMEA
-
+
Support for telemetry easy board
Wsparcie dla platformy TelemetrEZ
-
-
+
+
Support for MAVLINK devices
Wsparcie urządzeń MAVLINK
-
+
Rotary Encoder use in menus navigation
Użycie pokrętła do nawigacji w menu
-
+
Possibility to enable FAI MODE at field
Umożliwienie uaktywniania tryb FAI w menu
-
+
FAI MODE always enabled
Tryb FAI zawsze aktywny
+
+
+
+
+
+
+ Enable heli menu and cyclic mix support
+ Uaktywnione menu Heli i wsparcie dla cyklicznych mikserów
+
- Enable heli menu and cyclic mix support
- Uaktywnione menu Heli i wsparcie dla cyklicznych mikserów
+
+ Enable TEMPLATES menu
+ Uaktywnienie menu szablonów
-
-
- Enable TEMPLATES menu
- Uaktywnienie menu szablonów
+ No splash screen
+ Bez loga na ekranie
- No splash screen
- Bez loga na ekranie
-
-
-
-
-
-
-
-
+
+
No flight modes
Firmware bez menu faz lotu
-
-
-
-
-
-
- In model setup menus automatically set source by moving some of them
- W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim
-
-
-
-
-
-
-
-
-
-
- Use alternative SQT5 font
- Użyj alternatywnego fontu SQT5
-
-
-
- EEprom write progress bar
- Pasek postępu wgrywania EEPROMu
-
-
-
-
- No Winged Shadow How High support
- Bez wsparcia - Winged Shadow How High
-
-
-
-
- No vario support
- Bez wsparcia wario
-
-
-
-
- No GPS support
- Bez wsparcia GPS
-
-
-
-
- No gauges in the custom telemetry screen
- Bez graficznych wskazań telemetrii
-
-
-
- Allow compensating for offset errors in FrSky FAS current sensors
- Pozwolenie na kompensację błędów w czujnikach natężenia FrSky FAS
-
-
-
- OpenTX for FrSky Taranis Rev4a
- OpenTX dla platformy FrSky Taranis Rev4a
-
-
-
- Use FrSky Taranis sticks in a 9X/9XR
- Użyj drążków Taranisa w 9X/9XR
-
-
-
- OpenTX for FrSky Taranis
- OpenTX dla platformy FrSky Taranis
-
-
-
-
- Disable HELI menu and cyclic mix support
- Dezaktywowane menu Heli i wsparcie dla cyklicznych mikserów
-
-
-
-
- Disable TEMPLATES menu
- Dezaktywowane menu szablonów
-
-
-
-
- Disable Global variables
- dezaktywowane zmienne globalne
-
-
-
-
-
-
-
-
- Disable curves menus
- Bez menu krzywych
-
-
-
-
-
-
- Support for radio modified with regular speaker
- Wsparcie dla modyfikacji radia zwykłym głośnikiem
-
-
-
-
-
-
-
- Used if you have modified your radio with voice mode
- Używane jeśli radio jest zmodyfikowane w calu użycia komunikatów głosowych
-
-
-
-
-
-
- Used if you have modified your radio with haptic mode
- Używane jeśli radio jest zmodyfikowane do użycia wibracji
-
-
-
-
-
-
-
-
- Battery graph
- Grafika baterii
-
-
-
-
-
-
- Enable the throttle trace in Statistics
- Uaktywnić śledzenie gazu w statystykach
-
-
-
- Support of FrSky PXX protocol
- Wsparcie dla protokołu Frsky PXX
-
-
-
-
-
-
-
- Support for DSM2 modules
- wsparcie modułu DSM2
-
-
-
- Your radio probably uses a wrong firmware,
- eeprom size is 4096 but only the first 2048 are used
- Twoje radio prawdopodobnie używa złego firmware,
- wielkość eepromu jest 4096 ale tylko pierwsze 2048 jest używane
-
-
-
-
-
-
-
-
- PPM center adjustment in limits
- Limit dostrojenia centrowania PPM
-
-
-
-
-
-
-
-
-
-
- PPM values displayed in us
- Wartości PPM wyświetlane w us (mikrosekundy)
-
-
-
-
-
-
-
-
- Symetrical Limits
- Limity symetryczne
-
-
-
+
+
- Pots use in menus navigation
- Użycie potencjometrów do nawigacji w menu
-
-
-
- OpenTX for 9X board
- OpenTX dla platformy 9X
-
-
-
-
- SmartieParts 2.2 Backlight support
- Wsparcie podświetlenia SmartieParts 2.2
-
-
-
-
-
-
-
-
- In model setup menus automatically set switch by moving some of them
- W menu modelu automatyczne wybranie przełącznika w przez jego poruszenie
-
-
-
-
-
-
- Enable resetting values by pressing up and down at the same time
- Szybkie nastawianie wartości
-(+) a (-) neguje wartość
-(+)a (UP) ustawia max
-(-) a (DN) ustawia min
-(UP) a (DN) ustawia 0
-
-
-
-
-
-
-
-
- No graphical check boxes and sliders
- Brak graficznych chekboxów i sliderów
+ In model setup menus automatically set source by moving some of them
+ W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim
@@ -5076,35 +4741,173 @@ 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
+
+
+ Use alternative SQT5 font
+ Użyj alternatywnego fontu SQT5
-
- OpenTX for M128 / 9X board
- OpenTX dla platformy M128 / 9X
-
-
-
-
-
-
- EEprom write Progress bar
- Pasek postępu zapisywania EEPROM
+
+ EEprom write progress bar
+ Pasek postępu wgrywania EEPROMu
-
-
-
- Imperial units
- Imperialne jednostki w telemetrii
+ No Winged Shadow How High support
+ Bez wsparcia - Winged Shadow How High
-
- Bluetooth interface
- Interface Bluetooth
+
+
+ No vario support
+ Bez wsparcia wario
+
+
+
+
+ No GPS support
+ Bez wsparcia GPS
+
+
+
+
+ No gauges in the custom telemetry screen
+ Bez graficznych wskazań telemetrii
+
+
+
+ Allow compensating for offset errors in FrSky FAS current sensors
+ Pozwolenie na kompensację błędów w czujnikach natężenia FrSky FAS
+
+
+
+ OpenTX for FrSky Taranis Rev4a
+ OpenTX dla platformy FrSky Taranis Rev4a
+
+
+
+ Use FrSky Taranis sticks in a 9X/9XR
+ Użyj drążków Taranisa w 9X/9XR
+
+
+
+ OpenTX for FrSky Taranis
+ OpenTX dla platformy FrSky Taranis
+
+
+
+
+ Disable HELI menu and cyclic mix support
+ Dezaktywowane menu Heli i wsparcie dla cyklicznych mikserów
+
+
+
+
+ Disable TEMPLATES menu
+ Dezaktywowane menu szablonów
+
+
+
+
+ Disable Global variables
+ dezaktywowane zmienne globalne
+
+
+
+
+
+
+
+
+ Disable curves menus
+ Bez menu krzywych
+
+
+
+
+
+
+ Support for radio modified with regular speaker
+ Wsparcie dla modyfikacji radia zwykłym głośnikiem
+
+
+
+
+
+
+
+ Used if you have modified your radio with voice mode
+ Używane jeśli radio jest zmodyfikowane w calu użycia komunikatów głosowych
+
+
+
+
+
+
+ Used if you have modified your radio with haptic mode
+ Używane jeśli radio jest zmodyfikowane do użycia wibracji
+
+
+
+
+
+
+
+
+ Battery graph
+ Grafika baterii
+
+
+
+
+
+
+ Enable the throttle trace in Statistics
+ Uaktywnić śledzenie gazu w statystykach
+
+
+
+ Support of FrSky PXX protocol
+ Wsparcie dla protokołu Frsky PXX
+
+
+
+
+
+
+
+ Support for DSM2 modules
+ wsparcie modułu DSM2
+
+
+
+ Your radio probably uses a wrong firmware,
+ eeprom size is 4096 but only the first 2048 are used
+ Twoje radio prawdopodobnie używa złego firmware,
+ wielkość eepromu jest 4096 ale tylko pierwsze 2048 jest używane
+
+
+
+
+
+
+
+
+ PPM center adjustment in limits
+ Limit dostrojenia centrowania PPM
+
+
+
+
+
+
+
+
+
+
+ PPM values displayed in us
+ Wartości PPM wyświetlane w us (mikrosekundy)
@@ -5113,707 +4916,1136 @@ p, li { white-space: pre-wrap; }
+ Symetrical Limits
+ Limity symetryczne
+
+
+
+
+
+
+
+ Pots use in menus navigation
+ Użycie potencjometrów do nawigacji w menu
+
+
+
+ OpenTX for 9X board
+ OpenTX dla platformy 9X
+
+
+
+
+ SmartieParts 2.2 Backlight support
+ Wsparcie podświetlenia SmartieParts 2.2
+
+
+
+
+
+
+
+
+ In model setup menus automatically set switch by moving some of them
+ W menu modelu automatyczne wybranie przełącznika w przez jego poruszenie
+
+
+
+
+
+
+ Enable resetting values by pressing up and down at the same time
+ Szybkie nastawianie wartości
+(+) a (-) neguje wartość
+(+)a (UP) ustawia max
+(-) a (DN) ustawia min
+(UP) a (DN) ustawia 0
+
+
+
+
+
+
+
+
+ No graphical check boxes and sliders
+ Brak graficznych chekboxów i sliderów
+
+
+
+
+
+
+
+
+ Don't use bold font for highlighting active items
+ Nie używaj podświetlenia dla wybranych aktywnych elementów, mikserów, krzywych, expo, etc
+
+
+
+ OpenTX for M128 / 9X board
+ OpenTX dla platformy M128 / 9X
+
+
+
+
+
+
+ EEprom write Progress bar
+ Pasek postępu zapisywania EEPROM
+
+
+
+
+
+
+
+ Imperial units
+ Imperialne jednostki w telemetrii
+
+
+
+ Bluetooth interface
+ Interface Bluetooth
+
+
+
+
+
+
+
+
Global variables
Globalne zmienne
-
+
OpenTX for 9XR
OpenTX dla platformy 9XR
-
+
OpenTX for 9XR with M128 chip
OpenTX dla platformy 9X z układem M128
-
+
OpenTX for Gruvin9x board / 9X
ie: OpenTX dla platformy Gruvin9X / 9X
-
+
Support for SD memory card
Wsparcie karty SD
-
+
Support for DSM2 modules using ppm instead of true serial
Wsparcie modułu DSM2 przez użycie PPM zamiast prawdziwego szeregowego
-
+
OpenTX for Sky9x board / 9X
OpenTX dla platformy Sky9x / 9X
-
+
Enable HELI menu and cyclic mix support
Uaktywnij menu HELI i cyklicznych mikserów
-
-
+
+
Warning
Ostrzeżenie
-
+
EEPROM saved with these warnings:
EEPROM zapisany z tymi ostrzeżeniami:
-
-
+
+
FM%1
FP%1
FM%1
-
+
Input%1
Wejście %1
-
+
English
Angielski
-
+
French
Francuski
-
+
Italian
Włoski
-
+
German
Niemiecki
-
+
Czech
Czeski
-
+
Slovak
Słowacki
-
+
Spanish
Hiszpański
-
+
Portuguese
Portugalski
-
+
Polish
Polski
-
+
Finnish
Fiński
-
+
No
Nie
-
+
RotEnc A
Pokrętło :A
-
+
Rot Enc B
Pokrętło :B
-
+
Rot Enc C
Pokrętło :C
-
+
Rot Enc D
Pokrętło :D
-
+
Rot Enc E
Pokrętło :E
-
+
No repeat
Bez powtórzeń
-
+
%1 sec
%1 s
-
+
Safety %1
Bezpieczny %1
-
+
+
+ S3
+ S3
+
+
+
+ RSSI Tx
+ RSSI Tx
+
+
+
+ RSSI Rx
+ RSSI Rx
+
+
+
+ Rx Batt
+ Bateria Rx
+
+
+
+ A3
+ A3
+
+
+
+ A4
+ A4
+
+
+
ASpd
ASpd
-
+
dTE
dTE
-
+
+ A3-
+ A3-
+
+
+
+ A4-
+ A4-
+
+
Cel-
- Cel-
+ Cel-
-
Vfs-
- Vfs-
+ Vfs-
-
+ Cels-
+ Cele-
+
+
+
+ ACC
+ ACC
+
+
+
+
+ L1
+ L1
+
+
+
+
+ L2
+ L2
+
+
+
+
+ L3
+ L3
+
+
+
+
+ L4
+ L4
+
+
+
+
+ L5
+ L5
+
+
+
+
+ L6
+ L6
+
+
+
+
+ L7
+ L7
+
+
+
+
+ L8
+ L8
+
+
+
+
+ L9
+ L9
+
+
+
+
+ L10
+ L10
+
+
+
+
+ L11
+ L11
+
+
+
+
+ L12
+ L12
+
+
+
+
+ L13
+ L13
+
+
+
+
+ L14
+ L14
+
+
+
+
+ L15
+ L15
+
+
+
+
+ L16
+ L16
+
+
+
+
+ L17
+ L17
+
+
+
+
+ L18
+ L18
+
+
+
+
+ L19
+ L19
+
+
+
+
+ L20
+ L20
+
+
+
+
+ L21
+ L21
+
+
+
+
+ L22
+ L22
+
+
+
+
+ L23
+ L23
+
+
+
+
+ L24
+ L24
+
+
+
+
+ L25
+ L25
+
+
+
+
+ L26
+ L26
+
+
+
+
+ L27
+ L27
+
+
+
+
+ L28
+ L28
+
+
+
+
+ L29
+ L29
+
+
+
+
+ L30
+ L30
+
+
+
+
+ L31
+ L31
+
+
+
+
+ L32
+ L32
+
+
+
+ [I%1]
+ [W%1]
+
+
+
+ TR%1
+ TR%1
+
+
+
+ S31
+ S31
+
+
+
+ S32
+ S32
+
+
+
+ S33
+ S33
+
+
+
+ S34
+ S34
+
+
+
+ S35
+ S35
+
+
+
+ S36
+ S36
+
+
+
RudTrim Left
SK Trymer lewy
-
+
RudTrim Right
SK Trymer prawy
-
+
EleTrim Down
SW Trymer w dół
-
+
EleTrim Up
SW Trymer w górę
-
+
ThrTrim Down
Gaz Trymer w dół
-
+
ThrTrim Up
Gaz Trymer w gorę
-
+
AilTrim Left
Lotki trymer w lewo
-
+
AilTrim Right
Lotki trymer w prawo
-
+
ABS
ABS
-
+
THs
THs
-
+
TH%
TH%
-
+
THt
THt
-
+
???
???
-
+
a>x
a>x
-
+
a<x
a<x
-
+
|a|>x
|a|>x
-
+
|a|<x
|a|<x
-
+
AND
I (logiczne)
-
+
OR
Lub (logiczne)
-
+
XOR
XOR (Logiczne)
-
+
a=b
a=b
-
+
a!=b
a!=b
-
+
a>b
a>b
-
+
a<b
a<b
-
+
a>=b
a>=b
-
+
a<=b
a<=b
-
+
d>=x
d>=x
-
+
|d|>=x
|d|>=x
-
+
+ a=x
+ a=x
+
+
+
a~x
a~x
-
+
Timer
Timer
-
+
Sticky
-
+ Trwałe przełączenie
-
Stay
- Utrzymuj
+ Utrzymuj
-
+
Unknown
Nieznane
-
+
STAY(%1, [%2:%3])
Utrzymuj(%1, [%2:%3])
-
+
STICKY(%1, %2)
-
+ Trwałe przełączenie (%1, %2)
-
+
TIMER(%1, %2)
TIMER(%1, %2)
-
+
Trainer
Trener
-
+
Trainer RUD
Trener - SK
-
+
Trainer ELE
Trener - SW
-
+
Trainer THR
Trener - Gaz
-
+
Trainer AIL
Trener - Lotki
-
+
Instant Trim
Natychmiastowe trymowanie
-
+
Play Sound
Odtwórz dźwięk
-
+
Play Haptic
Wibruj
-
+
Reset
Zresetuj
-
+
Set Timer %1
Ustaw Timer %1
-
+
Vario
Wariometr
-
+
Play Both
Odtwórz oba
-
+
Play Value
Odtwórz wartość
-
+
Start Logs
Start logowania
-
+
Volume
Głośność
-
+
Backlight
Podświetlenie
-
+
Adjust GV%1
Ustaw ZG%1
-
-
-
-
-
-
+
+
+
+
+
+
<font color=red><b>Inconsistent parameter</b></font>
Niespójny parametr
<font color=red><b>Niespójny parametr</b></font>
-
+
Rotary Encoder
Pokrętło
-
+
!Flight mode %1
!Faza lotu %1
-
+
Flight mode %1
Faza lotu %1
-
+
Yellow
Żółty
-
+
Orange
Pomarańczowy
-
+
Red
Czerwony
-
+
Winged Shadow How High
-
+
Winged Shadow How High (not supported)
Winged Shadow How High (nie obsługiwane)
-
+
FrSky Sensor Hub
Hub sensora FrSky
-
-
+
+
None
Żaden
-
+
Imperial
Imperialne
-
+
Metric
Metryczne
-
+
Extra Fine
Bardzo dokładne
-
+
Fine
Dokładne
-
+
Medium
Średni
-
+
Coarse
Gruby
-
+
Exponential
Eksponencjalny
-
+
Count Up
Licz
-
+
Count Down
Odliczaj
-
+
%1:%2,
-
+
: %1 Channels, %2usec Delay
:Kanały %1, opóźnienie %2usX
-
+
Flight modes(%1)
Fazy lotu(%1)
-
+
Flight mode(%1)
Faza lotu (%1)
-
+
Rudder
SK
-
+
Elevator
SW
-
+
Throttle
Gaz
-
+
Aileron
Lotki
-
+
Play Track
Odtwórz ścieżkę
-
-
-
+
+
+
---
-
+
Rud Trim
Trymer SK
-
+
Ele Trim
Trymer SW
-
+
Thr Trim
Trymer gazu
-
+
Ail Trim
Trymer lotek
-
+
Rot Enc
Pokrętło
-
+
Swedish
Szwedzki
-
+
+ X%1
+ X%1
+
+
+
+
CH%1
Kan %1
-
+
Background Music
Muzyka tła
-
+
Background Music Pause
Muzyka tła - pauza
-
+
Delay %1 sec
Opóźnienie %1sec
-
+
Duration %1 sec
Czas trwania %1 sec
-
-
-
-
+
+
+
+
Timer1
-
-
-
-
+
+
+
+
Timer2
-
-
-
+
+ Speed+
+ Prędkość+
+
+
+
+ Dist+
+ Dyst+
+
+
+
+ Cell-
+ Cela-
+
+
+
+ Cells-
+ Cele-
+
+
+
+ Vfas-
+ Vfat-
+
+
+
+ Curr+
+ Natęż+
+
+
+
+ Powr+
+ Moc+
+
+
+
+ Edge
+ Brzeg
+
+
+
+
+
All
Wszystkie
-
-
-
+
+
+
Telemetry
Telemetria
-
-
+
+
Value
Wartość
-
-
+
+
Decr:
Zmniejsz:
-
-
+
+
Incr:
Zwiększ:
@@ -5828,66 +6060,66 @@ p, li { white-space: pre-wrap; }
-
+
Value
Wartość
-
+
Source
Źródło
-
+
GVAR
Zmienna
-
+
Increment
Zwiększanie
-
+
Own value
Własny Wartość
-
+
Flight mode %1 value
Flight phase %1 value
Wartość Fazy lotu FL%1
-
+
Keys
Przyciski
-
+
Sticks
Drążki
-
+
Keys + Sticks
Przyciski i Drążki
-
+
-GV%1
-ZG%1
-
-
+
+
GV%1
ZG%1
-
+
Simulator for this firmware is not yet available
Nie jest dostępny symulator dla tego firmware
@@ -5898,26 +6130,30 @@ p, li { white-space: pre-wrap; }
Równoległe użycie expo i krzywych nie jest dłużej wspierane
-
openTx only accepts %1 points in all curves
- openTx dopuszcza tylko %1 punktów dla wszystkich krzywych
+ openTx dopuszcza tylko %1 punktów dla wszystkich krzywych
-
-
-
-
+
+ OpenTX only accepts %1 points in all curves
+ OpenTX zezwala tylko na %1 punktów we wszytkich krzywych
+
+
+
+
+
+
OpenTX on this board doesn't accept this function
OpenTX na tej platformie nie dopuszcza tej funkcji
-
-
+
+
OpenTX doesn't accept this protocol
OpenTX nie obsługuje tego protokołu
-
+
OpenTX doesn't allow this number of channels
OpenTX nie obsługuje tej ilości kanałów
@@ -5988,102 +6224,101 @@ Zespół OpenTX/Companion.
Formularz
-
Model Name
- Nazwa modelu
+ Nazwa modelu
-
+
Timer2
Timer 02
-
+
Timer1
Timer 01
-
+
Throttle Source
Źródło gazu
-
+
Center beep
Pikanie przy centrowaniu
-
+
Trim Increment
Kroki trymera
-
+
OFF
Wyłącz
-
+
Model Image
Obrazek modelu
-
+
Switch Warnings
Ostrzeżenie o przełącznikach
-
+
Exponential
Wykładnicze
-
+
Extra Fine
Bardzo dokładne
-
+
Fine
Dokładne
-
+
Medium
Średnie
-
+
Coarse
Zgrubne
-
+
Extended Limits
Rozszerzone limity (125%)
-
+
Extended Trims
Poszerzone trymery
-
+
Display Checklist
Wyświetl Czeklistę
-
+
Throttle Trim
Trymer gazu
-
+
Throttle Warning
Ostrzeżenie o gazie
-
+
Reverse throttle operation.
If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
@@ -6093,25 +6328,35 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
-
+
Reverse Throttle
Odwrotna praca gazu
-
+
+ Warnings
+ Ostrzeżenia
+
+
+
Pot Warnings
Ostrzeżenie o potencjometrach
-
+
Manual
-
+
Auto
Automatyczne
+
+
+ Model
+ Model
+
SimulatorDialog
@@ -6411,223 +6656,227 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
Formularz
-
-
-
-
+
+
+
+
A1
A1
-
-
-
-
+
+
+
+
A2
A2
-
+
RSSI
RSSI
-
+
Alarm 1
Alarm 1
-
-
+
+
----
----
-
-
+
+
Yellow
Żółty
-
-
+
+
Orange
Pomarańczowy
-
-
+
+
Red
Czerwony
-
+
Alarm 2
Alarm 2
-
+
Serial Protocol
Protokół szeregowy
-
+
Volt source
Źródło napięcia
-
+
Metric
Metryczne
-
+
Imperial
Imperialne
-
+
Current source
Źródło prądu(natężenia)
-
+
Protocol
Protokół
-
+
NONE
BRAK
-
-
+
+
FAS
FAS
-
+
None
Żadne
-
+
FrSky Sensor Hub
Hub Czujników FrSky
-
+
CEL
Ogniwo
-
+
2
2
-
+
3
3
-
+
4
4
-
+
Units
Jednostki
-
+
Blades
Łopaty śmigła
-
Altimetry / Vario
- Wysokościomierz/Wario
+ Wysokościomierz/Wario
-
+
Alti
Wysokościomierz
-
+
Alti+
Wysokościomierz+
-
+
Vario
Wario
-
+
Sink Max
Maks. Opadanie
-
+
Off
Wyłączone
-
+
Climb Max
Maks. Wznoszenie
-
+
Sink Min
Min. Opadanie
-
+
Climb Min
Min. Wznoszenie
-
+
Vario source
Źródło wario
-
+
Vario limits
Limity wario
-
+
Use GPS as altitude source
Używaj GPS jako źródła danych wysokości
-
+
Display altitude in toolbar
Wyświetl wysokość na pasku
-
+
+ Altimetry
+ Wysokościomierz
+
+
+
Various
Różne
-
+
mAh count
Licznik mAh
-
+
FAS Offset
Wyrównanie FAS
-
+
Persistent mAh
Stałe mAh
@@ -6640,113 +6889,123 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
Formularz
-
+
Unit
Jednostka
-
+
Max Value
Maks. wartość
-
+
Alarm 1
Alarm 1
-
-
+
+
----
----
-
-
+
+
Yellow
Żółty
-
-
+
+
Orange
Pomarańczowy
-
-
+
+
Red
Czerwony
-
-
+
+
<
<
-
-
+
+
>
>
-
+
Alarm 2
Alarm 2
-
+
Min Value
Min. Wartość
-
+
Volts (V)
Wolty (V)
-
+
Amps (A)
Ampery (A)
-
+
Speed (m/s or ft/s)
Prędkość (m/s albo ft/s)
-
+
Raw (-)
Bezwymiarowe (-)
-
+
Speed (km/h or miles/h)
Prędkość (km/h albo míle/h)
-
+
Meters (m or ft)
Wysokość (m albo ft)
-
+
Temp (°)
Temp (°)
-
+
Fuel (%)
Paliwo (%)
-
+
mAmps (mA)
miliAmpery (mA)
-
+
+ Low Alarm
+ Alarm niski
+
+
+
+ Critical Alarm
+ Alarm krytyczny
+
+
+
Range
Zasięg
@@ -6797,17 +7056,27 @@ 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)
@@ -6866,25 +7135,25 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
appPreferencesDialog
-
+
Simulator capture folder
Katalog zapisu symulatora
-
+
Remember simulator switch values
Zapamiętaj ustawienia przełączników w symulatorze
-
-
-
-
+
+
+
+
Open Folder
Otwórz katalog
-
+
User Splash Screens
Użyj ekranu powitalnego
@@ -6894,52 +7163,62 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
Edycja Ustawień
-
+
+ General Settings
+ Główne ustawienia
+
+
+
+ TextLabel
+ Etykieta
+
+
+
Application Settings
Ustawienia Aplikacji
-
+
Only show user splash images
Pokaż tylko ekrany powitalne użytkownika
-
+
Show user and companion splash images
Pokaż ekrany powitalne użytkownika i Companion
-
+
Simulator Settings
Ustawienia Symulatora
-
+
Blue
Niebieskie
-
+
Green
Zielone
-
+
Red
Czerwone
-
+
Orange
Pomarańczowe
-
+
Yellow
Żółte
-
+
Mode selection:
Mode 1:
@@ -6962,27 +7241,32 @@ Mode 4:
-
+
+ Radio Profile
+ Profil radia
+
+
+
Mode 1 (RUD ELE THR AIL)
Mod 1 (SK.SW.Gaz.Lot)
-
+
Mode 2 (RUD THR ELE AIL)
Mod 2 (SK.Gaz.SW.Lot)
-
+
Mode 3 (AIL ELE THR RUD)
-
+
Mode 4 (AIL THR ELE RUD)
Mod 4 (Lot.Gaz.SW.SK)
-
+
Channel order
This is used by the templated to determine which channel goes to what number output.
@@ -6991,187 +7275,224 @@ This is used by the templated to determine which channel goes to what number out
To ustawienie jest używane przez szablony, określa jakie wyjście przypisane jest do kanału.
-
+
R E T A
K W G L
-
+
R E A T
K W L G
-
+
R T E A
-
+
R T A E
K G L W
-
+
R A E T
K L W G
-
+
R A T E
K L G W
-
+
E R T A
W K G L
-
+
E R A T
W K L G
-
+
E T R A
W G K L
-
+
E T A R
W G L K
-
+
E A R T
W L K G
-
+
E A T R
W L G K
-
+
T R E A
G K W L
-
+
T R A E
G K L W
-
+
T E R A
G W K L
-
+
T E A R
G W L K
-
+
T A R E
G L K W
-
+
T A E R
G L W K
-
+
A R E T
L K W G
-
+
A R T E
L R G W
-
+
A E R T
L W K G
-
+
A E T R
L W G K
-
+
A T R E
L G K W
-
+
A T E R
L G W K
-
+
Default Stick Mode
Bazowy mod drążków
-
+
Splash Screen
Ekran startowy
-
+
Channel Order
Kolejność kanałów
-
+
Append version number to FW file name
Dodaj numer Firmware do nazwy pliku
-
+
SD Structure path
Struktura karty SD
-
- Firmware Variant
- Wariant Firmware
+
+ 9X
+ 9X
-
+
+ 9X with m128
+ 9X z m128
+
+
+
+ 9XR
+ 9XR
+
+
+
+ 9XR with m128
+ 9XR z m128
+
+
+
+ Gruvin9x Board
+ Płyta Gruvin9x
+
+
+
+ Sky9x Board
+ Płyta Sky9x
+
+
+
+ Taranis
+ Taranis
+
+
+ Firmware Variant
+ Wariant Firmware
+
+
+
Select Image
Wybierz obrazek
-
Firmware File
- Plik Firmware
+ Plik Firmware
-
+
Offer to write FW to Tx after download
Zaproponuj zapisanie FirmWare do radia po pobraniu
-
Radio Settings Profile
- Profil Ustawień Radia
+ Profil Ustawień Radia
-
+
Profile Name
Nazwa profilu
-
+
Remove Profile
Usuń Profil
-
+
+ Radio Type
+ Typ Radia
+
+
+
Clear Image
Wyczyść obrazek
@@ -7180,128 +7501,148 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j
Firmware
-
+
Splash Screen Library
Biblioteka ekranół powitalnych
-
+
Files to keep
Pkili to zapamiętania
-
+
Simulator BackLight
Podświetlenie symularota
-
+
Automatic Backup Folder
Automatyczny Katalog Backupów
-
+
Only capture to clipboard
Przechwyć tylko do schowka
-
+
Joystick
Joystick
-
+
Find Executable
Znajdź plik wykonywalny
-
+
Google Earth Executable
Plik wykonywalny Google Earth
-
+
Calibrate
Kalibracja
-
+
Enable
Aktywowany
-
+
Show splash screen when Companion starts
Pokaz ekran startowy przy uruchamianiu Companion
-
+
Automatic check for OpenTX firmware updates
Automatycznie sprawdź aktualizacje firmware OpenTX
-
+
Automatic check for Companion updates
Automatycznie sprawdź aktualizacje Companion
-
+
Offer to use wizard for new models
Zaproponuj użycie konfiguratora dla nowych modeli
-
+
Enable automatic backup before writing firmware
Uaktywnij automatyczny backup przed zapisem firmware
-
+
+ My Radio
+ Moje Radio
+
+
+
Select your snapshot folder
Katalog zrzutów
-
-
+
+
No joysticks found
Brak oysticka
-
+
+ EMPTY: No radio settings stored in profile
+ PUSTY:Brak ustawień radia w profilu
+
+
+
+ AVAILABLE: Radio settings of unknown age
+ DOSTĘPNY:Nieznany wiek ustawień radia
+
+
+
+ AVAILABLE: Radio settings stored %1
+ DOSTĘPNY:Zapamietane ustawienai radia %1
+
+
+
Select your library folder
Wybierz katalog bibliteki
-
+
Select your Models and Settings backup folder
Wybierz folder do backupowania Modeli i Ustawień
-
+
Select Google Earth executable
Wybierz wykonywalny plik Google Earth
-
+
Select the folder replicating your SD structure
Wybierz folder do zreplikowania struktury Twojej karty SD
-
+
Not possible to remove profile
Usunięcie profilu jest niemożliwe
-
+
The default profile can not be removed.
Podstawowy profil nie moze być usunięty.
-
+
Open Image to load
Otwórz obrazek do załadowania
-
+
Images (%1)
Obrazki (%1)
@@ -7319,55 +7660,55 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j
Pokaż szczegóły
-
+
result
result
Wynik
-
+
executable not found
executable not found
plik wykonywalny nie został znaleziony
-
-
+
+
Error
Błąd
-
+
Cannot open source file
Nie mogę otworzyć pliku źródłowego
-
+
Cannot write destination
Nie mogę zapisać w miejscu docelowym
-
+
Writing file:
Zapisuję plik:
-
+
ie: OpenTX for 9X board or OpenTX for 9XR board
ie: OpenTX dal platformy 9X lub OpenTX lub 9XR
-
+
ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip
ie: OpenTX dla platformy M128 / 9X lub OpenTX dla platformy 9XR z chipem M128
-
+
ie: OpenTX for Gruvin9X board
ie: OpenTX dla platformy Gruvin9X
-
+
Your radio uses a %1 CPU!!!
Please check advanced burn options to set the correct cpu type.
@@ -7376,7 +7717,7 @@ Please check advanced burn options to set the correct cpu type.
Sprawdź zaawansowane funkcje wypiekania by ustalić prawidłowy procesor.
-
+
Your radio uses a %1 CPU!!!
Please select an appropriate firmware type to program it.
@@ -7385,7 +7726,7 @@ Please select an appropriate firmware type to program it.
Proszę wybrać poprany rodzaj firmware.
-
+
You are currently using:
%1
@@ -7394,50 +7735,50 @@ Aktualnie używasz:
%1
-
-
+
+
Writing
Zapis
-
-
+
+
Reading
Czytanie
-
-
+
+
Verifying
Weryfikacja
-
+
done - exit code %1
done - exit code %1
Zakończone z kodem %1
-
+
done with errors
done with errors
Zakończone z Błędami
-
-
+
+
done - SUCCESSFUL
done - SUCCESSFUL
Zakończono sukcesem
-
+
did not finish correctly
did not finish correctly
Nie zakończono poprawnie
-
+
did not finish correctly!
Do you want some help ?
did not finish correctly!
@@ -7446,29 +7787,29 @@ Do you want some help ?
Potrzebujesz pomocy ?
-
+
Copy did not finish correctly
Nie zakończono poprawnie kopiowania
-
+
finished correctly
finished correctly
Zakończono poprawnie
-
+
Copy finished correctly
Zakończono poprawnie kopiowanie
-
+
Started
Started
Rozpoczęto
-
+
FUSES: Low=%1 High=%2 Ext=%3
Bezpieczniki: Low=%1 High=%2 Ext=%3
@@ -7489,8 +7830,8 @@ Potrzebujesz pomocy ?
-
-
+
+
The location of the AVRDUDE executable.
Położenie wykonywalnego AVRDUDE.
@@ -7501,15 +7842,15 @@ Potrzebujesz pomocy ?
-
-
+
+
Use this button to browse and look for the AVRDUDE executable file.
Użyj tego przycisku w celu znalezienia pliku wykonywalnego AVRDUDE.
-
-
+
+
Browse...
Przeglądaj ...
@@ -7536,13 +7877,13 @@ Please consult the programmer's documentation and the AVRDUDE documentation
-
+
Extra arguments that will be passed to AVRDUDE on every call
Dodatkowe argumenty przekazywane do AVRDUDE przy każdorazowym wywołaniu
-
+
Extra arguments used in AVRDUDE.
This can be used for providing extra information to AVRDUDE.
@@ -7570,24 +7911,24 @@ Nie ma to spradzania błędów i mozesz uszkodzić mikrokontroler.
Pokaż pomoc
-
-
+
+
Port
Port
-
+
AVRDUDE Location
Położenie AVRDUDE
-
+
Use advanced controls
Użyj zaawansowanych ustawień
-
-
+
+
CPU of your TX
Procesor/mikrokontroler twojego radia
@@ -7598,8 +7939,8 @@ Nie ma to spradzania błędów i mozesz uszkodzić mikrokontroler.
Port komunikacyjny do programatora.
-
-
+
+
CPU present on your 9x radio
Should be m64 for stock radios
m2560 for v4.1 boards
@@ -7608,71 +7949,71 @@ m64 dla zwykłego radia
m2560 dla platformy V4
-
+
SAM-BA Location
Położenie SAM-BA
-
+
Alternate device
Alternatywne urządzenie
-
+
Location of sam-ba executable
Położenie plików wykonywalnych sam-ba
-
+
MCU
Typ procesora CPU/MCU
-
+
ARM MCU
Procesor ARM
-
+
sam-ba serial port
Port szeregowy sam-ba
-
+
DFU-UTIL Configuration
Konfiguracja DFU-UTIL
-
+
SAM-BA Configuration
Konfiguracja SAM-BA
-
+
AVRDUDE Configuration
Konfiguracja AVRDUDE
-
-
-
+
+
+
Select Location
Wybierz położenie
-
-
+
+
Companion
Companion
-
+
<b><u>WARNING!</u></b><br>This will reset the fuses of %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue?
<b><u>UWAGA!</u></b><br>U zresetuje bezpieczniki %1 do fabrycznych ustawień.<br>Zapis bezpieczników może uszkodzić twoje radio.<br>Zrób to tylko jeśli jesteś pewien że są złe!<br>Jesteś pewien by kontynuować?
-
+
<b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent.
<b><u>Ostrzeżenie!</u></b><br>Normalnie typ procesora jest wybierany automatycznie zgodnie z wybranym firmware.<br>Jeśli zmienisz typ procesora dla EEpromu rezultaty mogą być nieprzewidywalne.
@@ -7710,37 +8051,37 @@ m2560 dla platformy V4
Zmień ustawiania parametrów HW wartościami z profilu
-
+
Date & Time
Data i Czas
-
+
+ Version
+ Wersja
+
+
+
Use firmware start screen
Użyj ekranu startowego z firmware
-
+
Use another start screen
Użyj innego ekranu startowego
-
+
Use profile start screen
Użyj ekranu startowego z profilu
-
+
Use library start screen
Użyj ekranu startowego z biblioteki
-
- SVN
-
-
-
-
+
Variant
Wariant
@@ -7761,18 +8102,18 @@ m2560 dla platformy V4
Zmień logo w firmware
-
-
+
+
Browse for file
Przeglądaj pliki
-
+
Allows Companion to write to older version of the firmware
Pozwól Companion na zapis do starszej wersji firmware
-
+
Backup and restore Models and Settings
Zbakupuj i odtwórz Modele i Ustawienia
@@ -7781,12 +8122,12 @@ m2560 dla platformy V4
Użyj Logo w ustawieniach
-
+
Check Firmware compatibility
Sprawdź kompatybilność firmware
-
+
Current Profile
Aktualny profil
@@ -7796,22 +8137,22 @@ m2560 dla platformy V4
Przerwij
-
+
Write firmware to TX
Zapisz firmware do radia
-
+
Current profile
Aktualny profil
-
-
-
-
-
-
+
+
+
+
+
+
Warning
Ostrzeżenie
@@ -7824,102 +8165,102 @@ m2560 dla platformy V4
Wypiecz mimo wszystko !
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Error
Błąd
-
+
Unable to find file %1!
Nie mogę odnaleźć pliku %1!
-
-
-
+
+
+
Error opening file %1:
%2.
Błąd otwarcia pliku %1:
%2.
-
+
Write Models and Settings to TX
Zapisz Modele i Ustawienia do radia
-
+
Write Models and Settings in %1 to TX
Zapisz Modele i Ustawienia w %1 do radia
-
+
Open Firmware File
Otwórz plik Firmware
-
+
Choose file to load Models and Settings from
Wybierz plik Modeli i Ustawien do wczytania
-
+
%1 may not be a valid firmware file
%1 moze nie być prawidłowym plikiem firmware
-
-
-
+
+
+
Invalid binary Models and Settings File %1, Proceed anyway ?
Nieprawidłowy plik Modeli i Ustawień : %1. Kontynuować ?
-
+
Error reading file %1:
%2.
Błąd odczytu pliku %1:
%2.
-
+
The firmware file is not valid.
Plik firmware jest błedny.
-
+
There is no start screen image in the firmware file.
Brak obrazka ekranu startowego w firmware.
-
+
The profile image %1 does not contain an image.
Obraz profilu %1 nie zawiera obrazka.
-
+
Open image file to use as Tx start screen
Otwórz plik obrazka by użyć go jako ekran startowy radia
-
+
Image could not be loaded from %1
Obrazek nie moze być załadowany z %1
-
+
The library image could not be loaded
Obrazek z biblioteki nie może być załadowany
@@ -7928,7 +8269,7 @@ m2560 dla platformy V4
Otwórz plik z logo
-
+
Images (%1)
Obrazki (%1)
@@ -7937,40 +8278,40 @@ m2560 dla platformy V4
Nie mogę załadować %1.
-
+
Cannot save customized firmware
Nie mogę zapisać przystosowanego firmware
-
+
Custom image not found
Własny obrazek nie odnaleziony
-
+
No firmware selected
Brak wyboru firmware
-
+
Wrong radio calibration data in profile, Settings not patched
Błędna kalibracja radia w profilu, Ustawienia nie spatchowane
-
+
Wrong radio setting data in profile, Settings not patched
Błędne ustawienia radia w profilu, Ustawienia nie spatchowane
-
-
+
+
Cannot write file %1:
%2.
Nie mogę zapisać pliku %1:
%2.
-
+
Error writing file %1:
%2.
Błąd zapisu pliku %1:
@@ -8316,6 +8657,11 @@ m2560 dla platformy V4
9 Points Curves
9-cio punktowe Krzywe
+
+
+ Special Functions
+ Funkcje Specjalne
+
@@ -8334,6 +8680,11 @@ m2560 dla platformy V4
Enable
Włączone
+
+
+ SF
+ SF
+
Telemetry Settings
@@ -8473,14 +8824,12 @@ m2560 dla platformy V4
L suwak
-
Switch Assignment
- Przypisanie Przełączników
+ Funkcje Specjalne
-
CF
- FS
+ FS
@@ -8544,46 +8893,46 @@ m2560 dla platformy V4
Edytor ekrany startowego radia
-
-
+
+
Invert
Odwróć
-
-
+
+
Load FW
Otwórz firmware
-
-
+
+
Load Pict
Otwórz obrazek
-
-
+
+
Load Profile
Załaduj profil
-
-
+
+
Save
Zapisz
-
-
+
+
Open Splash Library
Otwórz bibliotekę obrazków
-
-
-
-
+
+
+
+
...
@@ -8669,17 +9018,17 @@ m2560 dla platformy V4
Pobierz:
-
+
Unable to save the file %1: %2.
Nie mogę zapisać pliku %1: %2.
-
+
Companion
Companion
-
+
Download failed: %1.
Pobieranie nieudane: %1.
@@ -8841,57 +9190,57 @@ p, li { white-space: pre-wrap; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
CheckBox
CheckBox
-
+
Set language of voice.
May be different from firmware language
Ustaw język komuniaktów głosowych ().
Moze być inny od języka firmware
-
+
Processor ID
ID procesora
-
+
Options
Opcje
@@ -8901,32 +9250,32 @@ Moze być inny od języka firmware
Język Menu
-
+
Voice Language
Język komunikatów
-
+
Firmware Type
TYp Firmware
-
+
Download Voice
Pobierz Głos
-
+
FwInfo
Informacje o Firmware
-
+
Download FW
Pobiesz Firmware
-
+
Check for updates
Sprawdź aktualizacje
@@ -10240,423 +10589,427 @@ Mode 4:
Ustawianie:
-
+
printed on: %1
Wydrukowanno na: %1
-
+
General Model Settings
Główne ustawienia modelu
-
-
-
-
+
+
+
+
Name
Nazwa
-
+
EEprom Size
Rozmiar EEPROM
-
+
Timer1
-
+
Timer2
-
+
Protocol
Protokół
-
+
Pulse Polarity
Polaryzacja pulsu
-
+
Throttle Trim
Trymer gazu
-
-
+
+
Enabled
Włączone
-
+
Disabled
Wyłaczone
-
+
Throttle Expo
Expo gazu
-
+
Trim Increment
Krok trymera
-
+
Center Beep
Sygnał centrowania
-
+
Flight modes Settings
Flight Phases Settings
Uztawienie faz lotu
-
+
Fades
Przejścia
-
+
Trims
Trymery
-
+
Gvars
Zmienne globalne
-
+
Rot.Enc.
Pokrętło.
-
-
-
-
+
+
+
+
Switch
Przełącznik
-
+
Logical Switches
Przełączniki Logiczne
-
-
+
+
LS
PL
-
Switch Assignments
- Przypisanie Przełączników
+ Funkcje Specjalne
-
+
IN
(+)
-
+
OUT
(-)
-
-
-
-
+
+
+
+
FM
FP
LR
-
+
Expo/Dr Settings
Ustawienia Expo/DR
-
+
Weight
Vaga
-
-
-
+
+
+
Curve
Krzywa
-
+
Mixers
Miksery
-
-
-
-
+
+
+
+
CH
Kanał
-
+
noTrim
Bez trimu
-
-
-
-
-
+
+
+
+
+
Offset
Ofset
-
+
Delay(u%1:d%2)
Opóżnienie(u%1:d%2)
-
+
Slow(u%1:d%2)
Spowolnienie(u%1:d%2)
-
+
Warn
Ostrzeżenie
-
-
+
+
DISABLED
Wyłączone
-
+
Limits
Limity
-
-
-
-
+
+
+
+
Min
-
-
-
-
+
+
+
+
Max
Maks
-
-
-
+
+
+
Invert
Odwrócenie
-
-
-
+
+
+
INV
Odwr
-
-
-
+
+
+
NOR
---
-
+
Curves
Krzywe
-
+
pt %1
pkt %1
-
+
Global Variables
Zmienne globalne
-
+
GV
GZ
-
-
-
-
+
+
+
+
Value
Wartość
-
+
Function
Funkcja
-
+
+ Special Functions
+ Funkcje Specjalne
+
+
+
Parameter
Parametr
-
+
Repeat
Powtórz
-
+
Telemetry Settings
Ustawienia telemetrii
-
-
+
+
Alarm 1
Alarm 1
-
-
+
+
Alarm 2
Alarm 2
-
+
Analog
Analog
-
+
Unit
Jednostki
-
+
Scale
Skala
-
-
-
-
+
+
+
+
Type
Typ
-
-
-
-
+
+
+
+
Condition
Warunek
-
+
A%1
-
+
RSSI Alarm
Alarm RSSI
-
+
Frsky serial protocol
Protokół szeregowy Frsky
-
+
System of units
System jednostek
-
+
Propeller blades
Łopaty śmigła
-
+
Telemetry Bars
Belki telemetrii
-
+
Bar Number
Numer belki
-
+
Source
Źródło
-
+
ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*)
pliki ODF (*.odt);;pliki PDF (*.pdf);;pliki HTML (*.htm *.html);;Wszystkie pliki (*)
-
-
+
+
Custom Telemetry View
Widok telemetrii użytkownika
-
+
Flight mode name
Nazwa trybu lotu
-
-
+
+
Flight modes
Tryby lotu
-
-
+
+
Flight mode
Tryb lotu
-
+
Print Document
Drukuj dokument
-
+
Select PDF output file
Wybierz docelowy plik PDF
@@ -10695,4 +11048,22 @@ Mode 4:
Nie znaleziono prawodłowego obrazka w biblitece, sprawdź ustawienia
+
+ taranisNotFoundDialog
+
+
+ No Taranis Radio Found
+ Nie znaleziono Radia Taranis
+
+
+
+ <html><head/><body><p>No Taranis Radio was found!</p><p>Make sure that you hold the lower trim buttons towards the center while you turn it on.</p><p>Then connect the USB wire.</p></body></html>
+ <html><head/><body><p>Radio Taranis nie znalezione</p><p>Upewnij się że trzymasz oba dolne trymery wciśnięte w stronę środka gdy włączasz radio.</p><p>Potem podłącz kabel USB.</p></body></html>
+
+
+
+ OK
+ OK
+
+
diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts
index 091cd0560..5ca910c7f 100644
--- a/companion/src/translations/companion_sv.ts
+++ b/companion/src/translations/companion_sv.ts
@@ -168,12 +168,12 @@
-
+
ON
På
-
+
Error
Fel
@@ -1844,30 +1844,30 @@ FAI-funktionen kan inte slås av i sändaren.
InputsPanel
-
+
Move Up
Flytta uppåt
-
-
+
+
Ctrl+Up
Ctrl+Up
-
-
+
+
Move Down
Flytta nedåt
-
-
+
+
Ctrl+Down
Ctrl+Down
-
+
Source(%1)
Källa(%1)
@@ -1897,7 +1897,7 @@ FAI-funktionen kan inte slås av i sändaren.
För få filter är tillgängliga!
-
+
Delete Selected Inputs?
Radera valda filter?
@@ -1985,7 +1985,7 @@ FAI-funktionen kan inte slås av i sändaren.
LogicalSwitchesPanel
-
+
Condition
Villkor
@@ -2066,13 +2066,13 @@ FAI-funktionen kan inte slås av i sändaren.
-
-
+
+
File loaded
Filen har laddats
-
+
@@ -2128,7 +2128,7 @@ Vill du ladda ned den nya versionen nu ?
Filen sparades
-
+
Copyright
Copyright
@@ -2149,7 +2149,7 @@ Vill du ladda ned den nya versionen nu ?
Spara Som...
-
+
Exit
Avsluta
@@ -2347,7 +2347,7 @@ Vill du ladda ned den nya versionen nu ?
&Sök efter uppdateringar...
-
+
Display previous message again at startup ?
Skall föregående varning visas igen vid uppstart ?
@@ -2381,7 +2381,7 @@ Vill du ladda ned den nu ?
Skriv Modeller och Inställningar från %1 till sändaren?
-
+
Conversion failed
Konverteringen misslyckades
@@ -2405,7 +2405,7 @@ Vill du ladda ned den nu ?
&Inställningar...
-
+
Edit Settings
Redigera Inställningar
@@ -2535,7 +2535,7 @@ Vill du ladda ned den nu ?
Companion - Editor för Modeller och Inställningar - %1
-
+
Checking for updates
Letar efter uppdateringar
@@ -2550,7 +2550,7 @@ Vill du ladda ned den nu ?
Ladda inte ned versionen (r%1)?
-
+
OpenTX Home Page: <a href='%1'>%1</a>
OpenTX Hemsida: <a href='%1'>%1</a>
@@ -2594,7 +2594,7 @@ Vill du ladda ned den nu ?
&Skriv Modeller och Inställningar till sändaren
-
+
Write Models and Settings to transmitter
Skriv Modeller och Inställningar till sändaren
@@ -2743,29 +2743,29 @@ Vill du ladda ned den nu ?
-
+
Edit
Redigera
-
-
+
+
Help
Hjälp
-
-
+
+
Radio Settings Profile
Radioprofil
-
+
Show recent Models+Settings documents
Visa senaste Modeller+Inställningar-dokument
-
+
Show a selection list of radio settings profiles
Visa en lista med radioprofiler
@@ -2779,7 +2779,7 @@ Vill du ladda ned den nu ?
&Bidragsgivare...
-
+
Display previous warning again at startup ?
SKall föregående varning visas igen vid uppstart ?
@@ -2789,19 +2789,19 @@ Vill du ladda ned den nu ?
-
+
-
+
Error
Fel
-
+
Cannot write file %1:
%2.
Filen %1 kunde inte skrivas:
@@ -2815,7 +2815,7 @@ Vill du ladda ned den nu ?
-
+
Error opening file %1:
@@ -2824,7 +2824,7 @@ Vill du ladda ned den nu ?
%2.
-
+
Compilation server termporary failure, try later
Tillfälligt fel i byggservern. Försök igen senare
@@ -2845,26 +2845,26 @@ Vill du ladda ned den nu ?
Jämför...
-
+
Compare models
Jämför modeller
-
-
+
+
Backup is impossible
Säkerhetskopiering kan inte utföras
-
-
+
+
The backup dir set in preferences does not exist
Foldern för säkerhetskopior existerar inte
-
+
Warning
Varning
@@ -2878,7 +2878,7 @@ Vill du ladda ned den nu ?
&Läs/Skriv
-
+
Write
Skriv
@@ -2894,7 +2894,7 @@ Vill du ladda ned den nu ?
Kan inte hitta filen %1 !
-
+
Error reading file %1:
%2.
Fel vid inläsning från filen %1:
@@ -2905,7 +2905,7 @@ Vill du ladda ned den nu ?
ladda&Backup...
-
+
Load backup from file
Ladda backup från fil
@@ -2922,16 +2922,16 @@ Vill du ladda ned den nu ?
Öppna loggfil
-
+
-
+
Taranis radio not found
Hittade inte någon Taranis-sändare
-
+
@@ -3002,12 +3002,12 @@ Vill du ladda ned den nu ?
-
+
Open Models and Settings file
Öppna Modeller och Inställningar-fil
-
+
Firmware updates
Firmware-uppdatering
@@ -3019,14 +3019,14 @@ Vill du ladda ned den nu ?
-
+
-
+
Read Models and Settings From Tx
Läs Modeller och Inställningar från sändaren
-
+
The file %1
has not been recognized as a valid Models and Settings file
Write anyway ?
@@ -3039,13 +3039,13 @@ Starta skrivningen i alla fall ?
-
+
Backup Models and Settings From Tx
Säkerhetskopiera Modeller och Inställningar från sändaren
-
+
Cannot check Models and Settings compatibility! Continue anyway?
Det går inte att verifiera att Modeller och Inställningar är kompatibla. Fortsätt i alla fall?
@@ -3061,12 +3061,12 @@ Starta skrivningen i alla fall ?
-
+
Write Models and Settings To Tx
Skriv Modeller och Inställningar till sändaren
-
+
Write Firmware To Tx
Skriv firmware till sändaren
@@ -3162,7 +3162,7 @@ Starta skrivningen i alla fall ?
Ny Profil
-
+
Create a new Radio Setting Profile
Lägg till en ny profil med radio-inställningar
@@ -3469,12 +3469,12 @@ Starta skrivningen i alla fall ?
-
+
Recent Models+Settings
Senaste Modell+Inställnings-filer
-
+
Set Icon Theme
Ställ in Ikontema
@@ -3492,13 +3492,13 @@ Starta skrivningen i alla fall ?
Profiler för Radioinställningar
-
+
Invalid Models and Settings File %1
Filen innehåller inte Modeller och Inställningar: %1
-
+
Invalid binary Models and Settings File %1
Den binära filen innehåller inte Modeller och Inställningar: %1
@@ -3988,59 +3988,59 @@ p, li { white-space: pre-wrap; }
MixesPanel
-
+
Move Up
Flytta uppåt
-
-
+
+
Ctrl+Up
Ctrl+Up
-
-
+
+
Move Down
Flytta nedåt
-
-
+
+
Ctrl+Down
Ctrl+Down
-
+
Clear Mixes
Nollställ mixarna
-
-
+
+
X%1
X%1
-
-
-
+
+
+
CH%1%2
KN%1%2
-
+
Weight(%1)
Vikt(%1)
-
+
Switch(%1)
Brytare(%1)
-
+
No Trim
Ingen Trim
@@ -4519,12 +4519,12 @@ p, li { white-space: pre-wrap; }
P3
-
+
MAX
MAX
-
+
A1
A1
@@ -4534,12 +4534,12 @@ p, li { white-space: pre-wrap; }
A2
-
+
T1
T1
-
+
T2
T2
@@ -4552,7 +4552,7 @@ p, li { white-space: pre-wrap; }
er9x
-
+
Trainer
Trainer
@@ -4592,15 +4592,15 @@ p, li { white-space: pre-wrap; }
Starta loggning
-
-
-
+
+
+
----
----
-
+
Rud
Rod
@@ -4624,24 +4624,24 @@ p, li { white-space: pre-wrap; }
Ske
-
-
+
+
Timer1
Timer1
-
-
+
+
Timer2
Timer2
-
-
+
+
Warning
Varning
@@ -4660,21 +4660,46 @@ p, li { white-space: pre-wrap; }
Det finns ännu ingen simulator för denna typ av firmware
-
-
+
+
REa
REa
-
-
+
+
REb
REb
-
+
+ RSSI Tx
+ RSSI Tx
+
+
+
+ RSSI Rx
+ RSSI Rx
+
+
+
+ Rx Batt
+ Rx Batt
+
+
+
+ A3
+ A3
+
+
+
+ A4
+ A4
+
+
+
Alt
Höj
@@ -4704,209 +4729,208 @@ p, li { white-space: pre-wrap; }
GPS Höj
-
+
Cell
Batt
-
-
+
+
LS1
LB1
-
-
+
+
LS2
LB2
-
-
+
+
LS3
LB3
-
-
+
+
LS4
LB4
-
-
+
+
LS5
LB5
-
-
+
+
LS6
LB6
-
-
+
+
LS7
LB7
-
-
+
+
LS8
LB8
-
-
+
+
LS9
LB9
-
-
+
+
LSA
LBA
-
-
+
+
LSB
LBB
-
-
+
+
LSC
LBC
-
-
+
+
LSD
LBD
-
-
+
+
LSE
LBE
-
-
+
+
LSF
LBF
-
-
+
+
LSG
LBG
-
-
+
+
LSH
LBH
-
-
+
+
LSI
LBI
-
-
+
+
LSJ
LBJ
-
-
+
+
LSK
LBK
-
-
+
+
LSL
LBL
-
-
+
+
LSM
LBM
-
-
+
+
LSN
LBN
-
-
+
+
LSO
LBO
-
-
+
+
LSP
LBP
-
-
+
+
LSQ
LBQ
-
-
+
+
LSR
LBR
-
-
+
+
LSS
LBS
-
-
+
+
LST
LBT
-
-
+
+
LSU
LBU
-
-
+
+
LSV
LBV
-
-
+
+
LSW
LBW
-
Input %1
- Filter %1
+ Filter %1
-
+
CYC%1
CYC%1
@@ -4916,13 +4940,13 @@ p, li { white-space: pre-wrap; }
PPM%1
-
+
THR
GAS
-
+
ON
På
@@ -4935,7 +4959,7 @@ p, li { white-space: pre-wrap; }
Av
-
+
Safety %1
Säkring %1
@@ -4945,7 +4969,7 @@ p, li { white-space: pre-wrap; }
th9x stödjer inte inställningshjul för detta sändarkort
-
+
TrmR
TrmR
@@ -4965,7 +4989,7 @@ p, li { white-space: pre-wrap; }
TrmA
-
+
Play Haptic
Spela Vibration
@@ -4999,12 +5023,17 @@ p, li { white-space: pre-wrap; }
Spela Värde
-
+
Cels
Celsius
-
+
+ S3
+ S3
+
+
+
Vfas
Vfas
@@ -5014,7 +5043,7 @@ p, li { white-space: pre-wrap; }
Ström
-
+
VSpd
VHastighet
@@ -5029,7 +5058,7 @@ p, li { white-space: pre-wrap; }
A2-
-
+
Alt-
Hjd-
@@ -5064,17 +5093,16 @@ p, li { white-space: pre-wrap; }
Avstånd+
-
+
Cur+
Ström+
-
ACC
- ACC
+ ACC
-
+
Time
Tid
@@ -5109,7 +5137,7 @@ p, li { white-space: pre-wrap; }
Inm.Hjul E
-
+
Play Track
Spela Spår
@@ -5150,7 +5178,7 @@ p, li { white-space: pre-wrap; }
Det går inte att använda Expo på en specialkurva i open9x
-
+
Support for frsky telemetry mod
Stöd för FrSky telemeri
@@ -5400,7 +5428,7 @@ p, li { white-space: pre-wrap; }
Slå på helikoptermenyn och stöd för cyklisk mix
-
+
CH%1%2
KN%1%2
@@ -5410,21 +5438,21 @@ p, li { white-space: pre-wrap; }
X%1
-
-
+
+
GV%1
GV%1
-
+
-
+
---
----
-
+
Rud Trim
Rod.Trim
@@ -5464,7 +5492,7 @@ p, li { white-space: pre-wrap; }
KN%1
-
+
Background Music
Bakgrundsmusik
@@ -5494,7 +5522,7 @@ p, li { white-space: pre-wrap; }
Eget värde
-
+
-GV%1
-GV%1
@@ -5546,22 +5574,20 @@ p, li { white-space: pre-wrap; }
RS
-
+
Batt
Batt
-
Tx
- Tx
+ Tx
-
Rx
- Rx
+ Rx
-
+
Cnsp
Cnsp
@@ -5571,7 +5597,7 @@ p, li { white-space: pre-wrap; }
Powr
-
+
AccX
AccX
@@ -5586,7 +5612,7 @@ p, li { white-space: pre-wrap; }
AccZ
-
+
HDG
HDG
@@ -5602,6 +5628,16 @@ p, li { white-space: pre-wrap; }
+ A3-
+ A3-
+
+
+
+ A4-
+ A4-
+
+
+
Cel-
@@ -5611,7 +5647,52 @@ p, li { white-space: pre-wrap; }
-
+
+ Cels-
+
+
+
+
+ ACC
+
+
+
+
+ [I%1]
+
+
+
+
+ S31
+ S31
+
+
+
+ S32
+ S32
+
+
+
+ S33
+ S33
+
+
+
+ S34
+ S34
+
+
+
+ S35
+ S35
+
+
+
+ S36
+ S36
+
+
+
RudTrim Left
RoderTrim Vänster
@@ -5750,6 +5831,11 @@ p, li { white-space: pre-wrap; }
|d|>=x
|d|>=x
+
+
+ a=x
+ a=x
+
a~x
@@ -5797,7 +5883,7 @@ p, li { white-space: pre-wrap; }
-
+
No repeat
Repetera ej
@@ -5855,7 +5941,7 @@ p, li { white-space: pre-wrap; }
%1s
-
+
Value
Värde
@@ -5875,7 +5961,7 @@ p, li { white-space: pre-wrap; }
Ökning
-
+
Yellow
Gul
@@ -6011,22 +6097,21 @@ p, li { white-space: pre-wrap; }
Batteriikon
-
+
SWR
SWR
-
RSSI
- RSSI
+ RSSI
-
+
Pwr+
-
+
S11
S11
@@ -6086,7 +6171,7 @@ p, li { white-space: pre-wrap; }
S26
-
+
Diff(%1)
Diff(%1)
@@ -6111,7 +6196,7 @@ p, li { white-space: pre-wrap; }
!Kurva(%1)
-
+
FM%1
FM%1
@@ -6182,20 +6267,24 @@ p, li { white-space: pre-wrap; }
Flygläge %1 värde
-
openTx only accepts %1 points in all curves
- openTX accepterar bar %1 punkter i alla kurvor
+ openTX accepterar bar %1 punkter i alla kurvor
-
-
+
+ OpenTX only accepts %1 points in all curves
+ OpenTX accepterar bara %1 punkter i alla kurvor
+
+
+
+
OpenTX on this board doesn't accept this function
OpenTX stödjer inte funktionen för den aktuella hårdvaran
-
+
OpenTX doesn't accept this protocol
OpenTX accepterar inte detta protokoll
@@ -6206,14 +6295,14 @@ p, li { white-space: pre-wrap; }
OpenTX accepterar inte detta antal kanaler
-
+
Your radio probably uses a wrong firmware,
eeprom size is 4096 but only the first 2048 are used
Din sändare har antagligen laddats med felaktig programvara.
eeprom-storleken är 4096, men enbart den första hälften används
-
+
Support for MAVLINK devices
Stöd för MAVLINK-enheter
@@ -7282,7 +7371,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga
Programmets Inställningar
-
+
Simulator capture folder
Lagra simulatorbilder i
@@ -7305,12 +7394,12 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga
Egna Startbilder
-
+
Edit Settings
Redigera Inställningar
-
+
Application Settings
Programmet
@@ -7554,16 +7643,50 @@ Detta används av mallen för att koppla kanal till output-nummer.
Spaktilldelning
-
+
+ 9X
+ 9X
+
+
+
+ 9X with m128
+ 9X med m128
+
+
+
+ 9XR
+ 9XR
+
+
+
+ 9XR with m128
+ 9XR med m128
+
+
+
+ Gruvin9x Board
+ Gruvin9X-kort
+
+
+
+ Sky9x Board
+ Sky9x-kort
+
+
+
+ Taranis
+ Taranis
+
+
Firmware File
- Firmware
+ Firmware
Settings Profile
Profil
-
+
Splash Screen
Startbild
@@ -7583,17 +7706,16 @@ Detta används av mallen för att koppla kanal till output-nummer.
Sökväg till SD-struktur
-
Firmware Variant
- Firmware-typ
+ Firmware-typ
-
+
Select Image
Välj Bild
-
+
Offer to write FW to Tx after download
Skriv FW till Tx efter nedladdning
@@ -7613,7 +7735,12 @@ Detta används av mallen för att koppla kanal till output-nummer.
Ta bort Profil
-
+
+ Radio Type
+ Radiotyp
+
+
+
Clear Image
Ta bort Bild
@@ -7630,7 +7757,7 @@ Detta används av mallen för att koppla kanal till output-nummer.
Enbart användarens bilder
-
+
Splash Screen Library
Bibliotek för startbilder
@@ -7705,13 +7832,18 @@ Detta används av mallen för att koppla kanal till output-nummer.
Säkerhetskopiera innan firmware-skrivning
-
+
+ My Radio
+ Min Radio
+
+
+
Select your snapshot folder
Välj katalog för snapshots av Tx-simulatorn
-
+
No joysticks found
Ingen joystick hittades
@@ -7736,7 +7868,7 @@ Detta används av mallen för att koppla kanal till output-nummer.
Välj katalog med en kopia av din SD-struktur
-
+
Not possible to remove profile
Det går inte att ta bort profilen
@@ -7754,7 +7886,7 @@ Detta används av mallen för att koppla kanal till output-nummer.
Det går inte att ladda %1.
-
+
Open Image to load
Öppna bild för laddning
@@ -7777,7 +7909,7 @@ Detta används av mallen för att koppla kanal till output-nummer.
Visa Detaljer
-
+
Writing
Skriver
@@ -7789,19 +7921,19 @@ Detta används av mallen för att koppla kanal till output-nummer.
Läser
-
+
Verifying
Verifierar
-
+
FUSES: Low=%1 High=%2 Ext=%3
Vad är EXT?
SÄKRINGAR: Låg=%1 Hög=%2 Ext=%3
-
+
result
result
resultat
@@ -7813,55 +7945,55 @@ Detta används av mallen för att koppla kanal till output-nummer.
program hittades ej
-
+
done - exit code %1
done - exit code %1
klar - returkod %1
-
+
done with errors
done with errors
klar, men med fel
-
-
+
+
done - SUCCESSFUL
done - SUCCESSFUL
klar - FRAMGÅNG
-
+
did not finish correctly
did not finish correctly
avslutade inte korrekt
-
+
finished correctly
finished correctly
avslutade korrekt
-
+
Started
Started
Startade
-
-
+
+
Error
Fel
-
+
Cannot open source file
Kan inte öppna ursprungsfilen
-
+
Cannot write destination
Det gick inte att skriva till målet
@@ -7871,22 +8003,22 @@ Detta används av mallen för att koppla kanal till output-nummer.
Skriver till fi:
-
+
ie: OpenTX for 9X board or OpenTX for 9XR board
dvs: OpenTX för 9X eller OpenTX för 9XR
-
+
ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip
dvs: OpenTX för 9X eller 9XR med M128-processor
-
+
ie: OpenTX for Gruvin9X board
dvs: OpenTX för 9X med Gruvin9X-kort
-
+
Your radio uses a %1 CPU!!!
Please check advanced burn options to set the correct cpu type.
@@ -7895,7 +8027,7 @@ Please check advanced burn options to set the correct cpu type.
Välj rätt CPU-typ i de avancerade inställningarna i Brännar-menyn.
-
+
Your radio uses a %1 CPU!!!
Please select an appropriate firmware type to program it.
@@ -7913,7 +8045,7 @@ Du använder för närvarande:
%1
-
+
did not finish correctly!
Do you want some help ?
did not finish correctly!
@@ -7927,7 +8059,7 @@ Vill du ha hjälp ?
Kopieringen gick inte bra
-
+
Copy finished correctly
Kopieringen gick bra
@@ -9162,7 +9294,7 @@ m2560 för v4.1-kort
Nedladdning:
-
+
Unable to save the file %1: %2.
Kan ej spara filen %1: %2.
@@ -9334,7 +9466,7 @@ p, li { white-space: pre-wrap; }
-
+
@@ -9481,7 +9613,7 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.Spara Profil
-
+
Menu Language
Menyspråk
@@ -9490,7 +9622,7 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.Profil
-
+
Voice Language
Röstspråk
diff --git a/companion/targets/windows/companion-msys.nsi.in b/companion/targets/windows/companion-msys.nsi.in
index cbf3b0c34..e2f1ed51e 100644
--- a/companion/targets/windows/companion-msys.nsi.in
+++ b/companion/targets/windows/companion-msys.nsi.in
@@ -109,11 +109,18 @@ Section "OpenTX companion" SecDummy
${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
-
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
-
+
+ ;Registry information for add/remove programs
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayName" "OpenTX Companion"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayIcon" "$\"$INSTDIR\companion.exe$\""
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "Publisher" "OpenTX"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "URLInfoAbout" "http://www.open-tx.org"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ImageMaker" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
+
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
@@ -178,6 +185,7 @@ Section "Uninstall"
RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey /ifempty HKCU "Software\companion9x"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX"
SectionEnd
diff --git a/companion/targets/windows/companion-vs.nsi.in b/companion/targets/windows/companion-vs.nsi.in
index 64432c62d..ac572467e 100644
--- a/companion/targets/windows/companion-vs.nsi.in
+++ b/companion/targets/windows/companion-vs.nsi.in
@@ -12,14 +12,14 @@
;General
;Name and file
- Name "OpenTX companion"
+ Name "OpenTX Companion"
OutFile "companionInstall_v@C9X_VERSION@.exe"
;Default installation folder
- InstallDir "$PROGRAMFILES\OpenTX companion"
+ InstallDir "$PROGRAMFILES\OpenTX"
;Get installation folder from registry if available
- InstallDirRegKey HKCU "Software\companion9x" ""
+ InstallDirRegKey HKCU "Software\OpenTX" ""
;Compressor options
SetCompressor /FINAL /SOLID lzma
@@ -66,7 +66,7 @@
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
- !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x"
+ !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenTX"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
@@ -77,7 +77,7 @@
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED
- !define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
+ !define MUI_FINISHPAGE_RUN_TEXT "Launch OpenTX Companion"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
@@ -95,7 +95,7 @@
;--------------------------------
;Installer Sections
-Section "OpenTX companion" SecDummy
+Section "OpenTX Companion" SecDummy
SetOutPath "$INSTDIR"
@@ -129,7 +129,7 @@ Section "OpenTX companion" SecDummy
SetOutPath "$INSTDIR"
;Store installation folder
- WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
+ WriteRegStr HKCU "Software\OpenTX" "" $INSTDIR
;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
@@ -141,6 +141,14 @@ Section "OpenTX companion" SecDummy
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
+ ;Registry information for add/remove programs
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayName" "OpenTX Companion"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayIcon" "$\"$INSTDIR\companion.exe$\""
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "Publisher" "OpenTX"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "URLInfoAbout" "http://www.open-tx.org"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ImageMaker" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
+
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
@@ -207,7 +215,8 @@ Section "Uninstall"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder"
- DeleteRegKey /ifempty HKCU "Software\companion9x"
+ DeleteRegKey /ifempty HKCU "Software\OpenTX"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX"
SectionEnd
diff --git a/companion/targets/windows/license.txt b/companion/targets/windows/license.txt
index 62dda6edd..383da8e36 100644
--- a/companion/targets/windows/license.txt
+++ b/companion/targets/windows/license.txt
@@ -1,6 +1,6 @@
-Copyright 2011-2013 Bertrand Songis and Romolo Manfredini
+Copyright 2011-2014 OpenTX team
-companion9x is based on code named eePe by author - Erez Raviv
+OpenTX Companion is based on code named eePe by author - Erez Raviv
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
diff --git a/radio/releasenotes-9x.txt b/radio/releasenotes-9x.txt
index 23b43ac4b..999b443e7 100644
--- a/radio/releasenotes-9x.txt
+++ b/radio/releasenotes-9x.txt
@@ -1,5 +1,26 @@
+2940 / 2014-02-02
+[Arm Boards]
+
+- Wav files played even in silent mode
+
- GPS support had broken VFAS
+
+
+[all]
+
+- Custom function triggered by a CSW based on analog triggering erroneously at powerup
+
- Problem with mixer weight field when !GVARS
+
- PPM5 was broken
+
+
+2923 / 2014-01-08
+[Arm Boards]
+
+- Audio freeze bug fixed
+
- Aurora gimbals support
+
+
2834 / 2013-10-29
[Arm Boards]
@@ -10,7 +31,7 @@
[all]
- Mixer bug when a MULTIPLY mix used with a slow
-
- I GVAR popup removed
+
- GVAR popup removed
- Sticky virtual switches are reset when ResetFlight function is called
diff --git a/radio/releasenotes-taranis.txt b/radio/releasenotes-taranis.txt
index 5e117747d..fe6615752 100644
--- a/radio/releasenotes-taranis.txt
+++ b/radio/releasenotes-taranis.txt
@@ -1,13 +1,28 @@
+2940 / 2014-02-02
+
+- Wav files played even in silent mode
+
- GPS support had broken VFAS
+
- Custom function triggered by a CSW based on analog triggering erroneously at powerup
+
- Problem with mixer weight field when !GVARS
+
- PPM5 was broken
+
+
+2923 / 2014-01-08
+
+- DSM2 Support
+
- New S.PORT sensors support
+
- Audio freeze bug fixed
+
- Telemetry corruption
+
- A2 alarms reinstated in D16 mode for X8R2Analog sensor
+
- Telemetry lost alarm no more triggered by a telemetry reset
+
+
2834 / 2013-10-29
- Altitude played without decimal when >= 10m
- Check to avoid too long paths when playing SD files
-
-
-[all]
-
- Mixer bug when a MULTIPLY mix used with a slow
- I GVAR popup removed
- Sticky virtual switches are reset when ResetFlight function is called
diff --git a/radio/src/.gitignore b/radio/src/.gitignore
index af2b25b2f..f296b655b 100644
--- a/radio/src/.gitignore
+++ b/radio/src/.gitignore
@@ -16,3 +16,4 @@
/SOUNDS
/LOGS
/allsrc.cpp
+/BMP
diff --git a/radio/src/FatFs/ffconf.h b/radio/src/FatFs/ffconf.h
index fcdf65533..48e579763 100644
--- a/radio/src/FatFs/ffconf.h
+++ b/radio/src/FatFs/ffconf.h
@@ -28,14 +28,20 @@ extern "C" {
/ object instead of the sector buffer in the individual file object for file
/ data transfer. This reduces memory consumption 512 bytes each file object. */
-
+#if defined(BOOT)
+#define _FS_READONLY 1 /* 0:Read/Write or 1:Read only */
+#else
#define _FS_READONLY 0 /* 0:Read/Write or 1:Read only */
+#endif
/* Setting _FS_READONLY to 1 defines read only configuration. This removes
/ writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,
/ f_truncate and useless f_getfree. */
-
+#if defined(BOOT)
+#define _FS_MINIMIZE 1 /* 0 to 3 */
+#else
#define _FS_MINIMIZE 0 /* 0 to 3 */
+#endif
/* The _FS_MINIMIZE option defines minimization level to remove some functions.
/
/ 0: Full function.
@@ -45,7 +51,11 @@ extern "C" {
/ 3: f_lseek is removed in addition to 2. */
+#if defined(BOOT)
+#define _USE_STRFUNC 0 /* 0:Disable or 1-2:Enable */
+#else
#define _USE_STRFUNC 1 /* 0:Disable or 1-2:Enable */
+#endif
/* To enable string functions, set _USE_STRFUNC to 1 or 2. */
@@ -186,7 +196,7 @@ extern "C" {
/* A header file that defines sync object types on the O/S, such as
/ windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */
-#if defined(CPUARM)
+#if defined(CPUARM) && !defined(BOOT)
#define _FS_REENTRANT 1 /* 0:Disable or 1:Enable */
#define _SYNC_t unsigned char /*OS_MutexID*/ /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
#else
diff --git a/radio/src/Makefile b/radio/src/Makefile
index e373abd7c..c80161774 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -271,8 +271,9 @@ MENUS_LOCK == NO
# Define programs and commands.
SHELL = sh
IMG2LBM = -python ../util/img2lbm.py
+BIN2LBM = -python ../util/bin2lbm.py
TRANSLATE = -python ../util/translate.py
-VERSION = 2.0
+VERSION = 1.99
SRC =
CPPSRC =
@@ -281,7 +282,7 @@ EXTRAINCDIRS =
# MCU name
ifneq ($(PCB), $(filter $(PCB), STD 9X 9XR STD128 9X128 9XR128 9X2561 9XR2561 GRUVIN9X MEGA2560 SKY9X TARANIS))
- $(error Sorry, the PCB $(PCB) is not supported yet in openTx)
+ $(error Sorry, the PCB $(PCB) is not supported yet in OpenTX)
endif
GVARS_VARIANT = +1
@@ -613,7 +614,7 @@ ifeq ($(PCB), TARANIS)
else
CPPDEFS = -DREV4
endif
- LDSCRIPT = targets/taranis/stm32_flash.ld
+ LDSCRIPT = targets/taranis/stm32_flash_bl.ld
TRGT = arm-none-eabi-
MCU = cortex-m3
OPT = 2
@@ -627,13 +628,14 @@ ifeq ($(PCB), TARANIS)
EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc
EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/inc
BOARDSRC = targets/taranis/board_taranis.cpp
- EXTRABOARDSRC += targets/taranis/lcd_driver.cpp targets/taranis/aspi.cpp targets/taranis/i2c.c
+ EXTRABOARDSRC += targets/taranis/lcd_driver.cpp targets/taranis/aspi.c targets/taranis/i2c.c targets/taranis/delays.c
SRC += CoOS/kernel/core.c CoOS/kernel/hook.c CoOS/kernel/task.c CoOS/kernel/event.c CoOS/kernel/time.c CoOS/kernel/timer.c CoOS/kernel/flag.c CoOS/kernel/mutex.c CoOS/kernel/serviceReq.c CoOS/portable/GCC/port.c CoOS/portable/arch.c
+ SRC += targets/taranis/pwr_driver.c targets/taranis/usb_driver.c
EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp eeprom_conversions.cpp
PULSESSRC = protocols/pulses_arm.cpp protocols/ppm_arm.cpp protocols/pxx_arm.cpp
CPPSRC += audio_arm.cpp
- CPPSRC += targets/taranis/pwr_driver.cpp 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/delays.cpp targets/taranis/uart3_driver.cpp targets/taranis/sport_driver.cpp
- CPPSRC += bmp.cpp gui/view_channels.cpp gui/view_about.cpp gui/view_text.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/sport_driver.cpp
+ CPPSRC += bmp.cpp gui/view_channels.cpp gui/view_about.cpp gui/view_text.cpp loadboot.cpp
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/misc.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
@@ -645,18 +647,14 @@ ifeq ($(PCB), TARANIS)
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_pwr.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_usart.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc_ride7/startup_stm32f2xx.s
- SRC += targets/taranis/usb_bsp.c targets/taranis/usbd_desc.c
+ SRC += targets/taranis/usb_bsp.c targets/taranis/usbd_desc.c targets/taranis/usbd_hid_joystick.c
SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_core.c
SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_dcd.c
SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c
SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/src/usbd_core.c
SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/src/usbd_ioreq.c
SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/src/usbd_req.c
- SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c
- SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c
- SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c
- SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c
- EXTRABOARDSRC += targets/taranis/usbd_usr.cpp targets/taranis/usbd_storage_msd.cpp
+ EXTRABOARDSRC += targets/taranis/usbd_usr.cpp
SRC += targets/sky9x/syscalls.c
ifneq ($(LUA), NO)
@@ -697,6 +695,7 @@ ifeq ($(PCB), TARANIS)
CPPSRC += protocols/hubsan.cpp
CPPSRC += targets/taranis/a7105_driver.cpp
endif
+
endif
CC = $(TRGT)gcc
@@ -728,7 +727,7 @@ else
TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi")
endif
-CPPSRC += opentx.cpp $(PULSESSRC) stamp.cpp gui/menus.cpp gui/menu_model.cpp gui/menu_general.cpp gui/view_main.cpp gui/view_statistics.cpp $(EEPROMSRC) lcd.cpp keys.cpp maths.cpp translations.cpp $(TTS_SRC)
+CPPSRC += opentx.cpp $(PULSESSRC) stamp.cpp gui/menus.cpp gui/menu_model.cpp gui/menu_general.cpp gui/view_main.cpp gui/view_statistics.cpp $(EEPROMSRC) lcd.cpp keys.cpp maths.cpp translations.cpp fonts.cpp $(TTS_SRC)
# Debugging format.
# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
@@ -979,8 +978,10 @@ ifeq ($(HELI), YES)
endif
ifeq ($(TEMPLATES), YES)
- CPPDEFS += -DTEMPLATES
- CPPSRC += templates.cpp
+ ifneq ($(PCB), TARANIS)
+ CPPDEFS += -DTEMPLATES
+ CPPSRC += templates.cpp
+ endif
endif
ifeq ($(PXX), YES)
@@ -1082,10 +1083,21 @@ all: begin gccversion sizebefore build sizeafter end
# Change the build target to build a HEX file or a library.
ifeq ($(ARCH), AVR)
build: stamp_header tra lbm allsrc.cpp elf remallsrc hex
+else ifeq ($(PCB), TARANIS)
+ build: stamp_header tra lbm bootloader.lbm allsrc.cpp elf remallsrc bin
else
build: stamp_header tra lbm allsrc.cpp elf remallsrc bin
endif
+# build bootloader
+bootloader.lbm: bootloader/bootloader_ramBoot.bin
+ test -z "$$(find $^ -size +32k)"
+ $(BIN2LBM) $^ $@
+
+.PHONY bootloader/bootloader_ramBoot.bin:
+ @echo "Building bootloader..."
+ $(MAKE) -C bootloader PCB=$(PCB) PCBREV=$(PCBREV)
+
tra: translations/en.h translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h
lbm: fonts bitmaps/sticks.lbm
@@ -1237,7 +1249,7 @@ sizeafter:
@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); fi
# Display compiler version information.
-gccversion :
+gccversion:
@$(CC) --version
FOXINC=-I/usr/local/include/fox-1.6 -I/usr/include/fox-1.6 \
@@ -1277,8 +1289,7 @@ endif
%.eep: %.elf
@echo
@echo $(MSG_EEPROM) $@
- -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
---change-section-lma .eeprom=0 -O $(FORMAT) $< $@
+ -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O $(FORMAT) $< $@
# Create a symbol table from ELF output file.
%.sym: %.elf
@@ -1344,6 +1355,8 @@ clean_list :
$(REMOVE) *.lst
$(REMOVE) allsrc.cpp
$(REMOVE) stamp-opentx.h
+ $(REMOVE) `find . -name "*.lbm"`
+ $(MAKE) -C bootloader clean
#### Install
diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index 36f11d17e..9f9bff8c9 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -324,7 +324,7 @@ void getSwitchAudioFile(char * filename, int index)
str += 5;
}
else {
- str += 1;
+ *(str+1) = 0;
}
strcat(str, SOUNDS_EXT);
}
@@ -390,7 +390,7 @@ void referenceModelAudioFiles()
}
// Logical Switches Audio Files -[on|off].wav
- for (int i=0; i $@
+
+%hex: %elf
+ $(BIN) $< $@
+
+%bin: %elf
+ $(BINX) $< $@
+
+# $(PROJECT)_flash8
+# $(PROJECT)_flash4
+# $(PROJECT)_ramBootS
+# $(PROJECT)_ramBootT
+
+clean:
+ -rm -f *.o
+ -rm -f *.elf
+ -rm -f *.map
+ -rm -f *.hex
+ -rm -f *.bin
+ -rm -f *.lss
+ -rm -fR .dep
+
+
+#
+# Include the dependency files, should be the last of the makefile
+#
+-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
+
+# *** EOF ***
diff --git a/radio/src/bootloader/boot.cpp b/radio/src/bootloader/boot.cpp
new file mode 100644
index 000000000..1912b9b34
--- /dev/null
+++ b/radio/src/bootloader/boot.cpp
@@ -0,0 +1,943 @@
+/****************************************************************************
+ * Copyright (c) 2014 by Michael Blandford. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ ****************************************************************************
+ * Other Authors:
+ * - Andre Bernet
+ * - Bertrand Songis
+ * - Bryan J. Rentoul (Gruvin)
+ * - Cameron Weeks
+ * - Erez Raviv
+ * - Jean-Pierre Parisy
+ * - Karl Szmutny
+ * - Michal Hlavinka
+ * - Pat Mackenzie
+ * - Philip Moss
+ * - Rob Thomson
+ * - Romolo Manfredini
+ * - Thomas Husterer
+ *
+ ****************************************************************************/
+
+/*----------------------------------------------------------------------------
+ * Headers
+ *----------------------------------------------------------------------------*/
+
+#include
+#include
+#include
+
+#if defined(PCBTARANIS)
+#include "stm32f2xx_flash.h"
+#endif
+
+#include "board_taranis.h"
+#include "../pwr.h"
+#include "../lcd.h"
+#include "../keys.h"
+#include "../sdcard.h"
+#include "../FatFs/ff.h"
+#include "../FatFs/diskio.h"
+#include "../translations/en.h"
+
+#if defined(PCBTARANIS)
+ #define BOOTLOADER_TITLE " OpenTX Boot Loader v1.0"
+ #define BOOT_KEY_UP KEY_PLUS
+ #define BOOT_KEY_DOWN KEY_MINUS
+ #define BOOT_KEY_LEFT KEY_MENU
+ #define BOOT_KEY_RIGHT KEY_PAGE
+ #define BOOT_KEY_MENU KEY_ENTER
+ #define BOOT_KEY_EXIT KEY_EXIT
+ #define DISPLAY_CHAR_WIDTH 35
+#elif defined(PCBSKY9X)
+ #define BOOTLOADER_TITLE "Boot Loader - Sky9x"
+#endif
+
+#define BOOTLOADER_SIZE 0x8000
+
+#if defined(PCBTARANIS)
+ #define FIRMWARE_ADDRESS 0x08000000
+#elif defined(PCBSKY9X)
+ #define FIRMWARE_ADDRESS 0x00400000
+#endif
+
+// states
+enum BootLoaderStates {
+ ST_START,
+ ST_FLASH_MENU,
+ ST_DIR_CHECK,
+ ST_OPEN_DIR,
+ ST_FILE_LIST,
+ ST_FLASH_CHECK,
+ ST_FLASHING,
+ ST_FLASH_DONE,
+ ST_USB,
+ ST_REBOOT,
+};
+
+/*----------------------------------------------------------------------------
+ * Local variables
+ *----------------------------------------------------------------------------*/
+
+uint32_t FirmwareSize;
+
+uint32_t Master_frequency;
+volatile uint8_t Tenms;
+uint8_t EE_timer;
+
+TCHAR FlashFilename[60];
+FIL FlashFile;
+DIR Dj;
+FILINFO Finfo;
+
+TCHAR Filenames[20][50];
+uint32_t FileSize[20];
+uint32_t FnStartIndex;
+uint32_t Valid;
+
+uint32_t FlashSize;
+
+uint32_t FlashBlocked = 1;
+uint32_t LockBits;
+
+uint32_t Block_buffer[1024];
+UINT BlockCount;
+
+#if defined(PCBSKY9X)
+ extern int32_t EblockAddress;
+#endif
+
+extern uint32_t EepromBlocked;
+
+extern void init_spi(void);
+extern void writeBlock(void);
+
+/*----------------------------------------------------------------------------
+ * Global functions
+ *----------------------------------------------------------------------------*/
+
+#if defined(PCBSKY9X)
+// Starts TIMER0 at full speed (MCK/2) for delay timing
+// @ 36MHz this is 18MHz
+// This was 6 MHz, we may need to slow it to TIMER_CLOCK2 (MCK/8=4.5 MHz)
+void start_timer0()
+{
+ register Tc *ptc;
+
+ PMC->PMC_PCER0 |= 0x00800000L; // Enable peripheral clock to TC0
+
+ ptc = TC0;// Tc block 0 (TC0-2)
+ ptc->TC_BCR = 0;// No sync
+ ptc->TC_BMR = 2;
+ ptc->TC_CHANNEL[0].TC_CMR = 0x00008001;// Waveform mode MCK/8 for 36MHz osc.(Upset be write below)
+ ptc->TC_CHANNEL[0].TC_RC = 0xFFF0;
+ ptc->TC_CHANNEL[0].TC_RA = 0;
+ ptc->TC_CHANNEL[0].TC_CMR = 0x00008040;// 0000 0000 0000 0000 1000 0000 0100 0000, stop at regC, 18MHz
+ ptc->TC_CHANNEL[0].TC_CCR = 5;// Enable clock and trigger it (may only need trigger)
+}
+
+void stop_timer0( void )
+{
+ TC0->TC_CHANNEL[0].TC_CCR = TC_CCR0_CLKDIS; // Disable clock
+}
+
+void delay2ms()
+{
+ TC0->TC_CHANNEL[0].TC_CCR = 5;// Enable clock and trigger it (may only need trigger)
+ while ( TC0->TC_CHANNEL[0].TC_CV < 36000 )// 2mS, Value depends on MCK/2 (used 18MHz)
+ {
+ // Wait
+ }
+}
+#endif
+
+#if defined(PCBTARANIS)
+uint32_t isFirmwareStart(uint32_t *block)
+{
+ if ((block[0] & 0xFFFC0000) != 0x20000000) {
+ return 0;
+ }
+ if ((block[1] & 0xFFF00000) != 0x08000000) {
+ return 0;
+ }
+ if ((block[2] & 0xFFF00000) != 0x08000000) {
+ return 0;
+ }
+ return 1;
+}
+#elif defined(PCBSKY9X)
+uint32_t isFirmwareStart( uint32_t *block )
+{
+ if ((block[0] & 0xFFFE3000) != 0x20000000 ) {
+ return 0;
+ }
+ if ((block[1] & 0xFFF80000) != 0x00400000) {
+ return 0;
+ }
+ if ((block[2] & 0xFFF80000) != 0x00400000) {
+ return 0;
+ }
+ return 1;
+}
+#endif
+
+#if defined(PCBSKY9X)
+
+uint32_t (*IAP_Function)(uint32_t, uint32_t);
+
+uint32_t program( uint32_t *address, uint32_t *buffer ) // size is 256 bytes
+{
+ uint32_t FlashSectorNum;
+ uint32_t flash_cmd = 0;
+ uint32_t i;
+// uint32_t flash_status = 0;
+ // uint32_t EFCIndex = 0; // 0:EEFC0, 1: EEFC1
+ /* Initialize the function pointer (retrieve function address from NMI vector) */
+
+ if ((uint32_t) address == FIRMWARE_START+BOOTLOADER_SIZE) {
+ if (isFirmwareStart(buffer))
+ FlashBlocked = 0;
+ else
+ FlashBlocked = 1;
+ }
+
+ if (FlashBlocked) {
+ return 1;
+ }
+
+ // Always initialise this here, setting a default doesn't seem to work
+ IAP_Function = (uint32_t (*)(uint32_t, uint32_t)) *(( uint32_t *)0x00800008);
+ FlashSectorNum = (uint32_t) address;
+ FlashSectorNum >>= 8;// page size is 256 bytes
+ FlashSectorNum &= 2047;// max page number
+
+ /* Send data to the sector here */
+ for ( i = 0; i < 64; i += 1 )
+ {
+ *address++ = *buffer++;
+ }
+
+ /* build the command to send to EEFC */
+ flash_cmd = (0x5A << 24) | (FlashSectorNum << 8) | 0x03; //AT91C_MC_FCMD_EWP ;
+
+ __disable_irq();
+ /* Call the IAP function with appropriate command */
+ i = IAP_Function( 0, flash_cmd );
+ __enable_irq();
+ return i;
+}
+
+uint32_t readLockBits()
+{
+ // Always initialise this here, setting a default doesn't seem to work
+ IAP_Function = (uint32_t (*)(uint32_t, uint32_t)) *(( uint32_t *)0x00800008);
+
+ uint32_t flash_cmd = (0x5A << 24) | 0x0A;//AT91C_MC_FCMD_GLB ;
+ __disable_irq();
+ (void) IAP_Function( 0, flash_cmd );
+ __enable_irq();
+ return EFC->EEFC_FRR;
+}
+
+void clearLockBits()
+{
+ uint32_t i;
+ uint32_t flash_cmd = 0;
+
+ // Always initialise this here, setting a default doesn't seem to work
+ IAP_Function = (uint32_t (*)(uint32_t, uint32_t)) *(( uint32_t *)0x00800008);
+ for ( i = 0; i < 16; i += 1 )
+ {
+ flash_cmd = (0x5A << 24) | ((128*i) << 8) | 0x09; //AT91C_MC_FCMD_CLB ;
+ __disable_irq();
+ /* Call the IAP function with appropriate command */
+ (void) IAP_Function( 0, flash_cmd );
+ __enable_irq();
+ }
+}
+#endif
+
+void interrupt10ms(void)
+{
+ Tenms |= 1; // 10 mS has passed
+
+ uint8_t enuk = KEY_MENU;
+ uint8_t in = ~readKeys();
+
+ for (int i = 1; i < 7; i++) {
+ uint8_t value = in & (1 << i);
+ keys[enuk].input(value, (EnumKeys) enuk);
+ ++enuk;
+ }
+}
+
+#if defined(PCBSKY9X)
+void init10msTimer()
+{
+ register Tc *ptc;
+ register uint32_t timer;
+
+ PMC->PMC_PCER0 |= 0x02000000L; // Enable peripheral clock to TC2
+
+ timer = Master_frequency / 12800;// MCK/128 and 100 Hz
+
+ ptc = TC0;// Tc block 0 (TC0-2)
+ ptc->TC_BCR = 0;// No sync
+ ptc->TC_BMR = 0;
+ ptc->TC_CHANNEL[2].TC_CMR = 0x00008000;// Waveform mode
+ ptc->TC_CHANNEL[2].TC_RC = timer;// 10 Hz
+ ptc->TC_CHANNEL[2].TC_RA = timer >> 1;
+ ptc->TC_CHANNEL[2].TC_CMR = 0x0009C003;// 0000 0000 0000 1001 1100 0000 0000 0011
+ // MCK/128, set @ RA, Clear @ RC waveform
+ ptc->TC_CHANNEL[2].TC_CCR = 5;// Enable clock and trigger it (may only need trigger)
+
+ NVIC_EnableIRQ(TC2_IRQn);
+ TC0->TC_CHANNEL[2].TC_IER = TC_IER0_CPCS;
+}
+
+extern "C" void TC2_IRQHandler()
+{
+ register uint32_t dummy;
+
+ /* Clear status bit to acknowledge interrupt */
+ dummy = TC0->TC_CHANNEL[2].TC_SR;
+ (void) dummy; // Discard value - prevents compiler warning
+
+ interrupt10ms();
+
+}
+#endif
+
+#if defined(PCBTARANIS)
+void init10msTimer()
+{
+ // Timer14
+ RCC->APB1ENR |= RCC_APB1ENR_TIM14EN; // Enable clock
+ TIM14->ARR = 9999; // 10mS
+ TIM14->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 1000000 - 1; // 1uS from 12MHz
+ TIM14->CCER = 0;
+ TIM14->CCMR1 = 0;
+ TIM14->EGR = 0;
+ TIM14->CR1 = 5;
+ TIM14->DIER |= 1;
+ NVIC_EnableIRQ(TIM8_TRG_COM_TIM14_IRQn);
+}
+
+extern "C" void TIM8_TRG_COM_TIM14_IRQHandler()
+{
+ TIM14->SR &= ~TIM_SR_UIF;
+ interrupt10ms();
+}
+
+void init_hw_timer()
+{
+ // Timer13
+ RCC->APB1ENR |= RCC_APB1ENR_TIM13EN; // Enable clock
+ TIM13->ARR = 65535;
+ TIM13->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 10000000 - 1;// 0.1uS from 12MHz
+ TIM13->CCER = 0;
+ TIM13->CCMR1 = 0;
+ TIM13->EGR = 0;
+ TIM13->CR1 = 1;
+}
+
+// delay in units of 0.1 uS up to 6.5535 mS
+void hw_delay(uint16_t time)
+{
+ TIM13->CNT = 0;
+ TIM13->EGR = 1; // Re-start counter
+ while ( TIM13->CNT < time) {
+ // wait
+ }
+}
+
+//After reset, write is not allowed in the Flash control register (FLASH_CR) to protect the
+//Flash memory against possible unwanted operations due, for example, to electric
+//disturbances. The following sequence is used to unlock this register:
+//1. Write KEY1 = 0x45670123 in the Flash key register (FLASH_KEYR)
+//2. Write KEY2 = 0xCDEF89AB in the Flash key register (FLASH_KEYR)
+//Any wrong sequence will return a bus error and lock up the FLASH_CR register until the
+//next reset.
+//The FLASH_CR register can be locked again by software by setting the LOCK bit in the
+//FLASH_CR register.
+void unlockFlash()
+{
+ FLASH->KEYR = 0x45670123;
+ FLASH->KEYR = 0xCDEF89AB;
+}
+
+void waitFlashIdle()
+{
+ while (FLASH->SR & FLASH_FLAG_BSY) {
+ wdt_reset();
+ }
+}
+
+#define SECTOR_MASK ((uint32_t)0xFFFFFF07)
+
+void eraseSector(uint32_t sector)
+{
+ waitFlashIdle();
+
+ FLASH->CR &= CR_PSIZE_MASK;
+ FLASH->CR |= FLASH_PSIZE_WORD;
+ FLASH->CR &= SECTOR_MASK;
+ FLASH->CR |= FLASH_CR_SER | (sector << 3);
+ FLASH->CR |= FLASH_CR_STRT;
+
+ /* Wait for operation to be completed */
+ waitFlashIdle();
+
+ /* if the erase operation is completed, disable the SER Bit */
+ FLASH->CR &= (~FLASH_CR_SER);
+ FLASH->CR &= SECTOR_MASK;
+}
+
+uint32_t program(uint32_t *address, uint32_t *buffer) // size is 256 bytes
+{
+ uint32_t i;
+
+ if ((uint32_t) address == 0x08008000) {
+ if (isFirmwareStart(buffer)) {
+ FlashBlocked = 0;
+ }
+ else {
+ FlashBlocked = 1;
+ }
+ }
+
+ if (FlashBlocked) {
+ return 1;
+ }
+
+ if ((uint32_t) address == 0x08008000) {
+ eraseSector(2);
+ }
+ if ((uint32_t) address == 0x0800C000) {
+ eraseSector(3);
+ }
+ if ((uint32_t) address == 0x08010000) {
+ eraseSector(4);
+ }
+ if ((uint32_t) address == 0x08020000) {
+ eraseSector(5);
+ }
+ if ((uint32_t) address == 0x08040000) {
+ eraseSector(6);
+ }
+ if ((uint32_t) address == 0x08060000) {
+ eraseSector(7);
+ }
+
+ // Now program the 256 bytes
+
+ for (i = 0; i < 64; i += 1) {
+ /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+ be done by word */
+
+ // Wait for last operation to be completed
+ waitFlashIdle();
+
+ FLASH->CR &= CR_PSIZE_MASK;
+ FLASH->CR |= FLASH_PSIZE_WORD;
+ FLASH->CR |= FLASH_CR_PG;
+
+ *address = *buffer;
+
+ /* Wait for operation to be completed */
+ waitFlashIdle();
+ FLASH->CR &= (~FLASH_CR_PG);
+
+ /* Check the written value */
+ if (*address != *buffer) {
+ /* Flash content doesn't match SRAM content */
+ return 2;
+ }
+ /* Increment FLASH destination address */
+ address += 1;
+ buffer += 1;
+ }
+ return 0;
+}
+
+#endif
+
+uint8_t *cpystr(uint8_t *dest, uint8_t *source)
+{
+ while ((*dest++ = *source++))
+ ;
+ return dest - 1;
+}
+
+FRESULT readBinDir(DIR *dj, FILINFO *fno)
+{
+ FRESULT fr;
+ uint32_t loop;
+ do {
+ loop = 0;
+ fr = f_readdir(dj, fno); // First entry
+
+ if (fr != FR_OK || fno->fname[0] == 0) {
+ break;
+ }
+ if (*fno->lfname == 0) {
+ cpystr((uint8_t *) fno->lfname, (uint8_t *) fno->fname); // Copy 8.3 name
+ }
+ int32_t len = strlen(fno->lfname) - 4;
+ if (len < 0) {
+ loop = 1;
+ }
+ if (fno->lfname[len] != '.') {
+ loop = 1;
+ }
+ if ((fno->lfname[len + 1] != 'b') && (fno->lfname[len + 1] != 'B')) {
+ loop = 1;
+ }
+ if ((fno->lfname[len + 2] != 'i') && (fno->lfname[len + 2] != 'I')) {
+ loop = 1;
+ }
+ if ((fno->lfname[len + 3] != 'n') && (fno->lfname[len + 3] != 'N')) {
+ loop = 1;
+ }
+
+ } while (loop);
+ return fr;
+}
+
+uint32_t fillNames(uint32_t index)
+{
+ uint32_t i;
+ FRESULT fr;
+ Finfo.lfname = Filenames[0];
+ Finfo.lfsize = 48;
+ fr = f_readdir(&Dj, 0); // rewind
+ fr = f_readdir(&Dj, &Finfo); // Skip .
+ fr = f_readdir(&Dj, &Finfo); // Skip ..
+ i = 0;
+ while (i <= index) {
+ fr = readBinDir(&Dj, &Finfo); // First entry
+ FileSize[0] = Finfo.fsize;
+ i += 1;
+ if (fr == FR_NO_FILE) {
+ return 0;
+ }
+ }
+ for (i = 1; i < 7; i += 1) {
+ Finfo.lfname = Filenames[i];
+ fr = readBinDir(&Dj, &Finfo); // First entry
+ FileSize[i] = Finfo.fsize;
+ if (fr != FR_OK || Finfo.fname[0] == 0) {
+ break;
+ }
+ }
+ return i;
+}
+
+FRESULT openFirmwareFile(uint32_t index)
+{
+ cpystr(cpystr((uint8_t *)FlashFilename, (uint8_t *)FIRMWARES_PATH "/"), (uint8_t *) Filenames[index]);
+ f_open(&FlashFile, FlashFilename, FA_READ);
+ f_lseek(&FlashFile, BOOTLOADER_SIZE);
+ return f_read(&FlashFile, (BYTE *) Block_buffer, 4096, &BlockCount);
+}
+
+int menuFlashFile(uint32_t index, uint8_t event)
+{
+ FRESULT fr;
+
+ lcd_putsLeft(4*FH, "\012Hold [ENT] to start loading" );
+
+ if (Valid == 0) {
+ // Validate file here
+ // return 3 if invalid
+ fr = openFirmwareFile(index);
+ fr = f_close(&FlashFile);
+ Valid = 1;
+ if (isFirmwareStart(Block_buffer) == 0) {
+ Valid = 2;
+ }
+ }
+
+ if (Valid == 2) {
+ lcd_putsLeft(4*FH, "\011No firmware found in the file!");
+ if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT) || event == EVT_KEY_FIRST(BOOT_KEY_MENU)) {
+ return 0;
+ }
+ return -1;
+ }
+
+ if (event == EVT_KEY_LONG(BOOT_KEY_MENU)) {
+ fr = openFirmwareFile(index);
+ FirmwareSize = FileSize[index];
+ if (fr != FR_OK) {
+ return 0; // File open error
+ }
+ return 1;
+ }
+ else if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT)) {
+ return 0;
+ }
+
+ return -1;
+}
+
+extern Key keys[];
+
+static uint32_t PowerUpDelay;
+
+int main()
+{
+ uint8_t index = 0;
+#if defined(PCBTARANIS)
+ uint8_t TenCount = 2;
+#endif
+ uint8_t maxhsize = DISPLAY_CHAR_WIDTH;
+ FRESULT fr;
+ uint32_t state = ST_START;
+ uint32_t nameCount = 0;
+ uint32_t vpos = 0;
+ uint32_t hpos = 0;
+ uint32_t firmwareAddress = FIRMWARE_ADDRESS;
+ uint32_t firmwareWritten = 0;
+
+#if defined(PCBTARANIS)
+ wdt_reset();
+ RCC->AHB1ENR |= RCC_AHB1ENR_GPIOAEN; // Enable portA clock
+#endif
+
+ pwrInit();
+
+#if defined(PCBSKY9X)
+ MATRIX->CCFG_SYSIO |= 0x000000F0L; // Disable syspins, enable B4,5,6,7
+#endif
+
+#if defined(PCBSKY9X)
+ init_SDcard();
+ PIOC->PIO_PER = PIO_PC25; // Enable bit C25 (USB-detect)
+ start_timer0();
+#endif
+
+ lcdInit();
+#if defined(PCBSKY9X)
+ extern uint8_t OptrexDisplay;
+ OptrexDisplay = 1;
+#endif
+ lcd_clear();
+ lcd_putsLeft(0, BOOTLOADER_TITLE);
+ lcd_invert_line(0);
+ lcdRefresh();
+#if defined(PCBSKY9X)
+ OptrexDisplay = 0;
+ lcdRefresh();
+#endif
+
+#if defined(PCBTARANIS)
+ keysInit();
+ I2C_EE_Init();
+ init_hw_timer();
+#endif
+
+ __enable_irq();
+ init10msTimer();
+
+#if defined(PCBSKY9X)
+ EblockAddress = -1;
+ init_spi();
+#endif
+
+#if defined(PCBSKY9X)
+ uint32_t chip_id = CHIPID->CHIPID_CIDR;
+ FlashSize = ( (chip_id >> 8 ) & 0x000F ) == 9 ? 256 : 512;
+#elif defined(PCBTARANIS)
+ FlashSize = 512;
+#endif
+
+#if defined(PCBSKY9X)
+ LockBits = readLockBits();
+ if (LockBits) {
+ clearLockBits();
+ }
+#endif
+
+#if defined(PCBTARANIS)
+ // SD card detect pin
+ sdInit();
+ unlockFlash();
+ usbInit();
+ usbStart();
+#endif
+
+ for (;;) {
+ wdt_reset();
+
+ if (Tenms) {
+ wdt_reset(); // Retrigger hardware watchdog
+
+ if (EE_timer) {
+ if (--EE_timer == 0) {
+#if defined(PCBSKY9X)
+ writeBlock();
+#endif
+ }
+ }
+
+ Tenms = 0;
+
+ lcd_clear();
+ lcd_putsLeft(0, BOOTLOADER_TITLE);
+ lcd_invert_line(0);
+
+ uint8_t event = getEvent();
+
+ if (usbPlugged()) {
+ state = ST_USB;
+ }
+
+ if (state == ST_START) {
+ lcd_putsLeft(2*FH, "\010Load Firmware");
+ lcd_putsLeft(3*FH, "\010Exit");
+ lcd_invert_line(2+vpos);
+ lcd_putsLeft(6*FH, INDENT "Or plug in a USB cable for mass storage");
+ if (event == EVT_KEY_FIRST(BOOT_KEY_DOWN) || event == EVT_KEY_FIRST(BOOT_KEY_UP)) {
+ vpos = (vpos+1) & 0x01;
+ }
+ else if (event == EVT_KEY_FIRST(BOOT_KEY_MENU)) {
+ if (vpos == 0)
+ state = ST_FLASH_MENU;
+ else
+ state = ST_REBOOT;
+ }
+ }
+
+ if (state == ST_USB) {
+ lcd_putsLeft(4*FH, "\026USB Connected");
+ if (usbPlugged() == 0) {
+ vpos = 0;
+ state = ST_START;
+ }
+#if defined(PCBSKY9X)
+ usbMassStorage();
+ lcd_putc( 0, 6*FH, 'F' );
+ lcd_putc( 6, 6*FH, '0' + FlashBlocked );
+ lcd_putc( 0, 7*FH, 'E' );
+ lcd_putc( 6, 7*FH, '0' + EepromBlocked );
+#endif
+ }
+
+ if (state == ST_FLASH_MENU) {
+ sdInit();
+ state = ST_DIR_CHECK;
+ }
+
+ else if (state == ST_DIR_CHECK) {
+ fr = f_chdir(FIRMWARES_PATH);
+ if (fr == FR_OK) {
+ state = ST_OPEN_DIR;
+ }
+ else {
+ lcd_putsLeft(2*FH, INDENT "No firmware in " FIRMWARES_PATH " directory");
+ if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT) || event == EVT_KEY_FIRST(BOOT_KEY_MENU)) {
+ vpos = 0;
+ state = ST_START;
+ }
+ }
+ }
+
+ if (state == ST_OPEN_DIR) {
+ index = 0;
+ fr = f_opendir(&Dj, ".");
+ if (fr == FR_OK) {
+ state = ST_FILE_LIST;
+ nameCount = fillNames(0);
+ hpos = 0;
+ vpos = 0;
+ }
+ }
+
+ if (state == ST_FILE_LIST) {
+ uint32_t limit = 6;
+ if (nameCount < limit) {
+ limit = nameCount;
+ }
+ maxhsize = 0;
+ for (uint32_t i=0; i maxhsize) {
+ maxhsize = x;
+ }
+ if (x > DISPLAY_CHAR_WIDTH) {
+ if (hpos + DISPLAY_CHAR_WIDTH > x) {
+ x = x - DISPLAY_CHAR_WIDTH;
+ }
+ else {
+ x = hpos;
+ }
+ }
+ else {
+ x = 0;
+ }
+ lcd_putsnAtt(INDENT_WIDTH, 16 + FH * i, &Filenames[i][x], DISPLAY_CHAR_WIDTH, 0);
+ }
+
+ if (event == EVT_KEY_REPT(BOOT_KEY_DOWN) || event == EVT_KEY_FIRST(BOOT_KEY_DOWN)) {
+ if (vpos < limit - 1) {
+ vpos += 1;
+ }
+ else {
+ if (nameCount > limit) {
+ index += 1;
+ nameCount = fillNames(index);
+ }
+ }
+ }
+ else if (event == EVT_KEY_REPT(BOOT_KEY_UP) || event == EVT_KEY_FIRST(BOOT_KEY_UP)) {
+ if (vpos > 0) {
+ vpos -= 1;
+ }
+ else {
+ if (index) {
+ index -= 1;
+ nameCount = fillNames(index);
+ }
+ }
+ }
+#if !defined(PCBTARANIS)
+ else if (event == EVT_KEY_REPT(BOOT_KEY_RIGHT) || event == EVT_KEY_FIRST(BOOT_KEY_RIGHT)) {
+ if (hpos + DISPLAY_CHAR_WIDTH < maxhsize) {
+ hpos += 1;
+ }
+ }
+ else if (event == EVT_KEY_REPT(BOOT_KEY_LEFT) || event == EVT_KEY_FIRST(BOOT_KEY_LEFT)) {
+ if (hpos) {
+ hpos -= 1;
+ }
+ }
+#endif
+ else if (event == EVT_KEY_FIRST(BOOT_KEY_MENU)) {
+ // Select file to flash
+ state = ST_FLASH_CHECK;
+ Valid = 0;
+ }
+ else if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT)) {
+ state = ST_START;
+ vpos = 0;
+ }
+
+ lcd_invert_line(2 + vpos);
+ }
+
+ else if (state == ST_FLASH_CHECK) {
+ int result = menuFlashFile(vpos, event);
+ FirmwareSize = FileSize[vpos] - BOOTLOADER_SIZE;
+ if (result == 0) {
+ // canceled
+ state = ST_FILE_LIST;
+ }
+ else if (result == 1) {
+ // confirmed
+ firmwareAddress = FIRMWARE_ADDRESS + BOOTLOADER_SIZE;
+ firmwareWritten = 0;
+ state = ST_FLASHING;
+ }
+ }
+
+ if (state == ST_FLASHING) {
+ // Commit to flashing
+ uint32_t blockOffset = 0;
+ lcd_putsLeft(4*FH, "\032Loading...");
+ while (BlockCount) {
+ program((uint32_t *) firmwareAddress, &Block_buffer[blockOffset]); // size is 256 bytes
+ blockOffset += 64; // 32-bit words (256 bytes)
+ firmwareAddress += 256;
+ if (BlockCount > 256) {
+ BlockCount -= 256;
+ }
+ else {
+ BlockCount = 0;
+ }
+ }
+ firmwareWritten += 4; // 4K blocks
+
+ lcd_rect( 3, 6*FH+4, 204, 7);
+ lcd_hline(5, 6*FH+6, (200*2*firmwareWritten-32)/(FlashSize), FORCE);
+ lcd_hline(5, 6*FH+7, (200*2*firmwareWritten-32)/(FlashSize), FORCE);
+ lcd_hline(5, 6*FH+8, (200*2*firmwareWritten-32)/(FlashSize), FORCE);
+
+ fr = f_read(&FlashFile, (BYTE *)Block_buffer, sizeof(Block_buffer), &BlockCount);
+ if (BlockCount == 0) {
+ state = ST_FLASH_DONE;
+ }
+ if (firmwareWritten >= FlashSize - 32) {
+ state = ST_FLASH_DONE; // Backstop
+ }
+ }
+
+ if (state == ST_FLASH_DONE) {
+ lcd_putsLeft(4*FH, "\024Loading Complete");
+ if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT) || event == EVT_KEY_FIRST(BOOT_KEY_MENU)) {
+ state = ST_START;
+ vpos = 0;
+ }
+ }
+
+ if (event == EVT_KEY_LONG(BOOT_KEY_EXIT)) {
+ state = ST_REBOOT;
+ }
+
+ if (--TenCount == 0) {
+ TenCount = 2;
+ lcdRefresh();
+ }
+
+ if (PowerUpDelay < 20) { // 200 mS
+ PowerUpDelay += 1;
+ }
+ else {
+ sdPoll10ms();
+ }
+ }
+
+ if (pwrCheck() == e_power_off && state != ST_FLASHING && state != ST_USB) {
+ pwrOff();
+ for (;;) {
+ // Wait for power to go off
+ }
+ }
+
+ if (state == ST_REBOOT) {
+ if ((~readKeys() & 0x7E) == 0) {
+ NVIC_SystemReset();
+ }
+ }
+ }
+
+ return 0;
+}
+
diff --git a/radio/src/debug.h b/radio/src/debug.h
index cd852f852..52cd66229 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -51,12 +51,14 @@
#define TRACE_WARNING(...) do { printf("-W- " __VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_WARNING_WP(...) do { printf(__VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_ERROR(...) do { printf("-E- " __VA_ARGS__); fflush(stdout); } while(0)
-inline void dump(unsigned char *data, unsigned int size)
+inline void dump(void * data, unsigned int size)
{
+ unsigned char *uchar_data = (unsigned char *)data;
+
printf("DUMP %d bytes ...\n\r", size);
unsigned int i = 0, j=0;
while (i*32+j < size) {
- printf("%.2X ", data[i*32+j]);
+ printf("%.2X ", uchar_data[i*32+j]);
j++;
if (j==32) {
i++; j=0;
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index d6f95a775..68fdd0506 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -36,6 +36,7 @@
#include "opentx.h"
+#if defined(PCBTARANIS)
PACK(typedef struct {
uint8_t mode; // 0=end, 1=pos, 2=neg, 3=both
uint8_t chn;
@@ -47,6 +48,18 @@ PACK(typedef struct {
uint8_t spare[2];
int8_t curveParam;
}) ExpoData_v215;
+#else
+PACK(typedef struct {
+ uint8_t mode; // 0=end, 1=pos, 2=neg, 3=both
+ uint8_t chn;
+ int8_t swtch;
+ uint16_t phases;
+ int8_t weight;
+ uint8_t curveMode;
+ char name[LEN_EXPOMIX_NAME];
+ int8_t curveParam;
+}) ExpoData_v215;
+#endif
#if defined(PCBTARANIS)
#define LIMITDATA_V215_EXTRA char name[LEN_CHANNEL_NAME];
@@ -192,7 +205,7 @@ PACK(typedef struct {
int16_t curves[16];
int8_t points[NUM_POINTS];
- LogicalSwitchData_v215 customSw[NUM_CSW];
+ LogicalSwitchData_v215 customSw[NUM_LOGICAL_SWITCH];
CustomFnData_v215 funcSw[32];
SwashRingData swashR;
PhaseData_v215 phaseData[MAX_PHASES];
@@ -339,7 +352,7 @@ int ConvertSource_215_to_216(int source, bool insertZero=false)
if (source > MIXSRC_POT2)
source += 1;
// PPM9-PPM16 added
- if (source > MIXSRC_FIRST_PPM+7)
+ if (source > MIXSRC_FIRST_TRAINER+7)
source += 8;
// 4 GVARS added
if (source > MIXSRC_GVAR1+4)
@@ -384,6 +397,16 @@ int ConvertSwitch_215_to_216(int swtch)
}
#endif
+int16_t ConvertGVAR_215_to_216(int16_t var)
+{
+ if (var <= -508)
+ return var + 512 - 4096;
+ else if (var >= 507)
+ return var - 512 + 4096;
+ else
+ return var;
+}
+
void ConvertModel_215_to_216(ModelData &model)
{
// Virtual inputs added instead of Expo/DR
@@ -427,65 +450,94 @@ void ConvertModel_215_to_216(ModelData &model)
g_model.extendedLimits = oldModel.extendedLimits;
g_model.extendedTrims = oldModel.extendedTrims;
g_model.throttleReversed = oldModel.throttleReversed;
+
+#if defined(PCBTARANIS)
+ g_model.beepANACenter = (oldModel.beepANACenter & 0x3f) | ((oldModel.beepANACenter & 0xc0) << 1);
+#else
g_model.beepANACenter = oldModel.beepANACenter;
+#endif
for (uint8_t i=0; i<64; i++) {
- MixData & mix = g_model.mixData[i];
+ MixData * mix = &g_model.mixData[i];
+ MixData_v215 * oldMix = &oldModel.mixData[i];
#if defined(PCBTARANIS)
- mix.destCh = oldModel.mixData[i].destCh;
- mix.phases = oldModel.mixData[i].phases;
- mix.mltpx = oldModel.mixData[i].mltpx;
- mix.weight = oldModel.mixData[i].weight;
- mix.swtch = ConvertSwitch_215_to_216(oldModel.mixData[i].swtch);
- if (oldModel.mixData[i].curveMode==0/*differential*/) {
- mix.curve.type = CURVE_REF_DIFF;
- mix.curve.value = oldModel.mixData[i].curveParam;
+ mix->destCh = oldMix->destCh;
+ mix->phases = oldMix->phases;
+ mix->mltpx = oldMix->mltpx;
+ if (oldMix->carryTrim == TRIM_OFF) mix->carryTrim = TRIM_OFF;
+ mix->weight = ConvertGVAR_215_to_216(oldMix->weight);
+ mix->swtch = ConvertSwitch_215_to_216(oldMix->swtch);
+ if (oldMix->curveMode==0/*differential*/) {
+ mix->curve.type = CURVE_REF_DIFF;
+ mix->curve.value = oldMix->curveParam;
}
- else if (oldModel.mixData[i].curveParam <= 6) {
- mix.curve.type = CURVE_REF_FUNC;
- mix.curve.value = oldModel.mixData[i].curveParam;
+ else if (oldMix->curveParam <= 6) {
+ mix->curve.type = CURVE_REF_FUNC;
+ mix->curve.value = oldMix->curveParam;
}
else {
- mix.curve.type = CURVE_REF_CUSTOM;
- mix.curve.value = oldModel.mixData[i].curveParam - 6;
+ mix->curve.type = CURVE_REF_CUSTOM;
+ mix->curve.value = oldMix->curveParam - 6;
+ }
+ mix->mixWarn = oldMix->mixWarn;
+ mix->delayUp = oldMix->delayUp;
+ mix->delayDown = oldMix->delayDown;
+ mix->speedUp = oldMix->speedUp;
+ mix->speedDown = oldMix->speedDown;
+ mix->srcRaw = oldMix->srcRaw;
+ if (mix->srcRaw > 4 || oldMix->noExpo)
+ mix->srcRaw = ConvertSource_215_to_216(mix->srcRaw);
+ mix->offset = ConvertGVAR_215_to_216(oldMix->offset);
+ memcpy(mix->name, oldMix->name, LEN_EXPOMIX_NAME);
+ if (!GV_IS_GV_VALUE(mix->weight, 500, 500) && !GV_IS_GV_VALUE(mix->offset, 500, 500)) {
+ mix->offset = divRoundClosest(mix->offset * mix->weight, 100);
}
- mix.mixWarn = oldModel.mixData[i].mixWarn;
- mix.delayUp = oldModel.mixData[i].delayUp;
- mix.delayDown = oldModel.mixData[i].delayDown;
- mix.speedUp = oldModel.mixData[i].speedUp;
- mix.speedDown = oldModel.mixData[i].speedDown;
- mix.srcRaw = oldModel.mixData[i].srcRaw;
- if (mix.srcRaw > 4 || oldModel.mixData[i].noExpo)
- mix.srcRaw = ConvertSource_215_to_216(mix.srcRaw);
- mix.offset = oldModel.mixData[i].offset;
- memcpy(mix.name, oldModel.mixData[i].name, LEN_EXPOMIX_NAME);
#else
- memcpy(&mix, &oldModel.mixData[i], sizeof(mix));
+ mix->destCh = oldMix->destCh;
+ mix->mixWarn = oldMix->mixWarn;
+ mix->phases = oldMix->phases;
+ mix->curveMode = oldMix->curveMode;
+ mix->noExpo = oldMix->noExpo;
+ mix->carryTrim = oldMix->carryTrim;
+ mix->mltpx = oldMix->mltpx;
+ mix->weight = oldMix->weight;
+ mix->swtch = oldMix->swtch;
+ mix->curveParam = oldMix->curveParam;
+ mix->delayUp = oldMix->delayUp;
+ mix->delayDown = oldMix->delayDown;
+ mix->speedUp = oldMix->speedUp;
+ mix->speedDown = oldMix->speedDown;
+ mix->srcRaw = oldMix->srcRaw;
+ mix->offset = oldMix->offset;
+ memcpy(mix->name, oldMix->name, LEN_EXPOMIX_NAME);
#endif
- if (mix.weight <= -508)
- mix.weight = mix.weight + 512 - 4096;
- else if (mix.weight >= 507)
- mix.weight = mix.weight - 512 + 4096;
- else
- mix.offset = mix.offset * mix.weight / 100;
}
for (uint8_t i=0; i<32; i++) {
+#if defined(PCBTARANIS)
g_model.limitData[i].min = 10 * oldModel.limitData[i].min;
g_model.limitData[i].max = 10 * oldModel.limitData[i].max;
+#else
+ g_model.limitData[i].min = oldModel.limitData[i].min;
+ g_model.limitData[i].max = oldModel.limitData[i].max;
+#endif
g_model.limitData[i].ppmCenter = oldModel.limitData[i].ppmCenter;
g_model.limitData[i].offset = oldModel.limitData[i].offset;
g_model.limitData[i].symetrical = oldModel.limitData[i].symetrical;
g_model.limitData[i].revert = oldModel.limitData[i].revert;
#if defined(PCBTARANIS)
- memcpy(&g_model.limitData[i].name, &oldModel.limitData[i].name, LEN_CHANNEL_NAME);
+ memcpy(g_model.limitData[i].name, oldModel.limitData[i].name, LEN_CHANNEL_NAME);
#endif
}
- int indexes[NUM_STICKS] = { 0, 0, 0, 0 };
- for (uint8_t i=0; i<32; i++) {
- if (oldModel.expoData[i].mode) {
#if defined(PCBTARANIS)
- uint8_t chn = oldModel.expoData[i].chn;
- if (!oldModel.expoData[i].swtch && !oldModel.expoData[i].phases) {
+ int indexes[NUM_STICKS] = { 0, 0, 0, 0 };
+#endif
+ for (uint8_t i=0; i<32; i++) {
+ ExpoData * expo = &g_model.expoData[i];
+ ExpoData_v215 * oldExpo = &oldModel.expoData[i];
+ if (oldExpo->mode) {
+#if defined(PCBTARANIS)
+ uint8_t chn = oldExpo->chn;
+ if (!oldExpo->swtch && !oldExpo->phases) {
indexes[chn] = -1;
}
else if (indexes[chn] != -1) {
@@ -494,26 +546,36 @@ void ConvertModel_215_to_216(ModelData &model)
for (uint8_t j=chn+1; jsrcRaw = MIXSRC_Rud+chn;
+ expo->chn = chn;
+ expo->mode = oldExpo->mode;
+ expo->swtch = ConvertSwitch_215_to_216(oldExpo->swtch);
+ expo->phases = oldExpo->phases;
+ expo->weight = oldExpo->weight;
+ memcpy(expo->name, oldExpo->name, LEN_EXPOMIX_NAME);
+ if (oldExpo->curveMode==0/*expo*/) {
+ if (oldExpo->curveParam) {
+ expo->curve.type = CURVE_REF_EXPO;
+ expo->curve.value = oldExpo->curveParam;
+ }
}
- else if (oldModel.expoData[i].curveParam <= 6) {
- g_model.expoData[i].curve.type = CURVE_REF_FUNC;
- g_model.expoData[i].curve.value = oldModel.expoData[i].curveParam;
+ else if (oldExpo->curveParam <= 6) {
+ expo->curve.type = CURVE_REF_FUNC;
+ expo->curve.value = oldExpo->curveParam;
}
else {
- g_model.expoData[i].curve.type = CURVE_REF_CUSTOM;
- g_model.expoData[i].curve.value = oldModel.expoData[i].curveParam - 7;
+ expo->curve.type = CURVE_REF_CUSTOM;
+ expo->curve.value = oldExpo->curveParam - 7;
}
#else
- memcpy(&g_model.expoData[i], &oldModel.expoData[i], sizeof(g_model.expoData[i]));
+ expo->mode = oldExpo->mode;
+ expo->chn = oldExpo->chn;
+ expo->curveMode = oldExpo->curveMode;
+ expo->swtch = oldExpo->swtch;
+ expo->phases = oldExpo->phases;
+ expo->weight = oldExpo->weight;
+ memcpy(expo->name, oldExpo->name, LEN_EXPOMIX_NAME);
+ expo->curveParam = oldExpo->curveParam;
#endif
}
else {
@@ -524,13 +586,14 @@ void ConvertModel_215_to_216(ModelData &model)
for (int i=NUM_STICKS-1; i>=0; i--) {
int idx = indexes[i];
if (idx >= 0) {
- ExpoData *expo = expoAddress(idx);
+ ExpoData * expo = expoAddress(idx);
memmove(expo+1, expo, (MAX_EXPOS-(idx+1))*sizeof(ExpoData));
memclear(expo, sizeof(ExpoData));
expo->srcRaw = MIXSRC_Rud + i;
expo->chn = i;
expo->weight = 100;
expo->curve.type = CURVE_REF_EXPO;
+ expo->mode = 3;
}
for (int c=0; c<4; c++) {
g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*(i+1)+c]);
@@ -703,26 +766,33 @@ void ConvertModel_215_to_216(ModelData &model)
g_model.swashR.collectiveSource = ConvertSource_215_to_216(g_model.swashR.collectiveSource);
for (uint8_t i=0; i<9; i++) {
- memcpy(&g_model.phaseData[i], &oldModel.phaseData[i], sizeof(oldModel.phaseData[i])); // the last 4 gvars will remain blank
- g_model.phaseData[i].swtch = ConvertSwitch_215_to_216(oldModel.phaseData[i].swtch);
+ if (oldModel.phaseData[i].swtch) {
+ memcpy(&g_model.phaseData[i], &oldModel.phaseData[i], sizeof(oldModel.phaseData[i])); // the last 4 gvars will remain blank
+ g_model.phaseData[i].swtch = ConvertSwitch_215_to_216(oldModel.phaseData[i].swtch);
#if defined(PCBTARANIS)
- for (uint8_t t=0; t<4; t++) {
- int trim = oldModel.phaseData[i].trim[t];
- if (trim > 500) {
- trim -= 501;
- if (trim >= i)
- trim += 1;
- g_model.phaseData[i].trim[t].mode = 2*trim;
- g_model.phaseData[i].trim[t].value = 0;
+ for (uint8_t t=0; t<4; t++) {
+ int trim = oldModel.phaseData[i].trim[t];
+ if (trim > 500) {
+ trim -= 501;
+ if (trim >= i)
+ trim += 1;
+ g_model.phaseData[i].trim[t].mode = 2*trim;
+ g_model.phaseData[i].trim[t].value = 0;
+ }
+ else {
+ g_model.phaseData[i].trim[t].mode = 2*i;
+ g_model.phaseData[i].trim[t].value = trim;
+ }
}
- else {
- g_model.phaseData[i].trim[t].mode = 2*i;
- g_model.phaseData[i].trim[t].value = trim;
- }
- }
#endif
+ }
}
g_model.thrTraceSrc = oldModel.thrTraceSrc;
+#if defined(PCBTARANIS)
+ // S3 added
+ if (g_model.thrTraceSrc >= THROTTLE_SOURCE_S3)
+ g_model.thrTraceSrc += 1;
+#endif
g_model.switchWarningStates = oldModel.switchWarningStates >> 1;
g_model.nSwToWarn = (oldModel.switchWarningStates & 0x01) ? 0xFF : 0;
for (uint8_t i=0; i<5; i++) {
@@ -779,15 +849,10 @@ bool eeConvert()
ALERT(STR_EEPROMWARN, msg, AU_BAD_EEPROM);
// Message
- MESSAGE(STR_EEPROMWARN, PSTR("EEPROM Converting"), NULL, AU_EEPROM_FORMATTING); // TODO translations
+ MESSAGE(STR_EEPROMWARN, STR_EEPROM_CONVERTING, NULL, AU_EEPROM_FORMATTING); // TODO translations
// General Settings conversion
-#if defined(PCBTARANIS)
- theFile.openRlc(0);
- theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral));
-#else
- #pragma message("TODO openRlc for sky9x")
-#endif
+ loadGeneralSettings();
if (g_eeGeneral.version == 215) ConvertGeneralSettings_215_to_216(g_eeGeneral);
s_eeDirtyMsk = EE_GENERAL;
eeCheck(true);
@@ -798,16 +863,9 @@ bool eeConvert()
uint8_t currModel = g_eeGeneral.currModel;
for (uint8_t id=0; id(File_system[0].size, sizeof(g_eeGeneral));
+ if (size) {
+ read32_eeprom_data((File_system[0].block_no << 12) + sizeof(struct t_eeprom_header), (uint8_t *)&g_eeGeneral, size);
+ }
+}
+
+void loadModel(int index)
+{
+ memset(&g_model, 0, sizeof(g_model));
+ int size = min(File_system[index+1].size, sizeof(g_model));
+ if (size > 256) { // if loaded a fair amount
+ read32_eeprom_data((File_system[index+1].block_no << 12) + sizeof(struct t_eeprom_header), (uint8_t *)&g_model, size) ;
+ }
+}
+
bool eeLoadGeneral()
{
- uint16_t size = File_system[0].size;
-
- memset(&g_eeGeneral, 0, sizeof(EEGeneral));
-
- if (size > sizeof(EEGeneral)) {
- size = sizeof(EEGeneral) ;
- }
-
- if (size) {
- read32_eeprom_data( ( File_system[0].block_no << 12) + sizeof( struct t_eeprom_header), ( uint8_t *)&g_eeGeneral, size) ;
- }
-
+ loadGeneralSettings();
if (g_eeGeneral.version != EEPROM_VER) {
TRACE("EEPROM version %d instead of %d", g_eeGeneral.version, EEPROM_VER);
if (!eeConvert())
@@ -359,9 +367,10 @@ void eeLoadModel(uint8_t id)
memset(&g_model, 0, sizeof(g_model));
#if defined(SIMU)
- if (size > 0 && size != sizeof(g_model)) {
- printf("Model data read=%d bytes vs %d bytes\n", size, (int)sizeof(ModelData));
- }
+ if (sizeof(struct t_eeprom_header) + sizeof(g_model) > 4096)
+ TRACE("Model data size can't exceed %d bytes (%d bytes)", int(4096-sizeof(struct t_eeprom_header)), (int)sizeof(g_model));
+ else if (size > 0 && size != sizeof(g_model))
+ TRACE("Model data read=%d bytes vs %d bytes\n", size, (int)sizeof(ModelData));
#endif
if (size > sizeof(g_model)) {
diff --git a/radio/src/eeprom_raw.h b/radio/src/eeprom_raw.h
index a582fa014..027089820 100644
--- a/radio/src/eeprom_raw.h
+++ b/radio/src/eeprom_raw.h
@@ -101,5 +101,8 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc);
const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name);
#endif
+void loadGeneralSettings();
+void loadModel(int index);
+
#endif
diff --git a/radio/src/eeprom_rlc.cpp b/radio/src/eeprom_rlc.cpp
index 5dc845404..f29f4a16e 100644
--- a/radio/src/eeprom_rlc.cpp
+++ b/radio/src/eeprom_rlc.cpp
@@ -868,6 +868,23 @@ void RlcFile::DisplayProgressBar(uint8_t x)
#define CHECK_EEPROM_VARIANT() (1)
#endif
+// For conversions ...
+#if defined(CPUARM)
+void loadGeneralSettings()
+{
+ memset(&g_eeGeneral, 0, sizeof(g_eeGeneral));
+ theFile.openRlc(FILE_GENERAL);
+ theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral));
+}
+
+void loadModel(int index)
+{
+ memset(&g_model, 0, sizeof(g_model));
+ theFile.openRlc(FILE_MODEL(index));
+ theFile.readRlc((uint8_t*)&g_model, sizeof(g_model));
+}
+#endif
+
bool eeLoadGeneral()
{
theFile.openRlc(FILE_GENERAL);
diff --git a/radio/src/eeprom_rlc.h b/radio/src/eeprom_rlc.h
index db285a6fe..969670e97 100644
--- a/radio/src/eeprom_rlc.h
+++ b/radio/src/eeprom_rlc.h
@@ -34,11 +34,16 @@
*
*/
-#ifndef eeprom_avr_h
-#define eeprom_avr_h
+#ifndef eeprom_rlc_h
+#define eeprom_rlc_h
#include
+// TODO duplicated
+#ifndef PACK
+#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
+#endif
+
#if defined(PCBTARANIS)
#define blkid_t uint16_t
#if !defined(EESIZE)
@@ -67,7 +72,7 @@
#define BS 16
#endif
-PACK(struct DirEnt{
+PACK(struct DirEnt {
blkid_t startBlk;
uint16_t size:12;
uint16_t typ:4;
@@ -79,7 +84,7 @@ PACK(struct DirEnt{
#define EEFS_EXTRA_FIELDS
#endif
-PACK(struct EeFs{
+PACK(struct EeFs {
uint8_t version;
blkid_t mySize;
blkid_t freeList;
@@ -236,4 +241,10 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc);
const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name);
#endif
+// For conversions
+#if defined(CPUARM)
+void loadGeneralSettings();
+void loadModel(int index);
+#endif
+
#endif
diff --git a/radio/src/fonts.cpp b/radio/src/fonts.cpp
new file mode 100755
index 000000000..5c1ec8bc4
--- /dev/null
+++ b/radio/src/fonts.cpp
@@ -0,0 +1,163 @@
+/*
+ * 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"
+
+const pm_uchar font_5x7[] PROGMEM = {
+#if defined (CPUARM)
+#include "font_05x07.lbm"
+#else
+#include "font_05x07_avr.lbm"
+#endif
+#if defined(TRANSLATIONS_DE)
+#include "font_de_05x07.lbm"
+#elif defined(TRANSLATIONS_CZ)
+#include "font_cz_05x07.lbm"
+#elif defined(TRANSLATIONS_ES)
+#include "font_es_05x07.lbm"
+#elif defined(TRANSLATIONS_FI)
+#include "font_fi_05x07.lbm"
+#elif defined(TRANSLATIONS_FR)
+#include "font_fr_05x07.lbm"
+#elif defined(TRANSLATIONS_IT)
+#include "font_it_05x07.lbm"
+#elif defined(TRANSLATIONS_PL)
+#include "font_pl_05x07.lbm"
+#elif defined(TRANSLATIONS_PT)
+#include "font_pt_05x07.lbm"
+#elif defined(TRANSLATIONS_SE)
+#include "font_se_05x07.lbm"
+#endif
+};
+
+#if defined(BOLD_FONT) && (!defined(CPUM64) || defined(EXTSTD))
+const pm_uchar font_5x7_B[] PROGMEM = {
+#include "font_05x07_B_compressed.lbm"
+};
+#endif
+
+#if !defined(BOOT)
+const pm_uchar font_10x14[] PROGMEM = {
+#include "font_10x14_compressed.lbm"
+#if defined(CPUARM)
+ #if defined(TRANSLATIONS_DE)
+ #include "font_de_10x14.lbm"
+ #elif defined(TRANSLATIONS_CZ)
+ #include "font_cz_10x14.lbm"
+ #elif defined(TRANSLATIONS_ES)
+ #include "font_es_10x14.lbm"
+ #elif defined(TRANSLATIONS_FI)
+ #include "font_fi_10x14.lbm"
+ #elif defined(TRANSLATIONS_FR)
+ #include "font_fr_10x14.lbm"
+ #elif defined(TRANSLATIONS_IT)
+ #include "font_it_10x14.lbm"
+ #elif defined(TRANSLATIONS_PL)
+ #include "font_pl_10x14.lbm"
+ #elif defined(TRANSLATIONS_PT)
+ #include "font_pt_10x14.lbm"
+ #elif defined(TRANSLATIONS_SE)
+ #include "font_se_10x14.lbm"
+ #endif
+#endif
+};
+#endif
+
+#if defined(CPUARM) && !defined(BOOT)
+const pm_uchar font_3x5[] PROGMEM = {
+#include "font_03x05.lbm"
+};
+
+const pm_uchar font_4x6[] PROGMEM = {
+#include "font_04x06.lbm"
+#if defined(TRANSLATIONS_DE)
+#include "font_de_04x06.lbm"
+#elif defined(TRANSLATIONS_CZ)
+#include "font_cz_04x06.lbm"
+#elif defined(TRANSLATIONS_ES)
+#include "font_es_04x06.lbm"
+#elif defined(TRANSLATIONS_FI)
+#include "font_fi_04x06.lbm"
+#elif defined(TRANSLATIONS_FR)
+#include "font_fr_04x06.lbm"
+#elif defined(TRANSLATIONS_IT)
+#include "font_it_04x06.lbm"
+#elif defined(TRANSLATIONS_PL)
+#include "font_pl_04x06.lbm"
+#elif defined(TRANSLATIONS_PT)
+#include "font_pt_04x06.lbm"
+#elif defined(TRANSLATIONS_SE)
+#include "font_se_04x06.lbm"
+#endif
+};
+
+const pm_uchar font_8x10[] PROGMEM = {
+#include "font_08x10.lbm"
+#if defined(TRANSLATIONS_DE)
+#include "font_de_08x10.lbm"
+#elif defined(TRANSLATIONS_CZ)
+#include "font_cz_08x10.lbm"
+#elif defined(TRANSLATIONS_ES)
+#include "font_es_08x10.lbm"
+#elif defined(TRANSLATIONS_FI)
+#include "font_fi_08x10.lbm"
+#elif defined(TRANSLATIONS_FR)
+#include "font_fr_08x10.lbm"
+#elif defined(TRANSLATIONS_IT)
+#include "font_it_08x10.lbm"
+#elif defined(TRANSLATIONS_PL)
+#include "font_pl_08x10.lbm"
+#elif defined(TRANSLATIONS_PT)
+#include "font_pt_08x10.lbm"
+#elif defined(TRANSLATIONS_SE)
+#include "font_se_08x10.lbm"
+#endif
+};
+
+const pm_uchar font_4x6_extra[] PROGMEM = {
+#include "font_04x06_extra.lbm"
+};
+
+const pm_uchar font_5x7_extra[] PROGMEM = {
+#include "font_05x07_extra.lbm"
+};
+
+const pm_uchar font_10x14_extra[] PROGMEM = {
+#include "font_10x14_extra.lbm"
+};
+
+#endif
+
diff --git a/radio/src/fonts.h b/radio/src/fonts.h
new file mode 100755
index 000000000..f254800dc
--- /dev/null
+++ b/radio/src/fonts.h
@@ -0,0 +1,57 @@
+/*
+ * 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 fonts_h
+#define fonts_h
+
+extern const pm_uchar font_5x7[];
+extern const pm_uchar font_10x14[];
+
+#if defined(BOLD_FONT) && (!defined(CPUM64) || defined(EXTSTD)) && !defined(BOOT)
+ #define BOLD_SPECIFIC_FONT
+ extern const pm_uchar font_5x7_B[];
+#endif
+
+#if defined(CPUARM)
+extern const pm_uchar font_3x5[];
+extern const pm_uchar font_4x6[];
+extern const pm_uchar font_8x10[];
+extern const pm_uchar font_5x7_extra[];
+extern const pm_uchar font_10x14_extra[];
+extern const pm_uchar font_4x6_extra[];
+#endif
+
+#endif
diff --git a/radio/src/gtests.cpp b/radio/src/gtests.cpp
index dbb8df463..22e53b688 100644
--- a/radio/src/gtests.cpp
+++ b/radio/src/gtests.cpp
@@ -42,7 +42,10 @@
void doMixerCalculations();
-#define MODEL_RESET() memset(&g_model, 0, sizeof(g_model))
+#define MODEL_RESET() \
+ memset(&g_model, 0, sizeof(g_model)); \
+ extern bool s_mixer_first_run_done; \
+ s_mixer_first_run_done = false;
#define MIXER_RESET() \
memset(channelOutputs, 0, sizeof(channelOutputs)); \
@@ -62,6 +65,7 @@ uint16_t anaIn(uint8_t chan)
return 0;
}
+#if !defined(PCBTARANIS)
TEST(Trims, greaterTrimLink)
{
MODEL_RESET();
@@ -88,6 +92,7 @@ TEST(Trims, infiniteChainedTrims)
setTrimValue(3, 0, TRIM_EXTENDED_MAX+3); // link to FP2 trim
EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 2), 0), 32);
}
+#endif
TEST(outdezNAtt, test_unsigned)
{
@@ -565,16 +570,18 @@ TEST(Mixer, SlowOnSwitch)
g_model.mixData[0].srcRaw = MIXSRC_MAX;
g_model.mixData[0].weight = 100;
g_model.mixData[0].swtch = SWSRC_THR;
- g_model.mixData[0].speedUp = 10;
- g_model.mixData[0].speedDown = 10;
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
+ g_model.mixData[0].speedDown = SLOW_STEP*5;
+ s_mixer_first_run_done = true;
+
perOut(e_perout_mode_normal, 0);
EXPECT_EQ(chans[0], 0);
simuSetSwitch(0, 1);
CHECK_SLOW_MOVEMENT(0, +1, 250);
- simuSetSwitch(0, 0);
+ simuSetSwitch(0, -1);
CHECK_SLOW_MOVEMENT(0, -1, 250);
}
@@ -587,11 +594,12 @@ TEST(Mixer, SlowUpOnSwitch)
g_model.mixData[0].srcRaw = MIXSRC_MAX;
g_model.mixData[0].weight = 100;
g_model.mixData[0].swtch = SWSRC_THR;
- g_model.mixData[0].speedUp = 10;
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
g_model.mixData[0].speedDown = 0;
simuSetSwitch(0, 0);
perOut(e_perout_mode_normal, 0);
+ s_mixer_first_run_done = true;
EXPECT_EQ(chans[0], 0);
simuSetSwitch(0, 1);
@@ -605,20 +613,22 @@ TEST(Mixer, SlowUpOnSwitch)
simuSetSwitch(0, 1);
CHECK_SLOW_MOVEMENT(0, +1, 100);
}
+#endif
TEST(Mixer, SlowOnPhase)
{
MODEL_RESET();
MIXER_RESET();
- g_model.phaseData[1].swtch = SWSRC_THR;
+ g_model.phaseData[1].swtch = TR(SWSRC_THR, SWSRC_SA0);
g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_MAX;
g_model.mixData[0].weight = 100;
g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
- g_model.mixData[0].speedUp = 10;
- g_model.mixData[0].speedDown = 10;
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
+ g_model.mixData[0].speedDown = SLOW_STEP*5;
+ s_mixer_first_run_done = true;
s_perout_flight_phase = 0;
perOut(e_perout_mode_normal, 0);
EXPECT_EQ(chans[0], 0);
@@ -629,20 +639,26 @@ TEST(Mixer, SlowOnPhase)
CHECK_SLOW_MOVEMENT(0, -1, 250);
}
+#if !defined(CPUARM)
TEST(Mixer, SlowOnSwitchAndPhase)
{
MODEL_RESET();
MIXER_RESET();
- g_model.phaseData[1].swtch = SWSRC_THR;
+ g_model.phaseData[1].swtch = TR(SWSRC_THR, SWSRC_SA0);
g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_MAX;
g_model.mixData[0].weight = 100;
- g_model.mixData[0].swtch = SWSRC_THR;
+ g_model.mixData[0].swtch = TR(SWSRC_THR, SWSRC_SA0);
+#if defined(CPUARM)
+ g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 + 0x20 + 0x40 + 0x80 + 0x100 /*only enabled in phase 0*/;
+#else
g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
- g_model.mixData[0].speedUp = 10;
- g_model.mixData[0].speedDown = 10;
+#endif
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
+ g_model.mixData[0].speedDown = SLOW_STEP*5;
+ s_mixer_first_run_done = true;
perOut(e_perout_mode_normal, 0);
EXPECT_EQ(chans[0], 0);
@@ -650,25 +666,26 @@ TEST(Mixer, SlowOnSwitchAndPhase)
s_perout_flight_phase = 0;
CHECK_SLOW_MOVEMENT(0, +1, 250);
- simuSetSwitch(0, 0);
+ simuSetSwitch(0, -1);
s_perout_flight_phase = 1;
CHECK_SLOW_MOVEMENT(0, -1, 250);
}
#endif
-#if !defined(PCBTARANIS)
TEST(Mixer, SlowOnSwitchSource)
{
MODEL_RESET();
MIXER_RESET();
g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD;
- g_model.mixData[0].srcRaw = MIXSRC_THR;
+ g_model.mixData[0].srcRaw = TR(MIXSRC_THR, MIXSRC_SA);
g_model.mixData[0].weight = 100;
- g_model.mixData[0].speedUp = 10;
- g_model.mixData[0].speedDown = 10;
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
+ g_model.mixData[0].speedDown = SLOW_STEP*5;
- simuSetSwitch(0, 0);
+ s_mixer_first_run_done = true;
+
+ simuSetSwitch(0, -1);
CHECK_SLOW_MOVEMENT(0, -1, 250);
EXPECT_EQ(chans[0], -CHANNEL_MAX);
@@ -676,6 +693,22 @@ TEST(Mixer, SlowOnSwitchSource)
CHECK_SLOW_MOVEMENT(0, +1, 500);
}
+TEST(Mixer, SlowDisabledOnStartup)
+{
+ MODEL_RESET();
+ MIXER_RESET();
+ g_model.mixData[0].destCh = 0;
+ g_model.mixData[0].mltpx = MLTPX_ADD;
+ g_model.mixData[0].srcRaw = MIXSRC_MAX;
+ g_model.mixData[0].weight = 100;
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
+ g_model.mixData[0].speedDown = SLOW_STEP*5;
+
+ perOut(e_perout_mode_normal, 0);
+ EXPECT_EQ(chans[0], CHANNEL_MAX);
+}
+
+#if !defined(PCBTARANIS)
TEST(Mixer, SlowAndDelayOnReplace3POSSource)
{
MODEL_RESET();
@@ -685,9 +718,11 @@ TEST(Mixer, SlowAndDelayOnReplace3POSSource)
g_model.mixData[0].srcRaw = MIXSRC_3POS;
g_model.mixData[0].weight = 100;
g_model.mixData[0].delayUp = 10;
- g_model.mixData[0].speedUp = 10;
- g_model.mixData[0].speedDown = 10;
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
+ g_model.mixData[0].speedDown = SLOW_STEP*5;
+ s_mixer_first_run_done = true;
+
simuSetSwitch(3, -1);
CHECK_SLOW_MOVEMENT(0, -1, 250);
EXPECT_EQ(chans[0], -CHANNEL_MAX);
@@ -717,7 +752,7 @@ TEST(Mixer, SlowOnSwitchReplace)
g_model.mixData[1].srcRaw = MIXSRC_MAX;
g_model.mixData[1].weight = 100;
g_model.mixData[1].swtch = SWSRC_THR;
- g_model.mixData[1].speedDown = 10;
+ g_model.mixData[1].speedDown = SLOW_STEP*5;
simuSetSwitch(0, 0);
perOut(e_perout_mode_normal, 1);
@@ -745,16 +780,19 @@ TEST(Mixer, NoTrimOnInactiveMix)
g_model.mixData[0].srcRaw = MIXSRC_Thr;
g_model.mixData[0].weight = 100;
g_model.mixData[0].swtch = SWSRC_THR;
- g_model.mixData[0].speedUp = 10;
- g_model.mixData[0].speedDown = 10;
+ g_model.mixData[0].speedUp = SLOW_STEP*5;
+ g_model.mixData[0].speedDown = SLOW_STEP*5;
setTrimValue(0, 2, 256);
+ s_mixer_first_run_done = true;
+
simuSetSwitch(0, 1);
CHECK_SLOW_MOVEMENT(0, 1, 100);
- simuSetSwitch(0, 0);
+ simuSetSwitch(0, -1);
CHECK_SLOW_MOVEMENT(0, -1, 100);
}
+#endif
TEST(Mixer, SlowOnMultiply)
{
@@ -768,20 +806,21 @@ TEST(Mixer, SlowOnMultiply)
g_model.mixData[1].mltpx = MLTPX_MUL;
g_model.mixData[1].srcRaw = MIXSRC_MAX;
g_model.mixData[1].weight = 100;
- g_model.mixData[1].swtch = SWSRC_THR;
- g_model.mixData[1].speedUp = 10;
- g_model.mixData[1].speedDown = 10;
+ g_model.mixData[1].swtch = TR(SWSRC_THR, SWSRC_SA0);
+ g_model.mixData[1].speedUp = SLOW_STEP*5;
+ g_model.mixData[1].speedDown = SLOW_STEP*5;
+
+ s_mixer_first_run_done = true;
simuSetSwitch(0, 1);
CHECK_SLOW_MOVEMENT(0, 1, 250);
- simuSetSwitch(0, 0);
+ simuSetSwitch(0, -1);
CHECK_NO_MOVEMENT(0, CHANNEL_MAX, 250);
simuSetSwitch(0, 1);
CHECK_NO_MOVEMENT(0, CHANNEL_MAX, 250);
}
-#endif
TEST(Curves, LinearIntpol)
{
diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index 5f2ade988..2e1f9777f 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -388,19 +388,19 @@ void menuGeneralSetup(uint8_t event)
SLIDER_5POS(y, g_eeGeneral.varioVolume, TR_SPEAKER_VOLUME, event, attr);
break;
case ITEM_SETUP_VARIO_PITCH:
- lcd_putsLeft(y, "\001Pitch at Zero");
+ lcd_putsLeft(y, STR_PITCH_AT_ZERO);
lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
lcd_putsAtt(lcdLastPos, y, "Hz", attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40);
break;
case ITEM_SETUP_VARIO_RANGE:
- lcd_putsLeft(y, "\001Pitch at Max");
+ lcd_putsLeft(y, STR_PITCH_AT_MAX);
lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
lcd_putsAtt(lcdLastPos, y, "Hz", attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80);
break;
case ITEM_SETUP_VARIO_REPEAT:
- lcd_putsLeft(y, "\001Repeat at Zero");
+ lcd_putsLeft(y, STR_REPEAT_AT_ZERO);
lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
lcd_putsAtt(lcdLastPos, y, "ms", attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50);
@@ -432,12 +432,8 @@ void menuGeneralSetup(uint8_t event)
case ITEM_SETUP_CONTRAST:
lcd_putsLeft(y, STR_CONTRAST);
lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
- if(attr) {
-#if defined(PCBTARANIS)
- CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, 0, 45);
-#else
- CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, 10, 45);
-#endif
+ if (attr) {
+ CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, CONTRAST_MIN, CONTRAST_MAX);
lcdSetContrast();
}
break;
@@ -601,24 +597,16 @@ void menuGeneralSetup(uint8_t event)
#endif
#if defined(MAVLINK)
- case ITEM_MAVLINK_BAUD:
- g_eeGeneral.mavbaud = selectMenuItem(RADIO_SETUP_2ND_COLUMN, //Y
- y, // Y
- STR_MAVLINK_BAUD_LABEL, // pm_char *label
- STR_MAVLINK_BAUDS, // pm_char *values
-// PSTR("4800""9600""14400""19200""38400""57600""76800""115200"),
- g_eeGeneral.mavbaud, // value
- 0, // min
- 7, // max
- attr, // attr
- event); // event
- break;
+ case ITEM_MAVLINK_BAUD:
+ g_eeGeneral.mavbaud = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_MAVLINK_BAUD_LABEL, STR_MAVLINK_BAUDS, PSTR("4800""9600""14400""19200""38400""57600""76800""115200"), g_eeGeneral.mavbaud, 0, 7, attr, event);
+ break;
#endif
case ITEM_SETUP_RX_CHANNEL_ORD:
lcd_putsLeft(y, STR_RXCHANNELORD); // RAET->AETR
- for (uint8_t i=1; i<=4; i++)
+ for (uint8_t i=1; i<=4; i++) {
putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channel_order(i), attr);
+ }
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23);
break;
@@ -629,7 +617,9 @@ void menuGeneralSetup(uint8_t event)
case ITEM_SETUP_STICK_MODE:
lcd_putcAtt(2*FW, y, '1'+g_eeGeneral.stickMode, attr);
- for (uint8_t i=0; i<4; i++) putsMixerSource((6+4*i)*FW, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + i), 0);
+ for (uint8_t i=0; i<4; i++) {
+ putsMixerSource((6+4*i)*FW, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + i), 0);
+ }
if (attr && s_editMode>0) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickMode, 0, 3);
}
@@ -1039,7 +1029,8 @@ void menuGeneralTrainer(uint8_t event)
lcd_outdezAtt(LEN_MULTIPLIER*FW+3*FW, 6*FH+1, g_eeGeneral.PPM_Multiplier+10, attr|PREC1);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.PPM_Multiplier, -10, 40);
- attr = (m_posVert==6) ? blink : 0;
+ attr = (m_posVert==6) ? INVERS : 0;
+ if (attr) s_editMode = 0;
lcd_putsAtt(0*FW, 1+7*FH, STR_CAL, attr);
for (uint8_t i=0; i<4; i++) {
uint8_t x = (i*TRAINER_CALIB_POS+16)*FW/2;
@@ -1051,11 +1042,10 @@ void menuGeneralTrainer(uint8_t event)
}
if (attr) {
- if (event==EVT_KEY_FIRST(KEY_MENU)){
- s_editMode = -1;
+ if (event==EVT_KEY_LONG(KEY_ENTER)){
memcpy(g_eeGeneral.trainer.calib, g_ppmIns, sizeof(g_eeGeneral.trainer.calib));
eeDirty(EE_GENERAL);
- AUDIO_KEYPAD_UP();
+ AUDIO_WARNING1();
}
}
}
@@ -1223,10 +1213,10 @@ void menuGeneralHardware(uint8_t event)
putsMixerSource(sizeof(TR_TYPE)*FW, y, MIXSRC_FIRST_POT+idx);
uint8_t potType = (g_eeGeneral.potsType & mask) >> shift;
if (potType == POT_TYPE_NONE && i < 2)
- potType = 1;
+ potType = POT_TYPE_POT;
potType = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_TYPE, STR_POTTYPES, potType, 0, POT_TYPE_MAX, attr, event);
if (potType == POT_TYPE_POT && i < 2)
- potType = 0;
+ potType = POT_TYPE_NONE;
g_eeGeneral.potsType &= ~mask;
g_eeGeneral.potsType |= (potType << shift);
break;
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index bea52b0ce..288b6977e 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -14,7 +14,6 @@
* - Pat Mackenzie
* - Philip Moss
* - Rob Thomson
- * - Romolo Manfredini
* - Thomas Husterer
*
* opentx is based on code named
@@ -870,13 +869,13 @@ enum menuModelSetupItems {
ITEM_MODEL_EXTENDED_LIMITS,
ITEM_MODEL_EXTENDED_TRIMS,
ITEM_MODEL_TRIM_INC,
+ CASE_PCBTARANIS(ITEM_MODEL_THROTTLE_LABEL)
ITEM_MODEL_THROTTLE_REVERSED,
ITEM_MODEL_THROTTLE_TRACE,
ITEM_MODEL_THROTTLE_TRIM,
+ CASE_PCBTARANIS(ITEM_MODEL_PREFLIGHT_LABEL)
+ CASE_PCBTARANIS(ITEM_MODEL_CHECKLIST_DISPLAY)
ITEM_MODEL_THROTTLE_WARNING,
-#if defined(PCBTARANIS)
- ITEM_MODEL_CHECKLIST_DISPLAY,
-#endif
ITEM_MODEL_SWITCHES_WARNING,
CASE_PCBTARANIS(ITEM_MODEL_POT_WARNING)
ITEM_MODEL_BEEP_CENTER,
@@ -964,7 +963,7 @@ void menuModelSetup(uint8_t event)
#define POT_WARN_ITEMS() ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0)
bool CURSOR_ON_CELL = (m_posHorz >= 0);
- MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, CASE_PCBTARANIS(0) 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
+ MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0,CASE_PCBTARANIS(LABEL(PreflightCheck)) CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
#elif defined(CPUM64)
#define CURSOR_ON_CELL (true)
#define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX)
@@ -1121,6 +1120,12 @@ void menuModelSetup(uint8_t event)
g_model.trimInc = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_TRIMINC, STR_VTRIMINC, g_model.trimInc, -2, 2, attr, event);
break;
+#if defined(PCBTARANIS)
+ case ITEM_MODEL_THROTTLE_LABEL:
+ lcd_putsLeft(y, STR_THROTTLE_LABEL);
+ break;
+#endif
+
case ITEM_MODEL_THROTTLE_REVERSED:
g_model.throttleReversed = onoffMenuItem(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEREVERSE, attr, event ) ;
break;
@@ -1128,7 +1133,7 @@ void menuModelSetup(uint8_t event)
case ITEM_MODEL_THROTTLE_TRACE:
{
lcd_putsLeft(y, STR_TTRACE);
- if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.thrTraceSrc, NUM_POTS+NUM_CHNOUT);
+ if (attr) CHECK_INCDEC_MODELVAR_ZERO_CHECK(event, g_model.thrTraceSrc, NUM_POTS+NUM_CHNOUT, isThrottleSourceAvailable);
uint8_t idx = g_model.thrTraceSrc + MIXSRC_Thr;
if (idx > MIXSRC_Thr)
idx += 1;
@@ -1142,16 +1147,20 @@ void menuModelSetup(uint8_t event)
g_model.thrTrim = onoffMenuItem(g_model.thrTrim, MODEL_SETUP_2ND_COLUMN, y, STR_TTRIM, attr, event);
break;
- case ITEM_MODEL_THROTTLE_WARNING:
- g_model.disableThrottleWarning = !onoffMenuItem(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEWARNING, attr, event);
- break;
-
#if defined(PCBTARANIS)
+ case ITEM_MODEL_PREFLIGHT_LABEL:
+ lcd_putsLeft(y, STR_PREFLIGHT);
+ break;
+
case ITEM_MODEL_CHECKLIST_DISPLAY:
g_model.displayText = onoffMenuItem(g_model.displayText, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event);
break;
#endif
+ case ITEM_MODEL_THROTTLE_WARNING:
+ g_model.disableThrottleWarning = !onoffMenuItem(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEWARNING, attr, event);
+ break;
+
case ITEM_MODEL_SWITCHES_WARNING:
{
lcd_putsLeft(y, STR_SWITCHWARNING);
@@ -1201,9 +1210,9 @@ void menuModelSetup(uint8_t event)
uint8_t swactive = !(g_model.nSwToWarn & 1 << i);
#if defined(PCBTARANIS)
c = "\300-\301"[states & 0x03];
- lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*(2*FW), y, 'A'+i, line && (m_posHorz == i) ? INVERS : 0);
- if (swactive) lcd_putc(MODEL_SETUP_2ND_COLUMN+i*(2*FW)+FWNUM, y, c);
- lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+((NUM_SWITCHES-1)*2*FW+2), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
+ lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*(2*FW+1), y, 'A'+i, line && (m_posHorz == i) ? INVERS : 0);
+ if (swactive) lcd_putc(MODEL_SETUP_2ND_COLUMN+i*(2*FW+1)+FWNUM+1, y, c);
+ lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+((NUM_SWITCHES-1)*2*FW+8), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
states >>= 2;
#else
attr = 0;
@@ -1261,7 +1270,7 @@ void menuModelSetup(uint8_t event)
for (uint8_t i=0; i0 || p1valdiff)) {
switch (m_posHorz) {
case 0:
@@ -1780,7 +1791,7 @@ FlightModesType editFlightModes(uint8_t x, uint8_t y, uint8_t event, FlightModes
if (posHorz==p) flags |= BLINK;
}
if (value & (1<0 ? INVERS|BLINK : INVERS) : 0);
lcd_putsLeft(3*FH+1, STR_TYPE);
- lcd_putsiAtt(INDENT_WIDTH, 4*FH+1, "\010StandardCustom\0", crv.type, attr);
+ lcd_putsiAtt(INDENT_WIDTH, 4*FH+1, STR_CURVE_TYPES, crv.type, attr);
if (attr) {
uint8_t newType = checkIncDecModelZero(event, crv.type, CURVE_TYPE_LAST);
if (newType != crv.type) {
@@ -2435,9 +2446,9 @@ void menuModelCurveOne(uint8_t event)
}
attr = (m_posVert==2 ? (s_editMode>0 ? INVERS|BLINK : INVERS) : 0);
- lcd_putsLeft(5*FH+1, "Count");
+ lcd_putsLeft(5*FH+1, STR_COUNT);
lcd_outdezAtt(INDENT_WIDTH, 6*FH+1, 5+crv.points, LEFT|attr);
- lcd_putsAtt(lcdLastPos, 6*FH+1, PSTR("pts"), attr);
+ lcd_putsAtt(lcdLastPos, 6*FH+1, STR_PTS, attr);
if (attr) {
int8_t count = checkIncDecModel(event, crv.points, -3, 12); // 2pts - 17pts
if (checkIncDec_Ret) {
@@ -2456,7 +2467,7 @@ void menuModelCurveOne(uint8_t event)
}
}
- lcd_putsLeft(7*FH+1, PSTR("Smooth"));
+ lcd_putsLeft(7*FH+1, STR_SMOOTH);
menu_lcd_onoff(7*FW, 7*FH+1, crv.smooth, m_posVert==3 ? INVERS : 0);
if (m_posVert==3) crv.smooth = checkIncDecModel(event, crv.smooth, 0, 1);
@@ -2727,9 +2738,8 @@ void insertExpoMix(uint8_t expo, uint8_t idx)
#if defined(PCBTARANIS)
expo->srcRaw = (s_currCh > 4 ? MIXSRC_Rud - 1 + s_currCh : MIXSRC_Rud - 1 + channel_order(s_currCh));
expo->curve.type = CURVE_REF_EXPO;
-#else
- expo->mode = 3; // pos&neg
#endif
+ expo->mode = 3; // pos&neg
expo->chn = s_currCh - 1;
expo->weight = 100;
}
@@ -2870,7 +2880,7 @@ enum ExposFields {
IF_CURVES(EXPO_FIELD_CURVE)
IF_FLIGHT_MODES(EXPO_FIELD_FLIGHT_PHASE)
EXPO_FIELD_SWITCH,
- CASE_9X(EXPO_FIELD_SIDE)
+ EXPO_FIELD_SIDE,
CASE_PCBTARANIS(EXPO_FIELD_TRIM)
EXPO_FIELD_MAX
};
@@ -3004,11 +3014,9 @@ void menuModelExpoOne(uint8_t event)
ed->swtch = switchMenuItem(EXPO_ONE_2ND_COLUMN-IF_9X(3*FW), y, ed->swtch, attr, event);
break;
-#if !defined(PCBTARANIS)
case EXPO_FIELD_SIDE:
- ed->mode = 4 - selectMenuItem(EXPO_ONE_2ND_COLUMN-3*FW, y, STR_SIDE, STR_VSIDE, 4-ed->mode, 1, 3, attr, event);
+ ed->mode = 4 - selectMenuItem(EXPO_ONE_2ND_COLUMN-IF_9X(3*FW), y, STR_SIDE, STR_VSIDE, 4-ed->mode, 1, 3, attr, event);
break;
-#endif
#if defined(PCBTARANIS)
case EXPO_FIELD_TRIM:
@@ -3060,7 +3068,7 @@ enum MixFields {
MIX_FIELD_SOURCE,
MIX_FIELD_WEIGHT,
MIX_FIELD_OFFSET,
- CASE_9X(MIX_FIELD_TRIM)
+ MIX_FIELD_TRIM,
IF_CURVES(MIX_FIELD_CURVE)
IF_FLIGHT_MODES(MIX_FIELD_FLIGHT_PHASE)
MIX_FIELD_SWITCH,
@@ -3105,7 +3113,7 @@ void menuModelMixOne(uint8_t event)
else
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, CASE_9X(1) IF_CURVES(1) IF_FLIGHT_MODES((MAX_PHASES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
#else
- SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, CASE_9X(1) IF_CURVES(1) IF_FLIGHT_MODES((MAX_PHASES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
+ SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, CASE_9X(1) CASE_PCBTARANIS(0) IF_CURVES(1) IF_FLIGHT_MODES((MAX_PHASES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
#endif
#if MENU_COLUMNS > 1
@@ -3160,17 +3168,19 @@ void menuModelMixOne(uint8_t event)
break;
}
-#if !defined(PCBTARANIS)
+#if defined(PCBTARANIS)
+ case MIX_FIELD_TRIM:
+ lcd_putsColumnLeft(COLUMN_X, y, STR_TRIM);
+ menu_lcd_onoff(COLUMN_X+MIXES_2ND_COLUMN, y, !md2->carryTrim, attr);
+ if (attr) md2->carryTrim = !checkIncDecModel(event, !md2->carryTrim, 0, 1);
+ break;
+#else
case MIX_FIELD_TRIM:
{
uint8_t not_stick = (md2->srcRaw > NUM_STICKS);
int8_t carryTrim = -md2->carryTrim;
lcd_putsColumnLeft(COLUMN_X, y, STR_TRIM);
-#if LCD_W >= 212 && defined(TRANSLATIONS_FR)
- lcd_putsiAtt((not_stick ? COLUMN_X+MIXES_2ND_COLUMN : COLUMN_X+11*FW-3), y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, m_posHorz==0 ? attr : 0);
-#else
lcd_putsiAtt((not_stick ? COLUMN_X+MIXES_2ND_COLUMN : COLUMN_X+6*FW-3), y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, m_posHorz==0 ? attr : 0);
-#endif
if (attr && m_posHorz==0 && (not_stick || editMode>0)) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL);
if (!not_stick) {
lcd_puts(COLUMN_X+MIXES_2ND_COLUMN, y, STR_DREX);
@@ -3269,20 +3279,22 @@ static uint8_t s_copySrcCh;
#define _STR_MAX(x) PSTR("/" #x)
#define STR_MAX(x) _STR_MAX(x)
-#define MIX_LINE_SRC_POS 4*FW-1
-
#if LCD_W >= 212
- #define EXPO_LINE_WEIGHT_POS 8*FW+3
- #define EXPO_LINE_SRC_POS 9*FW-2
- #define EXPO_LINE_CURVE_POS 12*FW+4
- #define EXPO_LINE_SWITCH_POS 17*FW-1
+ #define EXPO_LINE_WEIGHT_POS 8*FW+8
+ #define EXPO_LINE_SRC_POS 9*FW+3
+ #define EXPO_LINE_CURVE_POS 12*FW+11
+ #define EXPO_LINE_TRIM_POS 19*FW-4
+ #define EXPO_LINE_SWITCH_POS 20*FW-1
+ #define EXPO_LINE_SIDE_POS 23*FW
+ #define EXPO_LINE_FM_POS 24*FW+2
#define EXPO_LINE_SELECT_POS 5*FW+2
- #define EXPO_LINE_FM_POS LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH-FW-1
#define EXPO_LINE_NAME_POS LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH
- #define MIX_LINE_WEIGHT_POS 11*FW+5
- #define MIX_LINE_CURVE_POS 12*FW+4
- #define MIX_LINE_SWITCH_POS 16*FW+1
- #define MIX_LINE_DELAY_POS 19*FW+2
+ #define MIX_LINE_WEIGHT_POS 6*FW+8
+ #define MIX_LINE_SRC_POS 7*FW+3
+ #define MIX_LINE_CURVE_POS 13*FW+3
+ #define MIX_LINE_SWITCH_POS 21*FW-1
+ #define MIX_LINE_FM_POS 24*FW+2
+ #define MIX_LINE_DELAY_POS 18*FW+2
#elif defined(CPUARM)
#define EXPO_LINE_WEIGHT_POS 7*FW+1
#define EXPO_LINE_EXPO_POS 10*FW+5
@@ -3291,6 +3303,7 @@ static uint8_t s_copySrcCh;
#define EXPO_LINE_SELECT_POS 24
#define EXPO_LINE_FM_POS
#define EXPO_LINE_NAME_POS LCD_W-sizeof(ed->name)*FW-MENUS_SCROLLBAR_WIDTH
+ #define MIX_LINE_SRC_POS 4*FW-1
#define MIX_LINE_WEIGHT_POS 11*FW+3
#define MIX_LINE_CURVE_POS 12*FW+2
#define MIX_LINE_SWITCH_POS 16*FW
@@ -3306,6 +3319,7 @@ static uint8_t s_copySrcCh;
#endif
#define EXPO_LINE_FM_POS LCD_W-FW-MENUS_SCROLLBAR_WIDTH
#define EXPO_LINE_SELECT_POS 24
+ #define MIX_LINE_SRC_POS 4*FW-1
#define MIX_LINE_WEIGHT_POS 11*FW+3
#define MIX_LINE_CURVE_POS 12*FW+2
#define MIX_LINE_SWITCH_POS 16*FW
@@ -3558,6 +3572,8 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
#endif
#if defined(PCBTARANIS)
+ if (ed->carryTrim != TRIM_ON)
+ lcd_putc(EXPO_LINE_TRIM_POS, y, ed->carryTrim > 0 ? '-' : STR_RETA123[-ed->carryTrim]);
putsCurveRef(EXPO_LINE_CURVE_POS, y, ed->curve, 0);
#else
if (ed->curveMode == MODE_CURVE)
@@ -3568,12 +3584,10 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
putsSwitches(EXPO_LINE_SWITCH_POS, y, ed->swtch, 0);
-#if !defined(PCBTARANIS)
if (ed->mode!=3) lcd_putc(EXPO_LINE_SIDE_POS, y, ed->mode == 2 ? 126 : 127);
-#endif
#if defined(CPUARM) && LCD_W >= 212
- displayFlightModes(EXPO_LINE_FM_POS, y, ed->phases);
+ if (ed->phases) lcd_puts(EXPO_LINE_FM_POS, y, STR_FP);
if (ed->name[0]) lcd_putsnAtt(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR | (isExpoActive(i) ? BOLD : 0));
#elif defined(CPUARM)
if (ed->name[0]) lcd_putsnAtt(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR | (isExpoActive(i) ? BOLD : 0));
@@ -3594,10 +3608,6 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, attr | (isMixActive(i) ? BOLD : 0), event);
-#if LCD_W >= 212
- displayFlightModes(EXPO_LINE_FM_POS, y, md->phases);
-#endif
-
#if defined(CPUARM)
if (md->name[0]) {
lcd_putsnAtt(EXPO_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR | (isMixActive(i) ? BOLD : 0));
@@ -3608,6 +3618,8 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
#endif
{
#if defined(PCBTARANIS)
+ putsCurveRef(MIX_LINE_CURVE_POS, y, md->curve, 0);
+ if (md->phases) lcd_puts(MIX_LINE_FM_POS, y, STR_FP);
#else
if (md->curveParam) {
if (md->curveMode == MODE_CURVE)
@@ -3616,7 +3628,9 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
displayGVar(MIX_LINE_CURVE_POS+3*FW, y, md->curveParam, -100, 100);
}
#endif
- if (md->swtch) putsSwitches(MIX_LINE_SWITCH_POS, y, md->swtch);
+ if (md->swtch) {
+ putsSwitches(MIX_LINE_SWITCH_POS, y, md->swtch);
+ }
char cs = ' ';
if (md->speedDown || md->speedUp)
@@ -3735,7 +3749,7 @@ enum LimitsItems {
#define LIMITS_DIRECTION_POS 21*FW
#define LIMITS_MAX_POS 26*FW
#define LIMITS_REVERT_POS 27*FW
- #define LIMITS_CURVE_POS 32*FW
+ #define LIMITS_CURVE_POS 32*FW-3
#endif
#else
#if defined(PPM_UNIT_US)
@@ -3767,7 +3781,7 @@ enum LimitsItems {
#endif
#endif
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
#define LIMITS_MIN_MAX_OFFSET 1000
#define CONVERT_US_MIN_MAX(x) (((x)*128)/250)
#define MIN_MAX_LIMIT (10*limit)
@@ -3803,7 +3817,7 @@ void onLimitsMenu(const char *result)
ld->revert = false;
ld->curve = 0;
}
- else if (result == STR_COPY_TRIMS_TO_OFFSET) {
+ else if (result == STR_COPY_TRIMS_TO_OFS) {
copyTrimsToOffset(ch);
}
}
@@ -3871,10 +3885,16 @@ void menuModelLimits(uint8_t event)
lcd_putc(LIMITS_DIRECTION_POS, y, swVal);
#endif
-#if defined(PPM_CENTER_ADJUSTABLE)
- int8_t limit = ((g_model.extendedLimits && !limitAddress(k)->ppmCenter) ? 125 : 100);
+#if defined(PCBTARANIS)
+ int limit;
#else
- int8_t limit = (g_model.extendedLimits ? 125 : 100);
+ int8_t limit;
+#endif
+
+#if defined(PPM_CENTER_ADJUSTABLE)
+ limit = ((g_model.extendedLimits && !limitAddress(k)->ppmCenter) ? 125 : 100);
+#else
+ limit = (g_model.extendedLimits ? 125 : 100);
#endif
#if defined(PCBTARANIS)
@@ -3882,7 +3902,7 @@ void menuModelLimits(uint8_t event)
if (sub==k && m_posHorz < 0 && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
MENU_ADD_ITEM(STR_RESET);
- MENU_ADD_ITEM(STR_COPY_TRIMS_TO_OFFSET);
+ MENU_ADD_ITEM(STR_COPY_TRIMS_TO_OFS);
menuHandler = onLimitsMenu;
}
#else
@@ -3921,7 +3941,7 @@ void menuModelLimits(uint8_t event)
break;
case ITEM_LIMITS_MIN:
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
ld->min = LIMITS_MIN_MAX_OFFSET + GVAR_MENU_ITEM(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), -MIN_MAX_LIMIT, 0, MIN_MAX_ATTR, DBLKEYS_1000, event);
#else
lcd_outdezAtt(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
@@ -3930,7 +3950,7 @@ void menuModelLimits(uint8_t event)
break;
case ITEM_LIMITS_MAX:
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
ld->max = -LIMITS_MIN_MAX_OFFSET + GVAR_MENU_ITEM(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), 0, MIN_MAX_LIMIT, MIN_MAX_ATTR, DBLKEYS_1000, event);
#else
lcd_outdezAtt(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
@@ -3983,7 +4003,11 @@ void menuModelLimits(uint8_t event)
#if defined(PPM_LIMITS_SYMETRICAL)
case ITEM_LIMITS_SYMETRICAL:
+#if defined(CPUARM)
+ lcd_putcAtt(LCD_W-FW-MENUS_SCROLLBAR_WIDTH, y, ld->symetrical ? '=' : '\306', attr);
+#else
lcd_putcAtt(LCD_W-FW-MENUS_SCROLLBAR_WIDTH, y, ld->symetrical ? '=' : '^', attr);
+#endif
if (active) {
CHECK_INCDEC_MODELVAR_ZERO(event, ld->symetrical, 1);
}
@@ -4051,7 +4075,7 @@ void menuModelCurvesAll(uint8_t event)
editName(4*FW, y, g_model.curveNames[k], sizeof(g_model.curveNames[k]), 0, 0);
CurveInfo & crv = g_model.curves[k];
lcd_outdezAtt(11*FW, y, 5+crv.points, LEFT);
- lcd_putsAtt(lcdLastPos, y, PSTR("pts"), 0);
+ lcd_putsAtt(lcdLastPos, y, STR_PTS, 0);
#endif
}
}
@@ -4119,7 +4143,7 @@ void menuModelGVars(uint8_t event)
uint8_t y = 1 + 3*FH + i*FH;
#endif
- if (g_model.gvars[i].popup) lcd_putc(3*FW-3, y, '!');
+ if (g_model.gvars[i].popup) lcd_putc(3*FW, y, '!');
putsStrIdx(0, y, STR_GV, i+1, (sub==i && m_posHorz<0) ? INVERS : 0);
for (uint8_t j=0; j<1+MAX_PHASES; j++) {
@@ -4158,7 +4182,6 @@ void menuModelGVars(uint8_t event)
}
if (attr) {
if (event == EVT_KEY_LONG(KEY_ENTER)) {
- s_editMode = 2; // TODO constant for that ...
v = (v > GVAR_MAX ? 0 : GVAR_MAX+1);
eeDirty(EE_MODEL);
}
@@ -4172,23 +4195,6 @@ void menuModelGVars(uint8_t event)
}
}
-#if defined(CPUARM)
- #define INCDEC_DECLARE_VARS() uint8_t incdecFlag = EE_MODEL; IsValueAvailable isValueAvailable = NULL
- #define INCDEC_SET_FLAG(f) incdecFlag = (EE_MODEL|(f))
- #define INCDEC_ENABLE_CHECK(fn) isValueAvailable = fn
- #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag, isValueAvailable)
-#elif defined(CPUM64)
- #define INCDEC_DECLARE_VARS()
- #define INCDEC_SET_FLAG(f)
- #define INCDEC_ENABLE_CHECK(fn)
- #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, EE_MODEL)
-#else
- #define INCDEC_DECLARE_VARS() uint8_t incdecFlag = EE_MODEL
- #define INCDEC_SET_FLAG(f) incdecFlag = (EE_MODEL|(f))
- #define INCDEC_ENABLE_CHECK(fn)
- #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag)
-#endif
-
if (m_posVert > 0 && m_posHorz < 0 && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
if (g_model.gvars[sub].popup)
@@ -4201,23 +4207,6 @@ void menuModelGVars(uint8_t event)
}
#endif
-#if defined(CPUARM)
- #define INCDEC_DECLARE_VARS() uint8_t incdecFlag = EE_MODEL; IsValueAvailable isValueAvailable = NULL
- #define INCDEC_SET_FLAG(f) incdecFlag = (EE_MODEL|(f))
- #define INCDEC_ENABLE_CHECK(fn) isValueAvailable = fn
- #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag, isValueAvailable)
-#elif defined(CPUM64)
- #define INCDEC_DECLARE_VARS()
- #define INCDEC_SET_FLAG(f)
- #define INCDEC_ENABLE_CHECK(fn)
- #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, EE_MODEL)
-#else
- #define INCDEC_DECLARE_VARS() uint8_t incdecFlag = EE_MODEL
- #define INCDEC_SET_FLAG(f) incdecFlag = (EE_MODEL|(f))
- #define INCDEC_ENABLE_CHECK(fn)
- #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag)
-#endif
-
enum LogicalSwitchFields {
LS_FIELD_FUNCTION,
LS_FIELD_V1,
@@ -4248,6 +4237,23 @@ enum LogicalSwitchFields {
#define CSW_4TH_COLUMN (18*FW+2)
#endif
+#if defined(CPUARM)
+ #define INCDEC_DECLARE_VARS() uint8_t incdecFlag = EE_MODEL; IsValueAvailable isValueAvailable = NULL
+ #define INCDEC_SET_FLAG(f) incdecFlag = (EE_MODEL|(f))
+ #define INCDEC_ENABLE_CHECK(fn) isValueAvailable = fn
+ #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag, isValueAvailable)
+#elif defined(CPUM64)
+ #define INCDEC_DECLARE_VARS()
+ #define INCDEC_SET_FLAG(f)
+ #define INCDEC_ENABLE_CHECK(fn)
+ #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, EE_MODEL)
+#else
+ #define INCDEC_DECLARE_VARS() uint8_t incdecFlag = EE_MODEL
+ #define INCDEC_SET_FLAG(f) incdecFlag = (EE_MODEL|(f))
+ #define INCDEC_ENABLE_CHECK(fn)
+ #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag)
+#endif
+
#if defined(CPUARM) && LCD_W < 212
#define CSWONE_2ND_COLUMN (11*FW)
@@ -4264,6 +4270,10 @@ void menuModelLogicalSwitchOne(uint8_t event)
int8_t sub = m_posVert;
+ INCDEC_DECLARE_VARS();
+
+ int v1_val = cs->v1;
+
for (uint8_t k=0; kv1, attr);
+ putsSwitches(CSWONE_2ND_COLUMN, y, v1_val, attr);
v1_min = SWSRC_OFF+1; v1_max = SWSRC_ON-1;
}
else if (cstate == LS_FAMILY_TIMER) {
- lcd_outdezAtt(CSWONE_2ND_COLUMN, y, cs->v1+1, LEFT|attr);
+ lcd_outdezAtt(CSWONE_2ND_COLUMN, y, v1_val+1, LEFT|attr);
v1_max = 99;
}
else {
- putsMixerSource(CSWONE_2ND_COLUMN, y, cs->v1, attr);
+ v1_val = (uint8_t)cs->v1;
+ putsMixerSource(CSWONE_2ND_COLUMN, y, v1_val, attr);
+ INCDEC_SET_FLAG(INCDEC_SOURCE);
+ INCDEC_ENABLE_CHECK(isSourceAvailable);
}
if (attr) {
- CHECK_INCDEC_MODELVAR(event, cs->v1, v1_min, v1_max);
+ cs->v1 = CHECK_INCDEC_PARAM(event, v1_val, v1_min, v1_max);
}
break;
}
case LS_FIELD_V2:
{
lcd_putsLeft(y, STR_V2);
- int16_t v2_min=0, v2_max=MIXSRC_LAST_TELEM;
+ int v2_min=0, v2_max=MIXSRC_LAST_TELEM;
if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY) {
putsSwitches(CSWONE_2ND_COLUMN, y, cs->v2, attr);
v2_min = SWSRC_OFF+1; v2_max = SWSRC_ON-1;
@@ -4339,22 +4352,17 @@ void menuModelLogicalSwitchOne(uint8_t event)
}
else if (cstate == LS_FAMILY_COMP) {
putsMixerSource(CSWONE_2ND_COLUMN, y, cs->v2, attr);
+ INCDEC_SET_FLAG(INCDEC_SOURCE);
+ INCDEC_ENABLE_CHECK(isSourceAvailable);
}
else {
#if defined(FRSKY)
- if (cs->v1 >= MIXSRC_FIRST_TELEM) {
- putsTelemetryChannel(CSWONE_2ND_COLUMN, y, cs->v1 - MIXSRC_FIRST_TELEM, convertCswTelemValue(cs), attr|LEFT);
- v2_max = maxTelemValue(cs->v1 - MIXSRC_FIRST_TELEM + 1);
- if (cstate == LS_FAMILY_OFS) {
- v2_min = -128;
- v2_max -= 128;
- }
- else {
- v2_max = min((uint8_t)127, (uint8_t)v2_max);
- v2_min = -v2_max;
- }
- if (cs->v2 > v2_max) {
- cs->v2 = v2_max;
+ if (v1_val >= MIXSRC_FIRST_TELEM) {
+ putsTelemetryChannel(CSWONE_2ND_COLUMN, y, v1_val - MIXSRC_FIRST_TELEM, convertCswTelemValue(cs), attr|LEFT);
+ v2_max = maxTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1);
+ v2_min = minTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1);
+ if (cs->v2 < v2_min || cs->v2 > v2_max) {
+ cs->v2 = 0;
eeDirty(EE_MODEL);
}
}
@@ -4398,7 +4406,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
void menuModelLogicalSwitches(uint8_t event)
{
- SIMPLE_MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1);
+ SIMPLE_MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_LOGICAL_SWITCH+1);
uint8_t y = 0;
uint8_t k = 0;
@@ -4505,7 +4513,7 @@ void onLogicalSwitchesMenu(const char *result)
*cs = clipboard.data.csw;
eeDirty(EE_MODEL);
}
- else if (result == STR_DELETE) {
+ else if (result == STR_CLEAR) {
memset(cs, 0, sizeof(LogicalSwitchData));
eeDirty(EE_MODEL);
}
@@ -4516,7 +4524,7 @@ void menuModelLogicalSwitches(uint8_t event)
{
INCDEC_DECLARE_VARS();
- MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1, {0, NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/});
+ MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_LOGICAL_SWITCH+1, {0, NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/});
uint8_t y = 0;
uint8_t k = 0;
@@ -4533,10 +4541,12 @@ void menuModelLogicalSwitches(uint8_t event)
if (sub>=0 && horz<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
killEvents(event);
LogicalSwitchData * cs = cswAddress(sub);
- if (cs->func) MENU_ADD_ITEM(STR_COPY);
+ if (cs->func)
+ MENU_ADD_ITEM(STR_COPY);
if (clipboard.type == CLIPBOARD_TYPE_CUSTOM_SWITCH)
MENU_ADD_ITEM(STR_PASTE);
- if (cs->func || cs->v1 || cs->v2 || cs->delay || cs->duration || cs->andsw) MENU_ADD_ITEM(STR_DELETE);
+ if (cs->func || cs->v1 || cs->v2 || cs->delay || cs->duration || cs->andsw)
+ MENU_ADD_ITEM(STR_CLEAR);
menuHandler = onLogicalSwitchesMenu;
}
#endif
@@ -4686,7 +4696,7 @@ void menuModelLogicalSwitches(uint8_t event)
// CSW delay
if (cstate == LS_FAMILY_STAY) {
- lcd_puts(CSW_6TH_COLUMN, y, "N/A");
+ lcd_puts(CSW_6TH_COLUMN, y, STR_NA);
if (attr && horz == LS_FIELD_DELAY) {
REPEAT_LAST_CURSOR_MOVE();
}
@@ -4864,10 +4874,9 @@ void menuModelCustomFunctions(uint8_t event)
MENU_ADD_ITEM(STR_PASTE);
if (!CFN_EMPTY(sd) && CFN_EMPTY(&g_model.funcSw[NUM_CFN-1]))
MENU_ADD_ITEM(STR_INSERT);
- if (CFN_EMPTY(sd))
- MENU_ADD_ITEM(STR_DELETE);
- else
+ if (!CFN_EMPTY(sd))
MENU_ADD_ITEM(STR_CLEAR);
+ MENU_ADD_ITEM(STR_DELETE);
menuHandler = onCustomFunctionsMenu;
}
#endif
@@ -5118,16 +5127,16 @@ void menuModelCustomFunctions(uint8_t event)
#if LCD_W >= 212
lcd_putsAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN+2, y, "1x", attr);
#else
- lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF+1, y, '-', attr);
+ lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF+3, y, '-', attr);
#endif
}
#if defined(CPUARM)
else if (CFN_PLAY_REPEAT(sd) == CFN_PLAY_REPEAT_NOSTART) {
#if LCD_W >= 212
- lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN-2, y, '!', attr);
+ lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN-1, y, '!', attr);
lcd_putsAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN+2, y, "1x", attr);
#else
- lcd_putcAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF+1, y, '!', attr);
+ lcd_putsAtt(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF, y, "!-", attr);
#endif
}
#endif
@@ -5199,7 +5208,7 @@ void menuModelCustomScriptOne(uint8_t event)
uint8_t attr = (sub==i ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0);
if (i == ITEM_MODEL_CUSTOMSCRIPT_FILE) {
- lcd_putsLeft(y, "Script");
+ lcd_putsLeft(y, STR_SCRIPT);
if (ZEXIST(sd.file))
lcd_putsnAtt(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.file, sizeof(sd.file), attr);
else
@@ -5216,11 +5225,11 @@ void menuModelCustomScriptOne(uint8_t event)
}
}
else if (i == ITEM_MODEL_CUSTOMSCRIPT_NAME) {
- lcd_putsLeft(y, "Name");
+ lcd_putsLeft(y, TR_NAME);
editName(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.name, sizeof(sd.name), event, attr);
}
else if (i == ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL) {
- lcd_putsLeft(y, "Inputs");
+ lcd_putsLeft(y, STR_INPUTS);
}
else if (i <= ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL+scriptInternalData[s_currIdx].inputsCount) {
int inputIdx = i-ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL-1;
@@ -5243,7 +5252,7 @@ void menuModelCustomScriptOne(uint8_t event)
if (scriptInternalData[s_currIdx].outputsCount > 0) {
lcd_vline(SCRIPT_ONE_3RD_COLUMN_POS-4, FH+1, LCD_H-FH-1);
- lcd_puts(SCRIPT_ONE_3RD_COLUMN_POS, FH+1, "Outputs");
+ lcd_puts(SCRIPT_ONE_3RD_COLUMN_POS, FH+1, STR_OUTPUTS);
for (int i=0; i=MIXSRC_SW1 && source<=MIXSRC_LAST_CSW) {
+ if (source>=MIXSRC_SW1 && source<=MIXSRC_LAST_LOGICAL_SWITCH) {
LogicalSwitchData * cs = cswAddress(source-MIXSRC_SW1);
return (cs->func != LS_FUNC_NONE);
}
@@ -1421,7 +1424,7 @@ bool isInputSourceAvailable(int source)
if (source>=MIXSRC_FIRST_CH && source<=MIXSRC_LAST_CH)
return true;
- if (source>=MIXSRC_FIRST_PPM && source<=MIXSRC_LAST_PPM)
+ if (source>=MIXSRC_FIRST_TRAINER && source<=MIXSRC_LAST_TRAINER)
return true;
if (source>=MIXSRC_FIRST_TELEM && source<=MIXSRC_LAST_TELEM)
@@ -1473,6 +1476,15 @@ bool isSwitchAvailable(int swtch)
return true;
}
+bool isThrottleSourceAvailable(int source)
+{
+#if defined(PCBTARANIS)
+ if (source == THROTTLE_SOURCE_S3 && !IS_POT_AVAILABLE(POT3))
+ return false;
+#endif
+ return true;
+}
+
bool isLogicalSwitchFunctionAvailable(int function)
{
return function != LS_FUNC_RANGE;
diff --git a/radio/src/gui/menus.h b/radio/src/gui/menus.h
index 3ee37c250..93d064997 100644
--- a/radio/src/gui/menus.h
+++ b/radio/src/gui/menus.h
@@ -138,6 +138,11 @@ void menuStatisticsView(uint8_t event);
void menuStatisticsDebug(uint8_t event);
void menuAboutView(uint8_t event);
+#if defined(PCBTARANIS)
+void menuMainViewChannelsMonitor(uint8_t event);
+void menuChannelsView(uint8_t event);
+#endif
+
#if defined(NAVIGATION_POT1)
extern int16_t p1valdiff;
#else
@@ -202,6 +207,7 @@ int8_t checkIncDecGen(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max);
#endif
#if defined(CPUARM)
+ bool isThrottleSourceAvailable(int source);
bool isLogicalSwitchFunctionAvailable(int function);
bool isAssignableFunctionAvailable(int function);
bool isSwitchAvailable(int swtch);
@@ -429,7 +435,8 @@ bool modelHasNotes();
#define REPEAT_LAST_CURSOR_MOVE() { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) putEvent(event); else m_posHorz = 0; }
#define MOVE_CURSOR_FROM_HERE() if (m_posHorz > 0) REPEAT_LAST_CURSOR_MOVE()
#elif defined(ROTARY_ENCODER_NAVIGATION)
- #define REPEAT_LAST_CURSOR_MOVE() { if (EVT_KEY_MASK(event) >= 0x0e) putEvent(event); else m_posHorz = 0; }
+ void repeatLastCursorMove(uint8_t event);
+ #define REPEAT_LAST_CURSOR_MOVE() { if (EVT_KEY_MASK(event) >= 0x0e) putEvent(event); else repeatLastCursorMove(event); }
#define MOVE_CURSOR_FROM_HERE() if (m_posHorz > 0) REPEAT_LAST_CURSOR_MOVE()
#else
void repeatLastCursorMove(uint8_t event);
diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp
index 4c373e18c..dceea1a28 100644
--- a/radio/src/gui/view_main.cpp
+++ b/radio/src/gui/view_main.cpp
@@ -58,7 +58,7 @@
#define TIMER2_Y 45
#define TIMERS_R 193
#define REBOOT_X (LCD_W-FW)
-#define VSWITCH_X(i) (((i>=NUM_CSW*3/4) ? BITMAP_X+28 : ((i>=NUM_CSW/2) ? BITMAP_X+25 : ((i>=NUM_CSW/4) ? 21 : 18))) + 3*i)
+#define VSWITCH_X(i) (((i>=NUM_LOGICAL_SWITCH*3/4) ? BITMAP_X+28 : ((i>=NUM_LOGICAL_SWITCH/2) ? BITMAP_X+25 : ((i>=NUM_LOGICAL_SWITCH/4) ? 21 : 18))) + 3*i)
#define VSWITCH_Y (LCD_H-9)
#define BAR_HEIGHT (31-9)
#define TRIM_LH_X (32+9)
@@ -275,7 +275,7 @@ void displayTopBar()
/* Altitude */
if (g_model.frsky.altitudeDisplayed && TELEMETRY_BARO_ALT_AVAILABLE()) {
LCD_ICON(altitude_icon_x, BAR_Y, ICON_ALTITUDE);
- putsTelemetryValue(altitude_icon_x+2*FW-1, BAR_Y+1, TELEMETRY_RELATIVE_BARO_ALT_BP, UNIT_SPEED, LEFT);
+ putsTelemetryValue(altitude_icon_x+2*FW-1, BAR_Y+1, TELEMETRY_RELATIVE_BARO_ALT_BP, UNIT_DIST, LEFT);
}
}
@@ -802,23 +802,23 @@ void menuMainView(uint8_t event)
// Custom Switches
#if defined(PCBSKY9X)
- for (uint8_t i=0; i 2
- for (uint8_t i=0; i1 ? 3*FW+6 : 0), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
#elif defined(PCBGRUVIN9X)
- for (uint8_t i=0; i1 ? 3*FW : 0), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
#elif !defined(PCBSTD)
- for (uint8_t i=0; i= 48) { //3 6 12 24 48 pulses in every 480ms
+ if (m_cnt >= 48) { //3 6 12 24 48 pulses in every 480ms
m_state >>= 1;
m_cnt = 0;
}
// no break
case 1:
- if( (m_cnt & (m_state-1)) == 0) putEvent(EVT_KEY_REPT(enuk));
+ if ((m_cnt & (m_state-1)) == 0) {
+ putEvent(EVT_KEY_REPT(enuk));
+ }
break;
case KSTATE_PAUSE: //pause
- if(m_cnt >= 64) {
+ if (m_cnt >= 64) {
m_state = 8;
m_cnt = 0;
}
diff --git a/radio/src/keys.h b/radio/src/keys.h
new file mode 100755
index 000000000..350ab81d5
--- /dev/null
+++ b/radio/src/keys.h
@@ -0,0 +1,231 @@
+/*
+ * 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 keys_h
+#define keys_h
+
+enum EnumKeys {
+ KEY_MENU,
+ KEY_EXIT,
+#if defined(PCBTARANIS)
+ KEY_ENTER,
+ KEY_PAGE,
+ KEY_PLUS,
+ KEY_MINUS,
+#else
+ KEY_DOWN,
+ KEY_UP,
+ KEY_RIGHT,
+ KEY_LEFT,
+#endif
+
+ TRM_BASE,
+ TRM_LH_DWN = TRM_BASE,
+ TRM_LH_UP,
+ TRM_LV_DWN,
+ TRM_LV_UP,
+ TRM_RV_DWN,
+ TRM_RV_UP,
+ TRM_RH_DWN,
+ TRM_RH_UP,
+
+#if ROTARY_ENCODERS > 0 || defined(ROTARY_ENCODER_NAVIGATION)
+ BTN_REa,
+#endif
+#if ROTARY_ENCODERS > 0
+ BTN_REb,
+#endif
+
+ NUM_KEYS,
+ SW_BASE=NUM_KEYS,
+
+#if defined(PCBTARANIS)
+ SW_SA0=SW_BASE,
+ SW_SA1,
+ SW_SA2,
+ SW_SB0,
+ SW_SB1,
+ SW_SB2,
+ SW_SC0,
+ SW_SC1,
+ SW_SC2,
+ SW_SD0,
+ SW_SD1,
+ SW_SD2,
+ SW_SE0,
+ SW_SE1,
+ SW_SE2,
+ SW_SF0,
+ SW_SF2,
+ SW_SG0,
+ SW_SG1,
+ SW_SG2,
+ SW_SH0,
+ SW_SH2,
+#else
+ SW_ID0=SW_BASE,
+ SW_ID1,
+ SW_ID2,
+#if defined(EXTRA_3POS)
+ SW_ID3,
+ SW_ID4,
+ SW_ID5,
+#endif
+
+ SW_THR,
+ SW_RUD,
+ SW_ELE,
+ SW_AIL,
+ SW_GEA,
+ SW_TRN,
+#endif
+
+};
+
+#define EVT_KEY_MASK(e) ((e) & 0x1f)
+
+#define _MSK_KEY_BREAK 0x20
+#define _MSK_KEY_REPT 0x40
+#define _MSK_KEY_FIRST 0x60
+#define _MSK_KEY_LONG 0x80
+
+#define EVT_KEY_BREAK(key) ((key)|_MSK_KEY_BREAK)
+#define EVT_KEY_FIRST(key) ((key)|_MSK_KEY_FIRST)
+#define EVT_KEY_REPT(key) ((key)|_MSK_KEY_REPT)
+#define EVT_KEY_LONG(key) ((key)|_MSK_KEY_LONG)
+
+#define IS_KEY_BREAK(evt) (((evt)&0xe0) == _MSK_KEY_BREAK)
+#define IS_KEY_FIRST(evt) (((evt)&0xe0) == _MSK_KEY_FIRST)
+#define IS_KEY_LONG(evt) (((evt)&0xe0) == _MSK_KEY_LONG)
+
+#define EVT_ENTRY 0xbf
+#define EVT_ENTRY_UP 0xbe
+#define EVT_MENU_UP 0xbd
+
+#if defined(PCBTARANIS)
+ #define EVT_ROTARY_BREAK EVT_KEY_BREAK(KEY_ENTER)
+ #define EVT_ROTARY_LONG EVT_KEY_LONG(KEY_ENTER)
+#else
+ #define EVT_ROTARY_BREAK 0xcf
+ #define EVT_ROTARY_LONG 0xce
+ #define EVT_ROTARY_LEFT 0xdf
+ #define EVT_ROTARY_RIGHT 0xde
+#endif
+
+#if defined(PCBTARANIS)
+ #define IS_ROTARY_LEFT(evt) (evt==EVT_KEY_FIRST(KEY_MINUS) || evt==EVT_KEY_REPT(KEY_MINUS))
+ #define IS_ROTARY_RIGHT(evt) (evt==EVT_KEY_FIRST(KEY_PLUS) || evt==EVT_KEY_REPT(KEY_PLUS))
+ #define IS_ROTARY_UP(evt) (evt==EVT_KEY_FIRST(KEY_PLUS) || evt==EVT_KEY_REPT(KEY_PLUS))
+ #define IS_ROTARY_DOWN(evt) (evt==EVT_KEY_FIRST(KEY_MINUS) || evt==EVT_KEY_REPT(KEY_MINUS))
+ #define IS_ROTARY_BREAK(evt) (evt==EVT_KEY_BREAK(KEY_ENTER))
+ #define IS_ROTARY_LONG(evt) (evt==EVT_KEY_LONG(KEY_ENTER))
+ #define IS_ROTARY_EVENT(evt) (0)
+ #define CASE_EVT_ROTARY_BREAK /*case EVT_KEY_BREAK(KEY_ENTER):*/
+ #define CASE_EVT_ROTARY_LONG /*case EVT_KEY_LONG(KEY_ENTER):*/
+ #define CASE_EVT_ROTARY_LEFT case EVT_KEY_FIRST(KEY_MOVE_DOWN): case EVT_KEY_REPT(KEY_MOVE_DOWN):
+ #define CASE_EVT_ROTARY_RIGHT case EVT_KEY_FIRST(KEY_MOVE_UP): case EVT_KEY_REPT(KEY_MOVE_UP):
+#elif defined(ROTARY_ENCODER_NAVIGATION)
+ #define IS_ROTARY_LEFT(evt) (evt == EVT_ROTARY_LEFT)
+ #define IS_ROTARY_RIGHT(evt) (evt == EVT_ROTARY_RIGHT)
+ #define IS_ROTARY_UP(evt) IS_ROTARY_LEFT(evt)
+ #define IS_ROTARY_DOWN(evt) IS_ROTARY_RIGHT(evt)
+ #define IS_ROTARY_BREAK(evt) (evt == EVT_ROTARY_BREAK)
+ #define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG)
+ #define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e)
+ #define CASE_EVT_ROTARY_BREAK case EVT_ROTARY_BREAK:
+ #define CASE_EVT_ROTARY_LONG case EVT_ROTARY_LONG:
+ #define CASE_EVT_ROTARY_LEFT case EVT_ROTARY_LEFT:
+ #define CASE_EVT_ROTARY_RIGHT case EVT_ROTARY_RIGHT:
+#else
+ #define IS_ROTARY_LEFT(evt) (0)
+ #define IS_ROTARY_RIGHT(evt) (0)
+ #define IS_ROTARY_UP(evt) (0)
+ #define IS_ROTARY_DOWN(evt) (0)
+ #define IS_ROTARY_BREAK(evt) (0)
+ #define IS_ROTARY_LONG(evt) (0)
+ #define IS_ROTARY_EVENT(evt) (0)
+ #define CASE_EVT_ROTARY_BREAK
+ #define CASE_EVT_ROTARY_LONG
+ #define CASE_EVT_ROTARY_LEFT
+ #define CASE_EVT_ROTARY_RIGHT
+#endif
+
+class Key
+{
+#define FILTERBITS 4
+
+#ifdef SIMU
+ #define FFVAL 1
+#else
+ #define FFVAL ((1< 0; }
+ void pauseEvents() { m_state = KSTATE_PAUSE; m_cnt = 0; }
+ void killEvents() { m_state = KSTATE_KILLED; }
+};
+
+extern Key keys[NUM_KEYS];
+
+extern uint8_t s_evt;
+
+#define putEvent(evt) s_evt = evt
+
+void clearKeyEvents();
+void pauseEvents(uint8_t enuk);
+void killEvents(uint8_t enuk);
+
+#if defined(CPUARM)
+ uint8_t getEvent(bool trim=false);
+#else
+ uint8_t getEvent();
+#endif
+
+uint8_t keyDown();
+
+#endif
diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index 0bfd78820..4d084c49a 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -49,42 +49,6 @@ void lcd_clear()
memset(displayBuf, 0, sizeof(displayBuf));
}
-void lcd_img(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t idx, LcdFlags att)
-{
- const pm_uchar *q = img;
-#if LCD_W >= 260
- xcoord_t w = pgm_read_byte(q++);
- if (w == 255) w += pgm_read_byte(q++);
-#else
- uint8_t w = pgm_read_byte(q++);
-#endif
- uint8_t hb = (pgm_read_byte(q++)+7)/8;
- bool inv = (att & INVERS) ? true : (att & BLINK ? BLINK_ON_PHASE : false);
- q += idx*w*hb;
- for (uint8_t yb = 0; yb < hb; yb++) {
- uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ];
- for (xcoord_t i=0; i= UNIT_RAW) {
- converted_value /= 10;
+ converted_value = div10_and_round(converted_value);
}
else {
#if !defined(PCBTARANIS)
@@ -1224,7 +1200,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
att |= PREC2;
}
else {
- converted_value /= 10;
+ converted_value = div10_and_round(converted_value);
att |= PREC1;
}
#else
@@ -1281,7 +1257,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
#if defined(FRSKY_SPORT)
case TELEM_ALT-1:
- putsTelemetryValue(x, y, val/10, UNIT_DIST, att|PREC1);
+ putsTelemetryValue(x, y, div10_and_round(val), UNIT_DIST, att|PREC1);
break;
#elif defined(WS_HOW_HIGH)
case TELEM_ALT-1:
@@ -1329,7 +1305,45 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
}
#endif
+void lcd_img(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t idx, LcdFlags att)
+{
+ const pm_uchar *q = img;
+#if LCD_W >= 260
+ xcoord_t w = pgm_read_byte(q++);
+ if (w == 255) w += pgm_read_byte(q++);
+#else
+ uint8_t w = pgm_read_byte(q++);
+#endif
+ uint8_t hb = (pgm_read_byte(q++)+7)/8;
+ bool inv = (att & INVERS) ? true : (att & BLINK ? BLINK_ON_PHASE : false);
+ q += idx*w*hb;
+ for (uint8_t yb = 0; yb < hb; yb++) {
+ uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ];
+ for (xcoord_t i=0; i
+
+#if defined(PCBSKY9X)
+ #include "AT91SAM3S4.h"
+#elif defined(PCBTARANIS)
+ #include "stm32f2xx.h"
+ #include "stm32f2xx_gpio.h"
+#endif
+
+#if defined(PCBTARANIS)
+void bwdt_reset()
+{
+ IWDG->KR = 0xAAAA; // reload
+}
+
+__attribute__ ((section(".bootrodata"), used))
+void _bootStart(void);
+
+__attribute__ ((section(".isr_boot_vector"), used))
+const uint32_t BootVectors[] = { (uint32_t) &_estack,
+ (uint32_t) (void (*)(void)) ((unsigned long) &_bootStart) };
+
+__attribute__ ((section(".bootrodata.*"), used))
+
+#elif defined(PCBSKY9X)
+__attribute__ ((section(".bootrodata"), used))
+#endif
+
+const uint8_t BootCode[] = {
+#include "bootloader.lbm"
+};
+
+#if defined(PCBTARANIS)
+
+__attribute__ ((section(".bootrodata"), used))
+
+void _bootStart()
+{
+ RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN; // Enable portC clock
+ RCC->AHB1ENR |= RCC_AHB1ENR_GPIOEEN; // Enable portE clock
+
+ GPIOC->PUPDR = 0x00000004;
+ GPIOE->PUPDR = 0x00000040;
+
+ uint32_t i;
+ for (i = 0; i < 50000; i += 1) {
+ bwdt_reset();
+ }
+
+ if ((GPIOE->IDR & 0x00000008) == 0) {
+ if ((GPIOC->IDR & 0x00000002) == 0) {
+ // Bootloader needed
+ const uint8_t *src;
+ uint8_t *dest;
+ uint32_t size;
+
+ bwdt_reset();
+ size = sizeof(BootCode);
+ src = BootCode;
+ dest = (uint8_t *) 0x20000000;
+
+ for (; size; size -= 1) {
+ *dest++ = *src++;
+ }
+ // Could check for a valid copy to RAM here
+ // Go execute bootloader
+ bwdt_reset();
+
+ uint32_t address = *(uint32_t *) 0x20000004;
+
+ ((void (*)(void)) (address))(); // Go execute the loaded application
+
+ }
+ }
+// run_application() ;
+ asm(" mov.w r1, #134217728");
+ // 0x8000000
+ asm(" add.w r1, #32768");
+ // 0x8000
+
+ asm(" movw r0, #60680");
+ // 0xED08
+ asm(" movt r0, #57344");
+ // 0xE000
+ asm(" str r1, [r0, #0]");
+ // Set the VTOR
+
+ asm("ldr r0, [r1, #0]");
+ // Stack pointer value
+ asm("msr msp, r0");
+ // Set it
+ asm("ldr r0, [r1, #4]");
+ // Reset address
+ asm("mov.w r1, #1");
+ asm("orr r0, r1");
+ // Set lsbit
+ asm("bx r0");
+ // Execute application
+}
+#endif
+
+#endif
diff --git a/radio/src/lua.cpp b/radio/src/lua.cpp
index 1a2ab9e1a..8211ebd5b 100644
--- a/radio/src/lua.cpp
+++ b/radio/src/lua.cpp
@@ -517,7 +517,7 @@ static int luaModelDeleteMix(lua_State *L)
static int luaModelGetLogicalSwitch(lua_State *L)
{
int idx = luaL_checkunsigned(L, 1);
- if (idx < NUM_CSW) {
+ if (idx < NUM_LOGICAL_SWITCH) {
LogicalSwitchData * sw = cswAddress(idx);
lua_newtable(L);
lua_pushtablenumber(L, "function", sw->func);
@@ -537,7 +537,7 @@ static int luaModelGetLogicalSwitch(lua_State *L)
static int luaModelSetLogicalSwitch(lua_State *L)
{
int idx = luaL_checkunsigned(L, 1);
- if (idx < NUM_CSW) {
+ if (idx < NUM_LOGICAL_SWITCH) {
LogicalSwitchData * sw = cswAddress(idx);
luaL_checktype(L, -1, LUA_TTABLE);
for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) {
@@ -824,18 +824,18 @@ void luaInit()
// Init lua
luaL_openlibs(L);
- // Push openTX libs
+ // Push OpenTX libs
lua_registerlib(L, "model", modelLib);
lua_registerlib(L, "lcd", lcdLib);
- // Push openTX functions
+ // Push OpenTX functions
lua_register(L, "getTime", luaGetTime);
lua_register(L, "getVersion", luaGetVersion);
lua_register(L, "getValue", luaGetValue);
lua_register(L, "playFile", luaPlayFile);
lua_register(L, "popupInput", luaPopupInput);
- // Push openTX constants
+ // Push OpenTX constants
lua_registerint(L, "DBLSIZE", DBLSIZE);
lua_registerint(L, "MIDSIZE", MIDSIZE);
lua_registerint(L, "SMLSIZE", SMLSIZE);
@@ -844,11 +844,11 @@ void luaInit()
lua_registerint(L, "VALUE", 0);
lua_registerint(L, "SOURCE", 1);
lua_registerint(L, "REPLACE", MLTPX_REP);
- lua_registerint(L, "MIX_Rud", MIXSRC_Rud);
- lua_registerint(L, "MIX_Ele", MIXSRC_Ele);
- lua_registerint(L, "MIX_Thr", MIXSRC_Thr);
- lua_registerint(L, "MIX_Ail", MIXSRC_Ail);
- lua_registerint(L, "SW_Last", SWSRC_LAST_CSW);
+ lua_registerint(L, "STICK_RUDDER", MIXSRC_Rud);
+ lua_registerint(L, "STICK_ELEVATOR", MIXSRC_Ele);
+ lua_registerint(L, "STICK_THROTTLE", MIXSRC_Thr);
+ lua_registerint(L, "STICK_AILERON", MIXSRC_Ail);
+ lua_registerint(L, "SWITCH_LAST", SWSRC_LAST_CSW);
lua_registerint(L, "EVT_MENU_BREAK", EVT_KEY_BREAK(KEY_MENU));
lua_registerint(L, "EVT_PAGE_BREAK", EVT_KEY_BREAK(KEY_PAGE));
lua_registerint(L, "EVT_ENTER_BREAK", EVT_KEY_BREAK(KEY_ENTER));
diff --git a/radio/src/maths.cpp b/radio/src/maths.cpp
index 66ccea7a4..2cd8597f4 100644
--- a/radio/src/maths.cpp
+++ b/radio/src/maths.cpp
@@ -36,6 +36,29 @@
#include "opentx.h"
+
+/*
+ Division by 10 and rounding or fixed point arithmetic values
+
+ Examples:
+ value -> result
+ 105 -> 11
+ 104 -> 10
+ -205 -> -21
+ -204 -> -20
+*/
+getvalue_t div10_and_round(getvalue_t value)
+{
+ if (value >= 0 ) {
+ value += 5;
+ }
+ else {
+ value -= 5;
+ }
+ return value/10;
+}
+
+
#if defined(FRSKY)
uint16_t getChannelRatio(uint8_t channel)
{
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index ba722512f..cb763f208 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -73,11 +73,11 @@
#define MAX_PHASES 9
#define MAX_MIXERS 64
#define MAX_EXPOS 64
- #define NUM_CSW 32 // number of custom switches
+ #define NUM_LOGICAL_SWITCH 32 // number of custom switches
#define NUM_CFN 64 // number of functions assigned to switches
#define MAX_SCRIPTS 7
#define MAX_INPUTS 32
- #define NUM_PPM 16
+ #define NUM_TRAINER 16
#define NUM_POTS 5
#define NUM_XPOTS 3
#elif defined(CPUARM)
@@ -86,9 +86,9 @@
#define MAX_PHASES 9
#define MAX_MIXERS 64
#define MAX_EXPOS 32
- #define NUM_CSW 32 // number of custom switches
+ #define NUM_LOGICAL_SWITCH 32 // number of custom switches
#define NUM_CFN 64 // number of functions assigned to switches
- #define NUM_PPM 16
+ #define NUM_TRAINER 16
#define NUM_POTS 3
#define NUM_XPOTS 0
#elif defined(CPUM2560) || defined(CPUM2561)
@@ -97,9 +97,9 @@
#define MAX_PHASES 6
#define MAX_MIXERS 32
#define MAX_EXPOS 16
- #define NUM_CSW 15 // number of custom switches
+ #define NUM_LOGICAL_SWITCH 15 // number of custom switches
#define NUM_CFN 24 // number of functions assigned to switches
- #define NUM_PPM 8
+ #define NUM_TRAINER 8
#define NUM_POTS 3
#define NUM_XPOTS 0
#elif defined(CPUM128)
@@ -108,9 +108,9 @@
#define MAX_PHASES 5
#define MAX_MIXERS 32
#define MAX_EXPOS 14
- #define NUM_CSW 15 // number of custom switches
+ #define NUM_LOGICAL_SWITCH 15 // number of custom switches
#define NUM_CFN 24 // number of functions assigned to switches
- #define NUM_PPM 8
+ #define NUM_TRAINER 8
#define NUM_POTS 3
#define NUM_XPOTS 0
#else
@@ -119,9 +119,9 @@
#define MAX_PHASES 5
#define MAX_MIXERS 32
#define MAX_EXPOS 14
- #define NUM_CSW 12 // number of custom switches
+ #define NUM_LOGICAL_SWITCH 12 // number of custom switches
#define NUM_CFN 16 // number of functions assigned to switches
- #define NUM_PPM 8
+ #define NUM_TRAINER 8
#define NUM_POTS 3
#define NUM_XPOTS 0
#endif
@@ -439,36 +439,37 @@ PACK(typedef struct t_CurveRef {
#endif
#if defined(PCBTARANIS)
-PACK(typedef struct t_ExpoData {
+PACK(typedef struct {
uint8_t srcRaw;
uint16_t scale;
uint8_t chn;
int8_t swtch;
uint16_t phases;
int8_t weight;
- int8_t carryTrim;
+ int8_t carryTrim:6;
+ uint8_t mode:2;
char name[LEN_EXPOMIX_NAME];
int8_t offset;
CurveRef curve;
uint8_t spare;
}) ExpoData;
#define MIN_EXPO_WEIGHT -100
-#define EXPO_VALID(ed) ((ed)->srcRaw)
-#define EXPO_MODE_ENABLE(ed, v) (true)
+#define EXPO_VALID(ed) ((ed)->mode)
+#define EXPO_MODE_ENABLE(ed, v) (((v)<0 && ((ed)->mode&1)) || ((v)>=0 && ((ed)->mode&2)))
#elif defined(CPUARM)
-PACK(typedef struct t_ExpoData {
- uint8_t mode; // 0=end, 1=pos, 2=neg, 3=both
- uint8_t chn;
+PACK(typedef struct {
+ uint8_t mode:2; // 0=end, 1=pos, 2=neg, 3=both
+ uint8_t chn:4;
+ uint8_t curveMode:2;
int8_t swtch;
uint16_t phases;
int8_t weight;
- uint8_t curveMode;
char name[LEN_EXPOMIX_NAME];
int8_t curveParam;
}) ExpoData;
#define MIN_EXPO_WEIGHT 0
#define EXPO_VALID(ed) ((ed)->mode)
-#define EXPO_MODE_ENABLE(ed, v) ((v<0 && (ed->mode&1)) || (v>=0 && (ed->mode&2)))
+#define EXPO_MODE_ENABLE(ed, v) (((v)<0 && ((ed)->mode&1)) || ((v)>=0 && ((ed)->mode&2)))
#elif defined(CPUM2560) || defined(CPUM2561)
PACK(typedef struct t_ExpoData {
uint8_t mode:2; // 0=end, 1=pos, 2=neg, 3=both
@@ -482,7 +483,7 @@ PACK(typedef struct t_ExpoData {
}) ExpoData;
#define MIN_EXPO_WEIGHT 0
#define EXPO_VALID(ed) ((ed)->mode)
-#define EXPO_MODE_ENABLE(ed, v) ((v<0 && (ed->mode&1)) || (v>=0 && (ed->mode&2)))
+#define EXPO_MODE_ENABLE(ed, v) (((v)<0 && ((ed)->mode&1)) || ((v)>=0 && ((ed)->mode&2)))
#else
PACK(typedef struct t_ExpoData {
uint8_t mode:2; // 0=end, 1=pos, 2=neg, 3=both
@@ -495,10 +496,10 @@ PACK(typedef struct t_ExpoData {
}) ExpoData;
#define MIN_EXPO_WEIGHT 0
#define EXPO_VALID(ed) ((ed)->mode)
-#define EXPO_MODE_ENABLE(ed, v) ((v<0 && (ed->mode&1)) || (v>=0 && (ed->mode&2)))
+#define EXPO_MODE_ENABLE(ed, v) (((v)<0 && ((ed)->mode&1)) || ((v)>=0 && ((ed)->mode&2)))
#endif
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
#define limit_min_max_t int16_t
#define LIMIT_MAX(lim) (GV_IS_GV_VALUE(lim->max+1000, 0, 1250) ? GET_GVAR(lim->max+1000, 0, 125, s_perout_flight_phase)*10 : lim->max+1000)
#define LIMIT_MIN(lim) (GV_IS_GV_VALUE(lim->min-1000, -1250, 0) ? GET_GVAR(lim->min-1000, -125, 0, s_perout_flight_phase)*10 : lim->min-1000)
@@ -540,30 +541,26 @@ PACK(typedef struct t_LimitData {
#define MLTPX_REP 2
#if defined(CPUARM)
-// highest bit used for small values in mix 128 --> 8 bit is enough
-#define GV1_SMALL 128
-// highest bit used for large values in mix 4096 --> 12 bits is used (type for weight and offset has even 16 bits)
-#define GV1_LARGE 4096
-// the define GV1_LARGE marks the highest bit value used for this variables
-// because this would give too big numbers for ARM, we limit it further for offset and weight
-// must be smaller than GV1_LARGE - RESERVE_RANGE_FOR_GVARS -1
+#define GV1_SMALL 128
+#define GV1_LARGE 4096
#define GV_RANGE_WEIGHT 500
#define GV_RANGE_OFFSET 500
-
-#define DELAY_STEP 10
-#define SLOW_STEP 10
-#define DELAY_MAX (25*DELAY_STEP) /* 25 seconds */
-#define SLOW_MAX (25*SLOW_STEP) /* 25 seconds */
+#define DELAY_STEP 10
+#define SLOW_STEP 10
+#define DELAY_MAX (25*DELAY_STEP) /* 25 seconds */
+#define SLOW_MAX (25*SLOW_STEP) /* 25 seconds */
#if defined(PCBTARANIS)
-PACK(typedef struct t_MixData {
+PACK(typedef struct {
uint8_t destCh;
uint16_t phases;
- uint8_t mltpx; // multiplex method: 0 means +=, 1 means *=, 2 means :=
+ uint8_t mltpx:2; // multiplex method: 0 means +=, 1 means *=, 2 means :=
+ uint8_t carryTrim:1;
+ uint8_t spare1:5;
int16_t weight;
int8_t swtch;
CurveRef curve;
- uint8_t mixWarn:4; // mixer warning
- uint8_t srcVariant:4;
+ uint8_t mixWarn:4; // mixer warning
+ uint8_t spare2:4;
uint8_t delayUp;
uint8_t delayDown;
uint8_t speedUp;
@@ -571,11 +568,12 @@ PACK(typedef struct t_MixData {
uint8_t srcRaw;
int16_t offset;
char name[LEN_EXPOMIX_NAME];
- uint8_t spare;
+ uint8_t spare3;
}) MixData;
#else
-PACK(typedef struct t_MixData {
- uint8_t destCh;
+PACK(typedef struct {
+ uint8_t destCh:4;
+ uint8_t mixWarn:4; // mixer warning
uint16_t phases;
uint8_t curveMode:1;
uint8_t noExpo:1;
@@ -585,8 +583,6 @@ PACK(typedef struct t_MixData {
int16_t weight;
int8_t swtch;
int8_t curveParam;
- uint8_t mixWarn:4; // mixer warning
- uint8_t srcVariant:4;
uint8_t delayUp;
uint8_t delayDown;
uint8_t speedUp;
@@ -887,7 +883,7 @@ PACK(typedef struct t_CustomFnData { // Function Switches data
#define CFN_TIMER_INDEX(p) ((p)->all.param)
#define CFN_PLAY_REPEAT(p) ((p)->active)
#define CFN_PLAY_REPEAT_MUL 1
-#define CFN_PLAY_REPEAT_NOSTART 0x3F
+#define CFN_PLAY_REPEAT_NOSTART 0xFF
#define CFN_GVAR_MODE(p) ((p)->all.mode)
#define CFN_PARAM(p) ((p)->all.val)
#define CFN_RESET(p) ((p)->active=0, (p)->clear.val1=0, (p)->clear.val2=0)
@@ -1112,12 +1108,18 @@ enum FrskyUsrProtocols {
USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
};
-enum FrskySource {
- FRSKY_SOURCE_NONE,
- FRSKY_SOURCE_A1,
- FRSKY_SOURCE_A2,
- FRSKY_SOURCE_FAS,
- FRSKY_SOURCE_CELLS,
+enum FrskyCurrentSource {
+ FRSKY_CURRENT_SOURCE_NONE,
+ FRSKY_CURRENT_SOURCE_A1,
+ FRSKY_CURRENT_SOURCE_A2,
+ FRSKY_CURRENT_SOURCE_FAS,
+};
+
+enum FrskyVoltsSource {
+ FRSKY_VOLTS_SOURCE_A1,
+ FRSKY_VOLTS_SOURCE_A2,
+ FRSKY_VOLTS_SOURCE_FAS,
+ FRSKY_VOLTS_SOURCE_CELLS,
};
#if defined(CPUARM)
@@ -1350,7 +1352,7 @@ enum SwitchSources {
SWSRC_SWA,
SWSRC_SWB,
SWSRC_SWC,
- SWSRC_LAST_CSW = SWSRC_SW1+NUM_CSW-1,
+ SWSRC_LAST_CSW = SWSRC_SW1+NUM_LOGICAL_SWITCH-1,
SWSRC_ON,
SWSRC_OFF = -SWSRC_ON,
@@ -1443,16 +1445,16 @@ enum MixSources {
MIXSRC_GEA,
MIXSRC_TRN,
#endif
- MIXSRC_FIRST_CSW,
- MIXSRC_SW1 = MIXSRC_FIRST_CSW,
+ MIXSRC_FIRST_LOGICAL_SWITCH,
+ MIXSRC_SW1 = MIXSRC_FIRST_LOGICAL_SWITCH,
MIXSRC_SW9 = MIXSRC_SW1 + 8,
MIXSRC_SWA,
MIXSRC_SWB,
MIXSRC_SWC,
- MIXSRC_LAST_CSW = MIXSRC_FIRST_CSW+NUM_CSW-1,
+ MIXSRC_LAST_LOGICAL_SWITCH = MIXSRC_FIRST_LOGICAL_SWITCH+NUM_LOGICAL_SWITCH-1,
- MIXSRC_FIRST_PPM,
- MIXSRC_LAST_PPM = MIXSRC_FIRST_PPM+NUM_PPM-1,
+ MIXSRC_FIRST_TRAINER,
+ MIXSRC_LAST_TRAINER = MIXSRC_FIRST_TRAINER+NUM_TRAINER-1,
MIXSRC_FIRST_CH,
MIXSRC_CH1 = MIXSRC_FIRST_CH,
@@ -1574,7 +1576,8 @@ enum FailsafeModes {
FAILSAFE_HOLD,
FAILSAFE_CUSTOM,
FAILSAFE_NOPULSES,
- FAILSAFE_LAST = FAILSAFE_NOPULSES
+ FAILSAFE_RECEIVER,
+ FAILSAFE_LAST = FAILSAFE_RECEIVER
};
#if defined(FRSKY) || !defined(PCBSTD)
@@ -1605,6 +1608,22 @@ PACK(typedef struct {
#define AVR_FIELD(x) x;
#endif
+enum ThrottleSources {
+ THROTTLE_SOURCE_THR,
+#if defined(PCBTARANIS)
+ THROTTLE_SOURCE_S1,
+ THROTTLE_SOURCE_S2,
+ THROTTLE_SOURCE_S3,
+ THROTTLE_SOURCE_LS,
+ THROTTLE_SOURCE_RS,
+#else
+ THROTTLE_SOURCE_P1,
+ THROTTLE_SOURCE_P2,
+ THROTTLE_SOURCE_P3,
+#endif
+ THROTTLE_SOURCE_CH1,
+};
+
PACK(typedef struct t_ModelData {
ModelHeader header;
TimerData timers[MAX_TIMERS];
@@ -1628,7 +1647,7 @@ PACK(typedef struct t_ModelData {
CURVDATA curves[MAX_CURVES];
int8_t points[NUM_POINTS];
- LogicalSwitchData customSw[NUM_CSW];
+ LogicalSwitchData customSw[NUM_LOGICAL_SWITCH];
CustomFnData funcSw[NUM_CFN];
SwashRingData swashR;
PhaseData phaseData[MAX_PHASES];
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index a8090a9aa..49d430ac5 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -38,14 +38,15 @@
// static variables used in perOut - moved here so they don't interfere with the stack
// It's also easier to initialize them here.
-#if !defined(PCBTARANIS)
-int16_t rawAnas[NUM_INPUTS] = {0};
+#if defined(PCBTARANIS)
+int8_t virtualInputsTrims[NUM_INPUTS];
+#else
+int16_t rawAnas[NUM_INPUTS] = {0};
#endif
int16_t anas [NUM_INPUTS] = {0};
int16_t trims[NUM_STICKS] = {0};
int32_t chans[NUM_CHNOUT] = {0};
BeepANACenter bpanaCenter = 0;
-struct t_inactivity inactivity = {0};
int24_t act [MAX_MIXERS] = {0};
SwOn swOn [MAX_MIXERS]; // TODO better name later...
@@ -541,6 +542,7 @@ void applyDefaultTemplate()
expo->curve.type = CURVE_REF_EXPO;
expo->chn = i;
expo->weight = 100;
+ expo->mode = 3; // TODO constant
for (int c=0; c<4; c++) {
g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]);
}
@@ -588,7 +590,7 @@ void modelDefault(uint8_t id)
#if defined(MAVLINK)
g_model.mavlink.rc_rssi_scale = 15;
- g_model.mavlink.pc_rssi_en = 1;
+ g_model.mavlink.pc_rssi_en = 1;
#endif
}
@@ -1003,17 +1005,13 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
int16_t offset = GET_GVAR(ed->offset, -100, 100, s_perout_flight_phase);
if (offset) v += calc100toRESX(offset);
- //========== TRIMS ===============
- if (!(mode & e_perout_mode_notrims)) {
- int8_t input_trim = ed->carryTrim;
- if (input_trim < TRIM_ON)
- input_trim = -input_trim - 1;
- else if (input_trim == TRIM_ON && ed->srcRaw >= MIXSRC_Rud && ed->srcRaw <= MIXSRC_Ail)
- input_trim = ed->srcRaw - MIXSRC_Rud;
- else
- input_trim = -1;
- if (input_trim >= 0) v += trims[input_trim];
- }
+ //========== TRIMS ================
+ if (ed->carryTrim < TRIM_ON)
+ virtualInputsTrims[cur_chn] = -ed->carryTrim - 1;
+ else if (ed->carryTrim == TRIM_ON && ed->srcRaw >= MIXSRC_Rud && ed->srcRaw <= MIXSRC_Ail)
+ virtualInputsTrims[cur_chn] = ed->srcRaw - MIXSRC_Rud;
+ else
+ virtualInputsTrims[cur_chn] = -1;
#endif
anas[cur_chn] = v;
@@ -1248,7 +1246,7 @@ getvalue_t getValue(uint8_t i)
else if (i==MIXSRC_SF) return (switchState(SW_SF0) ? -1024 : 1024);
else if (i==MIXSRC_SG) return (switchState(SW_SG0) ? -1024 : (switchState(SW_SG1) ? 0 : 1024));
else if (i==MIXSRC_SH) return (switchState(SW_SH0) ? -1024 : 1024);
- else if (i<=MIXSRC_LAST_CSW) return getSwitch(SWSRC_FIRST_CSW+i-MIXSRC_FIRST_CSW) ? 1024 : -1024;
+ else if (i<=MIXSRC_LAST_LOGICAL_SWITCH) return getSwitch(SWSRC_FIRST_CSW+i-MIXSRC_FIRST_LOGICAL_SWITCH) ? 1024 : -1024;
#else
else if (i==MIXSRC_3POS) return (getSwitch(SW_ID0-SW_BASE+1) ? -1024 : (getSwitch(SW_ID1-SW_BASE+1) ? 0 : 1024));
// don't use switchState directly to give getSwitch possibility to hack values if needed for switch warning
@@ -1256,10 +1254,10 @@ getvalue_t getValue(uint8_t i)
else if (i==MIXSRC_3POS2) return (getSwitch(SW_ID3-SW_BASE+1) ? -1024 : (getSwitch(SW_ID4-SW_BASE+1) ? 0 : 1024));
// don't use switchState directly to give getSwitch possibility to hack values if needed for switch warning
#endif
- else if (i<=MIXSRC_LAST_CSW) return getSwitch(SWSRC_THR+i-MIXSRC_THR) ? 1024 : -1024;
+ else if (i<=MIXSRC_LAST_LOGICAL_SWITCH) return getSwitch(SWSRC_THR+i-MIXSRC_THR) ? 1024 : -1024;
#endif
- else if (i<=MIXSRC_LAST_PPM) { int16_t x = g_ppmIns[i-MIXSRC_FIRST_PPM]; if (i= 0
+#else
+ #define TRIM_REUSED(idx) 0
#endif
#if defined(CPUARM)
@@ -2648,8 +2650,7 @@ uint8_t checkTrim(uint8_t event)
bool thro;
#if defined(GVARS)
-#define TRIM_REUSED() trimGvar[idx] >= 0
- if (TRIM_REUSED()) {
+ if (TRIM_REUSED(idx)) {
#if defined(PCBSTD)
phase = 0;
#else
@@ -2668,7 +2669,6 @@ uint8_t checkTrim(uint8_t event)
thro = (idx==THR_STICK && g_model.thrTrim);
}
#else
-#define TRIM_REUSED() 0
phase = getTrimFlightPhase(s_perout_flight_phase, idx);
#if defined(PCBTARANIS)
before = getTrimValue(phase, idx);
@@ -2694,7 +2694,7 @@ uint8_t checkTrim(uint8_t event)
}
if ((beforeTRIM_MAX) || (before>after && afterplay.name)+sizeof(SOUNDS_EXT)] = SOUNDS_PATH "/";
- strncpy(filename+SOUNDS_PATH_LNG_OFS, currentLanguagePack->id, 2);
- strncpy(filename+sizeof(SOUNDS_PATH), sd->play.name, sizeof(sd->play.name));
- filename[sizeof(SOUNDS_PATH)+sizeof(sd->play.name)] = '\0';
- strcat(filename+sizeof(SOUNDS_PATH), SOUNDS_EXT);
- PLAY_FILE(filename, sd->func==FUNC_BACKGND_MUSIC ? PLAY_BACKGROUND : 0, id);
+ if (sd->play.name[0] != '\0') {
+ char filename[sizeof(SOUNDS_PATH)+sizeof(sd->play.name)+sizeof(SOUNDS_EXT)] = SOUNDS_PATH "/";
+ strncpy(filename+SOUNDS_PATH_LNG_OFS, currentLanguagePack->id, 2);
+ strncpy(filename+sizeof(SOUNDS_PATH), sd->play.name, sizeof(sd->play.name));
+ filename[sizeof(SOUNDS_PATH)+sizeof(sd->play.name)] = '\0';
+ strcat(filename+sizeof(SOUNDS_PATH), SOUNDS_EXT);
+ PLAY_FILE(filename, sd->func==FUNC_BACKGND_MUSIC ? PLAY_BACKGROUND : 0, id);
+ }
}
#endif
@@ -3414,14 +3425,19 @@ void evalFunctions()
}
case FUNC_INSTANT_TRIM:
+ newActiveFunctions |= (1 << FUNCTION_INSTANT_TRIM);
if (!isFunctionActive(FUNCTION_INSTANT_TRIM)) {
- newActiveFunctions |= (1 << FUNCTION_INSTANT_TRIM);
if (g_menuStack[0] == menuMainView
#if defined(FRSKY)
|| g_menuStack[0] == menuTelemetryFrsky
#endif
- )
+#if defined(PCBTARANIS)
+ || g_menuStack[0] == menuMainViewChannelsMonitor
+ || g_menuStack[0] == menuChannelsView
+#endif
+ ) {
instantTrim();
+ }
}
break;
@@ -3746,12 +3762,21 @@ void perOut(uint8_t mode, uint8_t tick10ms)
//========== VALUE ===============
getvalue_t v = 0;
if (mode > e_perout_mode_inactive_phase) {
+#if defined(PCBTARANIS)
+ if (!mixEnabled) {
+ continue;
+ }
+ else {
+ v = getValue(md->srcRaw);
+ }
+#else
if (!mixEnabled || stickIndex >= NUM_STICKS || (stickIndex == THR_STICK && g_model.thrTrim)) {
continue;
}
else {
if (!(mode & e_perout_mode_nosticks)) v = anas[stickIndex];
}
+#endif
}
else {
#if !defined(PCBTARANIS)
@@ -3814,14 +3839,27 @@ void perOut(uint8_t mode, uint8_t tick10ms)
#endif
}
-#if !defined(PCBTARANIS) // (because trims are taken into account by INPUTS on Taranis)
if (apply_offset_and_curve) {
+#if !defined(PCBTARANIS) // OFFSET is now applied AFTER weight on Taranis
//========== OFFSET / SOURCE ===============
int16_t offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, s_perout_flight_phase);
if (offset) v += calc100toRESX_16Bits(offset);
+#endif
//========== TRIMS ================
if (!(mode & e_perout_mode_notrims)) {
+#if defined(PCBTARANIS)
+ if (!md->carryTrim) {
+ int8_t mix_trim;
+ if (stickIndex < NUM_STICKS)
+ mix_trim = stickIndex;
+ else if (md->srcRaw <= MIXSRC_LAST_INPUT)
+ mix_trim = virtualInputsTrims[md->srcRaw-1];
+ else
+ mix_trim = -1;
+ if (mix_trim >= 0) v += trims[mix_trim];
+ }
+#else
int8_t mix_trim = md->carryTrim;
if (mix_trim < TRIM_ON)
mix_trim = -mix_trim - 1;
@@ -3830,9 +3868,9 @@ void perOut(uint8_t mode, uint8_t tick10ms)
else
mix_trim = -1;
if (mix_trim >= 0) v += trims[mix_trim];
+#endif
}
}
-#endif
// saves 12 bytes code if done here and not together with weight; unknown reason
int16_t weight = GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, s_perout_flight_phase);
@@ -3852,21 +3890,21 @@ void perOut(uint8_t mode, uint8_t tick10ms)
// the unit of the stored value is the value from md->speedUp or md->speedDown divide SLOW_STEP seconds; e.g. value 4 means 4/SLOW_STEP = 2 seconds for CPU64
// because we get a tick each 10msec, we need 100 ticks for one second
// the value in md->speedXXX gives the time it should take to do a full movement from -100 to 100 therefore 200%. This equals 2048 in recalculated internal range
- if (tick10ms) {
+ if (tick10ms || !s_mixer_first_run_done) {
// only if already time is passed add or substract a value according the speed configured
int32_t rate = (int32_t) tick10ms << (DEL_MULT_SHIFT+11); // = DEL_MULT*2048*tick10ms
// rate equals a full range for one second; if less time is passed rate is accordingly smaller
// if one second passed, rate would be 2048 (full motion)*256(recalculated weight)*100(100 ticks needed for one second)
int32_t currentValue = ((int32_t) v< 0) {
- if (md->speedUp > 0) {
+ if (s_mixer_first_run_done && md->speedUp > 0) {
// if a speed upwards is defined recalculate the new value according configured speed; the higher the speed the smaller the add value is
int32_t newValue = tact+rate/((int16_t)(100/SLOW_STEP)*md->speedUp);
if (newValuespeedDown > 0) {
+ if (s_mixer_first_run_done && md->speedDown > 0) {
// see explanation in speedUp
int32_t newValue = tact-rate/((int16_t)(100/SLOW_STEP)*md->speedDown);
if (newValue>currentValue) currentValue = newValue; // Endposition; prevent toggling around the destination
@@ -4089,6 +4127,8 @@ void doMixerCalculations()
perOut(e_perout_mode_normal, tick10ms);
}
+ s_mixer_first_run_done = true;
+
//========== FUNCTIONS ===============
// must be done after mixing because some functions use the inputs/channels values
// must be done before limits because of the applyLimit function: it checks for safety switches which would be not initialized otherwise
@@ -4156,8 +4196,10 @@ void doMixerCalculations()
// usually max is 1024 min is -1024 --> max-min = 2048 full range / 128 = max 16 steps
gModelMax >>= (10-2);
- if (gModelMax != 8)
- val = (val << 3) / (gModelMax); // rescaling only needed if Min, Max differs
+
+ if (gModelMax != 0 && gModelMax != 8) {
+ val = (val << 3) / gModelMax; // rescaling only needed if Min, Max differs
+ }
// if (gModelMax!=2048) val = (int32_t) (val << 11) / (gModelMax); // recaling only needed if Min, Max differs
// val = val * 10 / (10+(lim->max-lim->min)/20);
@@ -4284,7 +4326,7 @@ void doMixerCalculations()
s_cnt_100ms -= 10;
s_cnt_1s += 1;
- for (uint8_t i=0; ifunc == LS_FUNC_TIMER) {
int16_t *lastValue = &csLastValue[i];
@@ -4553,6 +4595,44 @@ void opentxClose()
}
#endif
+
+#if defined(PCBTARANIS) && !defined(SIMU)
+extern USB_OTG_CORE_HANDLE USB_OTG_dev;
+
+/*
+ Prepare and send new USB data packet
+
+ The format of HID_Buffer is defined by
+ USB endpoint description can be found in
+ file usb_hid_joystick.c, variable HID_JOYSTICK_ReportDesc
+*/
+void usbJoystickUpdate(void)
+{
+ static uint8_t HID_Buffer[HID_IN_PACKET];
+
+ //buttons
+ HID_Buffer[0] = 0; //buttons
+ for (int i = 0; i < 8; ++i) {
+ if ( channelOutputs[i+8] > 0 ) {
+ HID_Buffer[0] |= (1 << i);
+ }
+ }
+
+ //analog values
+ //uint8_t * p = HID_Buffer + 1;
+ for (int i = 0; i < 8; ++i) {
+ int16_t value = channelOutputs[i] / 8;
+ if ( value > 127 ) value = 127;
+ else if ( value < -127 ) value = -127;
+ HID_Buffer[i+1] = static_cast(value);
+ }
+
+ USBD_HID_SendReport (&USB_OTG_dev, HID_Buffer, HID_IN_PACKET );
+}
+
+#endif //#if defined(PCBTARANIS) && !defined(SIMU)
+
+
void perMain()
{
#if defined(SIMU)
@@ -4704,14 +4784,24 @@ void perMain()
}
#endif
-#if defined(PCBTARANIS)
+#if defined(PCBTARANIS) && !defined(SIMU)
static bool usbStarted = false;
if (!usbStarted && usbPlugged()) {
- opentxClose();
usbStart();
usbStarted = true;
}
-#endif
+
+ if (usbStarted) {
+ if (!usbPlugged()) {
+ //disable USB
+ usbStop();
+ usbStarted = false;
+ }
+ else {
+ usbJoystickUpdate();
+ }
+ }
+#endif //#if defined(PCBTARANIS) && !defined(SIMU)
#if defined(NAVIGATION_STICKS)
if (StickScrollAllowed) {
@@ -4780,28 +4870,22 @@ void perMain()
const char *warn = s_warning;
uint8_t menu = s_menu_count;
- if (usbPlugged()) {
+ if (!LCD_LOCKED()) {
lcd_clear();
- menuMainView(0);
- }
- else {
- if (!LCD_LOCKED()) {
- lcd_clear();
- g_menuStack[g_menuStackPtr]((warn || menu) ? 0 : evt);
- if (warn) DISPLAY_WARNING(evt);
+ g_menuStack[g_menuStackPtr]((warn || menu) ? 0 : evt);
+ if (warn) DISPLAY_WARNING(evt);
#if defined(NAVIGATION_MENUS)
- if (menu) {
- const char * result = displayMenu(evt);
- if (result) {
- menuHandler(result);
- putEvent(EVT_MENU_UP);
- }
+ if (menu) {
+ const char * result = displayMenu(evt);
+ if (result) {
+ menuHandler(result);
+ putEvent(EVT_MENU_UP);
}
+ }
#endif
#if defined(LUA)
- evt = 0;
+ evt = 0;
#endif
- }
}
#if defined(LUA)
@@ -4883,7 +4967,7 @@ void perMain()
}
}
-int16_t g_ppmIns[NUM_PPM];
+int16_t g_ppmIns[NUM_TRAINER];
uint8_t ppmInState = 0; // 0=unsync 1..8= wait for value i-1
#if !defined(SIMU) && !defined(CPUARM)
@@ -5055,7 +5139,11 @@ void instantTrim()
if (i!=THR_STICK) {
// don't instant trim the throttle stick
uint8_t trim_phase = getTrimFlightPhase(s_perout_flight_phase, i);
+#if defined(PCBTARANIS)
+ int16_t trim = limit(TRIM_EXTENDED_MIN, (calibratedStick[i] + trims[i]) / 2, TRIM_EXTENDED_MAX);
+#else
int16_t trim = limit(TRIM_EXTENDED_MIN, (anas[i] + trims[i]) / 2, TRIM_EXTENDED_MAX);
+#endif
setTrimValue(trim_phase, i, trim);
}
}
@@ -5097,14 +5185,17 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim
zeros[i] = applyLimits(i, chans[i]);
}
- perOut(e_perout_mode_nosticks+e_perout_mode_notrainer, 0); // do output loop - only trims
+ perOut(e_perout_mode_noinput-e_perout_mode_notrims, 0); // do output loop - only trims
for (uint8_t i=0; i 0 || defined(ROTARY_ENCODER_NAVIGATION)
- BTN_REa,
-#endif
-#if ROTARY_ENCODERS > 0
- BTN_REb,
-#endif
-
- NUM_KEYS,
- SW_BASE=NUM_KEYS,
-
-#if defined(PCBTARANIS)
- SW_SA0=SW_BASE,
- SW_SA1,
- SW_SA2,
- SW_SB0,
- SW_SB1,
- SW_SB2,
- SW_SC0,
- SW_SC1,
- SW_SC2,
- SW_SD0,
- SW_SD1,
- SW_SD2,
- SW_SE0,
- SW_SE1,
- SW_SE2,
- SW_SF0,
- SW_SF2,
- SW_SG0,
- SW_SG1,
- SW_SG2,
- SW_SH0,
- SW_SH2,
-#else
- SW_ID0=SW_BASE,
- SW_ID1,
- SW_ID2,
-#if defined(EXTRA_3POS)
- SW_ID3,
- SW_ID4,
- SW_ID5,
-#endif
-
- SW_THR,
- SW_RUD,
- SW_ELE,
- SW_AIL,
- SW_GEA,
- SW_TRN,
-#endif
-
-};
#if defined(PCBTARANIS)
#define NUM_SWITCHES 8
@@ -587,35 +510,6 @@ extern uint8_t stickMode;
extern uint8_t channel_order(uint8_t x);
-class Key
-{
-#define FILTERBITS 4
-
-#ifdef SIMU
- #define FFVAL 1
-#else
- #define FFVAL ((1< 0; }
- void pauseEvents() { m_state = KSTATE_PAUSE; m_cnt = 0; }
- void killEvents() { m_state = KSTATE_KILLED; }
-};
-
-extern Key keys[NUM_KEYS];
-
enum BaseCurves {
CURVE_NONE,
CURVE_X_GT0,
@@ -630,77 +524,9 @@ enum BaseCurves {
#define THRCHK_DEADBAND 16
#if defined(FSPLASH) || defined(XSPLASH)
-#define SPLASH_TIMEOUT (g_eeGeneral.splashMode == 0 ? 60000/*infinite=10mn*/ : ((4*100) * (g_eeGeneral.splashMode & 0x03)))
+ #define SPLASH_TIMEOUT (g_eeGeneral.splashMode == 0 ? 60000/*infinite=10mn*/ : ((4*100) * (g_eeGeneral.splashMode & 0x03)))
#else
-#define SPLASH_TIMEOUT (4*100) // 4 seconds
-#endif
-
-#define EVT_KEY_MASK(e) ((e) & 0x1f)
-
-#define _MSK_KEY_BREAK 0x20
-#define _MSK_KEY_REPT 0x40
-#define _MSK_KEY_FIRST 0x60
-#define _MSK_KEY_LONG 0x80
-
-#define EVT_KEY_BREAK(key) ((key)|_MSK_KEY_BREAK)
-#define EVT_KEY_FIRST(key) ((key)|_MSK_KEY_FIRST)
-#define EVT_KEY_REPT(key) ((key)|_MSK_KEY_REPT)
-#define EVT_KEY_LONG(key) ((key)|_MSK_KEY_LONG)
-
-#define IS_KEY_BREAK(evt) (((evt)&0xe0) == _MSK_KEY_BREAK)
-#define IS_KEY_FIRST(evt) (((evt)&0xe0) == _MSK_KEY_FIRST)
-#define IS_KEY_LONG(evt) (((evt)&0xe0) == _MSK_KEY_LONG)
-
-#define EVT_ENTRY 0xbf
-#define EVT_ENTRY_UP 0xbe
-#define EVT_MENU_UP 0xbd
-
-#if defined(PCBTARANIS)
- #define EVT_ROTARY_BREAK EVT_KEY_BREAK(KEY_ENTER)
- #define EVT_ROTARY_LONG EVT_KEY_LONG(KEY_ENTER)
-#else
- #define EVT_ROTARY_BREAK 0xcf
- #define EVT_ROTARY_LONG 0xce
- #define EVT_ROTARY_LEFT 0xdf
- #define EVT_ROTARY_RIGHT 0xde
-#endif
-
-#if defined(PCBTARANIS)
- #define IS_ROTARY_LEFT(evt) (evt==EVT_KEY_FIRST(KEY_MINUS) || evt==EVT_KEY_REPT(KEY_MINUS))
- #define IS_ROTARY_RIGHT(evt) (evt==EVT_KEY_FIRST(KEY_PLUS) || evt==EVT_KEY_REPT(KEY_PLUS))
- #define IS_ROTARY_UP(evt) (evt==EVT_KEY_FIRST(KEY_PLUS) || evt==EVT_KEY_REPT(KEY_PLUS))
- #define IS_ROTARY_DOWN(evt) (evt==EVT_KEY_FIRST(KEY_MINUS) || evt==EVT_KEY_REPT(KEY_MINUS))
- #define IS_ROTARY_BREAK(evt) (evt==EVT_KEY_BREAK(KEY_ENTER))
- #define IS_ROTARY_LONG(evt) (evt==EVT_KEY_LONG(KEY_ENTER))
- #define IS_ROTARY_EVENT(evt) (0)
- #define CASE_EVT_ROTARY_BREAK /*case EVT_KEY_BREAK(KEY_ENTER):*/
- #define CASE_EVT_ROTARY_LONG /*case EVT_KEY_LONG(KEY_ENTER):*/
- #define CASE_EVT_ROTARY_LEFT case EVT_KEY_FIRST(KEY_MOVE_DOWN): case EVT_KEY_REPT(KEY_MOVE_DOWN):
- #define CASE_EVT_ROTARY_RIGHT case EVT_KEY_FIRST(KEY_MOVE_UP): case EVT_KEY_REPT(KEY_MOVE_UP):
-#elif defined(ROTARY_ENCODER_NAVIGATION)
- #define IS_ROTARY_LEFT(evt) (evt == EVT_ROTARY_LEFT)
- #define IS_ROTARY_RIGHT(evt) (evt == EVT_ROTARY_RIGHT)
- #define IS_ROTARY_UP(evt) IS_ROTARY_LEFT(evt)
- #define IS_ROTARY_DOWN(evt) IS_ROTARY_RIGHT(evt)
- #define IS_ROTARY_BREAK(evt) (evt == EVT_ROTARY_BREAK)
- #define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG)
- #define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e)
- #define CASE_EVT_ROTARY_BREAK case EVT_ROTARY_BREAK:
- #define CASE_EVT_ROTARY_LONG case EVT_ROTARY_LONG:
- #define CASE_EVT_ROTARY_LEFT case EVT_ROTARY_LEFT:
- #define CASE_EVT_ROTARY_RIGHT case EVT_ROTARY_RIGHT:
-#else
- #define IS_ROTARY_LEFT(evt) (0)
- #define IS_ROTARY_RIGHT(evt) (0)
- #define IS_ROTARY_UP(evt) (0)
- #define IS_ROTARY_DOWN(evt) (0)
- #define IS_ROTARY_BREAK(evt) (0)
- #define IS_ROTARY_LONG(evt) (0)
- #define IS_ROTARY_EVENT(evt) (0)
- #define CASE_EVT_ROTARY_BREAK
- #define CASE_EVT_ROTARY_LONG
- #define CASE_EVT_ROTARY_LEFT
- #define CASE_EVT_ROTARY_RIGHT
+ #define SPLASH_TIMEOUT (4*100) // 4 seconds
#endif
#if defined(PCBTARANIS)
@@ -734,6 +560,7 @@ struct t_inactivity
uint16_t counter;
uint8_t sum;
};
+
extern struct t_inactivity inactivity;
#if defined(PXX)
@@ -754,25 +581,8 @@ void str2zchar(char *dest, const char *src, int size);
void zchar2str(char *dest, const char *src, int size);
#endif
-extern uint8_t s_evt;
-#define putEvent(evt) s_evt = evt
-void clearKeyEvents();
-void pauseEvents(uint8_t enuk);
-void killEvents(uint8_t enuk);
-#if defined(CPUARM)
- uint8_t getEvent(bool trim);
-#else
- uint8_t getEvent();
-#endif
-
-uint8_t keyDown();
-
-enum PowerState {
- e_power_on,
- e_power_trainer,
- e_power_usb,
- e_power_off
-};
+#include "keys.h"
+#include "pwr.h"
bool switchState(EnumKeys enuk);
uint8_t trimDown(uint8_t idx);
@@ -907,12 +717,13 @@ void setTrimValue(uint8_t phase, uint8_t idx, int trim);
#if defined(CPUARM)
#define GV_GET_GV1_VALUE(max) ( (max<=GV_RANGESMALL && min>=GV_RANGESMALL_NEG) ? GV1_SMALL : GV1_LARGE )
#define GV_INDEX_CALCULATION(x,max) ( (max<=GV_RANGESMALL && min>=GV_RANGESMALL_NEG) ? (uint8_t) x-GV1_SMALL : ((x&(GV1_LARGE*2-1))-GV1_LARGE) )
+ #define GV_IS_GV_VALUE(x,min,max) ( (max>GV1_SMALL || min<-GV1_SMALL) ? (x>GV_RANGELARGE || xmax) || (xmax) || (xmax) || (x void swap(t & a, t & b) { t tmp = b; b = a; a = tmp; }
uint16_t isqrt32(uint32_t n);
#endif
-#if defined(CPUARM)
+#if defined(CPUARM) && !defined(BOOT)
#if !defined(SIMU)
extern "C" {
#include
@@ -1201,7 +1012,7 @@ extern uint8_t g_beepCnt;
extern uint8_t g_beepVal[5];
extern uint8_t ppmInState; //0=unsync 1..8= wait for value i-1
-extern int16_t g_ppmIns[NUM_PPM];
+extern int16_t g_ppmIns[NUM_TRAINER];
extern int32_t chans[NUM_CHNOUT];
extern int16_t ex_chans[NUM_CHNOUT]; // Outputs (before LIMITS) of the last perMain
extern int16_t channelOutputs[NUM_CHNOUT];
@@ -1514,6 +1325,7 @@ enum AUDIO_SOUNDS {
#endif
#include "translations.h"
+#include "fonts.h"
#if defined(HAPTIC)
#include "haptic.h"
@@ -1632,7 +1444,7 @@ extern union ReusableBuffer reusableBuffer;
void checkFlashOnBeep();
#if defined(FRSKY) || defined(CPUARM)
-FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit);
+void convertUnit(getvalue_t & val, uint8_t & unit); // TODO check FORCEINLINE on stock
void putsTelemetryValue(xcoord_t x, uint8_t y, lcdint_t val, uint8_t unit, uint8_t att);
#else
#define convertUnit(...)
@@ -1703,6 +1515,9 @@ getvalue_t convertCswTelemValue(LogicalSwitchData * cs);
lcdint_t applyChannelRatio(uint8_t channel, lcdint_t val);
#endif
+getvalue_t div10_and_round(getvalue_t value);
+
+
#if defined(FRSKY)
NOINLINE uint8_t getRssiAlarmValue(uint8_t alarm);
diff --git a/radio/src/protocols/pxx_arm.cpp b/radio/src/protocols/pxx_arm.cpp
index 0f84fd6d5..b6db89f23 100644
--- a/radio/src/protocols/pxx_arm.cpp
+++ b/radio/src/protocols/pxx_arm.cpp
@@ -211,13 +211,14 @@ void setupPulsesPXX(unsigned int port)
}
else {
flag1 = (g_model.moduleData[port].rfProtocol << 6) | pxxFlag[port];
-
- if (failsafeCounter[port]-- == 0) {
- failsafeCounter[port] = 1000;
- flag1 |= PXX_SEND_FAILSAFE;
- }
- if (failsafeCounter[port] == 0 && g_model.moduleData[port].channelsCount > 0) {
- flag1 |= PXX_SEND_FAILSAFE;
+ if (g_model.moduleData[port].failsafeMode != FAILSAFE_RECEIVER) {
+ if (failsafeCounter[port]-- == 0) {
+ failsafeCounter[port] = 1000;
+ flag1 |= PXX_SEND_FAILSAFE;
+ }
+ if (failsafeCounter[port] == 0 && g_model.moduleData[port].channelsCount > 0) {
+ flag1 |= PXX_SEND_FAILSAFE;
+ }
}
}
diff --git a/radio/src/pwr.h b/radio/src/pwr.h
new file mode 100755
index 000000000..b6816d590
--- /dev/null
+++ b/radio/src/pwr.h
@@ -0,0 +1,47 @@
+/*
+ * 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 pwr_h
+#define pwr_h
+
+enum PowerState {
+ e_power_on,
+ e_power_trainer,
+ e_power_usb,
+ e_power_off
+};
+
+#endif
diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h
index ccbad5fa6..1a216562c 100644
--- a/radio/src/sdcard.h
+++ b/radio/src/sdcard.h
@@ -47,6 +47,7 @@
#define SYSTEM_SUBDIR "SYSTEM" // no trailing slash = important
#define BITMAPS_PATH ROOT_PATH "BMP"
#define SCRIPTS_PATH ROOT_PATH "SCRIPTS"
+#define FIRMWARES_PATH ROOT_PATH "FIRMWARES"
#define MODELS_EXT ".bin"
#define LOGS_EXT ".csv"
@@ -62,6 +63,7 @@ extern const pm_char * openLogs();
extern void closeLogs();
extern void writeLogs();
+#if !defined(BOOT)
inline const pm_char *SDCARD_ERROR(FRESULT result)
{
if (result == FR_NOT_READY)
@@ -69,6 +71,7 @@ inline const pm_char *SDCARD_ERROR(FRESULT result)
else
return STR_SDCARD_ERROR;
}
+#endif
#if defined(PCBTARANIS)
#define O9X_FOURCC 0x3378396F // o9x for Taranis
diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp
index b00c96be7..305d00b61 100644
--- a/radio/src/simpgmspace.cpp
+++ b/radio/src/simpgmspace.cpp
@@ -101,37 +101,37 @@ sem_t *eeprom_write_sem;
#if defined(PCBTARANIS)
#define SWITCH_CASE(swtch, pin, mask) \
case swtch: \
- if (state) pin &= ~(mask); else pin |= (mask); \
+ if ((int)state > 0) pin &= ~(mask); else pin |= (mask); \
break;
#else
#define SWITCH_CASE(swtch, pin, mask) \
case swtch: \
- if (state) pin |= (mask); else pin &= ~(mask); \
+ if ((int)state > 0) pin |= (mask); else pin &= ~(mask); \
break;
#endif
#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
case swtch: \
- if (state < 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
- if (state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
+ if ((int)state < 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
+ if ((int)state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
break;
#define KEY_CASE(key, pin, mask) \
case key: \
- if (state) pin &= ~mask; else pin |= mask;\
+ if ((int)state > 0) pin &= ~mask; else pin |= mask;\
break;
#define TRIM_CASE KEY_CASE
#else
#define SWITCH_CASE(swtch, pin, mask) \
case swtch: \
- if (state) pin &= ~(mask); else pin |= (mask); \
+ if ((int)state > 0) pin &= ~(mask); else pin |= (mask); \
break;
#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
case swtch: \
- if (state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
- if (state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
+ if ((int)state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
+ if ((int)state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
break;
#define KEY_CASE(key, pin, mask) \
case key: \
- if (state) pin |= (mask); else pin &= ~(mask);\
+ if ((int)state > 0) pin |= (mask); else pin &= ~(mask);\
break;
#define TRIM_CASE KEY_CASE
#endif
@@ -637,7 +637,11 @@ void lcdRefresh()
}
#if defined(PCBTARANIS)
+void pwrInit() { }
+uint32_t pwrCheck() { return true; }
+void pwrOff() { }
void usbStart() { }
+int usbPlugged() { return false; }
void USART_DeInit(USART_TypeDef* ) { }
ErrorStatus RTC_SetTime(uint32_t RTC_Format, RTC_TimeTypeDef* RTC_TimeStruct) { return SUCCESS; }
ErrorStatus RTC_SetDate(uint32_t RTC_Format, RTC_DateTypeDef* RTC_DateStruct) { return SUCCESS; }
@@ -667,3 +671,4 @@ void RCC_LSEConfig(uint8_t RCC_LSE) { }
FlagStatus RCC_GetFlagStatus(uint8_t RCC_FLAG) { return RESET; }
ErrorStatus RTC_WaitForSynchro(void) { return SUCCESS; }
#endif
+
diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp
index cce6febc4..f4dec0b66 100644
--- a/radio/src/stamp.cpp
+++ b/radio/src/stamp.cpp
@@ -41,7 +41,9 @@
#define DEFNUMSTR(s) STR2(s)
#if defined(PCBSTD)
-const pm_char vers_stamp[] PROGMEM = "VERS\037\033: " VERS_STR "\036DATE\037\033: " DATE_STR"\036TIME\037\033: " TIME_STR "\036EEPR\037\033: " DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(EEPROM_VARIANT);
+ #define EEPROM_STR DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(EEPROM_VARIANT)
#else
-const pm_char vers_stamp[] PROGMEM = "VERS\037\033: " VERS_STR "\036DATE\037\033: " DATE_STR"\036TIME\037\033: " TIME_STR "\036EEPR\037\033: " DEFNUMSTR(EEPROM_VER);
+ #define EEPROM_STR DEFNUMSTR(EEPROM_VER);
#endif
+
+const pm_char vers_stamp[] PROGMEM = "VERS\037\033: " VERS_STR "\036DATE\037\033: " DATE_STR"\036TIME\037\033: " TIME_STR "\036EEPR\037\033: " EEPROM_STR;
diff --git a/radio/src/targets/sky9x/sam3s4c_flash.ld b/radio/src/targets/sky9x/sam3s4c_flash.ld
index fd8241a61..247bf4b1b 100644
--- a/radio/src/targets/sky9x/sam3s4c_flash.ld
+++ b/radio/src/targets/sky9x/sam3s4c_flash.ld
@@ -71,9 +71,15 @@ SECTIONS
*/
.text :
{
- _stext = .; /* Provide the name for the start of this section */
+ FILL(0xFFFF)
- CREATE_OBJECT_SYMBOLS
+ CREATE_OBJECT_SYMBOLS
+
+ *(.bootrodata)
+ *(.bootrodata.*)
+
+ . = ALIGN(32768); /* Align the start of the exidx part */
+ _stext = .; /* Provide the name for the start of this section */
KEEP(*(.vectors))
*(.text)
@@ -129,11 +135,8 @@ SECTIONS
. = ALIGN(4); /* Align the end of the section */
} > RAM
- _ebss = .; /* Provide the name for the end of this section */
+ _ebss = .; /* Provide the name for the end of this section */
- . = ALIGN(4); /* Align the end of the section */
- __end = .;
- _end = .;
/*
* The ".stack" section is our stack.
diff --git a/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c b/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
index 654bb5fcf..9c76b3459 100644
--- a/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
+++ b/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
@@ -232,7 +232,8 @@ void SystemInit(void)
#ifdef VECT_TAB_SRAM
SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM */
#else
- SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */
+ extern uint32_t g_pfnVectors ;
+ SCB->VTOR = (uint32_t) &g_pfnVectors ; /* Vector Table Relocation in Internal FLASH */
#endif
}
diff --git a/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_spi.c b/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_spi.c
index 033475e68..0a42a0f2c 100644
--- a/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_spi.c
+++ b/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_spi.c
@@ -113,8 +113,8 @@
*/
/* Includes ------------------------------------------------------------------*/
-#include "stm32f2xx_spi.h"
-#include "stm32f2xx_rcc.h"
+#include "../inc/stm32f2xx_spi.h"
+#include "../inc/stm32f2xx_rcc.h"
/** @addtogroup STM32F2xx_StdPeriph_Driver
* @{
diff --git a/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/src/usbd_core.c b/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/src/usbd_core.c
index fa647eb0f..ec68fc1e4 100644
--- a/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/src/usbd_core.c
+++ b/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/src/usbd_core.c
@@ -159,14 +159,16 @@ void USBD_Init(USB_OTG_CORE_HANDLE *pdev,
/**
* @brief USBD_DeInit
-* Re-Initialize th device library
+* Deinitialize USB device library
* @param pdev: device instance
* @retval status: status
*/
USBD_Status USBD_DeInit(USB_OTG_CORE_HANDLE *pdev)
{
- /* Software Init */
-
+ /*Disable Interrupts*/
+ USB_OTG_BSP_DisableInterrupt(pdev);
+ USB_OTG_DisableGlobalInt(pdev);
+ USB_OTG_BSP_Deinit(pdev);
return USBD_OK;
}
diff --git a/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h b/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h
index 6f1ebdb78..944683a35 100644
--- a/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h
+++ b/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h
@@ -78,9 +78,11 @@
void BSP_Init(void);
void USB_OTG_BSP_Init (USB_OTG_CORE_HANDLE *pdev);
+void USB_OTG_BSP_Deinit(USB_OTG_CORE_HANDLE *pdev);
void USB_OTG_BSP_uDelay (const uint32_t usec);
void USB_OTG_BSP_mDelay (const uint32_t msec);
void USB_OTG_BSP_EnableInterrupt (USB_OTG_CORE_HANDLE *pdev);
+void USB_OTG_BSP_DisableInterrupt (USB_OTG_CORE_HANDLE *pdev);
#ifdef USE_HOST_MODE
void USB_OTG_BSP_ConfigVBUS(USB_OTG_CORE_HANDLE *pdev);
void USB_OTG_BSP_DriveVBUS(USB_OTG_CORE_HANDLE *pdev,uint8_t state);
diff --git a/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c b/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c
index 32984e610..10840e764 100644
--- a/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c
+++ b/radio/src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c
@@ -470,6 +470,36 @@ static uint32_t DCD_HandleInEP_ISR(USB_OTG_CORE_HANDLE *pdev)
}
if (diepint.b.emptyintr)
{
+ /*===============ADDED SECTION ==============================*/
+ /*
+ This only applies to INTERRUPT transfer mode.
+
+ diepint.b.emptyintr interrupt can't be reset by writing 1 to
+ DIEPINT register. According to reference manual, this bit
+ is read-only.
+
+ The CLEAR_IN_EP_INTR(epnum, emptyintr) does not work!
+
+ The only way to stop this interrupt is to disable it using
+ mask register DIEPEMPMSK.
+
+ Original code gets here, is unsuccessful at interrupt flag reset
+ and when interrupt handler returns, another one is fired again,
+ robbing CPU time, which is then spent only in interrupt handlers
+ (this one and all other that have higher priority)
+
+ This only happens in HID mode (when interrupt in endpoint is
+ used) and when host is not actively polling device (us) for
+ update. This is situation on Linux when no program is using
+ joystick. The kernel/joystick driver stops polling device.
+
+ */
+ if ( pdev->dev.in_ep[epnum].type == USB_OTG_EP_INT ) {
+
+ fifoemptymsk = 0x1 << epnum;
+ USB_OTG_MODIFY_REG32(&pdev->regs.DREGS->DIEPEMPMSK, fifoemptymsk, 0);
+ }
+ /*===============END OF ADDED SECTION ==============================*/
DCD_WriteEmptyTxFifo(pdev , epnum);
diff --git a/radio/src/targets/taranis/aspi.cpp b/radio/src/targets/taranis/aspi.c
similarity index 88%
rename from radio/src/targets/taranis/aspi.cpp
rename to radio/src/targets/taranis/aspi.c
index b03d54a6d..f75cb4a02 100644
--- a/radio/src/targets/taranis/aspi.cpp
+++ b/radio/src/targets/taranis/aspi.c
@@ -10,8 +10,7 @@
******************************************************************************
*/
-#include "../opentx.h"
-#include "./STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_gpio.h"
+#include "board_taranis.h"
/**
**********send command to lcd**************
diff --git a/radio/src/targets/taranis/aspi.h b/radio/src/targets/taranis/aspi.h
index cd42e7eb6..a3f4f829f 100644
--- a/radio/src/targets/taranis/aspi.h
+++ b/radio/src/targets/taranis/aspi.h
@@ -11,6 +11,10 @@
#ifndef _ASPI_H_
#define _ASPI_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "./STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h"
#define __no_operation __NOP
@@ -33,5 +37,9 @@
void AspiCmd(u8 Command_Byte);
void AspiData(u8 Para_data);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/radio/src/targets/taranis/audio_driver.cpp b/radio/src/targets/taranis/audio_driver.cpp
index d0b0508aa..15d6fdd37 100644
--- a/radio/src/targets/taranis/audio_driver.cpp
+++ b/radio/src/targets/taranis/audio_driver.cpp
@@ -36,7 +36,7 @@
#include "../../opentx.h"
-bool dacIdle = true;
+int dacIdle = 1;
void setSampleRate(uint32_t frequency)
{
@@ -96,7 +96,7 @@ void dacInit()
bool dacQueue(AudioBuffer *buffer)
{
if (dacIdle) {
- dacIdle = false;
+ dacIdle = 0;
DMA1_Stream5->CR &= ~DMA_SxCR_EN ; // Disable DMA channel
DMA1->HIFCR = DMA_HIFCR_CTCIF5 | DMA_HIFCR_CHTIF5 | DMA_HIFCR_CTEIF5 | DMA_HIFCR_CDMEIF5 | DMA_HIFCR_CFEIF5 ; // Write ones to clear bits
DMA1_Stream5->M0AR = CONVERT_PTR(buffer->data);
@@ -111,6 +111,20 @@ bool dacQueue(AudioBuffer *buffer)
}
}
+void dacStart()
+{
+ DMA1->HIFCR = DMA_HIFCR_CTCIF5 | DMA_HIFCR_CHTIF5 | DMA_HIFCR_CTEIF5 | DMA_HIFCR_CDMEIF5 | DMA_HIFCR_CFEIF5 ; // Write ones to clear bits
+ DMA1_Stream5->CR |= DMA_SxCR_CIRC | DMA_SxCR_EN ; // Enable DMA channel
+ DAC->SR = DAC_SR_DMAUDR1 ; // Write 1 to clear flag
+ DAC->CR |= DAC_CR_EN1 | DAC_CR_DMAEN1 ; // Enable DAC
+}
+
+void dacStop()
+{
+ DMA1_Stream5->CR &= ~DMA_SxCR_CIRC ;
+}
+
+
// Sound routines
void audioInit()
{
@@ -149,7 +163,7 @@ extern "C" void DMA1_Stream5_IRQHandler()
DAC->SR = DAC_SR_DMAUDR1; // Write 1 to clear flag
}
else {
- dacIdle = true;
+ dacIdle = 1;
}
}
#endif
diff --git a/radio/src/targets/taranis/audio_driver.h b/radio/src/targets/taranis/audio_driver.h
index 0a79ea75d..e357e8627 100644
--- a/radio/src/targets/taranis/audio_driver.h
+++ b/radio/src/targets/taranis/audio_driver.h
@@ -37,25 +37,14 @@
#ifndef audio_driver_h
#define audio_driver_h
-extern void audioInit( void ) ;
-extern void audioEnd( void ) ;
+void audioInit( void ) ;
+void audioEnd( void ) ;
+void dacStart();
+void dacStop();
extern void setSampleRate(uint32_t frequency);
-extern bool dacIdle;
-
-inline void dacStart()
-{
- DMA1->HIFCR = DMA_HIFCR_CTCIF5 | DMA_HIFCR_CHTIF5 | DMA_HIFCR_CTEIF5 | DMA_HIFCR_CDMEIF5 | DMA_HIFCR_CFEIF5 ; // Write ones to clear bits
- DMA1_Stream5->CR |= DMA_SxCR_CIRC | DMA_SxCR_EN ; // Enable DMA channel
- DAC->SR = DAC_SR_DMAUDR1 ; // Write 1 to clear flag
- DAC->CR |= DAC_CR_EN1 | DAC_CR_DMAEN1 ; // Enable DAC
-}
-
-inline void dacStop()
-{
- DMA1_Stream5->CR &= ~DMA_SxCR_CIRC ;
-}
+extern int dacIdle;
#define VOLUME_LEVEL_MAX 23
#define VOLUME_LEVEL_DEF 12
diff --git a/radio/src/targets/taranis/board_taranis.cpp b/radio/src/targets/taranis/board_taranis.cpp
index 754f6e6c1..5266f1c98 100644
--- a/radio/src/targets/taranis/board_taranis.cpp
+++ b/radio/src/targets/taranis/board_taranis.cpp
@@ -44,22 +44,6 @@ extern "C" {
volatile uint32_t Tenms ; // TODO to remove everywhere / use a #define
-#define PIN_MODE_MASK 0x0003
-#define PIN_INPUT 0x0000
-#define PIN_OUTPUT 0x0001
-#define PIN_PERIPHERAL 0x0002
-#define PIN_ANALOG 0x0003
-#define PIN_PULL_MASK 0x000C
-#define PIN_PULLUP 0x0004
-#define PIN_NO_PULLUP 0x0000
-#define PIN_PULLDOWN 0x0008
-#define PIN_NO_PULLDOWN 0x0000
-#define PIN_PERI_MASK 0x00F0
-#define PIN_PUSHPULL 0x0000
-#define PIN_ODRAIN 0x8000
-#define PIN_PORT_MASK 0x0700
-#define PIN_SPEED_MASK 0x6000
-
#if !defined(SIMU)
void configure_pins( uint32_t pins, uint16_t config )
{
@@ -106,32 +90,6 @@ void configure_pins( uint32_t pins, uint16_t config )
}
#endif
-bool usbPlugged(void)
-{
- return GPIO_ReadInputDataBit(GPIOA, PIN_FS_VBUS);
-}
-
-#if !defined(SIMU)
-extern "C" {
-USB_OTG_CORE_HANDLE USB_OTG_dev;
-
-void OTG_FS_IRQHandler(void)
-{
- USBD_OTG_ISR_Handler (&USB_OTG_dev);
-}
-}
-
-void usbInit()
-{
- USB_OTG_BSP_Init(&USB_OTG_dev);
-}
-
-void usbStart()
-{
- USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_MSC_cb, &USR_cb);
-}
-#endif
-
void watchdogInit(unsigned int duration)
{
IWDG->KR = 0x5555 ; // Unlock registers
diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h
index 4bbd2fde0..73cb2f812 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -37,6 +37,12 @@
#ifndef board_taranis_h
#define board_taranis_h
+#include "stddef.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_rcc.h"
#include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_gpio.h"
#include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_spi.h"
@@ -45,17 +51,26 @@
#include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_dma.h"
#include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_usart.h"
#include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h"
-extern "C" {
-#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/Core/inc/usbd_usr.h"
-#include "usbd_desc.h"
-#include "usb_conf.h"
-#include "usbd_conf.h"
-}
+#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_desc.h"
+ #include "usb_conf.h"
+ #include "usbd_conf.h"
+#endif
+
#include "hal.h"
#include "aspi.h"
#include "i2c.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#if !defined(BOOT)
#include "audio_driver.h"
+#endif
#define PERI1_FREQUENCY 30000000
#define PERI2_FREQUENCY 60000000
@@ -65,6 +80,22 @@ extern "C" {
#define JACK_PPM_OUT()
#define JACK_PPM_IN()
+#define PIN_MODE_MASK 0x0003
+#define PIN_INPUT 0x0000
+#define PIN_OUTPUT 0x0001
+#define PIN_PERIPHERAL 0x0002
+#define PIN_ANALOG 0x0003
+#define PIN_PULL_MASK 0x000C
+#define PIN_PULLUP 0x0004
+#define PIN_NO_PULLUP 0x0000
+#define PIN_PULLDOWN 0x0008
+#define PIN_NO_PULLDOWN 0x0000
+#define PIN_PERI_MASK 0x00F0
+#define PIN_PUSHPULL 0x0000
+#define PIN_ODRAIN 0x8000
+#define PIN_PORT_MASK 0x0700
+#define PIN_SPEED_MASK 0x6000
+
void configure_pins( uint32_t pins, uint16_t config );
#define strcpy_P strcpy
@@ -75,7 +106,7 @@ extern uint16_t sessionTimer;
#define SLAVE_MODE() (g_model.trainerMode == 1)
#define TRAINER_CONNECTED() (GPIO_ReadInputDataBit(GPIOTRNDET, PIN_TRNDET) == Bit_RESET)
-void delaysInit();
+void delaysInit(void);
#define DEBUG_BAUDRATE 115200
#define SPORT_BAUDRATE 57600
@@ -97,11 +128,11 @@ void delay_01us(uint16_t nb);
#define SD_GET_SIZE_MB() (0)
#define SD_GET_BLOCKNR() (0)
#define SD_GET_SPEED() (0)
- void sdInit();
- void sdDone();
- void sdPoll10ms();
+ void sdInit(void);
+ void sdDone(void);
+ void sdPoll10ms(void);
#define sdMountPoll()
- uint32_t sdMounted();
+ uint32_t sdMounted(void);
#define SD_CARD_PRESENT() (~SD_PRESENT_GPIO->IDR & SD_PRESENT_GPIO_Pin)
#endif
@@ -116,15 +147,15 @@ void init_dsm2( uint32_t module_index );
void disable_dsm2( uint32_t module_index );
// Trainer driver
-void init_trainer_ppm();
-void stop_trainer_ppm();
-void init_trainer_capture();
-void stop_trainer_capture();
+void init_trainer_ppm(void);
+void stop_trainer_ppm(void);
+void init_trainer_capture(void);
+void stop_trainer_capture(void);
// Keys driver
-void keysInit();
-uint32_t readKeys();
-uint32_t readTrims();
+void keysInit(void);
+uint32_t readKeys(void);
+uint32_t readTrims(void);
#define TRIMS_PRESSED() (readTrims())
#define KEYS_PRESSED() (~readKeys())
#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((2<
-#include "../FatFs/diskio.h"
-#include "../FatFs/ff.h"
-#include "../CoOS/kernel/CoOS.h"
+#include "board_taranis.h"
+#include "../../FatFs/diskio.h"
+#include "../../FatFs/ff.h"
+#include "../../CoOS/kernel/CoOS.h"
#include "hal.h"
/* Definitions for MMC/SDC command */
@@ -93,6 +94,7 @@ uint32_t transSpeed; */
/*-----------------------------------------------------------------------*/
/* Lock / unlock functions */
/*-----------------------------------------------------------------------*/
+#if !defined(BOOT)
int ff_cre_syncobj (BYTE vol, _SYNC_t *mutex)
{
*mutex = CoCreateMutex();
@@ -114,6 +116,7 @@ int ff_del_syncobj (_SYNC_t mutex)
{
return 1;
}
+#endif
static const DWORD socket_state_mask_cp = (1 << 0);
static const DWORD socket_state_mask_wp = (1 << 1);
@@ -124,7 +127,6 @@ DSTATUS Stat = STA_NOINIT; /* Disk status */
static volatile
DWORD Timer1, Timer2; /* 100Hz decrement timers */
-static
BYTE CardType; /* Card type flags */
enum speed_setting { INTERFACE_SLOW, INTERFACE_FAST };
@@ -178,12 +180,10 @@ static void card_power(BYTE on)
on=on;
}
-#if (STM32_SD_DISK_IOCTRL == 1)
static int chk_power(void)
{
return 1; /* fake powered */
}
-#endif
/*-----------------------------------------------------------------------*/
/* Transmit/Receive a byte to MMC via SPI (Platform dependent) */
@@ -433,30 +433,29 @@ void power_on (void)
static
void power_off (void)
{
-
GPIO_InitTypeDef GPIO_InitStructure;
- if (!(Stat & STA_NOINIT)) {
- SELECT();
- wait_ready();
- release_spi();
- }
+ if (!(Stat & STA_NOINIT)) {
+ SELECT();
+ wait_ready();
+ release_spi();
+ }
- SPI_I2S_DeInit(SPI_SD);
- SPI_Cmd(SPI_SD, DISABLE);
- RCC_APBPeriphClockCmd_SPI_SD(RCC_APBPeriph_SPI_SD, DISABLE);
-
- //All SPI-Pins to input with weak internal pull-downs
- GPIO_InitStructure.GPIO_Pin = GPIO_Pin_SPI_SD_SCK | GPIO_Pin_SPI_SD_MISO | GPIO_Pin_SPI_SD_MOSI;
- GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
+ SPI_I2S_DeInit(SPI_SD);
+ SPI_Cmd(SPI_SD, DISABLE);
+ RCC_APBPeriphClockCmd_SPI_SD(RCC_APBPeriph_SPI_SD, DISABLE);
+
+ //All SPI-Pins to input with weak internal pull-downs
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_SPI_SD_SCK | GPIO_Pin_SPI_SD_MISO
+ | GPIO_Pin_SPI_SD_MOSI;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_DOWN;
- GPIO_Init(GPIO_SPI_SD, &GPIO_InitStructure);
+ GPIO_Init(GPIO_SPI_SD, &GPIO_InitStructure);
- card_power(0);
+ card_power(0);
- Stat |= STA_NOINIT; /* Set STA_NOINIT */
-
+ Stat |= STA_NOINIT; /* Set STA_NOINIT */
}
/*-----------------------------------------------------------------------*/
@@ -501,7 +500,6 @@ BOOL rcvr_datablock (
/* Send a data packet to MMC */
/*-----------------------------------------------------------------------*/
-#if _FS_READONLY == 0
static
BOOL xmit_datablock (
const BYTE *buff, /* 512 byte data block to be transmitted */
@@ -537,8 +535,6 @@ BOOL xmit_datablock (
return TRUE;
}
-#endif /* _READONLY */
-
/*-----------------------------------------------------------------------*/
@@ -655,7 +651,6 @@ DSTATUS disk_initialize (
/*-----------------------------------------------------------------------*/
/* Get Disk Status */
/*-----------------------------------------------------------------------*/
-
DSTATUS disk_status (
BYTE drv /* Physical drive number (0) */
)
@@ -665,7 +660,6 @@ DSTATUS disk_status (
}
-
/*-----------------------------------------------------------------------*/
/* Read Sector(s) */
/*-----------------------------------------------------------------------*/
@@ -675,14 +669,23 @@ int8_t SD_ReadSectors(uint8_t *buff, uint32_t sector, uint32_t count)
{
if (!(CardType & CT_BLOCK)) sector *= 512; /* Convert to byte address if needed */
- if (send_cmd(CMD18, sector) == 0) { /* READ_MULTIPLE_BLOCK */
- do {
- if (!rcvr_datablock(buff, 512)) {
- break;
+ if (count == 1) { /* Single block read */
+ if (send_cmd(CMD17, sector) == 0) { /* READ_SINGLE_BLOCK */
+ if (rcvr_datablock(buff, 512)) {
+ count = 0;
}
- buff += 512;
- } while (--count);
- send_cmd(CMD12, 0); /* STOP_TRANSMISSION */
+ }
+ }
+ else { /* Multiple block read */
+ if (send_cmd(CMD18, sector) == 0) { /* READ_MULTIPLE_BLOCK */
+ do {
+ if (!rcvr_datablock(buff, 512)) {
+ break;
+ }
+ buff += 512;
+ } while (--count);
+ send_cmd(CMD12, 0); /* STOP_TRANSMISSION */
+ }
}
release_spi();
@@ -700,29 +703,9 @@ DRESULT disk_read (
if (drv || !count) return RES_PARERR;
if (Stat & STA_NOINIT) return RES_NOTRDY;
- if (!(CardType & CT_BLOCK)) sector *= 512; /* Convert to byte address if needed */
+ SD_ReadSectors(buff, sector, count);
- if (count == 1) { /* Single block read */
- if (send_cmd(CMD17, sector) == 0) { /* READ_SINGLE_BLOCK */
- if (rcvr_datablock(buff, 512)) {
- count = 0;
- }
- }
- }
- else { /* Multiple block read */
- if (send_cmd(CMD18, sector) == 0) { /* READ_MULTIPLE_BLOCK */
- do {
- if (!rcvr_datablock(buff, 512)) {
- break;
- }
- buff += 512;
- } while (--count);
- send_cmd(CMD12, 0); /* STOP_TRANSMISSION */
- }
- }
- release_spi();
-
- return count ? RES_ERROR : RES_OK;
+ return RES_OK;
}
@@ -731,8 +714,6 @@ DRESULT disk_read (
/* Write Sector(s) */
/*-----------------------------------------------------------------------*/
-#if _FS_READONLY == 0
-
// TODO quick & dirty
int8_t SD_WriteSectors(uint8_t *buff, uint32_t sector, uint32_t count)
{
@@ -752,6 +733,8 @@ int8_t SD_WriteSectors(uint8_t *buff, uint32_t sector, uint32_t count)
return 0;
}
+#if _FS_READONLY == 0
+
DRESULT disk_write (
BYTE drv, /* Physical drive number (0) */
const BYTE *buff, /* Pointer to the data to be written */
@@ -793,7 +776,6 @@ DRESULT disk_write (
/* Miscellaneous Functions */
/*-----------------------------------------------------------------------*/
-#if (STM32_SD_DISK_IOCTRL == 1)
DRESULT disk_ioctl (
BYTE drv, /* Physical drive number (0) */
BYTE ctrl, /* Control code */
@@ -919,7 +901,6 @@ DRESULT disk_ioctl (
return res;
}
-#endif /* _USE_IOCTL != 0 */
/*-----------------------------------------------------------------------*/
@@ -966,7 +947,16 @@ FATFS g_FATFS_Obj;
FIL g_telemetryFile = {0};
#endif
-void sdInit()
+#if defined(BOOT)
+void sdInit(void)
+{
+ if (f_mount(0, &g_FATFS_Obj) == FR_OK) {
+ f_chdir("/");
+ }
+}
+#else
+// TODO shouldn't be there!
+void sdInit(void)
{
if (f_mount(0, &g_FATFS_Obj) == FR_OK) {
referenceSystemAudioFiles();
@@ -989,6 +979,7 @@ void sdDone()
f_mount(0, 0); // unmount SD
}
}
+#endif
uint32_t sdMounted()
{
diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h
index f559ae171..592feb2c7 100644
--- a/radio/src/targets/taranis/hal.h
+++ b/radio/src/targets/taranis/hal.h
@@ -307,7 +307,9 @@
#define STM32_SD_DISK_IOCTRL_FORCE 0
//DMA
-#define STM32_SD_USE_DMA //Enable the DMA for SD
+#if !defined(BOOT)
+#define STM32_SD_USE_DMA //Enable the DMA for SD
+#endif
#ifdef STM32_SD_USE_DMA
#define DMA_Channel_SPI_SD_RX DMA1_Stream3
diff --git a/radio/src/targets/taranis/i2c.c b/radio/src/targets/taranis/i2c.c
index df9b616c4..91bd70cbe 100644
--- a/radio/src/targets/taranis/i2c.c
+++ b/radio/src/targets/taranis/i2c.c
@@ -10,7 +10,7 @@
******************************************************************************
*/
-#include "../opentx.h"
+#include "board_taranis.h"
#define I2C_delay() delay_01us(100);
@@ -44,7 +44,7 @@ static void I2C_GPIO_Configuration(void)
SCL_H;
}
-short I2C_START()
+short I2C_START(void)
{
SDA_H;
I2C_delay();
@@ -59,7 +59,7 @@ short I2C_START()
return 1;
}
-void I2C_STOP()
+void I2C_STOP(void)
{
SCL_L;
I2C_delay();
@@ -71,7 +71,7 @@ void I2C_STOP()
I2C_delay();
}
-void I2C_ACK()
+void I2C_ACK(void)
{
SCL_L;
I2C_delay();
@@ -82,7 +82,8 @@ void I2C_ACK()
SCL_L;
I2C_delay();
}
-void I2C_NO_ACK()
+
+void I2C_NO_ACK(void)
{
SCL_L;
I2C_delay();
@@ -94,7 +95,7 @@ void I2C_NO_ACK()
I2C_delay();
}
-short I2C_WAIT_ACK()
+short I2C_WAIT_ACK(void)
{
short i=50;
SCL_L;
@@ -103,7 +104,7 @@ short I2C_WAIT_ACK()
I2C_delay();
SCL_H;
I2C_delay();
- while(i) {
+ while (i) {
if(SDA_read) {
I2C_delay();
i--;
@@ -138,7 +139,7 @@ void I2C_SEND_DATA(char SendByte)
I2C_delay();
}
-char I2C_READ()
+char I2C_READ(void)
{
short i=8;
char ReceiveByte=0;
@@ -158,7 +159,7 @@ char I2C_READ()
return ReceiveByte;
}
-void I2C_EE_Init()
+void I2C_EE_Init(void)
{
/* GPIO Periph clock enable */
RCC_AHB1PeriphClockCmd(I2C_EE_GPIO_CLK, ENABLE);
diff --git a/radio/src/targets/taranis/i2c.h b/radio/src/targets/taranis/i2c.h
index b872dbc7f..75f75e7e2 100644
--- a/radio/src/targets/taranis/i2c.h
+++ b/radio/src/targets/taranis/i2c.h
@@ -33,6 +33,10 @@
#define WP_H do{I2C_EE_WP_GPIO->BSRRL = I2C_EE_WP;}while(0)
#define WP_L do{I2C_EE_WP_GPIO->BSRRH = I2C_EE_WP;}while(0)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Exported functions ------------------------------------------------------- */
void I2C_EE_Init(void);
void I2C_EE_ByteWrite(uint8_t* pBuffer, uint16_t WriteAddr);
@@ -42,7 +46,11 @@ void I2C_EE_BufferRead(uint8_t* pBuffer, uint16_t ReadAddr, uint16_t NumByteToRe
void I2C_EE_WaitEepromStandbyState(void);
void I2C_set_volume(register uint8_t volume);
-uint8_t I2C_read_volume();
+uint8_t I2C_read_volume(void);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* __I2C_EE_H */
diff --git a/radio/src/targets/taranis/lcd_driver.cpp b/radio/src/targets/taranis/lcd_driver.cpp
index 991fb952b..e9e3c1129 100644
--- a/radio/src/targets/taranis/lcd_driver.cpp
+++ b/radio/src/targets/taranis/lcd_driver.cpp
@@ -9,11 +9,11 @@
******************************************************************************
*/
-#include "../opentx.h"
+#include "../../opentx.h"
#define WriteData(x) AspiData(x)
#define WriteCommand(x) AspiCmd(x)
-#define CONTRAST_OFS 5
+#define CONTRAST_OFS 5
static void LCD_Init()
{
@@ -21,7 +21,11 @@ static void LCD_Init()
AspiCmd(0x25); //Temperature compensation curve definition: 0x25 = -0.05%/oC
AspiCmd(0xEA); //set bias=1/10 :Command table NO.27
AspiCmd(0x81); //Set Vop
- AspiCmd(g_eeGeneral.contrast+CONTRAST_OFS); //0--255
+#if defined(BOOT)
+ AspiCmd(CONTRAST_OFS+25);
+#else
+ AspiCmd(CONTRAST_OFS+g_eeGeneral.contrast);
+#endif
AspiCmd(0xA6); //inverse display off
AspiCmd(0xD1); //SET RGB:Command table NO.21 .SET RGB or BGR. D1=RGB
AspiCmd(0xD5); //set color mode 4K and 12bits :Command table NO.22
diff --git a/radio/src/targets/taranis/pwr_driver.cpp b/radio/src/targets/taranis/pwr_driver.c
similarity index 92%
rename from radio/src/targets/taranis/pwr_driver.cpp
rename to radio/src/targets/taranis/pwr_driver.c
index dd43832c6..2df7d5d2b 100644
--- a/radio/src/targets/taranis/pwr_driver.cpp
+++ b/radio/src/targets/taranis/pwr_driver.c
@@ -34,26 +34,8 @@
*
*/
-#include "../../opentx.h"
-
-void pwrOff()
-{
- GPIO_ResetBits(GPIOPWR,PIN_MCU_PWR);
-}
-
-uint32_t pwrCheck()
-{
-#if defined(SIMU)
- return e_power_on;
-#else
- if (GPIO_ReadInputDataBit(GPIOPWR, PIN_PWR_STATUS) == Bit_RESET)
- return e_power_on;
- else if (usbPlugged())
- return e_power_usb;
- else
- return e_power_off;
-#endif
-}
+#include "board_taranis.h"
+#include "../../pwr.h"
void pwrInit()
{
@@ -101,5 +83,25 @@ void pwrInit()
#endif
// Soft power ON
- GPIO_SetBits(GPIOPWR,PIN_MCU_PWR);
+ GPIO_SetBits(GPIOPWR, PIN_MCU_PWR);
+}
+
+void pwrOff()
+{
+ GPIO_ResetBits(GPIOPWR, PIN_MCU_PWR);
+}
+
+// TODO enums should be UPPERCASE
+uint32_t pwrCheck()
+{
+#if defined(SIMU)
+ return e_power_on;
+#else
+ if (GPIO_ReadInputDataBit(GPIOPWR, PIN_PWR_STATUS) == Bit_RESET)
+ return e_power_on;
+ else if (usbPlugged())
+ return e_power_usb;
+ else
+ return e_power_off;
+#endif
}
diff --git a/radio/src/targets/taranis/stm32_flash.ld b/radio/src/targets/taranis/stm32_flash_bl.ld
similarity index 92%
rename from radio/src/targets/taranis/stm32_flash.ld
rename to radio/src/targets/taranis/stm32_flash_bl.ld
index a3279e20a..da01f5785 100644
--- a/radio/src/targets/taranis/stm32_flash.ld
+++ b/radio/src/targets/taranis/stm32_flash_bl.ld
@@ -1,165 +1,176 @@
-/*
-*****************************************************************************
-**
-** File : stm32_flash.ld
-**
-** Abstract : Linker script for STM32F205 Device with
-** 0.5MByte FLASH, 128KByte SRAM
-**
-** Set heap size, stack size and stack location according
-** to application requirements.
-**
-** Set memory bank area and size if external memory is used.
-**
-** Target : STMicroelectronics STM32
-**
-** Environment : Atollic TrueSTUDIO(R)
-**
-** Distribution: The file is distributed as is, without any warranty
-** of any kind.
-**
-** (c)Copyright Atollic AB.
-** You may use this file as-is or modify it according to the needs of your
-** project. Distribution of this file (unmodified or modified) is not
-** permitted. Atollic AB permit registered Atollic TrueSTUDIO(R) users the
-** rights to distribute the assembled, compiled & linked contents of this
-** file as part of an application binary file, provided that it is built
-** using the Atollic TrueSTUDIO(R) toolchain.
-**
-*****************************************************************************
-*/
-
-/* Entry Point */
-ENTRY(Reset_Handler)
-
-/* Generate a link error if heap and stack don't fit into RAM */
-_Min_Heap_Size = 0; /* required amount of heap */
-_Min_Stack_Size = 0x200; /* required amount of stack */
-
-/* Specify the memory areas */
-MEMORY
-{
- FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K
- RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
- MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
-}
-
-/* Define output sections */
-SECTIONS
-{
- /* The startup code goes first into FLASH */
-
- /* The program code and other data goes into FLASH */
- .text :
- {
- . = ALIGN(4);
- KEEP(*(.isr_vector)) /* Startup code */
- *(.text) /* .text sections (code) */
- *(.text*) /* .text* sections (code) */
- *(.rodata) /* .rodata sections (constants, strings, etc.) */
- *(.rodata*) /* .rodata* sections (constants, strings, etc.) */
- *(.glue_7) /* glue arm to thumb code */
- *(.glue_7t) /* glue thumb to arm code */
- *(.eh_frame)
-
- KEEP (*(.init))
- KEEP (*(.fini))
-
- . = ALIGN(4);
- _etext = .; /* define a global symbols at end of code */
- } >FLASH
-
-
- .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
- .ARM : {
- __exidx_start = .;
- *(.ARM.exidx*)
- __exidx_end = .;
- } >FLASH
-
- .preinit_array :
- {
- PROVIDE_HIDDEN (__preinit_array_start = .);
- KEEP (*(.preinit_array*))
- PROVIDE_HIDDEN (__preinit_array_end = .);
- } >FLASH
- .init_array :
- {
- PROVIDE_HIDDEN (__init_array_start = .);
- KEEP (*(SORT(.init_array.*)))
- KEEP (*(.init_array*))
- PROVIDE_HIDDEN (__init_array_end = .);
- } >FLASH
- .fini_array :
- {
- PROVIDE_HIDDEN (__fini_array_start = .);
- KEEP (*(.fini_array*))
- KEEP (*(SORT(.fini_array.*)))
- PROVIDE_HIDDEN (__fini_array_end = .);
- } >FLASH
-
- /* used by the startup to initialize data */
- _sidata = .;
-
- /* Initialized data sections goes into RAM, load LMA copy after code */
- .data : AT ( _sidata )
- {
- . = ALIGN(4);
- _sdata = .; /* create a global symbol at data start */
- *(.data) /* .data sections */
- *(.data*) /* .data* sections */
-
- . = ALIGN(4);
- _edata = .; /* define a global symbol at data end */
- } >RAM
-
- /* Uninitialized data section */
- . = ALIGN(4);
- .bss :
- {
- /* This is used by the startup in order to initialize the .bss secion */
- _sbss = .; /* define a global symbol at bss start */
- __bss_start__ = _sbss;
- *(.bss)
- *(.bss*)
- *(COMMON)
-
- . = ALIGN(4);
- _ebss = .; /* define a global symbol at bss end */
- __bss_end__ = _ebss;
- } >RAM
-
- PROVIDE ( end = _ebss );
- PROVIDE ( _end = _ebss );
-
- /* User_heap_stack section, used to check that there is enough RAM left */
- ._user_heap_stack :
- {
- . = ALIGN(4);
- . = . + _Min_Heap_Size;
- . = . + _Min_Stack_Size;
- . = ALIGN(4);
- } >RAM
-
- PROVIDE ( _estack = ORIGIN(RAM) + LENGTH(RAM) );
-
- /* MEMORY_bank1 section, code must be located here explicitly */
- /* Example: extern int foo(void) __attribute__ ((section (".mb1text"))); */
- .memory_b1_text :
- {
- *(.mb1text) /* .mb1text sections (code) */
- *(.mb1text*) /* .mb1text* sections (code) */
- *(.mb1rodata) /* read-only data (constants) */
- *(.mb1rodata*)
- } >MEMORY_B1
-
- /* Remove information from the standard libraries */
- /DISCARD/ :
- {
- libc.a ( * )
- libm.a ( * )
- libgcc.a ( * )
- }
-
- .ARM.attributes 0 : { *(.ARM.attributes) }
-}
+/*
+*****************************************************************************
+**
+** File : stm32_flash.ld
+**
+** Abstract : Linker script for STM32F205 Device with
+** 0.5MByte FLASH, 128KByte SRAM
+**
+** Set heap size, stack size and stack location according
+** to application requirements.
+**
+** Set memory bank area and size if external memory is used.
+**
+** Target : STMicroelectronics STM32
+**
+** Environment : Atollic TrueSTUDIO(R)
+**
+** Distribution: The file is distributed as is, without any warranty
+** of any kind.
+**
+** (c)Copyright Atollic AB.
+** You may use this file as-is or modify it according to the needs of your
+** project. Distribution of this file (unmodified or modified) is not
+** permitted. Atollic AB permit registered Atollic TrueSTUDIO(R) users the
+** rights to distribute the assembled, compiled & linked contents of this
+** file as part of an application binary file, provided that it is built
+** using the Atollic TrueSTUDIO(R) toolchain.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20020000; /* end of 128K SRAM */
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0; /* required amount of heap */
+_Min_Stack_Size = 0x200; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K
+ RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
+ MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
+}
+
+/* Define output sections */
+SECTIONS
+{
+ /* The startup code goes first into FLASH */
+
+ /* The program code and other data goes into FLASH */
+ .text :
+ {
+ FILL(0xFFFF)
+
+ CREATE_OBJECT_SYMBOLS
+
+ KEEP(*(.isr_boot_vector)) /* Startup code */
+ *(.bootrodata)
+ *(.bootrodata.*)
+
+ . = ALIGN(32768); /* Align the start of the main program */
+ _stext = .; /* Provide the name for the start of this section */
+ . = ALIGN(4);
+ KEEP(*(.isr_vector)) /* Startup code */
+ *(.text) /* .text sections (code) */
+ *(.text*) /* .text* sections (code) */
+ *(.rodata) /* .rodata sections (constants, strings, etc.) */
+ *(.rodata*) /* .rodata* sections (constants, strings, etc.) */
+ *(.glue_7) /* glue arm to thumb code */
+ *(.glue_7t) /* glue thumb to arm code */
+ *(.eh_frame)
+
+ KEEP (*(.init))
+ KEEP (*(.fini))
+
+ . = ALIGN(4);
+ _etext = .; /* define a global symbols at end of code */
+ } >FLASH
+
+
+ .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+ .ARM : {
+ __exidx_start = .;
+ *(.ARM.exidx*)
+ __exidx_end = .;
+ } >FLASH
+
+ .preinit_array :
+ {
+ PROVIDE_HIDDEN (__preinit_array_start = .);
+ KEEP (*(.preinit_array*))
+ PROVIDE_HIDDEN (__preinit_array_end = .);
+ } >FLASH
+ .init_array :
+ {
+ PROVIDE_HIDDEN (__init_array_start = .);
+ KEEP (*(SORT(.init_array.*)))
+ KEEP (*(.init_array*))
+ PROVIDE_HIDDEN (__init_array_end = .);
+ } >FLASH
+ .fini_array :
+ {
+ PROVIDE_HIDDEN (__fini_array_start = .);
+ KEEP (*(.fini_array*))
+ KEEP (*(SORT(.fini_array.*)))
+ PROVIDE_HIDDEN (__fini_array_end = .);
+ } >FLASH
+
+ /* used by the startup to initialize data */
+ _sidata = .;
+
+ /* Initialized data sections goes into RAM, load LMA copy after code */
+ .data : AT ( _sidata )
+ {
+ . = ALIGN(4);
+ _sdata = .; /* create a global symbol at data start */
+ *(.data) /* .data sections */
+ *(.data*) /* .data* sections */
+
+ . = ALIGN(4);
+ _edata = .; /* define a global symbol at data end */
+ } >RAM
+
+ /* Uninitialized data section */
+ . = ALIGN(4);
+ .bss :
+ {
+ /* This is used by the startup in order to initialize the .bss secion */
+ _sbss = .; /* define a global symbol at bss start */
+ __bss_start__ = _sbss;
+ *(.bss)
+ *(.bss*)
+ *(COMMON)
+
+ . = ALIGN(4);
+ _ebss = .; /* define a global symbol at bss end */
+ __bss_end__ = _ebss;
+ } >RAM
+
+ PROVIDE ( end = _ebss );
+ PROVIDE ( _end = _ebss );
+
+ /* User_heap_stack section, used to check that there is enough RAM left */
+ ._user_heap_stack :
+ {
+ . = ALIGN(4);
+ . = . + _Min_Heap_Size;
+ . = . + _Min_Stack_Size;
+ . = ALIGN(4);
+ } >RAM
+
+ /* MEMORY_bank1 section, code must be located here explicitly */
+ /* Example: extern int foo(void) __attribute__ ((section (".mb1text"))); */
+ .memory_b1_text :
+ {
+ *(.mb1text) /* .mb1text sections (code) */
+ *(.mb1text*) /* .mb1text* sections (code) */
+ *(.mb1rodata) /* read-only data (constants) */
+ *(.mb1rodata*)
+ } >MEMORY_B1
+
+ /* Remove information from the standard libraries */
+ /DISCARD/ :
+ {
+ libc.a ( * )
+ libm.a ( * )
+ libgcc.a ( * )
+ }
+
+ .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/radio/src/targets/taranis/stm32_ramBoot.ld b/radio/src/targets/taranis/stm32_ramBoot.ld
new file mode 100644
index 000000000..d8a0b2e1f
--- /dev/null
+++ b/radio/src/targets/taranis/stm32_ramBoot.ld
@@ -0,0 +1,153 @@
+/*
+*****************************************************************************
+**
+** File : stm32_flashboot.ld
+**
+** Abstract : Linker script for STM32F205 Device with
+** 0.5MByte FLASH, 128KByte SRAM
+**
+** Set heap size, stack size and stack location according
+** to application requirements.
+**
+** Set memory bank area and size if external memory is used.
+**
+** Target : STMicroelectronics STM32
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20020000; /* end of 128K SRAM */
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0; /* required amount of heap */
+_Min_Stack_Size = 0x200; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K
+ RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
+ MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
+}
+
+/* Define output sections */
+SECTIONS
+{
+ /* The startup code goes first into FLASH */
+
+ /* The program code and other data goes into FLASH */
+ .text :
+ {
+ . = ALIGN(4);
+ KEEP(*(.isr_vector)) /* Startup code */
+ *(.text) /* .text sections (code) */
+ *(.text*) /* .text* sections (code) */
+ *(.rodata) /* .rodata sections (constants, strings, etc.) */
+ *(.rodata*) /* .rodata* sections (constants, strings, etc.) */
+ *(.glue_7) /* glue arm to thumb code */
+ *(.glue_7t) /* glue thumb to arm code */
+ *(.eh_frame)
+
+ KEEP (*(.init))
+ KEEP (*(.fini))
+
+ . = ALIGN(4);
+ _etext = .; /* define a global symbols at end of code */
+ } >RAM
+
+
+ .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >RAM
+ .ARM : {
+ __exidx_start = .;
+ *(.ARM.exidx*)
+ __exidx_end = .;
+ } >RAM
+
+ .preinit_array :
+ {
+ PROVIDE_HIDDEN (__preinit_array_start = .);
+ KEEP (*(.preinit_array*))
+ PROVIDE_HIDDEN (__preinit_array_end = .);
+ } >RAM
+ .init_array :
+ {
+ PROVIDE_HIDDEN (__init_array_start = .);
+ KEEP (*(SORT(.init_array.*)))
+ KEEP (*(.init_array*))
+ PROVIDE_HIDDEN (__init_array_end = .);
+ } >RAM
+ .fini_array :
+ {
+ PROVIDE_HIDDEN (__fini_array_start = .);
+ KEEP (*(.fini_array*))
+ KEEP (*(SORT(.fini_array.*)))
+ PROVIDE_HIDDEN (__fini_array_end = .);
+ } >RAM
+
+ /* used by the startup to initialize data */
+ _sidata = .;
+
+ /* Initialized data sections goes into RAM, load LMA copy after code */
+ .data : AT ( _sidata )
+ {
+ . = ALIGN(4);
+ _sdata = .; /* create a global symbol at data start */
+ *(.data) /* .data sections */
+ *(.data*) /* .data* sections */
+
+ . = ALIGN(4);
+ _edata = .; /* define a global symbol at data end */
+ } >RAM
+
+ /* Uninitialized data section */
+ . = ALIGN(4);
+ .bss :
+ {
+ /* This is used by the startup in order to initialize the .bss secion */
+ _sbss = .; /* define a global symbol at bss start */
+ __bss_start__ = _sbss;
+ *(.bss)
+ *(.bss*)
+ *(COMMON)
+
+ . = ALIGN(4);
+ _ebss = .; /* define a global symbol at bss end */
+ __bss_end__ = _ebss;
+ } >RAM
+
+ PROVIDE ( end = _ebss );
+ PROVIDE ( _end = _ebss );
+
+ /* User_heap_stack section, used to check that there is enough RAM left */
+ ._user_heap_stack :
+ {
+ . = ALIGN(4);
+ . = . + _Min_Heap_Size;
+ . = . + _Min_Stack_Size;
+ . = ALIGN(4);
+ } >RAM
+
+ /* MEMORY_bank1 section, code must be located here explicitly */
+ /* Example: extern int foo(void) __attribute__ ((section (".mb1text"))); */
+ .memory_b1_text :
+ {
+ *(.mb1text) /* .mb1text sections (code) */
+ *(.mb1text*) /* .mb1text* sections (code) */
+ *(.mb1rodata) /* read-only data (constants) */
+ *(.mb1rodata*)
+ } >MEMORY_B1
+
+ /* Remove information from the standard libraries */
+ /DISCARD/ :
+ {
+ libc.a ( * )
+ libm.a ( * )
+ libgcc.a ( * )
+ }
+
+ .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/radio/src/targets/taranis/usb_bsp.c b/radio/src/targets/taranis/usb_bsp.c
index 76fceaf79..f5aa51cac 100644
--- a/radio/src/targets/taranis/usb_bsp.c
+++ b/radio/src/targets/taranis/usb_bsp.c
@@ -82,9 +82,15 @@ void USB_OTG_BSP_Init(USB_OTG_CORE_HANDLE *pdev)
RCC_APB2PeriphClockCmd(RCC_APB2Periph_SYSCFG, ENABLE);
RCC_AHB2PeriphClockCmd(RCC_AHB2Periph_OTG_FS, ENABLE) ;
}
+
+void USB_OTG_BSP_Deinit(USB_OTG_CORE_HANDLE *pdev)
+{
+ //nothing to do
+}
+
/**
* @brief USB_OTG_BSP_EnableInterrupt
-* Enabele USB Global interrupt
+* Enable USB Global interrupt
* @param None
* @retval None
*/
@@ -99,6 +105,26 @@ void USB_OTG_BSP_EnableInterrupt(USB_OTG_CORE_HANDLE *pdev)
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
NVIC_Init(&NVIC_InitStructure);
}
+
+/**
+* @brief USB_OTG_BSP_DisableInterrupt
+* Disable USB Global interrupt
+* @param None
+* @retval None
+*/
+void USB_OTG_BSP_DisableInterrupt(USB_OTG_CORE_HANDLE *pdev)
+{
+ NVIC_InitTypeDef NVIC_InitStructure;
+
+ NVIC_PriorityGroupConfig(NVIC_PriorityGroup_1);
+ NVIC_InitStructure.NVIC_IRQChannel = OTG_FS_IRQn;
+ NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 1;
+ NVIC_InitStructure.NVIC_IRQChannelSubPriority = 3;
+ NVIC_InitStructure.NVIC_IRQChannelCmd = DISABLE;
+ NVIC_Init(&NVIC_InitStructure);
+}
+
+
/**
* @brief USB_OTG_BSP_uDelay
* This function provides delay time in micro sec
diff --git a/radio/src/targets/taranis/usb_conf.h b/radio/src/targets/taranis/usb_conf.h
index 6ac79fbad..005566797 100644
--- a/radio/src/targets/taranis/usb_conf.h
+++ b/radio/src/targets/taranis/usb_conf.h
@@ -31,11 +31,6 @@
#include "STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h"
-#define HID_IN_EP 0x81
-#define HID_OUT_EP 0x01
-
-#define HID_IN_PACKET 4
-#define HID_OUT_PACKET 4
/* USB Core and PHY interface configuration.
Tip: To avoid modifying these defines each time you need to change the USB
@@ -159,15 +154,17 @@
#endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */
/* __packed keyword used to decrease the data type alignment to 1-byte */
-#if defined (__CC_ARM) /* ARM Compiler */
- #define __packed __packed
-#elif defined (__ICCARM__) /* IAR Compiler */
- #define __packed __packed
-#elif defined ( __GNUC__ ) /* GNU Compiler */
- #define __packed __attribute__ ((__packed__))
-#elif defined (__TASKING__) /* TASKING Compiler */
- #define __packed __unaligned
-#endif /* __CC_ARM */
+#if !defined(__packed)
+ #if defined (__CC_ARM) /* ARM Compiler */
+ #define __packed __packed
+ #elif defined (__ICCARM__) /* IAR Compiler */
+ #define __packed __packed
+ #elif defined ( __GNUC__ ) /* GNU Compiler */
+ #define __packed __attribute__ ((__packed__))
+ #elif defined (__TASKING__) /* TASKING Compiler */
+ #define __packed __unaligned
+ #endif /* __CC_ARM */
+#endif
#endif //__USB_CONF__H__
diff --git a/radio/src/targets/taranis/usb_driver.c b/radio/src/targets/taranis/usb_driver.c
new file mode 100755
index 000000000..60edcc6fe
--- /dev/null
+++ b/radio/src/targets/taranis/usb_driver.c
@@ -0,0 +1,84 @@
+/*
+ * 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 "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)
+{
+ //debounce
+ static uint8_t debounced_state = 0;
+ static uint8_t last_state = 0;
+ if ( GPIO_ReadInputDataBit(GPIOA, PIN_FS_VBUS) ) {
+ if (last_state) debounced_state = 1;
+ last_state = 1;
+ }
+ else {
+ if (!last_state) debounced_state = 0;
+ last_state = 0;
+ }
+ return debounced_state;
+}
+
+USB_OTG_CORE_HANDLE USB_OTG_dev;
+
+void OTG_FS_IRQHandler(void)
+{
+ USBD_OTG_ISR_Handler (&USB_OTG_dev);
+}
+
+void usbInit(void)
+{
+ USB_OTG_BSP_Init(&USB_OTG_dev);
+}
+
+void usbStart(void)
+{
+#if !defined(BOOT)
+ //intialize USB as HID device
+ USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_HID_cb, &USR_cb);
+#else
+ //intialize USB as MSC device
+ USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_MSC_cb, &USR_cb);
+#endif //!defined(BOOT)
+}
+
+
+void usbStop(void)
+{
+ USBD_DeInit(&USB_OTG_dev);
+}
diff --git a/radio/src/targets/taranis/usbd_conf.h b/radio/src/targets/taranis/usbd_conf.h
index 753544841..7308a64c8 100644
--- a/radio/src/targets/taranis/usbd_conf.h
+++ b/radio/src/targets/taranis/usbd_conf.h
@@ -46,6 +46,12 @@
#define MSC_MEDIA_PACKET 4096
+#define HID_IN_EP 0x81
+#define HID_OUT_EP 0x01
+
+#define HID_IN_PACKET 9
+#define HID_OUT_PACKET 9
+
#endif //__USBD_CONF__H__
diff --git a/radio/src/targets/taranis/usbd_desc.c b/radio/src/targets/taranis/usbd_desc.c
index 4abd342ee..32fe20de5 100644
--- a/radio/src/targets/taranis/usbd_desc.c
+++ b/radio/src/targets/taranis/usbd_desc.c
@@ -31,6 +31,7 @@
#include "usbd_req.h"
#include "usbd_conf.h"
#include "usb_regs.h"
+#include "board_taranis.h"
/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
* @{
@@ -54,16 +55,24 @@
* @{
*/
-#define USBD_VID 0x0483
-#define USBD_PID 0x5720
+#define USBD_VID 0x0483
-#define USBD_LANGID_STRING 0x409
-#define USBD_MANUFACTURER_STRING "FrSky"
+#define USBD_LANGID_STRING 0x409
+#define USBD_MANUFACTURER_STRING "FrSky"
+#define USBD_SERIALNUMBER_FS_STRING "00000000001B"
-#define USBD_PRODUCT_FS_STRING "FrSky Taranis Mass Storage"
-#define USBD_SERIALNUMBER_FS_STRING "00000000001B"
-#define USBD_CONFIGURATION_FS_STRING "MSC Config"
-#define USBD_INTERFACE_FS_STRING "MSC Interface"
+
+#if defined(BOOT)
+ #define USBD_PID 0x5720
+ #define USBD_PRODUCT_FS_STRING "FrSky Taranis Bootloader"
+ #define USBD_CONFIGURATION_FS_STRING "MSC Config"
+ #define USBD_INTERFACE_FS_STRING "MSC Interface"
+#else
+ #define USBD_PID 0x5710
+ #define USBD_PRODUCT_FS_STRING "FrSky Taranis Joystick"
+ #define USBD_CONFIGURATION_FS_STRING "HID Config"
+ #define USBD_INTERFACE_FS_STRING "HID Interface"
+#endif
USBD_DEVICE USR_desc =
{
@@ -159,9 +168,7 @@ uint8_t * USBD_USR_LangIDStrDescriptor( uint8_t speed , uint16_t *length)
*/
uint8_t * USBD_USR_ProductStrDescriptor( uint8_t speed , uint16_t *length)
{
-
USBD_GetString ((uint8_t*)USBD_PRODUCT_FS_STRING, USBD_StrDesc, length);
-
return USBD_StrDesc;
}
@@ -188,7 +195,6 @@ uint8_t * USBD_USR_ManufacturerStrDescriptor( uint8_t speed , uint16_t *length)
uint8_t * USBD_USR_SerialStrDescriptor( uint8_t speed , uint16_t *length)
{
USBD_GetString ((uint8_t*)USBD_SERIALNUMBER_FS_STRING, USBD_StrDesc, length);
-
return USBD_StrDesc;
}
diff --git a/radio/src/targets/taranis/usbd_hid_joystick.c b/radio/src/targets/taranis/usbd_hid_joystick.c
new file mode 100644
index 000000000..29870a824
--- /dev/null
+++ b/radio/src/targets/taranis/usbd_hid_joystick.c
@@ -0,0 +1,479 @@
+/**
+ ******************************************************************************
+ * @file usbd_hid_core.c
+ * @author MCD Application Team
+ * @version V1.1.0
+ * @date 19-March-2012
+ * @brief This file provides the HID core functions.
+ *
+ * @verbatim
+ *
+ * ===================================================================
+ * HID Class Description
+ * ===================================================================
+ * This module manages the HID class V1.11 following the "Device Class Definition
+ * for Human Interface Devices (HID) Version 1.11 Jun 27, 2001".
+ * This driver implements the following aspects of the specification:
+ * - The Boot Interface Subclass
+ * - The Mouse protocol
+ * - Usage Page : Generic Desktop
+ * - Usage : Joystick)
+ * - Collection : Application
+ *
+ * @note In HS mode and when the DMA is used, all variables and data structures
+ * dealing with the DMA during the transaction process should be 32-bit aligned.
+ *
+ *
+ * @endverbatim
+ *
+ ******************************************************************************
+ * @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.
+ *
+ ******************************************************************************
+ */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_hid_core.h"
+#include "usbd_req.h"
+#include "usbd_desc.h"
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+ * @{
+ */
+
+
+/** @defgroup USBD_HID
+ * @brief usbd core module
+ * @{
+ */
+
+/** @defgroup USBD_HID_Private_TypesDefinitions
+ * @{
+ */
+/**
+ * @}
+ */
+
+
+/** @defgroup USBD_HID_Private_Defines
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+
+/** @defgroup USBD_HID_Private_Macros
+ * @{
+ */
+/**
+ * @}
+ */
+
+
+
+
+/** @defgroup USBD_HID_Private_FunctionPrototypes
+ * @{
+ */
+
+
+static uint8_t USBD_HID_Init (void *pdev,
+ uint8_t cfgidx);
+
+static uint8_t USBD_HID_DeInit (void *pdev,
+ uint8_t cfgidx);
+
+static uint8_t USBD_HID_Setup (void *pdev,
+ USB_SETUP_REQ *req);
+
+static uint8_t *USBD_HID_GetCfgDesc (uint8_t speed, uint16_t *length);
+
+static uint8_t USBD_HID_DataIn (void *pdev, uint8_t epnum);
+/**
+ * @}
+ */
+
+
+
+#ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED
+ #if defined ( __ICCARM__ ) /*!< IAR Compiler */
+ #pragma data_alignment=4
+ #endif
+#endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */
+/*
+ This USB HID endpoint report description defines a device with:
+ * 8 digital buttons
+ * 8 analog axes with 8bit resolution
+
+ Repot packet described as C struct is:
+
+ struct {
+ uint8_t buttons; //bit 0 - button 1, bit 1 - button 2, ..., mapped to channels 9-16, on if channel > 0
+ uint8_t X; //analog value, mapped to channel 1
+ uint8_t Y; //analog value, mapped to channel 2
+ uint8_t Z; //analog value, mapped to channel 3
+ uint8_t Rx; //analog value, mapped to channel 4
+ uint8_t Ry //analog value, mapped to channel 5
+ uint8_t Rz; //analog value, mapped to channel 6
+ uint8_t S1; //analog value, mapped to channel 7
+ uint8_t S2; //analog value, mapped to channel 8
+ }
+*/
+__ALIGN_BEGIN static uint8_t HID_JOYSTICK_ReportDesc[] __ALIGN_END =
+{
+ 0x05, 0x01, // USAGE_PAGE (Generic Desktop)
+ 0x09, 0x05, // USAGE (Game Pad)
+ 0xa1, 0x01, // COLLECTION (Application)
+ 0xa1, 0x00, // COLLECTION (Physical)
+ 0x05, 0x09, // USAGE_PAGE (Button)
+ 0x19, 0x01, // USAGE_MINIMUM (Button 1)
+ 0x29, 0x08, // USAGE_MAXIMUM (Button 8)
+ 0x15, 0x00, // LOGICAL_MINIMUM (0)
+ 0x25, 0x01, // LOGICAL_MAXIMUM (1)
+ 0x95, 0x08, // REPORT_COUNT (8)
+ 0x75, 0x01, // REPORT_SIZE (1)
+ 0x81, 0x02, // INPUT (Data,Var,Abs)
+ 0x05, 0x01, // USAGE_PAGE (Generic Desktop)
+ 0x09, 0x30, // USAGE (X)
+ 0x09, 0x31, // USAGE (Y)
+ 0x09, 0x32, // USAGE (Z)
+ 0x09, 0x33, // USAGE (Rx)
+ 0x09, 0x34, // USAGE (Ry)
+ 0x09, 0x35, // USAGE (Rz)
+ 0x09, 0x36, // USAGE (Slider)
+ 0x09, 0x36, // USAGE (Slider)
+ 0x15, 0x81, // LOGICAL_MINIMUM (-127)
+ 0x25, 0x7f, // LOGICAL_MAXIMUM (127)
+ 0x75, 0x08, // REPORT_SIZE (8)
+ 0x95, 0x08, // REPORT_COUNT (8)
+ 0x81, 0x02, // INPUT (Data,Var,Abs)
+ 0xc0, // END_COLLECTION
+ 0xc0 // END_COLLECTION
+};
+
+
+/** @defgroup USBD_HID_Private_Variables
+ * @{
+ */
+
+USBD_Class_cb_TypeDef USBD_HID_cb =
+{
+ USBD_HID_Init,
+ USBD_HID_DeInit,
+ USBD_HID_Setup,
+ NULL, /*EP0_TxSent*/
+ NULL, /*EP0_RxReady*/
+ USBD_HID_DataIn, /*DataIn*/
+ NULL, /*DataOut*/
+ NULL, /*SOF */
+ NULL,
+ NULL,
+ USBD_HID_GetCfgDesc,
+#ifdef USB_OTG_HS_CORE
+ USBD_HID_GetCfgDesc, /* use same config as per FS */
+#endif
+};
+
+#ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED
+ #if defined ( __ICCARM__ ) /*!< IAR Compiler */
+ #pragma data_alignment=4
+ #endif
+#endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */
+__ALIGN_BEGIN static uint32_t USBD_HID_AltSet __ALIGN_END = 0;
+
+#ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED
+ #if defined ( __ICCARM__ ) /*!< IAR Compiler */
+ #pragma data_alignment=4
+ #endif
+#endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */
+__ALIGN_BEGIN static uint32_t USBD_HID_Protocol __ALIGN_END = 0;
+
+#ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED
+ #if defined ( __ICCARM__ ) /*!< IAR Compiler */
+ #pragma data_alignment=4
+ #endif
+#endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */
+__ALIGN_BEGIN static uint32_t USBD_HID_IdleState __ALIGN_END = 0;
+
+#ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED
+ #if defined ( __ICCARM__ ) /*!< IAR Compiler */
+ #pragma data_alignment=4
+ #endif
+#endif /* USB_OTG_HS_INTERNAL_DMA_ENABLED */
+/* USB HID device Configuration Descriptor */
+__ALIGN_BEGIN static uint8_t USBD_HID_CfgDesc[USB_HID_CONFIG_DESC_SIZ] __ALIGN_END =
+{
+ 0x09, /* bLength: Configuration Descriptor size */
+ USB_CONFIGURATION_DESCRIPTOR_TYPE, /* bDescriptorType: Configuration */
+ USB_HID_CONFIG_DESC_SIZ,
+ /* wTotalLength: Bytes returned */
+ 0x00,
+ 0x01, /*bNumInterfaces: 1 interface*/
+ 0x01, /*bConfigurationValue: Configuration value*/
+ 0x00, /*iConfiguration: Index of string descriptor describing
+ the configuration*/
+ 0xE0, /*bmAttributes: bus powered and Support Remote Wake-up */
+ 0x32, /*MaxPower 100 mA: this current is used for detecting Vbus*/
+
+ /************** Descriptor of Joystick Mouse interface ****************/
+ /* 09 */
+ 0x09, /*bLength: Interface Descriptor size*/
+ USB_INTERFACE_DESCRIPTOR_TYPE,/*bDescriptorType: Interface descriptor type*/
+ 0x00, /*bInterfaceNumber: Number of Interface*/
+ 0x00, /*bAlternateSetting: Alternate setting*/
+ 0x01, /*bNumEndpoints*/
+ 0x03, /*bInterfaceClass: HID*/
+ 0x00 /*0x01*/, /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
+ 0x00 /*0x02*/, /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
+ 0, /*iInterface: Index of string descriptor*/
+ /******************** Descriptor of Joystick Mouse HID ********************/
+ /* 18 */
+ 0x09, /*bLength: HID Descriptor size*/
+ HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
+ 0x11, /*bcdHID: HID Class Spec release number*/
+ 0x01,
+ 0x00, /*bCountryCode: Hardware target country*/
+ 0x01, /*bNumDescriptors: Number of HID class descriptors to follow*/
+ 0x22, /*bDescriptorType*/
+ sizeof(HID_JOYSTICK_ReportDesc),/*wItemLength: Total length of Report descriptor*/
+ 0x00,
+ /******************** Descriptor of Mouse endpoint ********************/
+ /* 27 */
+ 0x07, /*bLength: Endpoint Descriptor size*/
+ USB_ENDPOINT_DESCRIPTOR_TYPE, /*bDescriptorType:*/
+
+ HID_IN_EP, /*bEndpointAddress: Endpoint Address (IN)*/
+ 0x03, /*bmAttributes: Interrupt endpoint*/
+ HID_IN_PACKET, /*wMaxPacketSize: 4 Byte max */
+ 0x00,
+ 0x0A, /*bInterval: Polling Interval (10 ms)*/
+ /* 34 */
+} ;
+
+
+
+static uint8_t ReportSent;
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_HID_Private_Functions
+ * @{
+ */
+
+/**
+ * @brief USBD_HID_Init
+ * Initialize the HID interface
+ * @param pdev: device instance
+ * @param cfgidx: Configuration index
+ * @retval status
+ */
+static uint8_t USBD_HID_Init (void *pdev,
+ uint8_t cfgidx)
+{
+
+ /* Open EP IN */
+ DCD_EP_Open(pdev,
+ HID_IN_EP,
+ HID_IN_PACKET,
+ USB_OTG_EP_INT);
+
+ /* Open EP OUT */
+ DCD_EP_Open(pdev,
+ HID_OUT_EP,
+ HID_OUT_PACKET,
+ USB_OTG_EP_INT);
+
+ ReportSent = 1;
+ return USBD_OK;
+}
+
+/**
+ * @brief USBD_HID_Init
+ * DeInitialize the HID layer
+ * @param pdev: device instance
+ * @param cfgidx: Configuration index
+ * @retval status
+ */
+static uint8_t USBD_HID_DeInit (void *pdev,
+ uint8_t cfgidx)
+{
+ /* Close HID EPs */
+ DCD_EP_Close (pdev , HID_IN_EP);
+ DCD_EP_Close (pdev , HID_OUT_EP);
+
+ ReportSent = 1;
+ return USBD_OK;
+}
+
+/**
+ * @brief USBD_HID_Setup
+ * Handle the HID specific requests
+ * @param pdev: instance
+ * @param req: usb requests
+ * @retval status
+ */
+static uint8_t USBD_HID_Setup (void *pdev,
+ USB_SETUP_REQ *req)
+{
+ uint16_t len = 0;
+ uint8_t *pbuf = NULL;
+
+ switch (req->bmRequest & USB_REQ_TYPE_MASK)
+ {
+ case USB_REQ_TYPE_CLASS :
+ switch (req->bRequest)
+ {
+
+
+ case HID_REQ_SET_PROTOCOL:
+ USBD_HID_Protocol = (uint8_t)(req->wValue);
+ break;
+
+ case HID_REQ_GET_PROTOCOL:
+ USBD_CtlSendData (pdev,
+ (uint8_t *)&USBD_HID_Protocol,
+ 1);
+ break;
+
+ case HID_REQ_SET_IDLE:
+ USBD_HID_IdleState = (uint8_t)(req->wValue >> 8);
+ break;
+
+ case HID_REQ_GET_IDLE:
+ USBD_CtlSendData (pdev,
+ (uint8_t *)&USBD_HID_IdleState,
+ 1);
+ break;
+
+ default:
+ USBD_CtlError (pdev, req);
+ return USBD_FAIL;
+ }
+ break;
+
+ case USB_REQ_TYPE_STANDARD:
+ switch (req->bRequest)
+ {
+ case USB_REQ_GET_DESCRIPTOR:
+ if( req->wValue >> 8 == HID_REPORT_DESC)
+ {
+ len = MIN(sizeof(HID_JOYSTICK_ReportDesc) , req->wLength);
+ pbuf = HID_JOYSTICK_ReportDesc; // wiiccReportDescriptor; //
+ }
+ else if( req->wValue >> 8 == HID_DESCRIPTOR_TYPE)
+ {
+
+#ifdef USB_OTG_HS_INTERNAL_DMA_ENABLED
+ pbuf = USBD_HID_Desc;
+#else
+ pbuf = USBD_HID_CfgDesc + 0x12;
+#endif
+ len = MIN(USB_HID_DESC_SIZ , req->wLength);
+ }
+
+ USBD_CtlSendData (pdev,
+ pbuf,
+ len);
+
+ break;
+
+ case USB_REQ_GET_INTERFACE :
+ USBD_CtlSendData (pdev,
+ (uint8_t *)&USBD_HID_AltSet,
+ 1);
+ break;
+
+ case USB_REQ_SET_INTERFACE :
+ USBD_HID_AltSet = (uint8_t)(req->wValue);
+ break;
+ }
+ }
+ return USBD_OK;
+}
+
+
+/**
+ * @brief USBD_HID_SendReport
+ * Send HID Report
+ * @param pdev: device instance
+ * @param buff: pointer to report
+ * @retval status
+ */
+uint8_t USBD_HID_SendReport (USB_OTG_CORE_HANDLE *pdev,
+ uint8_t *report,
+ uint16_t len)
+{
+ if (pdev->dev.device_status == USB_OTG_CONFIGURED )
+ {
+ if ( ReportSent )
+ {
+ ReportSent = 0;
+ DCD_EP_Tx (pdev, HID_IN_EP, report, len);
+ }
+ }
+ return USBD_OK;
+}
+
+/**
+ * @brief USBD_HID_GetCfgDesc
+ * return configuration descriptor
+ * @param speed : current device speed
+ * @param length : pointer data length
+ * @retval pointer to descriptor buffer
+ */
+static uint8_t *USBD_HID_GetCfgDesc (uint8_t speed, uint16_t *length)
+{
+ *length = sizeof (USBD_HID_CfgDesc);
+ return USBD_HID_CfgDesc;
+}
+
+/**
+ * @brief USBD_HID_DataIn
+ * handle data IN Stage
+ * @param pdev: device instance
+ * @param epnum: endpoint index
+ * @retval status
+ */
+static uint8_t USBD_HID_DataIn (void *pdev,
+ uint8_t epnum)
+{
+ ReportSent = 1;
+ /* Ensure that the FIFO is empty before a new transfer, this condition could
+ be caused by a new transfer before the end of the previous transfer */
+ DCD_EP_Flush(pdev, HID_IN_EP);
+ return USBD_OK;
+}
+
+/**
+ * @}
+ */
+
+
+/**
+ * @}
+ */
+
+
+/**
+ * @}
+ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/radio/src/targets/taranis/usbd_storage_msd.cpp b/radio/src/targets/taranis/usbd_storage_msd.cpp
index a11301c1e..79ddf8619 100644
--- a/radio/src/targets/taranis/usbd_storage_msd.cpp
+++ b/radio/src/targets/taranis/usbd_storage_msd.cpp
@@ -26,8 +26,8 @@
*/
/* Includes ------------------------------------------------------------------*/
-#include "../opentx.h"
-#include "../FatFs/diskio.h"
+#include "../../opentx.h"
+#include "../../FatFs/diskio.h"
#include "board_taranis.h"
extern "C" {
@@ -35,8 +35,6 @@ extern "C" {
#include "usbd_msc_mem.h"
#include "usb_conf.h"
-void eeprom_read_block (void *pointer_ram, uint16_t pointer_eeprom, size_t size);
-
#define STORAGE_LUN_NBR 2
#define BLOCKSIZE 512
@@ -205,14 +203,11 @@ int8_t STORAGE_Read (uint8_t lun,
uint16_t blk_len)
{
if (lun == 1) {
- if (fat12Read(buf, blk_addr, blk_len) != 0) {
+ if (fat12Read(buf, blk_addr, blk_len) != 0)
return -1;
- }
}
else {
- if (SD_ReadSectors(buf,
- blk_addr,
- blk_len) != 0) {
+ if (SD_ReadSectors(buf, blk_addr, blk_len) != 0) {
return -1;
}
}
@@ -240,9 +235,7 @@ int8_t STORAGE_Write (uint8_t lun,
return -1;
}
else {
- if (SD_WriteSectors(buf,
- blk_addr,
- blk_len) != 0)
+ if (SD_WriteSectors(buf, blk_addr, blk_len) != 0)
return -1;
}
diff --git a/radio/src/targets/taranis/usbd_usr.cpp b/radio/src/targets/taranis/usbd_usr.cpp
index 32fedc43c..5c443baf6 100644
--- a/radio/src/targets/taranis/usbd_usr.cpp
+++ b/radio/src/targets/taranis/usbd_usr.cpp
@@ -26,7 +26,7 @@
*/
/* Includes ------------------------------------------------------------------*/
-#include "../opentx.h"
+#include "../../opentx.h"
extern "C" {
#include "usbd_usr.h"
@@ -119,7 +119,6 @@ void USBD_USR_DeviceConnected (void)
*/
void USBD_USR_DeviceDisconnected (void)
{
- NVIC_SystemReset();
}
diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 408fa43cd..6d3c0736a 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -192,7 +192,7 @@ void parseTelemHubByte(uint8_t byte)
case offsetof(FrskySerialData, current):
#if defined(FAS_OFFSET) || !defined(CPUM64)
- if(((int16_t)frskyData.hub.current + g_model.frsky.fasOffset)>0)
+ if ((int16_t)frskyData.hub.current > 0 && ((int16_t)frskyData.hub.current + g_model.frsky.fasOffset) > 0)
frskyData.hub.current += g_model.frsky.fasOffset;
else
frskyData.hub.current = 0;
@@ -723,7 +723,7 @@ void telemetryInterrupt10ms()
uint16_t current = 0;
#endif
- channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
+ channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
if (channel <= 1) {
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
}
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index 8ac5a0801..14bfa74de 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -249,7 +249,7 @@ void processHubPacket(uint8_t id, uint16_t value)
case GPS_SPEED_BP_ID:
// Speed => Max speed
- frskyData.hub.gpsSpeed_bp = (frskyData.hub.gpsSpeed_bp * 46) / 25;
+ frskyData.hub.gpsSpeed_bp = frskyData.hub.gpsSpeed_bp;
if (frskyData.hub.gpsSpeed_bp > frskyData.hub.maxGpsSpeed)
frskyData.hub.maxGpsSpeed = frskyData.hub.gpsSpeed_bp;
break;
@@ -399,7 +399,7 @@ void processSportPacket(uint8_t *packet)
}
else if (appId >= GPS_SPEED_FIRST_ID && appId <= GPS_SPEED_LAST_ID) {
frskyData.hub.gpsSpeed_bp = SPORT_DATA_U32(packet);
- frskyData.hub.gpsSpeed_bp = (frskyData.hub.gpsSpeed_bp * 46) / 25 / 1000;
+ frskyData.hub.gpsSpeed_bp = frskyData.hub.gpsSpeed_bp / 1000;
if (frskyData.hub.gpsSpeed_bp > frskyData.hub.maxGpsSpeed)
frskyData.hub.maxGpsSpeed = frskyData.hub.gpsSpeed_bp;
}
@@ -595,7 +595,7 @@ void telemetryInterrupt10ms()
uint16_t current = 0;
#endif
- channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
+ channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
if (channel <= 1) {
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
}
diff --git a/radio/src/templates.cpp b/radio/src/templates.cpp
index 1b2e59a10..07e2c9670 100644
--- a/radio/src/templates.cpp
+++ b/radio/src/templates.cpp
@@ -56,6 +56,10 @@
#include "opentx.h"
+#if defined(PCBTARANIS)
+ #pragma message("Templates with virtual inputs (FrSky Taranis) are not implemented!")
+#endif
+
MixData* setDest(uint8_t dch, uint8_t src, bool clear=false)
{
uint8_t i = 0;
@@ -113,6 +117,7 @@ void defaultInputs()
expo->curve.type = CURVE_REF_EXPO;
expo->chn = i;
expo->weight = 100;
+ expo->mode = 3; // TODO constant
for (int c=0; c<4; c++) {
g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]);
}
@@ -183,13 +188,10 @@ void applyTemplate(uint8_t idx)
// Simple 4-Ch
case TMPL_SIMPLE_4CH:
defaultInputs();
-#if defined(PCBTARANIS)
- #pragma message("Templates with virtual inputs (FrSky Taranis) are not implemented!")
-#endif
- setDest(ICC(STK_RUD), MIXSRC_Rud);
- setDest(ICC(STK_ELE), MIXSRC_Ele);
- setDest(ICC(STK_THR), MIXSRC_Thr);
- setDest(ICC(STK_AIL), MIXSRC_Ail);
+ setDest(ICC(STK_RUD), TMPL_INPUT(STK_RUD));
+ setDest(ICC(STK_ELE), TMPL_INPUT(STK_ELE));
+ setDest(ICC(STK_THR), TMPL_INPUT(STK_THR));
+ setDest(ICC(STK_AIL), TMPL_INPUT(STK_AIL));
break;
// Sticky-T-Cut
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index b003a4336..d8d7a850f 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -112,11 +112,15 @@ const pm_char STR_OPEN9X[] PROGMEM =
#endif
#if defined(PCBTARANIS)
ISTR(VTRAINERMODES)
+ ISTR(TARANIS_PROTOCOLS)
+ ISTR(XJT_PROTOCOLS)
+ ISTR(DSM_PROTOCOLS)
+ ISTR(CURVE_TYPES)
#endif
#if defined(MAVLINK)
- ISTR(MAVLINK_BAUDS)
- ISTR(MAVLINK_AC_MODES)
- ISTR(MAVLINK_AP_MODES)
+ ISTR(MAVLINK_BAUDS)
+ ISTR(MAVLINK_AC_MODES)
+ ISTR(MAVLINK_AP_MODES)
#endif
;
@@ -230,6 +234,9 @@ const pm_char STR_SWITCHWARNING[] PROGMEM = TR_SWITCHWARNING;
const pm_char STR_TIMEZONE[] PROGMEM = TR_TIMEZONE;
const pm_char STR_GPSCOORD[] PROGMEM = TR_GPSCOORD;
const pm_char STR_VARIO[] PROGMEM = TR_VARIO;
+const pm_char STR_PITCH_AT_ZERO[] PROGMEM = TR_PITCH_AT_ZERO;
+const pm_char STR_PITCH_AT_MAX[] PROGMEM = TR_PITCH_AT_MAX;
+const pm_char STR_REPEAT_AT_ZERO[] PROGMEM = TR_REPEAT_AT_ZERO;
#endif
const pm_char STR_RXCHANNELORD[] PROGMEM = TR_RXCHANNELORD;
const pm_char STR_SLAVE[] PROGMEM = TR_SLAVE;
@@ -252,7 +259,7 @@ const pm_char STR_TMR1JITTERUS[] PROGMEM = TR_TMR1JITTERUS;
const pm_char STR_TMIXMAXMS[] PROGMEM = TR_TMIXMAXMS;
const pm_char STR_FREESTACKMINB[] PROGMEM = TR_FREESTACKMINB;
const pm_char STR_MENUTORESET[] PROGMEM = TR_MENUTORESET;
-const pm_char STR_PPM[] PROGMEM = TR_PPM;
+const pm_char STR_PPM_TRAINER[] PROGMEM = TR_PPM_TRAINER;
const pm_char STR_CH[] PROGMEM = TR_CH;
const pm_char STR_MODEL[] PROGMEM = TR_MODEL;
const pm_char STR_FP[] PROGMEM = TR_FP;
@@ -301,8 +308,8 @@ const pm_char STR_MENULOGICALSWITCHES[] PROGMEM = TR_MENULOGICALSWITCHES;
const pm_char STR_MENUCUSTOMFUNC[] PROGMEM = TR_MENUCUSTOMFUNC;
#if defined(LUA)
-const pm_char STR_MENUCUSTOMSCRIPTS[] PROGMEM = "CUSTOM SCRIPTS";
-const pm_char STR_MENUCUSTOMSCRIPT[] PROGMEM = "CUSTOM SCRIPT";
+const pm_char STR_MENUCUSTOMSCRIPTS[] PROGMEM = TR_MENUCUSTOMSCRIPTS;
+const pm_char STR_MENUCUSTOMSCRIPT[] PROGMEM = TR_MENUCUSTOMSCRIPT;
#endif
#if defined(FRSKY)
@@ -402,6 +409,7 @@ const pm_char STR_MODELS_EXT[] PROGMEM = MODELS_EXT;
const pm_char STR_WARNING[] PROGMEM = TR_WARNING;
const pm_char STR_EEPROMWARN[] PROGMEM = TR_EEPROMWARN;
+const pm_char STR_EEPROM_CONVERTING[] PROGMEM = TR_EEPROM_CONVERTING;
const pm_char STR_THROTTLEWARN[] PROGMEM = TR_THROTTLEWARN;
const pm_char STR_ALARMSWARN[] PROGMEM = TR_ALARMSWARN;
const pm_char STR_SWITCHWARN[] PROGMEM = TR_SWITCHWARN;
@@ -426,10 +434,10 @@ const pm_char STR_SDHC_CARD[] PROGMEM = TR_SDHC_CARD;
const pm_char STR_NO_SOUNDS_ON_SD[] PROGMEM = TR_NO_SOUNDS_ON_SD;
const pm_char STR_NO_MODELS_ON_SD[] PROGMEM = TR_NO_MODELS_ON_SD;
const pm_char STR_NO_BITMAPS_ON_SD[] PROGMEM = TR_NO_BITMAPS_ON_SD;
-const pm_char STR_NO_SCRIPTS_ON_SD[] PROGMEM = "No Scripts on SD"; // TODO TR_NO_BITMAPS_ON_SD;
+const pm_char STR_NO_SCRIPTS_ON_SD[] PROGMEM = TR_NO_SCRIPTS_ON_SD;
const pm_char STR_PLAY_FILE[] PROGMEM = TR_PLAY_FILE;
const pm_char STR_ASSIGN_BITMAP[] PROGMEM = TR_ASSIGN_BITMAP;
-const pm_char STR_EXECUTE_FILE[] PROGMEM = "Execute";
+const pm_char STR_EXECUTE_FILE[] PROGMEM = TR_EXECUTE_FILE;
const pm_char STR_DELETE_FILE[] PROGMEM = TR_DELETE_FILE;
const pm_char STR_COPY_FILE[] PROGMEM = TR_COPY_FILE;
const pm_char STR_RENAME_FILE[] PROGMEM = TR_RENAME_FILE;
@@ -455,8 +463,8 @@ const pm_char STR_OWN[] PROGMEM = TR_OWN;
const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER;
const pm_char STR_DATE[] PROGMEM = TR_DATE;
const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR;
-const pm_char STR_PATH_TOO_LONG[] PROGMEM = "Path too long";
-const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
+const pm_char STR_PATH_TOO_LONG[] PROGMEM = TR_PATH_TOO_LONG;
+const pm_char STR_VIEW_TEXT[] PROGMEM = TR_VIEW_TEXT;
#if LCD_W >= 212
const pm_char STR_MODELNAME[] PROGMEM = TR_MODELNAME;
@@ -482,22 +490,31 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
const pm_char STR_CHANNELRANGE[] PROGMEM = TR_CHANNELRANGE;
const pm_char STR_LOWALARM[] PROGMEM = TR_LOWALARM;
const pm_char STR_CRITICALALARM[] PROGMEM = TR_CRITICALALARM;
- const pm_char STR_ENABLE_POPUP[] PROGMEM = "Enable Popup";
- const pm_char STR_DISABLE_POPUP[] PROGMEM = "Disable Popup";
- const pm_char STR_CURVE_PRESET[] PROGMEM = "Preset...";
- const pm_char STR_PRESET[] PROGMEM = "Preset";
- const pm_char STR_MIRROR[] PROGMEM = "Mirror";
- const pm_char STR_CLEAR[] PROGMEM = "Clear";
- const pm_char STR_RESET[] PROGMEM = "Reset";
- const pm_char STR_COPY_TRIMS_TO_OFFSET[] = "Copy Trims To Offset";
+ const pm_char STR_ENABLE_POPUP[] PROGMEM = TR_ENABLE_POPUP;
+ const pm_char STR_DISABLE_POPUP[] PROGMEM = TR_DISABLE_POPUP;
+ const pm_char STR_CURVE_PRESET[] PROGMEM = TR_CURVE_PRESET;
+ const pm_char STR_PRESET[] PROGMEM = TR_PRESET;
+ const pm_char STR_MIRROR[] PROGMEM = TR_MIRROR;
+ const pm_char STR_CLEAR[] PROGMEM = TR_CLEAR;
+ const pm_char STR_RESET[] PROGMEM = TR_RESET;
+ const pm_char STR_COUNT[] PROGMEM = TR_COUNT;
+ const pm_char STR_PT[] PROGMEM = TR_PT;
+ const pm_char STR_PTS[] PROGMEM = TR_PTS;
+ const pm_char STR_SMOOTH[] PROGMEM = TR_SMOOTH;
+ const pm_char STR_COPY_TRIMS_TO_OFS[] PROGMEM = TR_COPY_TRIMS_TO_OFS;
const pm_char STR_TOP_BAR[] PROGMEM = TR_TOP_BAR;
const pm_char STR_ALTITUDE[] PROGMEM = TR_ALTITUDE;
- const pm_char STR_SCALE[] PROGMEM = "Scale";
- const pm_char STR_VIEW_CHANNELS[] PROGMEM = "View Channels";
- const pm_char STR_VIEW_NOTES[] PROGMEM = "View Notes";
+ const pm_char STR_SCALE[] PROGMEM = TR_SCALE;
+ const pm_char STR_VIEW_CHANNELS[] PROGMEM = TR_VIEW_CHANNELS;
+ const pm_char STR_VIEW_NOTES[] PROGMEM = TR_VIEW_NOTES;
const pm_char STR_POTWARNING[] PROGMEM = TR_POTWARNING;
+ const pm_char STR_PREFLIGHT[] PROGMEM = TR_PREFLIGHT;
const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST;
const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE;
+ const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL;
+ const pm_char STR_SCRIPT[] PROGMEM = TR_SCRIPT;
+ const pm_char STR_INPUTS[] PROGMEM = TR_INPUTS;
+ const pm_char STR_OUTPUTS[] PROGMEM = TR_OUTPUTS;
#endif
#if MENUS_LOCK == 1
@@ -576,126 +593,4 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
const pm_char STR_ABOUT_PARENTS_4[] PROGMEM = TR_ABOUT_PARENTS_4;
#endif
-const pm_uchar font_5x7[] PROGMEM = {
-#if defined (CPUARM)
-#include "font_05x07.lbm"
-#else
-#include "font_05x07_avr.lbm"
-#endif
-#if defined(TRANSLATIONS_DE)
-#include "font_de_05x07.lbm"
-#elif defined(TRANSLATIONS_CZ)
-#include "font_cz_05x07.lbm"
-#elif defined(TRANSLATIONS_ES)
-#include "font_es_05x07.lbm"
-#elif defined(TRANSLATIONS_FI)
-#include "font_fi_05x07.lbm"
-#elif defined(TRANSLATIONS_FR)
-#include "font_fr_05x07.lbm"
-#elif defined(TRANSLATIONS_IT)
-#include "font_it_05x07.lbm"
-#elif defined(TRANSLATIONS_PL)
-#include "font_pl_05x07.lbm"
-#elif defined(TRANSLATIONS_PT)
-#include "font_pt_05x07.lbm"
-#elif defined(TRANSLATIONS_SE)
-#include "font_se_05x07.lbm"
-#endif
-};
-
-#if !defined(CPUM64) || defined(EXTSTD)
-const pm_uchar font_5x7_B[] PROGMEM = {
-#include "font_05x07_B_compressed.lbm"
-};
-#endif
-
-const pm_uchar font_10x14[] PROGMEM = {
-#include "font_10x14_compressed.lbm"
-#if defined(CPUARM)
- #if defined(TRANSLATIONS_DE)
- #include "font_de_10x14.lbm"
- #elif defined(TRANSLATIONS_CZ)
- #include "font_cz_10x14.lbm"
- #elif defined(TRANSLATIONS_ES)
- #include "font_es_10x14.lbm"
- #elif defined(TRANSLATIONS_FI)
- #include "font_fi_10x14.lbm"
- #elif defined(TRANSLATIONS_FR)
- #include "font_fr_10x14.lbm"
- #elif defined(TRANSLATIONS_IT)
- #include "font_it_10x14.lbm"
- #elif defined(TRANSLATIONS_PL)
- #include "font_pl_10x14.lbm"
- #elif defined(TRANSLATIONS_PT)
- #include "font_pt_10x14.lbm"
- #elif defined(TRANSLATIONS_SE)
- #include "font_se_10x14.lbm"
- #endif
-#endif
-};
-
-#if defined(CPUARM)
-const pm_uchar font_3x5[] PROGMEM = {
-#include "font_03x05.lbm"
-};
-
-const pm_uchar font_4x6[] PROGMEM = {
-#include "font_04x06.lbm"
-#if defined(TRANSLATIONS_DE)
-#include "font_de_04x06.lbm"
-#elif defined(TRANSLATIONS_CZ)
-#include "font_cz_04x06.lbm"
-#elif defined(TRANSLATIONS_ES)
-#include "font_es_04x06.lbm"
-#elif defined(TRANSLATIONS_FI)
-#include "font_fi_04x06.lbm"
-#elif defined(TRANSLATIONS_FR)
-#include "font_fr_04x06.lbm"
-#elif defined(TRANSLATIONS_IT)
-#include "font_it_04x06.lbm"
-#elif defined(TRANSLATIONS_PL)
-#include "font_pl_04x06.lbm"
-#elif defined(TRANSLATIONS_PT)
-#include "font_pt_04x06.lbm"
-#elif defined(TRANSLATIONS_SE)
-#include "font_se_04x06.lbm"
-#endif
-};
-
-const pm_uchar font_8x10[] PROGMEM = {
-#include "font_08x10.lbm"
-#if defined(TRANSLATIONS_DE)
-#include "font_de_08x10.lbm"
-#elif defined(TRANSLATIONS_CZ)
-#include "font_cz_08x10.lbm"
-#elif defined(TRANSLATIONS_ES)
-#include "font_es_08x10.lbm"
-#elif defined(TRANSLATIONS_FI)
-#include "font_fi_08x10.lbm"
-#elif defined(TRANSLATIONS_FR)
-#include "font_fr_08x10.lbm"
-#elif defined(TRANSLATIONS_IT)
-#include "font_it_08x10.lbm"
-#elif defined(TRANSLATIONS_PL)
-#include "font_pl_08x10.lbm"
-#elif defined(TRANSLATIONS_PT)
-#include "font_pt_08x10.lbm"
-#elif defined(TRANSLATIONS_SE)
-#include "font_se_08x10.lbm"
-#endif
-};
-
-const pm_uchar font_4x6_extra[] PROGMEM = {
-#include "font_04x06_extra.lbm"
-};
-
-const pm_uchar font_5x7_extra[] PROGMEM = {
-#include "font_05x07_extra.lbm"
-};
-
-const pm_uchar font_10x14_extra[] PROGMEM = {
-#include "font_10x14_extra.lbm"
-};
-
-#endif
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 1f46fcb0a..ee2e49cb3 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -73,9 +73,9 @@
#define EOFS(x) ( OFS_##x + sizeof(TR_##x) )
#if LCD_W >= 212
- #define TR(x,y) y
+ #define TR(x, y) y
#else
- #define TR(x,y) x
+ #define TR(x, y) x
#endif
// The non-0-terminated-strings
@@ -131,54 +131,58 @@ extern const pm_char STR_OPEN9X[];
#define OFS_VTELEMUNIT (OFS_VTELEMCHNS + sizeof(TR_VTELEMCHNS))
#define OFS_VALARM (OFS_VTELEMUNIT + sizeof(TR_VTELEMUNIT))
#endif
- #define OFS_VALARMFN (OFS_VALARM + sizeof(TR_VALARM))
- #define OFS_VTELPROTO (OFS_VALARMFN + sizeof(TR_VALARMFN))
- #define OFS_GPSFORMAT (OFS_VTELPROTO + sizeof(TR_VTELPROTO))
- #define OFS_VOLTSRC (OFS_GPSFORMAT + sizeof(TR_GPSFORMAT))
- #define OFS_VARIOSRC (OFS_VOLTSRC + sizeof(TR_VOLTSRC))
- #define OFS_VSCREEN (OFS_VARIOSRC + sizeof(TR_VARIOSRC))
- #define OFS_VTEMPLATES (OFS_VSCREEN + sizeof(TR_VSCREEN))
+ #define OFS_VALARMFN (OFS_VALARM + sizeof(TR_VALARM))
+ #define OFS_VTELPROTO (OFS_VALARMFN + sizeof(TR_VALARMFN))
+ #define OFS_GPSFORMAT (OFS_VTELPROTO + sizeof(TR_VTELPROTO))
+ #define OFS_VOLTSRC (OFS_GPSFORMAT + sizeof(TR_GPSFORMAT))
+ #define OFS_VARIOSRC (OFS_VOLTSRC + sizeof(TR_VOLTSRC))
+ #define OFS_VSCREEN (OFS_VARIOSRC + sizeof(TR_VARIOSRC))
+ #define OFS_VTEMPLATES (OFS_VSCREEN + sizeof(TR_VSCREEN))
#else
- #define OFS_VTEMPLATES (OFS_VTELEMCHNS + sizeof(TR_VTELEMCHNS))
+ #define OFS_VTEMPLATES (OFS_VTELEMCHNS + sizeof(TR_VTELEMCHNS))
#endif
#if defined(TEMPLATES)
- #define OFS_VSWASHTYPE (OFS_VTEMPLATES + sizeof(TR_VTEMPLATES))
+ #define OFS_VSWASHTYPE (OFS_VTEMPLATES + sizeof(TR_VTEMPLATES))
#else
- #define OFS_VSWASHTYPE (OFS_VTEMPLATES)
+ #define OFS_VSWASHTYPE (OFS_VTEMPLATES)
#endif
#if defined(HELI)
- #define OFS_VKEYS (OFS_VSWASHTYPE + sizeof(TR_VSWASHTYPE))
+ #define OFS_VKEYS (OFS_VSWASHTYPE + sizeof(TR_VSWASHTYPE))
#else
- #define OFS_VKEYS (OFS_VSWASHTYPE)
+ #define OFS_VKEYS (OFS_VSWASHTYPE)
#endif
-#define OFS_VSWITCHES (OFS_VKEYS + sizeof(TR_VKEYS))
-#define OFS_VSRCRAW (OFS_VSWITCHES + sizeof(TR_VSWITCHES))
-#define OFS_VTMRMODES (OFS_VSRCRAW + sizeof(TR_VSRCRAW))
-#define OFS_DATETIME (OFS_VTMRMODES + sizeof(TR_VTMRMODES))
+#define OFS_VSWITCHES (OFS_VKEYS + sizeof(TR_VKEYS))
+#define OFS_VSRCRAW (OFS_VSWITCHES + sizeof(TR_VSWITCHES))
+#define OFS_VTMRMODES (OFS_VSRCRAW + sizeof(TR_VSRCRAW))
+#define OFS_DATETIME (OFS_VTMRMODES + sizeof(TR_VTMRMODES))
#if defined(CPUM2560) || defined(CPUARM)
- #define OFS_VLCD (OFS_DATETIME + sizeof(TR_DATETIME))
+ #define OFS_VLCD (OFS_DATETIME + sizeof(TR_DATETIME))
#else
- #define OFS_VLCD (OFS_DATETIME)
+ #define OFS_VLCD (OFS_DATETIME)
#endif
#if defined(CPUARM)
- #define OFS_VUNITSSYSTEM (OFS_VLCD + sizeof(TR_VLCD))
- #define OFS_VBEEPCOUNTDOWN (OFS_VUNITSSYSTEM + sizeof(TR_VUNITSSYSTEM))
- #define OFS_COUNTRYCODES (OFS_VBEEPCOUNTDOWN + sizeof(TR_VBEEPCOUNTDOWN))
+ #define OFS_VUNITSSYSTEM (OFS_VLCD + sizeof(TR_VLCD))
+ #define OFS_VBEEPCOUNTDOWN (OFS_VUNITSSYSTEM + sizeof(TR_VUNITSSYSTEM))
+ #define OFS_COUNTRYCODES (OFS_VBEEPCOUNTDOWN + sizeof(TR_VBEEPCOUNTDOWN))
#else
- #define OFS_COUNTRYCODES (OFS_VLCD)
+ #define OFS_COUNTRYCODES (OFS_VLCD)
#endif
#if defined(PXX)
- #define OFS_VFAILSAFE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
+ #define OFS_VFAILSAFE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
#else
- #define OFS_VFAILSAFE (OFS_COUNTRYCODES)
+ #define OFS_VFAILSAFE (OFS_COUNTRYCODES)
#endif
#if defined(PXX)
- #define OFS_VTRAINERMODES (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE))
+ #define OFS_VTRAINERMODES (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE))
#else
- #define OFS_VTRAINERMODES (OFS_VFAILSAFE)
+ #define OFS_VTRAINERMODES (OFS_VFAILSAFE)
#endif
#if defined(PCBTARANIS)
- #define OFS_MAVLINK_BAUDS (OFS_VTRAINERMODES + sizeof(TR_VTRAINERMODES))
+ #define OFS_TARANIS_PROTOCOLS (OFS_VTRAINERMODES + sizeof(TR_VTRAINERMODES))
+ #define OFS_XJT_PROTOCOLS (OFS_TARANIS_PROTOCOLS + sizeof(TR_TARANIS_PROTOCOLS))
+ #define OFS_DSM_PROTOCOLS (OFS_XJT_PROTOCOLS + sizeof(TR_XJT_PROTOCOLS))
+ #define OFS_CURVE_TYPES (OFS_DSM_PROTOCOLS + sizeof(TR_DSM_PROTOCOLS))
+ #define OFS_MAVLINK_BAUDS (OFS_CURVE_TYPES + sizeof(TR_CURVE_TYPES))
#else
#define OFS_MAVLINK_BAUDS (OFS_VTRAINERMODES)
#endif
@@ -187,7 +191,7 @@ extern const pm_char STR_OPEN9X[];
#define OFS_MAVLINK_AP_MODES (OFS_MAVLINK_AC_MODES + sizeof(TR_MAVLINK_AC_MODES))
#define OFS_SPARE (OFS_MAVLINK_AP_MODES + sizeof(TR_MAVLINK_AP_MODES))
#else
- #define OFS_SPARE (OFS_MAVLINK_BAUDS)
+ #define OFS_SPARE (OFS_MAVLINK_BAUDS)
#endif
#define STR_OFFON (STR_OPEN9X + OFS_OFFON)
@@ -271,11 +275,15 @@ extern const pm_char STR_OPEN9X[];
#endif
#if defined(PCBTARANIS)
- #define STR_VTRAINERMODES (STR_OPEN9X + OFS_VTRAINERMODES)
+ #define STR_VTRAINERMODES (STR_OPEN9X + OFS_VTRAINERMODES)
+ #define STR_TARANIS_PROTOCOLS (STR_OPEN9X + OFS_TARANIS_PROTOCOLS)
+ #define STR_XJT_PROTOCOLS (STR_OPEN9X + OFS_XJT_PROTOCOLS)
+ #define STR_DSM_PROTOCOLS (STR_OPEN9X + OFS_DSM_PROTOCOLS)
+ #define STR_CURVE_TYPES (STR_OPEN9X + OFS_CURVE_TYPES)
#endif
#if defined(MAVLINK)
- #define STR_MAVLINK_BAUDS (STR_OPEN9X + OFS_MAVLINK_BAUDS)
+ #define STR_MAVLINK_BAUDS (STR_OPEN9X + OFS_MAVLINK_BAUDS)
#define STR_MAVLINK_AC_MODES (STR_OPEN9X + OFS_MAVLINK_AC_MODES)
#define STR_MAVLINK_AP_MODES (STR_OPEN9X + OFS_MAVLINK_AP_MODES)
#endif
@@ -386,6 +394,9 @@ extern const pm_char STR_SWITCHWARNING[];
extern const pm_char STR_TIMEZONE[];
extern const pm_char STR_GPSCOORD[];
extern const pm_char STR_VARIO[];
+extern const pm_char STR_PITCH_AT_ZERO[];
+extern const pm_char STR_PITCH_AT_MAX[];
+extern const pm_char STR_REPEAT_AT_ZERO[];
extern const pm_char STR_RXCHANNELORD[];
extern const pm_char STR_SLAVE[];
extern const pm_char STR_MODESRC[];
@@ -409,7 +420,7 @@ extern const pm_char STR_TMR1JITTERUS[];
extern const pm_char STR_TMIXMAXMS[];
extern const pm_char STR_FREESTACKMINB[];
extern const pm_char STR_MENUTORESET[];
-extern const pm_char STR_PPM[];
+extern const pm_char STR_PPM_TRAINER[];
extern const pm_char STR_CH[];
extern const pm_char STR_MODEL[];
extern const pm_char STR_FP[];
@@ -446,8 +457,8 @@ extern const pm_char STR_MENUCURVE[];
extern const pm_char STR_MENULOGICALSWITCH[];
extern const pm_char STR_MENULOGICALSWITCHES[];
extern const pm_char STR_MENUCUSTOMFUNC[];
-extern const pm_char STR_MENUCUSTOMSCRIPTS[];
-extern const pm_char STR_MENUCUSTOMSCRIPT[];
+extern const pm_char STR_MENUCUSTOMSCRIPTS[];
+extern const pm_char STR_MENUCUSTOMSCRIPT[];
extern const pm_char STR_MENUTELEMETRY[];
extern const pm_char STR_MENUTEMPLATES[];
extern const pm_char STR_MENUSTAT[];
@@ -547,23 +558,9 @@ extern const pm_char STR_RESET_BTN[];
#define STR_UPDATE_LIST STR_DELAYDOWN
#endif
-extern const pm_uchar font_5x7[];
-extern const pm_uchar font_10x14[];
-#if !defined(CPUM64) || defined(EXTSTD)
-extern const pm_uchar font_5x7_B[];
-#endif
-
-#if defined(CPUARM)
-extern const pm_uchar font_3x5[];
-extern const pm_uchar font_4x6[];
-extern const pm_uchar font_8x10[];
-extern const pm_uchar font_5x7_extra[];
-extern const pm_uchar font_10x14_extra[];
-extern const pm_uchar font_4x6_extra[];
-#endif
-
extern const pm_char STR_WARNING[];
extern const pm_char STR_EEPROMWARN[];
+extern const pm_char STR_EEPROM_CONVERTING[];
extern const pm_char STR_THROTTLEWARN[];
extern const pm_char STR_ALARMSWARN[];
extern const pm_char STR_SWITCHWARN[];
@@ -588,10 +585,10 @@ extern const pm_char STR_SDHC_CARD[];
extern const pm_char STR_NO_SOUNDS_ON_SD[];
extern const pm_char STR_NO_MODELS_ON_SD[];
extern const pm_char STR_NO_BITMAPS_ON_SD[];
-extern const pm_char STR_NO_SCRIPTS_ON_SD[];
+extern const pm_char STR_NO_SCRIPTS_ON_SD[];
extern const pm_char STR_PLAY_FILE[];
extern const pm_char STR_ASSIGN_BITMAP[];
-extern const pm_char STR_EXECUTE_FILE[];
+extern const pm_char STR_EXECUTE_FILE[];
extern const pm_char STR_DELETE_FILE[];
extern const pm_char STR_COPY_FILE[];
extern const pm_char STR_RENAME_FILE[];
@@ -611,14 +608,14 @@ extern const pm_char STR_SD_SECTORS[];
extern const pm_char STR_SD_SIZE[];
extern const pm_char STR_TYPE[];
extern const pm_char STR_GLOBAL_VARS[];
-extern const pm_char STR_GLOBAL_V[];
+extern const pm_char STR_GLOBAL_V[];
extern const pm_char STR_GLOBAL_VAR[];
extern const pm_char STR_OWN[];
extern const pm_char STR_ROTARY_ENCODER[];
extern const pm_char STR_DATE[];
extern const pm_char STR_CHANNELS_MONITOR[];
-extern const pm_char STR_PATH_TOO_LONG[];
-extern const pm_char STR_VIEW_TEXT[];
+extern const pm_char STR_PATH_TOO_LONG[];
+extern const pm_char STR_VIEW_TEXT[];
#if defined(VOICE) && defined(CPUARM)
struct LanguagePack {
@@ -673,22 +670,31 @@ extern const pm_char STR_VIEW_TEXT[];
extern const pm_char STR_CHANNELRANGE[];
extern const pm_char STR_LOWALARM[];
extern const pm_char STR_CRITICALALARM[];
- extern const pm_char STR_ENABLE_POPUP[];
- extern const pm_char STR_DISABLE_POPUP[];
- extern const pm_char STR_CURVE_PRESET[];
- extern const pm_char STR_PRESET[];
- extern const pm_char STR_MIRROR[];
- extern const pm_char STR_CLEAR[];
- extern const pm_char STR_RESET[];
- extern const pm_char STR_COPY_TRIMS_TO_OFFSET[];
+ extern const pm_char STR_ENABLE_POPUP[];
+ extern const pm_char STR_DISABLE_POPUP[];
+ extern const pm_char STR_CURVE_PRESET[];
+ extern const pm_char STR_PRESET[];
+ extern const pm_char STR_MIRROR[];
+ extern const pm_char STR_CLEAR[];
+ extern const pm_char STR_RESET[];
+extern const pm_char STR_COUNT[];
+extern const pm_char STR_PT[];
+extern const pm_char STR_PTS[];
+extern const pm_char STR_SMOOTH[];
+ extern const pm_char STR_COPY_TRIMS_TO_OFS[];
extern const pm_char STR_TOP_BAR[];
extern const pm_char STR_ALTITUDE[];
- extern const pm_char STR_SCALE[];
- extern const pm_char STR_VIEW_CHANNELS[];
- extern const pm_char STR_VIEW_NOTES[];
+ extern const pm_char STR_SCALE[];
+ extern const pm_char STR_VIEW_CHANNELS[];
+ extern const pm_char STR_VIEW_NOTES[];
extern const pm_char STR_POTWARNING[];
+ extern const pm_char STR_PREFLIGHT[];
extern const pm_char STR_CHECKLIST[];
extern const pm_char STR_UART3MODE[];
+ extern const pm_char STR_THROTTLE_LABEL[];
+ extern const pm_char STR_SCRIPT[];
+ extern const pm_char STR_INPUTS[];
+ extern const pm_char STR_OUTPUTS[];
#endif
#if MENUS_LOCK == 1
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 96504d9a1..8244dbdb8 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -69,10 +69,10 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
-#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 "
+#define TR_UART3MODES "VYP\0 ""S-Port Mirror\0 ""Debug\0 "
#define LEN_POTTYPES "\017"
-#define TR_POTTYPES "Pot\0 ""Multipos Switch"
+#define TR_POTTYPES "Není\0 ""Potenciometr\0 ""Vícepol. přep.\0"
#define LEN_DATETIME "\006"
#define TR_DATETIME "DATUM:""ČAS: "
@@ -83,11 +83,23 @@
#define LEN_COUNTRYCODES TR("\002", "\010")
#define TR_COUNTRYCODES TR("US""JP""EU", "Amerika\0""Japonsko""Evropa\0 ")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC "\007"
#define TR_VTRIMINC "Expo\0 ""ExJemný""Jemný\0 ""Střední""Hrubý\0 "
#define LEN_VBEEPCOUNTDOWN "\006"
-#define TR_VBEEPCOUNTDOWN "Tichý\0Zvuk\0 Hlas\0 "
+#define TR_VBEEPCOUNTDOWN "Tichý\0""Zvuk\0 ""Hlas\0 "
+
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Custom\0"
#define LEN_RETA123 "\001"
@@ -98,7 +110,7 @@
#define TR_RETA123 "SVPK123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "SVPK12LR"
+ #define TR_RETA123 "SVPK123LR"
#else
#define TR_RETA123 "SVPK123"
#endif
@@ -141,8 +153,8 @@
#define LEN_VCURVEFUNC "\003"
#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|"
-#define LEN_VMLTPX "\010"
-#define TR_VMLTPX "Sečíst ""Násobit ""Zaměnit "
+#define LEN_VMLTPX "\007"
+#define TR_VMLTPX "Sečíst\0""Násobit""Zaměnit"
#define LEN_VMLTPX2 "\002"
#define TR_VMLTPX2 "+=""*="":="
@@ -234,44 +246,54 @@
#define TR_CFN_TEST
#endif
+#define TR_CFN_RESERVE "[rezerva]\0 "
+
#if defined(CPUARM)
- #define TR_VFSWFUNC "Zámek \0 ""Trenér \0 ""Insta-Trim\0""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Hlasitost\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podsvětlení" TR_CFN_TEST
+ #define TR_VFSWFUNC "Zámek \0 ""Trenér \0 ""Insta-Trim\0""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Hlasitost\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podsvětlení" TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Zámek \0 ""Trenér \0 ""Insta-Trim\0""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podsvětlení" TR_CFN_TEST
#else
#define TR_VFSWFUNC "Zámek \0 ""Trenér \0 ""Insta-Trim\0""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podsvětlení" TR_CFN_TEST
#endif
-#define LEN_VFSWRESET TR("\004", "\011")
+#define LEN_VFSWRESET TR("\004", "\012")
#if defined(FRSKY)
- #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
+ #define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie")
#else
#define TR_FSW_RESET_TELEM
#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("RoEn", "RotEnc\0 ")
#else
#define TR_FSW_RESET_ROTENC
#endif
-#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
+#define TR_VFSWRESET TR("Tmr1""Tmr2""Vše\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""Vše\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")
#define LEN_VTELEMCHNS "\004"
-#if defined(PCBTARANIS)
- #define TR_RSSI_0 "SWR\0"
- #define TR_RSSI_1 "RSSI"
+
+#if defined(CPUARM)
+ #define TR_TELEM_RESERVE "[--]"
+ #define TR_SWR "SWR\0"
+ #define TR_RX_BATT "RxBt"
+ #define TR_A3_A4 "A3\0 ""A4\0 "
+ #define TR_A3_A4_MIN "A3-\0""A4-\0"
#else
- #define TR_RSSI_0 "Tx\0 "
- #define TR_RSSI_1 "Rx\0 "
+ #define TR_TELEM_RESERVE
+ #define TR_SWR
+ #define TR_RX_BATT
+ #define TR_A3_A4
+ #define TR_A3_A4_MIN
#endif
-#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+""Acc\0""Time"
+
+#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
#define LENGTH_UNIT_IMP "ft\0"
#define SPEED_UNIT_IMP "mph"
@@ -307,7 +329,7 @@
#define TR_VALARMFN "<>"
#define LEN_VTELPROTO "\007"
-#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh""Halcyon"
+#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh"
#define LEN_VOLTSRC "\003"
#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
@@ -330,7 +352,7 @@
#define TR_VTEMPLATES "Smazat mixy\0\0""Zákl. 4kanál\0""Sticky-T-Cut\0""V-Tail \0""Elevon\\Delta\0""eCCPM \0""Heli Setup \0""Servo Test \0"
#define LEN_VSWASHTYPE "\004"
-#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
+#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#define LEN_VKEYS "\005"
#define TR_VKEYS TR("Menu\0""Exit\0""Dolů\0""Nhoru""Vprvo""Vlevo", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Mínus")
@@ -355,14 +377,14 @@
#endif
#if defined(CPUARM)
- #define TR_LOGICALSW "VS1""VS2""VS3""VS4""VS5""VS6""VS7""VS8""VS9""VSA""VSB""VSC""VSD""VSE""VSF""VSG""VSH""VSI""VSJ""VSK""VSL""VSM""VSN""VSO""VSP""VSQ""VSR""VSS""VST""VSU""VSV""VSW"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15""L16""L17""L18""L19""L20""L21""L22""L23""L24""L25""L26""L27""L28""L29""L30""L31""L32"
#elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128)
- #define TR_LOGICALSW "VS1""VS2""VS3""VS4""VS5""VS6""VS7""VS8""VS9""VSA""VSB""VSC""VSD""VSE""VSF"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15"
#else
- #define TR_LOGICALSW "VS1""VS2""VS3""VS4""VS5""VS6""VS7""VS8""VS9""VSA""VSB""VSC"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12"
#endif
-#define TR_TRIMS_SWITCHES "tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr"
+#define TR_TRIMS_SWITCHES "tSl""tSp""tVd""tVn""tPd""tPn""tKl""tKp"
#if defined(PCBSKY9X)
#define TR_ROTARY_ENCODERS "REa\0"
@@ -399,7 +421,7 @@
#define TR_VTRAINERMODES "Učitel""Žák\0 "
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Držet\0 ""Vlastní\0 ""Bez pulzů"
+#define TR_VFAILSAFE "Držet\0 ""Vlastní\0 ""Bez pulzů""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -434,20 +456,20 @@
#define TR_MODELNAME "Název modelu"
#define TR_PHASENAME "Jméno"
#define TR_MIXNAME "Jméno"
-#define TR_INPUTNAME "Input Name"
+#define TR_INPUTNAME "Jméno"
#if defined(PCBTARANIS)
- #define TR_EXPONAME "Line Name"
+ #define TR_EXPONAME "Poznámka"
#else
#define TR_EXPONAME "Jméno"
#endif
#define TR_BITMAP "Obrázek"
#define TR_TIMER "Stopky "
-#define TR_ELIMITS TR("Limit+25%", "Kanál +/- 125%")
-#define TR_ETRIMS TR("širšíTrim", "Široký trim")
-#define TR_TRIMINC TR("KrokTrimu", "Krok trimu")
-#define TR_TTRACE TR("StopaPlyn", "Stopař plynu")
-#define TR_TTRIM TR("TrimPlynu", "TrimPlyn-volnoběh")
-#define TR_BEEPCTR "(\043)Středy"
+#define TR_ELIMITS TR("Limit +25%", "Kanál +/- 125%")
+#define TR_ETRIMS TR("širší Trim", "Široký trim")
+#define TR_TRIMINC TR("Krok Trimu", "Krok trimu")
+#define TR_TTRACE TR("TH stopek", INDENT "Stopa TH stopek")
+#define TR_TTRIM TR("TrimPlynVol.", INDENT "Trim jen volnoběh")
+#define TR_BEEPCTR "Středy \221\222"
#define TR_PROTO INDENT"Protokol"
#define TR_PPMFRAME "PPM frame"
#define TR_MS "ms"
@@ -482,7 +504,7 @@
#define TR_MIXWARNING "Varování"
#define TR_OFF "VYP"
#define TR_MULTPX TR("Mat.operace", "Operace")
-#define TR_DELAYDOWN TR("Zpoždění Vyp", "Zdržet(-)")
+#define TR_DELAYDOWN TR("Zpoždění Vyp", "Zdržet(x)")
#define TR_DELAYUP TR("Zpoždění Zap", "Zdržet(\43)")
#define TR_SLOWDOWN TR("Zpomalení(-)", "Zpomal(\177)")
#define TR_SLOWUP TR("Zpomalení(+)", "Zpomal(\176)")
@@ -509,7 +531,8 @@
#define TR_MEMORYWARNING INDENT"Plná pamět'"
#define TR_ALARMWARNING INDENT"Vypnutý zvuk"
#define TR_RENAVIG "Navig. RotEnc"
-#define TR_THROTTLEREVERSE TR("ReversPlyn", "Revers plynu")
+#define TR_THROTTLE_LABEL "Plyn"
+#define TR_THROTTLEREVERSE TR("ReversPlyn", INDENT"Revers plynu")
#define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Oznamovat minuty")
#define TR_BEEPCOUNTDOWN INDENT"Odpočet"
#define TR_PERSISTENT INDENT"Trvalé"
@@ -518,9 +541,9 @@
#define TR_BLONBRIGHTNESS INDENT"Jas Zap."
#define TR_BLOFFBRIGHTNESS INDENT"Jas Vyp."
#define TR_SPLASHSCREEN "úvodníLogo"
-#define TR_THROTTLEWARNING "(\043)Plyn"
-#define TR_SWITCHWARNING "(\043)Spínače"
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("* Plyn", INDENT "Páka Plynu")
+#define TR_SWITCHWARNING TR("* Spínače", INDENT "Polohy Spínačů")
+#define TR_POTWARNING TR("* Potenc.", INDENT "Nastavení Pot.")
#define TR_TIMEZONE "časové pásmo"
#define TR_RXCHANNELORD TR("Pořadí kanálů", "Výchozí pořadí kanálů")
#define TR_SLAVE "Podřízený"
@@ -552,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER" >> Reset"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODEL"
#define TR_FP "LR"
@@ -581,11 +604,11 @@
#define TR_MENUHELISETUP "HELI"
#if defined(PCBTARANIS)
- #define TR_MENUINPUTS "INPUTS"
- #define TR_MENULIMITS "SERVOS"
+ #define TR_MENUINPUTS "VSTUPY"
+ #define TR_MENULIMITS "SERVA"
#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ...
- #define TR_MENUINPUTS "STICKS"
- #define TR_MENULIMITS "SERVOS"
+ #define TR_MENUINPUTS "DR/EXPO"
+ #define TR_MENULIMITS "LIMITY"
#else
#define TR_MENUINPUTS "DR/EXPO"
#define TR_MENULIMITS "LIMITY"
@@ -593,9 +616,11 @@
#define TR_MENUCURVES "KŘIVKY"
#define TR_MENUCURVE "\002k"
-#define TR_MENULOGICALSWITCH "VIRT. SPÍNAč"
-#define TR_MENULOGICALSWITCHES "VIRTUÁLNÍ SPÍNAčE"
+#define TR_MENULOGICALSWITCH "LOG. SPÍNAč"
+#define TR_MENULOGICALSWITCHES "LOGICKÉ SPÍNAčE"
#define TR_MENUCUSTOMFUNC "FUNKCE"
+#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
+#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRIE"
#define TR_MENUTEMPLATES "ŠABLONY"
#define TR_MENUSTAT "STATISTIKA"
@@ -608,6 +633,9 @@
#define TR_LONGITUDE "Zem. délka"
#define TR_GPSCOORD "GPS souřadnice"
#define TR_VARIO "Vario"
+#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero"
+#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
+#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "VYPÍNÁNí.."
#define TR_BATT_CALIB "Kalib:Baterie"
#define TR_CURRENT_CALIB " +=\006Proud"
@@ -617,14 +645,15 @@
#define TR_CREATE_MODEL "Nový model"
#define TR_COPY_MODEL "Kopírovat"
#define TR_MOVE_MODEL "Přesunout"
-#define TR_BACKUP_MODEL "Zálohovat"
+#define TR_BACKUP_MODEL "Zálohovat na SD"
#define TR_DELETE_MODEL "Smaž model"
-#define TR_RESTORE_MODEL "Obnov model"
+#define TR_RESTORE_MODEL "Obnov model z SD"
#define TR_SDCARD_ERROR "Chyba SD karty"
#define TR_NO_SDCARD "Není SD karta"
#define TR_INCOMPATIBLE "Nekompatibilní"
#define TR_WARNING "KONTROLA"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "EEPROM Converting"
#define TR_THROTTLEWARN "PLYNU"
#define TR_ALARMSWARN "ALARMU"
#define TR_SWITCHWARN "POZICE"
@@ -649,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "žádný zvuk na SD"
#define TR_NO_MODELS_ON_SD "žádný model na SD"
#define TR_NO_BITMAPS_ON_SD "žádné obrázky na SD"
+#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_PLAY_FILE "Přehrát"
#define TR_DELETE_FILE "Odstranit"
#define TR_COPY_FILE "Kopírovat"
#define TR_RENAME_FILE "Přejmenovat"
#define TR_ASSIGN_BITMAP "Zvolit obrázek"
+#define TR_EXECUTE_FILE "Execute"
#define TR_REMOVED " odstraněn"
#define TR_SD_INFO "Informace"
#define TR_SD_FORMAT "Formát"
@@ -670,13 +701,15 @@
#define TR_SD_SIZE "Velikost:"
#define TR_TYPE TR_SD_TYPE
#define TR_GLOBAL_VARS "Globální proměnné"
-#define TR_GLOBAL_V "GLOBAL V."
-#define TR_GLOBAL_VAR "Global Variable"
+#define TR_GLOBAL_V "GLOB.PROM."
+#define TR_GLOBAL_VAR "Globální proměnná"
#define TR_MENUGLOBALVARS "GLOBÁLNÍ PROMěNNÉ"
#define TR_OWN " \043 "
#define TR_DATE "Datum"
#define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "MONITOR KANÁLU"
+#define TR_PATH_TOO_LONG "Path too long"
+#define TR_VIEW_TEXT "View text"
#define TR_INTERNALRF "Vnitřní RF modul"
#define TR_EXTERNALRF "Externí RF modul"
#define TR_FAILSAFE "Mód Failsafe"
@@ -714,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Rozsah kanálů"
#define TR_LOWALARM INDENT "Nízký Alarm"
#define TR_CRITICALALARM INDENT "Kritický Alarm"
+#define TR_ENABLE_POPUP "Enable Popup"
+#define TR_DISABLE_POPUP "Disable Popup"
+#define TR_CURVE_PRESET "Preset..."
+#define TR_PRESET "Preset"
+#define TR_MIRROR "Mirror"
+#define TR_CLEAR "Clear"
+#define TR_RESET "Reset"
+#define TR_COUNT "Count"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Smooth"
+#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset"
#define TR_PERSISTENT_MAH INDENT "Store mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_PREFLIGHT "Předletová kontrola"
+#define TR_CHECKLIST INDENT "Zobrazit poznámky"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
-#define TR_UART3MODE "Serial port"
+#define TR_UART3MODE "Seriový port"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Inputs"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -746,7 +795,7 @@
#endif
// Taranis column headers
-#define TR_PHASES_HEADERS { " Jméno ", " Spínač ", " Trimy ", " Přechod Zap ", " Přechod Vyp " }
+#define TR_PHASES_HEADERS { " Jméno ", " Spínač ", " Trim směrovky ", " Trim výškovky ", " Trim plynu ", " Trim křidélek ", " Přechod náběhu ", " Přechod konce " }
#define TR_LIMITS_HEADERS { " Jméno ", " Subtrim ", " Min ", " Max ", " Směr ", " Křivka ", " Střed PPM ", " Symetrické " }
#define TR_CSW_HEADERS { " Funkce ", " Hodnota 1 ", " Hodnota 2 ", " Hodnota 2 ", " AND Spínač ", " Trvání ", " Zpoždění " }
@@ -808,7 +857,10 @@
#define TR_VARIO_VOLUME "Vario"
#define TR_BG_VOLUME "WAV na pozadí"
-#define TR_TOP_BAR "Top Bar"
-#define TR_ALTITUDE INDENT "Altitude"
-#define TR_MODS_FORBIDDEN "Modifications forbidden!"
-#define TR_UNLOCKED "Unlocked"
+#define TR_TOP_BAR "Horní lišta"
+#define TR_ALTITUDE INDENT "Výška"
+#define TR_SCALE "Scale"
+#define TR_VIEW_CHANNELS "View Channels"
+#define TR_VIEW_NOTES "View Notes"
+#define TR_MODS_FORBIDDEN "Změny nejsou povoleny!"
+#define TR_UNLOCKED "Odemčeno"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index 10706d1bc..80e28048c 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -1,4 +1,4 @@
-/* German checked 28.02.2014 kleine Änderungen
+/* German checked 29.03.2014 Test 010 kleine Änderungen
* Authors (alphabetical order)
* - Bertrand Songis
* - Bernet Andre
@@ -37,6 +37,9 @@
* \0 -ends actual string
*/
+
+
+
// NON ZERO TERMINATED STRINGS
#define LEN_OFFON "\003"
#define TR_OFFON "AUS""EIN"
@@ -69,7 +72,7 @@
#define TR_UART3MODES "AUS\0 ""S-Port Data Out\0""Debug\0 "
#define LEN_POTTYPES "\017"
-#define TR_POTTYPES "Poti\0 ""Stufen-Schalter "
+#define TR_POTTYPES "Kein\0 ""Poti\0 ""Stufen-Schalter "
#define LEN_DATETIME "\005"
#define TR_DATETIME "DATE:""ZEIT:"
@@ -80,12 +83,24 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "AUS\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "AUS\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC TR("\006","\013")
#define TR_VTRIMINC TR("Expo ""ExFein""Fein ""Mittel""Grob ","Exponential""Extra Fein ""Fein ""Mittel ""Grob ")
#define LEN_VBEEPCOUNTDOWN "\006"
#define TR_VBEEPCOUNTDOWN "Kein\0 Pieps\0Stimme"
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES " Nur Y "" X und Y" //"Standard""Custom\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -95,7 +110,7 @@
#define TR_RETA123 "SHGQ123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "SHGQ12LR"
+ #define TR_RETA123 "SHGQ123LR"
#else
#define TR_RETA123 "SHGQ123"
#endif
@@ -148,16 +163,16 @@
#define TR_VMIXTRIMS "AUS""EIN""Sei""Höh""Gas""Que" //Mixer Trim Werte
#if defined(PCBTARANIS)
- #define TR_CSWTIMER "Timer"
- #define TR_CSWSTICKY "Stcky"
- #define TR_CSWRANGE "Range"
- #define TR_CSWSTAY "Edge\0"
+ #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator
+ #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop
+ #define TR_CSWRANGE "Range" // unklar
+ #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls
#else
- #define TR_CSWTIMER "Tim\0 "
- #define TR_CSWSTICKY "Glue\0"
+ #define TR_CSWTIMER "Takt\0" //
+ #define TR_CSWSTICKY "SRFF\0" //
#if defined(CPUARM)
- #define TR_CSWRANGE "Rnge\0"
- #define TR_CSWSTAY "Edge\0"
+ #define TR_CSWRANGE "Rnge\0" //
+ #define TR_CSWSTAY "Puls\0" //
#else
#define TR_CSWRANGE
#define TR_CSWSTAY
@@ -244,7 +259,7 @@
#define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY)
- #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
+ #define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie")
#else
#define TR_FSW_RESET_TELEM
#endif
@@ -280,11 +295,16 @@
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
+#define LENGTH_UNIT_IMP "ft\0"
+#define SPEED_UNIT_IMP "mph"
+#define LENGTH_UNIT_METR "m\0 "
+#define SPEED_UNIT_METR "kmh"
+
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\012")
#define TR_VUNITSSYSTEM TR("Metrik""Imper.", "Metrisch\0 ""Imperial\0 ")
- #define LEN_VTELEMUNIT_NORM "\003"
- #define TR_VTELEMUNIT_NORM "V\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
+ #define LEN_VTELEMUNIT_METR "\003"
+ #define TR_VTELEMUNIT_METR "V\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
#define TR_VTELEMUNIT_IMP "V\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 "
#else
@@ -303,33 +323,33 @@
#define STR_A (STR_VTELEMUNIT+4)
#define LEN_VALARM "\003"
-#define TR_VALARM "---""Gel""Org""Rot"
+#define TR_VALARM "---""Glb""Org""Rot"
#define LEN_VALARMFN "\001"
#define TR_VALARMFN "<>"
#define LEN_VTELPROTO "\007"
-#define TR_VTELPROTO "Kein\0 ""Hub\0 ""WSHHigh""Halcyon"
+#define TR_VTELPROTO "Kein\0 ""Hub\0 ""WSHHigh"
-#define LEN_VOLTSRC "\003"
-#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
+#define LEN_VOLTSRC TR("\003", "\007")
+#define TR_VOLTSRC TR("---""A1\0""A2\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""FAS\0 ""Cells\0 ")
-#define LEN_VARIOSRC "\005"
+#define LEN_VARIOSRC "\004"
#if defined(FRSKY_SPORT)
- #define TR_VARIOSRC "Vario""A1\0 ""A2\0"
+ #define TR_VARIOSRC "Vspd""A1\0 ""A2\0 ""dTE\0"
#else
- #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0"
+ #define TR_VARIOSRC "Alt\0""Alt+""Vspd""A1\0 ""A2\0 "
#endif
#define LEN_VSCREEN "\006"
#define TR_VSCREEN "Werte\0""Balken" //Telemetrie Werte oder Balken
#define LEN_GPSFORMAT "\004"
-#define TR_GPSFORMAT "HMS\0""NMEA" //Koordinatenanzeige
+#define TR_GPSFORMAT "GMS\0""NMEA" //Koordinatenanzeige
#define LEN2_VTEMPLATES 15 // max String Länge für Menü (original=13)
#define LEN_VTEMPLATES "\017" // max String Länge 15+cr+lf
-#define TR_VTEMPLATES "Misch. Lösch.\0 ""Einfach. 4-CH\0 ""Fixe Gassperre\0""V-Stabilisator\0""Delta Mischer\0 ""eCCPM\0 ""Hubschrauber\0 ""Servo Tester\0 "
+#define TR_VTEMPLATES "Misch. Lösch.\0 ""Einfach. 4-CH\0 ""Fixe Gassperre\0""V-Leitwerk\0 ""Delta Mischer\0 ""eCCPM\0 ""Hubschrauber\0 ""Servo Tester\0 "
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
@@ -357,11 +377,11 @@
#endif
#if defined(CPUARM)
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF""LSG""LSH""LSI""LSJ""LSK""LSL""LSM""LSN""LSO""LSP""LSQ""LSR""LSS""LST""LSU""LSV""LSW"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15""L16""L17""L18""L19""L20""L21""L22""L23""L24""L25""L26""L27""L28""L29""L30""L31""L32"
#elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128)
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15"
#else
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12"
#endif
#define TR_TRIMS_SWITCHES "tSl""tSr""tHd""tHu""tGd""tGu""tQl""tQr"
@@ -401,7 +421,7 @@
#define TR_VTRAINERMODES "Lehrer\0""Schüler\0" // "Master""Slave\0"
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses"
+#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -438,17 +458,17 @@
#define TR_MIXNAME "Mix Name"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
- #define TR_EXPONAME "Linie Name"
+ #define TR_EXPONAME "Info Name"
#else
- #define TR_EXPONAME "Expo Name"
+ #define TR_EXPONAME "Info Name"
#endif
#define TR_BITMAP "Modell Bild"
#define TR_TIMER TR("Timer","Timer ")
-#define TR_ELIMITS TR("Erw.Limit","Erweit. Limits")
+#define TR_ELIMITS TR("Erw.Limit","Erweit. Wege 125%")
#define TR_ETRIMS TR("Erw.Trims","Erweit. Trimmung")
#define TR_TRIMINC TR("Trim Schr.","Trimm Schritte")
-#define TR_TTRACE TR("Gasquelle","Gas Verfolgung")
-#define TR_TTRIM TR("Gastrim","Gas Trimmung")
+#define TR_TTRACE TR("Gasquelle", INDENT "GasTimerQuelle")
+#define TR_TTRIM TR("Gastrim", INDENT "Gas Trimmung")
#define TR_BEEPCTR TR("Mitt.Piep","Mittelst. Pieps")
#define TR_PROTO TR(INDENT"Proto.",INDENT"Protokoll")
#define TR_PPMFRAME "PPM Einst."
@@ -465,7 +485,7 @@
#define TR_SWASHRING TR("Zykl. Begrenz","Zyklische Begrenzung")
#define TR_ELEDIRECTION TR("Nick Richtung"," Nick Servo Richtung")
#define TR_AILDIRECTION TR("Roll Richtung"," Roll Servo Richtung")
-#define TR_COLDIRECTION TR("Pit. Richtung"," Pitch Servo Richtung")
+#define TR_COLDIRECTION TR("Pit. Richtung"," Pitch Servo Richtung")
#define TR_MODE INDENT"Modus"
#define TR_NOFREEEXPO "Expos voll!"
#define TR_NOFREEMIXER "Mischer voll!"
@@ -495,9 +515,9 @@
#define TR_RANGE INDENT"Skala"
#define TR_BAR "Streifen"
#define TR_ALARM INDENT"Alarm"
-#define TR_USRDATA "Daten"
+#define TR_USRDATA "Daten berechnen--"
#define TR_BLADES INDENT"Blätter"
-#define TR_SCREEN "Bild "
+#define TR_SCREEN "Telm-Bild "
#define TR_SOUND_LABEL "----Töne---------"
#define TR_LENGTH INDENT"Dauer"
#define TR_SPKRPITCH INDENT"Tonhöhe"
@@ -511,7 +531,8 @@
#define TR_MEMORYWARNING INDENT"Speicher voll"
#define TR_ALARMWARNING INDENT"Ton aus"
#define TR_RENAVIG "Drehgeb. Navig."
-#define TR_THROTTLEREVERSE TR("Gas invers", "Vollgas hinten?") //Änderung wg TH9x, Taranis
+#define TR_THROTTLE_LABEL "Gas"
+#define TR_THROTTLEREVERSE TR("Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis
#define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Jede Minute")
#define TR_BEEPCOUNTDOWN INDENT"Countdown"
#define TR_PERSISTENT TR(INDENT"M-Zeit",INDENT"Modell Zeit")
@@ -520,12 +541,12 @@
#define TR_BLONBRIGHTNESS INDENT"An Helligkeit"
#define TR_BLOFFBRIGHTNESS INDENT"Aus Helligkeit"
#define TR_SPLASHSCREEN "Startbild"
-#define TR_THROTTLEWARNING "Gas Alarm"
-#define TR_SWITCHWARNING TR("Sch. Alarm","Schalter Alarm")
-#define TR_POTWARNING TR("Pot Warn.","Poti Warnung")
+#define TR_THROTTLEWARNING TR("Gas Alarm", INDENT "Gas Alarm")
+#define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter Alarm")
+#define TR_POTWARNING TR("Pot Warn.", INDENT "Poti Warnung")
#define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone")
#define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung")
-#define TR_SLAVE "Schüler PPM1-8 als Ausgang"
+#define TR_SLAVE "Schüler PPM1-16 als Ausgang"
#define TR_MODESRC " Modus\002% Quelle"
#define TR_MULTIPLIER "Multiplikator"
#define TR_CAL "Kal."
@@ -554,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER" für Reset"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR" //old #define TR_PPM "PPM"
#define TR_CH "CH"
#define TR_MODEL "MODELL"
#define TR_FP "FP"
@@ -568,14 +589,14 @@
#define TR_BADEEPROMDATA "EEPROM ungültig"
#define TR_EEPROMFORMATTING "EEPROM Initialisieren"
#define TR_EEPROMOVERFLOW "EEPROM Überlauf"
-#define TR_MENURADIOSETUP TR("SENDER EINST.","SENDER GRUNGEINSTELLUNGEN")
+#define TR_MENURADIOSETUP TR("SENDER EINST.","SENDER GRUNDEINSTELLUNGEN")
#define TR_MENUDATEANDTIME "DATUM UND ZEIT"
#define TR_MENUTRAINER TR("Lehr./Schül.","LEHRER/SCHÜLER")
#define TR_MENUVERSION "VERSION"
#define TR_MENUDIAG TR("Schalt.","Schalter Test")
#define TR_MENUANA "Analog Test"
#define TR_MENUCALIBRATION TR("KALIB. ANALOG","KALIBRIERUNG STICKS+POTIS")
-#define TR_TRIMS2OFFSETS "\006Trims => Offset"
+#define TR_TRIMS2OFFSETS "Kopie Trim to Servo-Subtrim" // "Trims => Offset"
#define TR_MENUMODELSEL TR("MODELLE","MODELL WÄHLEN")
#define TR_MENUSETUP TR("KONF.","MODELL EINSTELLUNGEN")
#define TR_MENUFLIGHTPHASE "FLUGPHASE"
@@ -584,10 +605,10 @@
#if defined(PCBTARANIS)
#define TR_MENUINPUTS "INPUTS"
- #define TR_MENULIMITS "AUSGÄNGE"
+ #define TR_MENULIMITS "SERVO WEG"
#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... #define TR_MENUDREXPO "KNÜPPEL"
#define TR_MENUINPUTS "INPUTS"
- #define TR_MENULIMITS "AUSGÄNGE"
+ #define TR_MENULIMITS "Servo Weg"
#else
#define TR_MENUINPUTS TR("DR/EXPO","DUALRATE/EXPO")
#define TR_MENULIMITS TR("GRENZEN","SERVO WEG")
@@ -598,6 +619,8 @@
#define TR_MENULOGICALSWITCH "LOGIK SCHALTER"
#define TR_MENULOGICALSWITCHES "LOGIK SCHALTER"
#define TR_MENUCUSTOMFUNC "SPEZ. FUNKTIONEN"
+#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
+#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRIE"
#define TR_MENUTEMPLATES "VORLAGEN"
#define TR_MENUSTAT "STAT"
@@ -610,16 +633,19 @@
#define TR_LONGITUDE "Länge:"
#define TR_GPSCOORD TR("Gps Koord.","GPS Koordinaten Format")
#define TR_VARIO TR("Vario","----Variometer----")
+#define TR_PITCH_AT_ZERO INDENT "Niedrigster Ton"
+#define TR_PITCH_AT_MAX INDENT "Höchster Ton"
+#define TR_REPEAT_AT_ZERO INDENT "Wiederholrate"
#define TR_SHUTDOWN "Herunterfahren"
#define TR_BATT_CALIB "Akku. Kalib."
#define TR_CURRENT_CALIB "Stromkalib."
-#define TR_VOLTAGE INDENT"Spann."
+#define TR_VOLTAGE INDENT"Spannung"
#define TR_CURRENT INDENT"Strom"
#define TR_SELECT_MODEL "Modell Wählen"
#define TR_CREATE_MODEL "Neues Modell"
#define TR_COPY_MODEL "Kopiere Modell"
#define TR_MOVE_MODEL "Verschiebe Modell"
-#define TR_BACKUP_MODEL "Modell Backup"
+#define TR_BACKUP_MODEL "Modell Backup auf SD"
#define TR_DELETE_MODEL "Modell Löschen" // TODO merged into DELETEMODEL?
#define TR_RESTORE_MODEL "Modell Restore"
#define TR_SDCARD_ERROR "SDcard Fehler"
@@ -627,6 +653,7 @@
#define TR_INCOMPATIBLE "Nicht kompatibel"
#define TR_WARNING "WARNUNG"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "EEPROM Converting"
#define TR_THROTTLEWARN "GAS"
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "SCHALTER"
@@ -651,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "Keine Töne auf SD"
#define TR_NO_MODELS_ON_SD "Keine Modelle auf SD"
#define TR_NO_BITMAPS_ON_SD "Keine Bitmaps auf SD"
+#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_PLAY_FILE "Spielen"
#define TR_DELETE_FILE "Löschen"
#define TR_COPY_FILE "Kopieren"
#define TR_RENAME_FILE "Umbenennen"
#define TR_ASSIGN_BITMAP "Assign Bitmap"
+#define TR_EXECUTE_FILE "Execute"
#define TR_REMOVED " gelöscht"
#define TR_SD_INFO "Information"
#define TR_SD_FORMAT "Formattieren"
@@ -679,6 +708,8 @@
#define TR_DATE "Datum:"
#define TR_ROTARY_ENCODER "Drehgeber"
#define TR_CHANNELS_MONITOR "Kanal Monitor"
+#define TR_PATH_TOO_LONG "Path too long"
+#define TR_VIEW_TEXT "View text"
#define TR_INTERNALRF "----Internes HF Modul----------"
#define TR_EXTERNALRF "----Externes HF Modul----------"
#define TR_FAILSAFE "Failsafe Mode"
@@ -716,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Ausgangs Kanäle"
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Kritisch Alarm"
+#define TR_ENABLE_POPUP "Enable Popup"
+#define TR_DISABLE_POPUP "Disable Popup"
+#define TR_CURVE_PRESET "Preset..."
+#define TR_PRESET "Preset"
+#define TR_MIRROR "Mirror"
+#define TR_CLEAR "Clear"
+#define TR_RESET "Reset"
+#define TR_COUNT "Punkte"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Runden"
+#define TR_COPY_TRIMS_TO_OFS "Kopie Trim to Servo-Subtrim" // "Trims => Offset"
#define TR_PERSISTENT_MAH INDENT "Speichern mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_PREFLIGHT "----Preflight Checks----"
+#define TR_CHECKLIST INDENT "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial Port"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Inputs"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -810,7 +857,10 @@
#define TR_VARIO_VOLUME "Vario Lautst"
#define TR_BG_VOLUME "Bg Lautst"
-#define TR_TOP_BAR "Info Zeile"
+#define TR_TOP_BAR "----Info Zeile----"
#define TR_ALTITUDE INDENT "Höhe"
+#define TR_SCALE "Scale"
+#define TR_VIEW_CHANNELS "View Channels"
+#define TR_VIEW_NOTES "View Notes"
#define TR_MODS_FORBIDDEN "Veränderungen verboten!"
#define TR_UNLOCKED "Entsperrt"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 7f26756f8..a72866571 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -83,12 +83,24 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC TR("\006", "\013")
#define TR_VTRIMINC TR("Expo\0 ""ExFine""Fine\0 ""Medium""Coarse", "Exponential""Extra Fine\0""Fine\0 ""Medium\0 ""Coarse\0 ")
#define LEN_VBEEPCOUNTDOWN "\006"
#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0"
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Custom\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -98,7 +110,7 @@
#define TR_RETA123 "RETA123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "RETA12LR"
+ #define TR_RETA123 "RETA123LR"
#else
#define TR_RETA123 "RETA123"
#endif
@@ -319,8 +331,8 @@
#define LEN_VTELPROTO "\007"
#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh"
-#define LEN_VOLTSRC "\003"
-#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
+#define LEN_VOLTSRC TR("\003", "\007")
+#define TR_VOLTSRC TR("---""A1\0""A2\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""FAS\0 ""Cells\0 ")
#define LEN_VARIOSRC "\004"
#if defined(FRSKY_SPORT)
@@ -333,7 +345,7 @@
#define TR_VSCREEN "Nums""Bars"
#define LEN_GPSFORMAT "\004"
-#define TR_GPSFORMAT "HMS ""NMEA"
+#define TR_GPSFORMAT "DMS\0""NMEA"
#define LEN2_VTEMPLATES 13
#define LEN_VTEMPLATES "\015"
@@ -365,11 +377,11 @@
#endif
#if defined(CPUARM)
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF""LSG""LSH""LSI""LSJ""LSK""LSL""LSM""LSN""LSO""LSP""LSQ""LSR""LSS""LST""LSU""LSV""LSW"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15""L16""L17""L18""L19""L20""L21""L22""L23""L24""L25""L26""L27""L28""L29""L30""L31""L32"
#elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128)
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15"
#else
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12"
#endif
#define TR_TRIMS_SWITCHES "tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr"
@@ -409,7 +421,7 @@
#define TR_VTRAINERMODES "Master""Slave\0"
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses"
+#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -455,11 +467,11 @@
#define TR_ELIMITS TR("E.Limits", "Extended Limits")
#define TR_ETRIMS TR("E.Trims", "Extended Trims")
#define TR_TRIMINC "Trim Step"
-#define TR_TTRACE TR("T-Source", "Throttle Source")
-#define TR_TTRIM TR("T-Trim", "Throttle Trim")
+#define TR_TTRACE TR("T-Source", INDENT "Timer Source")
+#define TR_TTRIM TR("T-Trim", INDENT "Trim Idle Only")
#define TR_BEEPCTR TR("Ctr Beep", "Center Beep")
#define TR_PROTO TR(INDENT "Proto", INDENT "Protocol")
-#define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame")
+#define TR_PPMFRAME TR(INDENT "PPM frame", INDENT "PPM frame")
#define TR_MS "ms"
#define TR_SWITCH "Switch"
#define TR_TRIMS "Trims"
@@ -503,7 +515,7 @@
#define TR_RANGE INDENT "Range"
#define TR_BAR "Bar"
#define TR_ALARM INDENT "Alarm"
-#define TR_USRDATA "UsrData"
+#define TR_USRDATA TR("UsrData","User Data")
#define TR_BLADES INDENT "Blades"
#define TR_SCREEN "Screen "
#define TR_SOUND_LABEL "Sound"
@@ -519,7 +531,8 @@
#define TR_MEMORYWARNING INDENT "Memory Low"
#define TR_ALARMWARNING INDENT "Sound Off"
#define TR_RENAVIG "RotEnc Navig"
-#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse")
+#define TR_THROTTLE_LABEL "Throttle"
+#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse")
#define TR_MINUTEBEEP TR(INDENT "Minute",INDENT "Minute call")
#define TR_BEEPCOUNTDOWN INDENT "Countdown"
#define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistent")
@@ -528,9 +541,9 @@
#define TR_BLONBRIGHTNESS INDENT "ON Brightness"
#define TR_BLOFFBRIGHTNESS INDENT "OFF Brightness"
#define TR_SPLASHSCREEN "Splash screen"
-#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning")
-#define TR_SWITCHWARNING TR("S-Warning","Switch Warning")
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle State")
+#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Positions")
+#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Positions")
#define TR_TIMEZONE TR("Time Zone","GPS Time zone")
#define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order")
#define TR_SLAVE "Slave"
@@ -562,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER " to reset"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODEL"
#define TR_FP "FM"
@@ -583,7 +596,7 @@
#define TR_MENUDIAG TR("SWITCHES","SWITCH TEST")
#define TR_MENUANA TR("ANAS","ANALOG INPUTS")
#define TR_MENUCALIBRATION "CALIBRATION"
-#define TR_TRIMS2OFFSETS "\006Trims => Offsets"
+#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#define TR_MENUMODELSEL TR("MODELSEL","MODEL SELECTION")
#define TR_MENUSETUP TR("SETUP","MODEL SETUP")
#define TR_MENUFLIGHTPHASE "FLIGHT MODE"
@@ -605,12 +618,14 @@
#define TR_MENUCURVE "CURVE"
#define TR_MENULOGICALSWITCH "LOGICAL SWITCH"
#define TR_MENULOGICALSWITCHES "LOGICAL SWITCHES"
-#define TR_MENUCUSTOMFUNC "CUSTOM FUNCTIONS"
+#define TR_MENUCUSTOMFUNC "SPECIAL FUNCTIONS"
+#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
+#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRY"
#define TR_MENUTEMPLATES "TEMPLATES"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
-#define TR_RXNUM TR("RxNum", INDENT "Receiver No.")
+#define TR_RXNUM TR(INDENT "RxNum", INDENT "Receiver No.")
#define TR_SYNCMENU "[Sync]"
#define TR_LIMIT INDENT "Limit"
#define TR_MINRSSI "Min Rssi"
@@ -618,6 +633,9 @@
#define TR_LONGITUDE "Longitude"
#define TR_GPSCOORD TR("GPS Coords", "GPS coordinate format")
#define TR_VARIO TR("Vario", "Variometer")
+#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero"
+#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
+#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "SHUTTING DOWN"
#define TR_BATT_CALIB "Battery Calib"
#define TR_CURRENT_CALIB "Current Calib"
@@ -630,11 +648,12 @@
#define TR_BACKUP_MODEL "Backup Model"
#define TR_DELETE_MODEL "Delete Model"
#define TR_RESTORE_MODEL "Restore Model"
-#define TR_SDCARD_ERROR "SDCARD Error"
-#define TR_NO_SDCARD "No SDCARD"
+#define TR_SDCARD_ERROR "SD Card Error"
+#define TR_NO_SDCARD "No SD Card"
#define TR_INCOMPATIBLE "Incompatible"
#define TR_WARNING "WARNING"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "Converting EEPROM"
#define TR_THROTTLEWARN "THROTTLE"
#define TR_ALARMSWARN "ALARMS"
#define TR_SWITCHWARN TR("SWITCH","CONTROL")
@@ -659,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "No Sounds on SD"
#define TR_NO_MODELS_ON_SD "No Models on SD"
#define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD"
+#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_PLAY_FILE "Play"
#define TR_DELETE_FILE "Delete"
#define TR_COPY_FILE "Copy"
#define TR_RENAME_FILE "Rename"
#define TR_ASSIGN_BITMAP "Assign Bitmap"
+#define TR_EXECUTE_FILE "Execute"
#define TR_REMOVED " removed"
#define TR_SD_INFO "Information"
#define TR_SD_FORMAT "Format"
@@ -687,6 +708,8 @@
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "CHANNEL MONITOR"
+#define TR_PATH_TOO_LONG "Path too long"
+#define TR_VIEW_TEXT "View text"
#define TR_INTERNALRF "Internal RF"
#define TR_EXTERNALRF "External RF"
#define TR_FAILSAFE INDENT "Failsafe mode"
@@ -709,7 +732,7 @@
#define TR_STATISTICS "Statistics"
#define TR_ABOUT_US "About"
#define TR_AND_SWITCH "AND Switch"
-#define TR_CF "CF"
+#define TR_CF "SF"
#define TR_SPEAKER INDENT "Speaker"
#define TR_BUZZER INDENT "Buzzer"
#define TR_BYTES "bytes"
@@ -724,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Channel Range"
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm"
-#define TR_PERSISTENT_MAH INDENT "Store mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_ENABLE_POPUP "Enable Popup"
+#define TR_DISABLE_POPUP "Disable Popup"
+#define TR_CURVE_PRESET "Preset..."
+#define TR_PRESET "Preset"
+#define TR_MIRROR "Mirror"
+#define TR_CLEAR "Clear"
+#define TR_RESET "Reset"
+#define TR_COUNT "Count"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Smooth"
+#define TR_COPY_TRIMS_TO_OFS "Copy Trim To Subtrim"
+#define TR_PERSISTENT_MAH TR(INDENT "Str mAh", INDENT "Store mAh")
+#define TR_PREFLIGHT "Preflight Checks"
+#define TR_CHECKLIST INDENT "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Inputs"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -820,5 +859,8 @@
#define TR_TOP_BAR "Top Bar"
#define TR_ALTITUDE INDENT "Altitude"
+#define TR_SCALE "Scale"
+#define TR_VIEW_CHANNELS "View Channels"
+#define TR_VIEW_NOTES "View Notes"
#define TR_MODS_FORBIDDEN "Modifications forbidden!"
#define TR_UNLOCKED "Unlocked"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index d0a5630cc..a6895cf05 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -72,7 +72,7 @@
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 "
#define LEN_POTTYPES "\017"
-#define TR_POTTYPES "Pot\0 ""Multipos Switch"
+#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch"
#define LEN_DATETIME "\005"
#define TR_DATETIME "DATA:""HORA:"
@@ -83,12 +83,24 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japon\0 ""Europa\0")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC TR("\006", "\013")
#define TR_VTRIMINC TR("Expo ""ExFino""Fino ""Medio ""Grueso", "Exponencial""Extra Fino ""Fino ""Medio ""Grueso ")
#define LEN_VBEEPCOUNTDOWN "\006"
#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voz\0"
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Custom\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -98,7 +110,7 @@
#define TR_RETA123 "RETA123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "RETA12LR"
+ #define TR_RETA123 "RETA123LR"
#else
#define TR_RETA123 "RETA123"
#endif
@@ -234,8 +246,10 @@
#define TR_CFN_TEST
#endif
+#define TR_CFN_RESERVE "[reserve]\0"
+
#if defined(CPUARM)
- #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volumen\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Luz fondo\0" TR_CFN_TEST
+ #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volumen\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Luz fondo\0" TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Luz fondo\0" TR_CFN_TEST
#else
@@ -264,14 +278,22 @@
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Avs1""Avs2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Aviso1""Aviso2""Cheep ""Ratata""Tick ""Sirena""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")
#define LEN_VTELEMCHNS "\004"
-#if defined(PCBTARANIS)
- #define TR_RSSI_0 "SWR\0"
- #define TR_RSSI_1 "RSSI"
+
+#if defined(CPUARM)
+ #define TR_TELEM_RESERVE "[--]"
+ #define TR_SWR "SWR\0"
+ #define TR_RX_BATT "RxBt"
+ #define TR_A3_A4 "A3\0 ""A4\0 "
+ #define TR_A3_A4_MIN "A3-\0""A4-\0"
#else
- #define TR_RSSI_0 "Tx\0 "
- #define TR_RSSI_1 "Rx\0 "
+ #define TR_TELEM_RESERVE
+ #define TR_SWR
+ #define TR_RX_BATT
+ #define TR_A3_A4
+ #define TR_A3_A4_MIN
#endif
-#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+""Acc\0""Hora"
+
+#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora"
#define LENGTH_UNIT_IMP "ft\0"
#define SPEED_UNIT_IMP "mph"
@@ -399,7 +421,7 @@
#define TR_VTRAINERMODES "Master""Esclav"
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Guardar\0 ""Adaptar\0 ""Sin pulsos"
+#define TR_VFAILSAFE "Guardar\0 ""Adaptar\0 ""Sin pulso""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -445,8 +467,8 @@
#define TR_ELIMITS TR("E.Limite","Ampliar Limites")
#define TR_ETRIMS TR("E.Trims","Ampliar Trims")
#define TR_TRIMINC "Paso Trim"
-#define TR_TTRACE TR("Fuente-A","Fuente Acelerad")
-#define TR_TTRIM TR("Trim-A","Trim Acelerad")
+#define TR_TTRACE TR("Fuente-A", INDENT "Fuente Acelerad")
+#define TR_TTRIM TR("Trim-A", INDENT "Trim Acelerad")
#define TR_BEEPCTR TR("Ctr Beep","Center Beep")
#define TR_PROTO TR(INDENT"Proto",INDENT"Protocol")
#define TR_PPMFRAME "Trama PPM"
@@ -509,7 +531,8 @@
#define TR_MEMORYWARNING INDENT"Memoria Baja"
#define TR_ALARMWARNING INDENT"Sin Sonido"
#define TR_RENAVIG "RotEnc Navig"
-#define TR_THROTTLEREVERSE TR("Invert_Acel", "Invertir Acel.")
+#define TR_THROTTLE_LABEL "Throttle"
+#define TR_THROTTLEREVERSE TR("Invert_Acel", INDENT "Invertir Acel.")
#define TR_MINUTEBEEP TR(INDENT"Minuto",INDENT"Cada Minuto")
#define TR_BEEPCOUNTDOWN INDENT"Cuentaatras"
#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente")
@@ -518,9 +541,9 @@
#define TR_BLONBRIGHTNESS INDENT"MAS Brillo"
#define TR_BLOFFBRIGHTNESS INDENT"MENOS Brillo"
#define TR_SPLASHSCREEN "Ptalla.inicio"
-#define TR_THROTTLEWARNING TR("Aviso-A", "Aviso Acelerador")
-#define TR_SWITCHWARNING TR("Aviso-I", "Aviso Intrptor")
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("Aviso-A", INDENT "Aviso Acelerador")
+#define TR_SWITCHWARNING TR("Aviso-I", INDENT "Aviso Intrptor")
+#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE TR("Zona Hora", "GPS Zona Hora")
#define TR_RXCHANNELORD TR("Rx Orden canal", "Orden habitual canales")
#define TR_SLAVE "Esclavo"
@@ -552,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER "Resetear"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODELO"
#define TR_FP "FM"
@@ -596,6 +619,8 @@
#define TR_MENULOGICALSWITCH "AJTE.INTERUP."
#define TR_MENULOGICALSWITCHES "AJTE.INTERUPTS."
#define TR_MENUCUSTOMFUNC "AJTE. FUNCIONES"
+#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
+#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRIA"
#define TR_MENUTEMPLATES "PLANTILLAS"
#define TR_MENUSTAT "STATS"
@@ -608,6 +633,9 @@
#define TR_LONGITUDE "Longitud"
#define TR_GPSCOORD TR("GPS Coords", "GPS formato coordenadas")
#define TR_VARIO TR("Vario", "Variometro")
+#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero"
+#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
+#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "APAGANDO"
#define TR_BATT_CALIB "Calib.bateria"
#define TR_CURRENT_CALIB "Calib. actual"
@@ -625,6 +653,7 @@
#define TR_INCOMPATIBLE "Incompatible"
#define TR_WARNING "AVISO"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "EEPROM Converting"
#define TR_THROTTLEWARN "ACELERADOR"
#define TR_ALARMSWARN "ALARMAS"
#define TR_SWITCHWARN "INTERPTOR"
@@ -649,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "Sin sonidos en SD"
#define TR_NO_MODELS_ON_SD "Sin Modelos en SD"
#define TR_NO_BITMAPS_ON_SD "Sin imagenes en SD"
+#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_PLAY_FILE "Play"
#define TR_DELETE_FILE "Borrar"
#define TR_COPY_FILE "Copiar"
#define TR_RENAME_FILE "Renombrar"
#define TR_ASSIGN_BITMAP "Asignar Imagen"
+#define TR_EXECUTE_FILE "Execute"
#define TR_REMOVED "Borrado"
#define TR_SD_INFO "Informacion"
#define TR_SD_FORMAT "Formatear"
@@ -677,6 +708,8 @@
#define TR_DATE "Fecha"
#define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "MONITOR CANALES"
+#define TR_PATH_TOO_LONG "Path too long"
+#define TR_VIEW_TEXT "View text"
#define TR_INTERNALRF "Interna RF"
#define TR_EXTERNALRF "Externa RF"
#define TR_FAILSAFE INDENT"Modo sgdad."
@@ -714,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Gama de canales"
#define TR_LOWALARM INDENT "Alarma baja"
#define TR_CRITICALALARM INDENT "Alarma Critica"
+#define TR_ENABLE_POPUP "Enable Popup"
+#define TR_DISABLE_POPUP "Disable Popup"
+#define TR_CURVE_PRESET "Preset..."
+#define TR_PRESET "Preset"
+#define TR_MIRROR "Mirror"
+#define TR_CLEAR "Clear"
+#define TR_RESET "Reset"
+#define TR_COUNT "Count"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Smooth"
+#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset"
#define TR_PERSISTENT_MAH INDENT "Valor mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_PREFLIGHT "Preflight Checks"
+#define TR_CHECKLIST INDENT "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Inputs"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -746,7 +795,7 @@
#endif
// Taranis column headers
-#define TR_PHASES_HEADERS { " Nombre ", " Interrup.", " Trims ", " Aparecer ", " Desparecer " }
+#define TR_PHASES_HEADERS { " Nombre ", " Interrup.", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Aparecer ", " Desparecer " }
#define TR_LIMITS_HEADERS { " Nombre ", " Compensacion", " Min ", " Max ", " Direccion ", " Curve ", " Centrado PPM ", " Simetrica " }
#define TR_CSW_HEADERS { " Funcion ", " V1 ", " V2 ", " V2 ", " AND Interrup. ", " Duracion ", " Retardo " }
@@ -810,5 +859,8 @@
#define TR_TOP_BAR "Top Bar"
#define TR_ALTITUDE INDENT "Altitude"
+#define TR_SCALE "Scale"
+#define TR_VIEW_CHANNELS "View Channels"
+#define TR_VIEW_NOTES "View Notes"
#define TR_MODS_FORBIDDEN "Modifications forbidden!"
#define TR_UNLOCKED "Unlocked"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index fca9d388e..d730c4935 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -42,16 +42,16 @@
// NON ZERO TERMINATED STRINGS
#define LEN_OFFON "\003"
-#define TR_OFFON "OFF""ON\0"
+#define TR_OFFON "POI""PÄÄ"
#define LEN_MMMINV "\003"
-#define TR_MMMINV "---""INV"
+#define TR_MMMINV "---""KÄÄ"
#define LEN_NCHANNELS "\004"
#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH"
#define LEN_VBEEPMODE "\005"
-#define TR_VBEEPMODE "Quiet""Alarm""NoKey""All "
+#define TR_VBEEPMODE "Äänet""Hälyt""EiNap""Kaikk"
#define LEN_VBEEPLEN "\005"
#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0"
@@ -69,26 +69,38 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
-#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 "
+#define TR_UART3MODES "POIS\0 ""S-Port Pelik\0 ""Debug\0 "
#define LEN_POTTYPES "\017"
-#define TR_POTTYPES "Pot\0 ""Multipos Switch"
+#define TR_POTTYPES "None\0 ""Potikka\0 ""Monias. Kytkin\0"
#define LEN_DATETIME "\005"
-#define TR_DATETIME "DATE:""TIME:"
+#define TR_DATETIME "PÄIV:""AIKA:"
#define LEN_VLCD "\006"
#define TR_VLCD "NormalOptrex"
#define LEN_COUNTRYCODES TR("\002", "\007")
-#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0")
+#define TR_COUNTRYCODES TR("US""JP""EU", "Amerikk""Japani\0""Euroopp")
+
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_VTRIMINC TR("\006", "\013")
-#define TR_VTRIMINC TR("Expo\0 ""ExFine""Fine\0 ""Medium""Coarse", "Exponential""Extra Fine\0""Fine\0 ""Medium\0 ""Coarse\0 ")
+#define TR_VTRIMINC TR("Expo\0 ""EriHie""Hieno\0""Keski\0""Karkea", "Exponential""Eri Hieno\0 ""Hieno\0 ""Keski\0 ""Karkea\0 ")
#define LEN_VBEEPCOUNTDOWN "\006"
#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0"
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Custom\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -98,7 +110,7 @@
#define TR_RETA123 "RETA123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "RETA12LR"
+ #define TR_RETA123 "RETA123LR"
#else
#define TR_RETA123 "RETA123"
#endif
@@ -234,8 +246,10 @@
#define TR_CFN_TEST
#endif
+#define TR_CFN_RESERVE "[reserve]\0"
+
#if defined(CPUARM)
- #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
+ #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
#else
@@ -264,14 +278,22 @@
#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")
#define LEN_VTELEMCHNS "\004"
-#if defined(PCBTARANIS)
- #define TR_RSSI_0 "SWR\0"
- #define TR_RSSI_1 "RSSI"
+
+#if defined(CPUARM)
+ #define TR_TELEM_RESERVE "[--]"
+ #define TR_SWR "SWR\0"
+ #define TR_RX_BATT "RxBt"
+ #define TR_A3_A4 "A3\0 ""A4\0 "
+ #define TR_A3_A4_MIN "A3-\0""A4-\0"
#else
- #define TR_RSSI_0 "Tx\0 "
- #define TR_RSSI_1 "Rx\0 "
+ #define TR_TELEM_RESERVE
+ #define TR_SWR
+ #define TR_RX_BATT
+ #define TR_A3_A4
+ #define TR_A3_A4_MIN
#endif
-#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cel-""Cls-""Vfs-""Cur+""Pwr+""Acc\0""Time"
+
+#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
#define LENGTH_UNIT_IMP "ft\0"
#define SPEED_UNIT_IMP "mph"
@@ -355,11 +377,11 @@
#endif
#if defined(CPUARM)
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF""LSG""LSH""LSI""LSJ""LSK""LSL""LSM""LSN""LSO""LSP""LSQ""LSR""LSS""LST""LSU""LSV""LSW"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15""L16""L17""L18""L19""L20""L21""L22""L23""L24""L25""L26""L27""L28""L29""L30""L31""L32"
#elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128)
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12""L13""L14""L15"
#else
- #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC"
+ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12"
#endif
#define TR_TRIMS_SWITCHES "tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr"
@@ -399,7 +421,7 @@
#define TR_VTRAINERMODES "Master""Slave\0"
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses"
+#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -445,8 +467,8 @@
#define TR_ELIMITS TR("E.Limits", "Extended Limits")
#define TR_ETRIMS TR("E.Trims", "Extended Trims")
#define TR_TRIMINC "Trim Step"
-#define TR_TTRACE TR("T-Source", "Throttle Source")
-#define TR_TTRIM TR("T-Trim", "Throttle Trim")
+#define TR_TTRACE TR("T-Source", INDENT "Throttle Source")
+#define TR_TTRIM TR("T-Trim", INDENT "Throttle Trim")
#define TR_BEEPCTR TR("Ctr Beep", "Center Beep")
#define TR_PROTO TR(INDENT "Proto", INDENT "Protocol")
#define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame")
@@ -509,7 +531,8 @@
#define TR_MEMORYWARNING INDENT"Memory Low"
#define TR_ALARMWARNING INDENT"Sound Off"
#define TR_RENAVIG "RotEnc Navig"
-#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse")
+#define TR_THROTTLE_LABEL "Throttle"
+#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Throttle reverse")
#define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call")
#define TR_BEEPCOUNTDOWN INDENT"Countdown"
#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent")
@@ -518,9 +541,9 @@
#define TR_BLONBRIGHTNESS INDENT"ON Brightness"
#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness"
#define TR_SPLASHSCREEN "Splash screen"
-#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning")
-#define TR_SWITCHWARNING TR("S-Warning","Switch Warning")
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle Warning")
+#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Warning")
+#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE TR("Time Zone","GPS Time zone")
#define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order")
#define TR_SLAVE "Slave"
@@ -552,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER " to reset"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODEL"
#define TR_FP "FM"
@@ -596,6 +619,8 @@
#define TR_MENULOGICALSWITCH "CUSTOM SWITCH"
#define TR_MENULOGICALSWITCHES "CUSTOM SWITCHES"
#define TR_MENUCUSTOMFUNC "CUSTOM FUNCTIONS"
+#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
+#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRY"
#define TR_MENUTEMPLATES "TEMPLATES"
#define TR_MENUSTAT "STATS"
@@ -608,6 +633,9 @@
#define TR_LONGITUDE "Longitude"
#define TR_GPSCOORD TR("GPS Coords", "GPS coordinate format")
#define TR_VARIO TR("Vario", "Variometer")
+#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero"
+#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
+#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "SHUTTING DOWN"
#define TR_BATT_CALIB "Battery Calib"
#define TR_CURRENT_CALIB "Current Calib"
@@ -625,6 +653,7 @@
#define TR_INCOMPATIBLE "Incompatible"
#define TR_WARNING "WARNING"
#define TR_EEPROMWARN "FINSKA"
+#define TR_EEPROM_CONVERTING "EEPROM Converting"
#define TR_THROTTLEWARN "THROTTLE"
#define TR_ALARMSWARN "ALARMS"
#define TR_SWITCHWARN TR("SWITCH","CONTROL")
@@ -649,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "No Sounds on SD"
#define TR_NO_MODELS_ON_SD "No Models on SD"
#define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD"
+#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_PLAY_FILE "Play"
#define TR_DELETE_FILE "Delete"
#define TR_COPY_FILE "Copy"
#define TR_RENAME_FILE "Rename"
#define TR_ASSIGN_BITMAP "Assign Bitmap"
+#define TR_EXECUTE_FILE "Execute"
#define TR_REMOVED " removed"
#define TR_SD_INFO "Information"
#define TR_SD_FORMAT "Format"
@@ -677,6 +708,8 @@
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "CHANNEL MONITOR"
+#define TR_PATH_TOO_LONG "Path too long"
+#define TR_VIEW_TEXT "View text"
#define TR_INTERNALRF "Internal RF"
#define TR_EXTERNALRF "External RF"
#define TR_FAILSAFE INDENT "Failsafe mode"
@@ -714,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Channel Range"
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm"
+#define TR_ENABLE_POPUP "Enable Popup"
+#define TR_DISABLE_POPUP "Disable Popup"
+#define TR_CURVE_PRESET "Preset..."
+#define TR_PRESET "Preset"
+#define TR_MIRROR "Mirror"
+#define TR_CLEAR "Clear"
+#define TR_RESET "Reset"
+#define TR_COUNT "Count"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Smooth"
+#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset"
#define TR_PERSISTENT_MAH INDENT "Store mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_PREFLIGHT "Preflight Checks"
+#define TR_CHECKLIST INDENT "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Inputs"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -797,18 +846,21 @@
#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)"
#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)"
-#define TR_CHR_SHORT 's'
-#define TR_CHR_LONG 'l'
-#define TR_CHR_TOGGLE 't'
-#define TR_CHR_HOUR 'h'
-#define TR_CHR_INPUT 'I' // Values between A-I will work
+#define TR_CHR_SHORT 's'
+#define TR_CHR_LONG 'l'
+#define TR_CHR_TOGGLE 't'
+#define TR_CHR_HOUR 'h'
+#define TR_CHR_INPUT 'I' // Values between A-I will work
-#define TR_BEEP_VOLUME "Beep Volume"
-#define TR_WAV_VOLUME "Wav Volume"
-#define TR_VARIO_VOLUME "Vario Volume"
-#define TR_BG_VOLUME "Bg Volume"
+#define TR_BEEP_VOLUME "Piip Voim"
+#define TR_WAV_VOLUME "Wav Voim"
+#define TR_VARIO_VOLUME "Variom Voim"
+#define TR_BG_VOLUME "Tausta Voim"
-#define TR_TOP_BAR "Top Bar"
-#define TR_ALTITUDE INDENT "Altitude"
-#define TR_MODS_FORBIDDEN "Modifications forbidden!"
-#define TR_UNLOCKED "Unlocked"
+#define TR_TOP_BAR "Ylä palkki"
+#define TR_ALTITUDE INDENT "Korkeus"
+#define TR_SCALE "Scale"
+#define TR_VIEW_CHANNELS "View Channels"
+#define TR_VIEW_NOTES "View Notes"
+#define TR_MODS_FORBIDDEN "Muutokset kielletty!"
+#define TR_UNLOCKED "Avattu"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index b28416cee..4f01cb889 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -37,6 +37,9 @@
* \0 -ends actual string
*/
+
+
+
// NON ZERO TERMINATED STRINGS
#define LEN_OFFON "\003"
#define TR_OFFON "OFF""ON\0"
@@ -80,11 +83,23 @@
#define LEN_COUNTRYCODES TR("\002", "\006")
#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC TR("\006","\013")
#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ")
-#define LEN_VBEEPCOUNTDOWN "\006"
-#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0"
+#define LEN_VBEEPCOUNTDOWN "\007"
+#define TR_VBEEPCOUNTDOWN "Silence""Bips\0 ""Voix\0 "
+
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Libre\0"
#define LEN_RETA123 "\001"
@@ -95,7 +110,7 @@
#define TR_RETA123 "DPGA123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "DPGA12LR"
+ #define TR_RETA123 "DPGA123LR"
#else
#define TR_RETA123 "DPGA123"
#endif
@@ -149,7 +164,7 @@
#if defined(PCBTARANIS)
#define TR_CSWTIMER "Tempo"
- #define TR_CSWSTICKY "Bist."
+ #define TR_CSWSTICKY "Bistb"
#define TR_CSWRANGE "Plage"
#define TR_CSWSTAY "Flanc"
#else
@@ -172,9 +187,9 @@
#define LEN_VCSWFUNC "\005"
#if defined(CPUARM)
-#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a"
#define LEN_VTELPROTO "\007"
-#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh""Halcyon"
+#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh"
#define LEN_VOLTSRC "\003"
#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
@@ -404,7 +421,7 @@
#define TR_VTRAINERMODES "Maître""Elève\0"
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp"
+#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp""Récepteur"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -439,7 +456,7 @@
#define TR_MODELNAME TR("Nom modèle","Nom du modèle")
#define TR_PHASENAME "Nom phase"
#define TR_MIXNAME TR("Nom mix.","Nom du mixeur")
-#define TR_INPUTNAME "Input Name"
+#define TR_INPUTNAME "Nom entrée"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Nom ligne"
#else
@@ -450,8 +467,8 @@
#define TR_ELIMITS TR("Limites ét", "Limites étendues")
#define TR_ETRIMS TR("Trims ét.", "Trims étendus")
#define TR_TRIMINC TR("Pas Trim", "Pas des trims")
-#define TR_TTRACE "Source gaz"
-#define TR_TTRIM "Trim gaz"
+#define TR_TTRACE TR("Source gaz", INDENT "Source gaz")
+#define TR_TTRIM TR("Trim gaz", INDENT "Trim ralenti")
#define TR_BEEPCTR TR("Bips centr", "Bips centrage")
#define TR_PROTO TR(INDENT "Proto.", INDENT "Protocole")
#define TR_PPMFRAME INDENT "Trame PPM"
@@ -514,7 +531,8 @@
#define TR_MEMORYWARNING INDENT "Mémoire pleine"
#define TR_ALARMWARNING TR(INDENT "Silence",INDENT "Sons désactivés")
#define TR_RENAVIG "Navig EncRot"
-#define TR_THROTTLEREVERSE TR("Inv. gaz","Inversion gaz")
+#define TR_THROTTLE_LABEL "Gaz"
+#define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz")
#define TR_MINUTEBEEP TR(INDENT "Bip min.",INDENT "Annonces minutes")
#define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin",INDENT "Compte à rebours")
#define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistant")
@@ -523,9 +541,9 @@
#define TR_BLONBRIGHTNESS INDENT "Luminosité ON"
#define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF"
#define TR_SPLASHSCREEN "Logo d'accueil"
-#define TR_THROTTLEWARNING "Alerte gaz"
-#define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.")
-#define TR_POTWARNING TR("Alerte pot","Alerte potentiom.")
+#define TR_THROTTLEWARNING TR("Alerte gaz", INDENT "Alerte gaz")
+#define TR_SWITCHWARNING TR("Alerte int", INDENT "Pos. interrupteurs")
+#define TR_POTWARNING TR("Alerte pot", INDENT "Pos. potentiom.")
#define TR_TIMEZONE "Fuseau horaire"
#define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré")
#define TR_SLAVE "Elève"
@@ -557,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER" pour reset"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODELE"
#define TR_FP "PV"
@@ -578,7 +596,7 @@
#define TR_MENUDIAG TR("INTERS","TEST INTERRUPTEURS")
#define TR_MENUANA TR("ANAS","ENTREES ANALOGIQUES")
#define TR_MENUCALIBRATION "CALIBRATION"
-#define TR_TRIMS2OFFSETS "\006Trims => Offsets"
+#define TR_TRIMS2OFFSETS "\005Trims => Subtrims"
#define TR_MENUMODELSEL "MODELES"
#define TR_MENUSETUP TR("CONF. MODELE","CONFIGURATION")
#define TR_MENUFLIGHTPHASE "PHASE DE VOL"
@@ -601,6 +619,8 @@
#define TR_MENULOGICALSWITCH "INTER LOG."
#define TR_MENULOGICALSWITCHES TR("INTERS LOG.","INTERS LOGIQUES")
#define TR_MENUCUSTOMFUNC TR("FONCTIONS SPEC.","FONCTIONS SPECIALES")
+#define TR_MENUCUSTOMSCRIPTS "SCRIPTS PERSOS"
+#define TR_MENUCUSTOMSCRIPT "SCRIPT PERSO"
#define TR_MENUTELEMETRY "TELEMESURE"
#define TR_MENUTEMPLATES "GABARITS"
#define TR_MENUSTAT TR("STATS","STATISTIQUES")
@@ -613,6 +633,9 @@
#define TR_LONGITUDE "Longitude"
#define TR_GPSCOORD TR("Coordonnées","Coordonnées GPS")
#define TR_VARIO TR("Vario","Variomètre")
+#define TR_PITCH_AT_ZERO INDENT "Tonalité au zéro"
+#define TR_PITCH_AT_MAX INDENT "Tonalité au max"
+#define TR_REPEAT_AT_ZERO INDENT "Tonalité au zéro"
#define TR_SHUTDOWN "ARRET EN COURS"
#define TR_BATT_CALIB "Calib. Batterie"
#define TR_CURRENT_CALIB "Calib. Courant"
@@ -626,10 +649,11 @@
#define TR_DELETE_MODEL "Supprimer Modèle"
#define TR_RESTORE_MODEL "Restaurer Modèle"
#define TR_SDCARD_ERROR "Erreur carte SD"
-#define TR_NO_SDCARD "Pas de carte SD"
+#define TR_NO_SDCARD "Carte SD indisponible"
#define TR_INCOMPATIBLE "Incompatible"
#define TR_WARNING "ALERTE"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "Conversion EEPROM"
#define TR_THROTTLEWARN "GAZ"
#define TR_ALARMSWARN "SON"
#define TR_SWITCHWARN TR("INTERS","CONTROLES")
@@ -654,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "Aucun son sur SD"
#define TR_NO_MODELS_ON_SD "Aucun modèle SD"
#define TR_NO_BITMAPS_ON_SD "Aucun Bitmap SD"
+#define TR_NO_SCRIPTS_ON_SD "Aucun Script SD"
#define TR_PLAY_FILE "Lire"
#define TR_DELETE_FILE "Supprimer"
#define TR_COPY_FILE "Copier"
#define TR_RENAME_FILE "Renommer"
#define TR_ASSIGN_BITMAP "Sélectionner image"
+#define TR_EXECUTE_FILE "Exécuter"
#define TR_REMOVED " supprimé"
#define TR_SD_INFO "Information"
#define TR_SD_FORMAT "Formater"
@@ -682,6 +708,8 @@
#define TR_DATE "Date"
#define TR_ROTARY_ENCODER "Enc.Rot."
#define TR_CHANNELS_MONITOR "MONITEUR CANAUX"
+#define TR_PATH_TOO_LONG "Chemin trop long"
+#define TR_VIEW_TEXT "Voir texte"
#define TR_INTERNALRF "HF interne"
#define TR_EXTERNALRF "HF externe"
#define TR_FAILSAFE INDENT "Type failsafe"
@@ -695,7 +723,7 @@
#define TR_COPY "Copier"
#define TR_MOVE "Déplacer"
#define TR_PASTE "Coller"
-#define TR_DELETE "Effacer"
+#define TR_DELETE "Supprimer"
#define TR_INSERT "Insérer"
#define TR_RESET_FLIGHT TR("Réinit. vol", "Réinitialiser vol")
#define TR_RESET_TIMER1 TR("Réinit. Timer1", "Réinitialiser Timer1")
@@ -719,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Plage de canaux"
#define TR_LOWALARM INDENT "Alarme basse"
#define TR_CRITICALALARM INDENT "Alarme critique"
+#define TR_ENABLE_POPUP "Activer Popup"
+#define TR_DISABLE_POPUP "Désactiver Popup"
+#define TR_CURVE_PRESET "Courbe standard..."
+#define TR_PRESET "Pente"
+#define TR_MIRROR "Miroir"
+#define TR_CLEAR "Effacer"
+#define TR_RESET "Réinitialiser"
+#define TR_COUNT "Nb points"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Lissage"
+#define TR_COPY_TRIMS_TO_OFS "Trim vers subtrim"
#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh")
-#define TR_CHECKLIST "Afficher notes"
+#define TR_PREFLIGHT "Vérifications avant vol"
+#define TR_CHECKLIST INDENT "Afficher notes"
#define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS")
#define TR_UART3MODE "Port série"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Entrées"
+#define TR_OUTPUTS "Sorties"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "RSSI Max"
@@ -751,8 +795,8 @@
#endif
// Taranis column headers
-#define TR_PHASES_HEADERS { " Nom ", " Inter ", " Trims ", " Fondu ON ", " Fondu OFF " }
-#define TR_LIMITS_HEADERS { " Nom ", " Subtrim ", " Min ", " Max ", " Direction ", " Curve ", " Neutre PPM ", " Mode subtrim " }
+#define TR_PHASES_HEADERS { " Nom ", " Inter ", " Trim Dir ", " Trim Prf ", " Trim Gaz ", " Trim Ail ", " Fondu ON ", " Fondu OFF " }
+#define TR_LIMITS_HEADERS { " Nom ", " Subtrim ", " Min ", " Max ", " Direction ", " Courbe ", " Neutre PPM ", " Mode subtrim " }
#define TR_CSW_HEADERS { " Fonction ", " V1 ", " V2 ", " V2 ", " ET suppl. ", " Durée ", " Délai " }
//Taranis About screen
@@ -806,14 +850,17 @@
#define TR_CHR_LONG 'l'
#define TR_CHR_TOGGLE 't'
#define TR_CHR_HOUR 'h'
-#define TR_CHR_INPUT 'E' // Values between A-I will work
+#define TR_CHR_INPUT 'E' // Values between A-I will work
-#define TR_BEEP_VOLUME "Beep Volume"
-#define TR_WAV_VOLUME "Wav Volume"
-#define TR_VARIO_VOLUME "Vario Volume"
-#define TR_BG_VOLUME "Bg Volume"
+#define TR_BEEP_VOLUME "Volume bips"
+#define TR_WAV_VOLUME "Volume audio"
+#define TR_VARIO_VOLUME "Volume vario"
+#define TR_BG_VOLUME "Volume musique"
#define TR_TOP_BAR "Barre titre"
#define TR_ALTITUDE INDENT "Altitude"
+#define TR_SCALE "Echelle"
+#define TR_VIEW_CHANNELS "Voir Voies"
+#define TR_VIEW_NOTES "Voir Notes"
#define TR_MODS_FORBIDDEN "Modifications désactivées!"
#define TR_UNLOCKED "Déverrouillé"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index dea57bbe9..e6cec2d25 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -72,7 +72,7 @@
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 "
#define LEN_POTTYPES "\017"
-#define TR_POTTYPES "Pot\0 ""Multipos Switch"
+#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch"
#define LEN_DATETIME "\005"
#define TR_DATETIME "DATA:""ORA :"
@@ -83,12 +83,24 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC "\006"
#define TR_VTRIMINC "Exp ""ExFine""Fine ""Medio ""Ampio "
#define LEN_VBEEPCOUNTDOWN "\006"
#define TR_VBEEPCOUNTDOWN "NienteSuoni\0Voce\0 "
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Custom\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -98,7 +110,7 @@
#define TR_RETA123 "RETA123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "RETA12LR"
+ #define TR_RETA123 "RETA123LR"
#else
#define TR_RETA123 "RETA123"
#endif
@@ -234,8 +246,10 @@
#define TR_CFN_TEST
#endif
+#define TR_CFN_RESERVE "[reserve]\0"
+
#if defined(CPUARM)
- #define TR_VFSWFUNC "Blocco\0 ""Maestro \0 ""Trim Instant ""Azzera\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Retroillum.\0 " TR_CFN_TEST
+ #define TR_VFSWFUNC "Blocco\0 ""Maestro \0 ""Trim Instant ""Azzera\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Retroillum.\0 " TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Blocco\0 ""Maestro \0 ""Trim Instant ""Azzera\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Retroillum.\0 " TR_CFN_TEST
#else
@@ -264,14 +278,22 @@
#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")
#define LEN_VTELEMCHNS "\004"
-#if defined(PCBTARANIS)
- #define TR_RSSI_0 "SWR\0"
- #define TR_RSSI_1 "RSSI"
+
+#if defined(CPUARM)
+ #define TR_TELEM_RESERVE "[--]"
+ #define TR_SWR "SWR\0"
+ #define TR_RX_BATT "RxBt"
+ #define TR_A3_A4 "A3\0 ""A4\0 "
+ #define TR_A3_A4_MIN "A3-\0""A4-\0"
#else
- #define TR_RSSI_0 "Tx\0 "
- #define TR_RSSI_1 "Rx\0 "
+ #define TR_TELEM_RESERVE
+ #define TR_SWR
+ #define TR_RX_BATT
+ #define TR_A3_A4
+ #define TR_A3_A4_MIN
#endif
-#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+""Acc\0""Time"
+
+#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
#define LENGTH_UNIT_IMP "ft\0"
#define SPEED_UNIT_IMP "mph"
@@ -307,7 +329,7 @@
#define TR_VALARMFN "<>"
#define LEN_VTELPROTO "\007"
-#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh""Halcyon"
+#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh"
#define LEN_VOLTSRC "\003"
#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
@@ -399,7 +421,7 @@
#define TR_VTRAINERMODES "Maestro""Allievo"
#define LEN_VFAILSAFE "\012"
-#define TR_VFAILSAFE "Mantieni\0 ""Personali\0""No impulsi"
+#define TR_VFAILSAFE "Mantieni\0 ""Personali\0""No impulsi""Receiver\0 "
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -445,8 +467,8 @@
#define TR_ELIMITS TR("Limiti.E","Limiti Estesi")
#define TR_ETRIMS TR("Trim Ext","Trim Estesi")
#define TR_TRIMINC "Trim Step"
-#define TR_TTRACE TR("T-Source","Throttle Source")
-#define TR_TTRIM TR("T-Trim","Throttle Trim")
+#define TR_TTRACE TR("T-Source", INDENT "Throttle Source")
+#define TR_TTRIM TR("T-Trim", INDENT "Throttle Trim")
#define TR_BEEPCTR TR("Ctr Beep","Center Beep")
#define TR_PROTO TR(INDENT "Proto", INDENT "Protocollo")
#define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame")
@@ -509,7 +531,8 @@
#define TR_MEMORYWARNING INDENT"Avviso memoria"
#define TR_ALARMWARNING INDENT"Spento"
#define TR_RENAVIG "Navig RotEnc "
-#define TR_THROTTLEREVERSE TR("Thr inv.", "Throttle Inverso")
+#define TR_THROTTLE_LABEL "Throttle"
+#define TR_THROTTLEREVERSE TR("Thr inv.", INDENT "Throttle Inverso")
#define TR_MINUTEBEEP INDENT"Minuto"
#define TR_BEEPCOUNTDOWN TR(INDENT"Conto rov",INDENT"Conto rovescia")
#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente")
@@ -518,9 +541,9 @@
#define TR_BLONBRIGHTNESS TR(INDENT"Lumin. ON",INDENT"Luminosità ON")
#define TR_BLOFFBRIGHTNESS TR(INDENT"Lumin. OFF",INDENT"Luminosità OFF")
#define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio")
-#define TR_THROTTLEWARNING TR("All. Thr", "Allarme Throttle")
-#define TR_SWITCHWARNING TR("Avv. Int.", "Avviso Interr.")
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("All. Thr", INDENT "Allarme Throttle")
+#define TR_SWITCHWARNING TR("Avv. Int.", INDENT "Avviso Interr.")
+#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE "Ora locale"
#define TR_RXCHANNELORD "Ordine ch RX"
#define TR_SLAVE "Allievo"
@@ -552,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER" x Azzerare"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODELLO"
#define TR_FP "FV"
@@ -596,6 +619,8 @@
#define TR_MENULOGICALSWITCH "SWITCH PERSON."
#define TR_MENULOGICALSWITCHES TR("SWITCH PERSON.","SWITCH PERSONALIZZATI")
#define TR_MENUCUSTOMFUNC TR("FUNZ. PERSON.","FUNZIONI PERSONALIZZATE")
+#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
+#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRIA"
#define TR_MENUTEMPLATES "ESEMPI GUIDA"
#define TR_MENUSTAT "STATS"
@@ -608,6 +633,9 @@
#define TR_LONGITUDE "Longitud."
#define TR_GPSCOORD "Coord. GPS"
#define TR_VARIO "Vario"
+#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero"
+#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
+#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "ARRESTO.."
#define TR_BATT_CALIB "Calibra batt."
#define TR_CURRENT_CALIB "Calibra corr."
@@ -625,6 +653,7 @@
#define TR_INCOMPATIBLE "Incompatibile"
#define TR_WARNING "AVVISO"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "EEPROM Converting"
#define TR_THROTTLEWARN "MOTORE"
#define TR_ALARMSWARN "ALLARMI"
#define TR_SWITCHWARN "SWITCH"
@@ -649,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "No Suoni su SD"
#define TR_NO_MODELS_ON_SD "No Model. su SD"
#define TR_NO_BITMAPS_ON_SD "no Immag. su SD"
+#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_PLAY_FILE "Suona"
#define TR_DELETE_FILE "Cancella"
#define TR_COPY_FILE "Copia"
#define TR_RENAME_FILE "Rinomomina"
#define TR_ASSIGN_BITMAP "Assegna Immagine"
+#define TR_EXECUTE_FILE "Execute"
#define TR_REMOVED " rimosso"
#define TR_SD_INFO "Informazioni"
#define TR_SD_FORMAT "Format"
@@ -677,6 +708,8 @@
#define TR_DATE "Data"
#define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "CHANNELS MONITOR"
+#define TR_PATH_TOO_LONG "Path too long"
+#define TR_VIEW_TEXT "View text"
#define TR_INTERNALRF "Modulo Interno"
#define TR_EXTERNALRF "Modulo esterno"
#define TR_FAILSAFE "Modo failsafe"
@@ -714,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Numero Canali"
#define TR_LOWALARM INDENT "Allarme Basso"
#define TR_CRITICALALARM INDENT "Allarme Critico"
+#define TR_ENABLE_POPUP "Enable Popup"
+#define TR_DISABLE_POPUP "Disable Popup"
+#define TR_CURVE_PRESET "Preset..."
+#define TR_PRESET "Preset"
+#define TR_MIRROR "Mirror"
+#define TR_CLEAR "Clear"
+#define TR_RESET "Reset"
+#define TR_COUNT "Count"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Smooth"
+#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset"
#define TR_PERSISTENT_MAH INDENT "Store mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_PREFLIGHT "Preflight Checks"
+#define TR_CHECKLIST INDENT "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Inputs"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -746,7 +795,7 @@
#endif
// Taranis column headers
-#define TR_PHASES_HEADERS { " Nome ", " Switch ", " Trims ", " Fade In ", " Fade Out " }
+#define TR_PHASES_HEADERS { " Nome ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Nome ", " Offset ", " Min ", " Max ", " Direzione ", " Curve ", " Centro PPM ", " Simmetria " }
#define TR_CSW_HEADERS { " Funzione ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Durata ", " Ritardo " }
@@ -810,5 +859,8 @@
#define TR_TOP_BAR "Top Bar"
#define TR_ALTITUDE INDENT "Altitude"
+#define TR_SCALE "Scale"
+#define TR_VIEW_CHANNELS "View Channels"
+#define TR_VIEW_NOTES "View Notes"
#define TR_MODS_FORBIDDEN "Modifications forbidden!"
#define TR_UNLOCKED "Unlocked"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index e6a3608ba..b00169847 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -72,7 +72,7 @@
#define TR_UART3MODES "Wyłącz\0 ""S-Port Mirror\0 ""Debug\0 "
#define LEN_POTTYPES "\017"
-#define TR_POTTYPES "Potencjometr\0 ""Przeł.Wielopoz."
+#define TR_POTTYPES "None\0 ""Potencjometr\0 ""Przeł.Wielopoz."
#define LEN_DATETIME "\006"
#define TR_DATETIME "DATA:\0""CZAS:\0"
@@ -83,12 +83,24 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "Ameryka""Japonia""Europa\0")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC "\012"
#define TR_VTRIMINC "Expo\0 ""B.Dokładny""Dokładny\0 ""Średni\0 ""Zgrubny\0 "
#define LEN_VBEEPCOUNTDOWN "\007"
#define TR_VBEEPCOUNTDOWN "Cichy\0 ""Pikanie""Dźwięki"
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Custom\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -98,7 +110,7 @@
#define TR_RETA123 "KWGL123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "KWGL12LR"
+ #define TR_RETA123 "KWGL123LR"
#else
#define TR_RETA123 "KWGL123"
#endif
@@ -152,15 +164,15 @@
#if defined(PCBTARANIS)
#define TR_CSWTIMER "Timer"
- #define TR_CSWSTICKY "Stcky"
- #define TR_CSWRANGE "Range"
- #define TR_CSWSTAY "Edge\0"
+ #define TR_CSWSTICKY "Trwały"
+ #define TR_CSWRANGE "Zasięg"
+ #define TR_CSWSTAY "Brzeg\0"
#else
#define TR_CSWTIMER "Tim\0 "
- #define TR_CSWSTICKY "Glue\0"
+ #define TR_CSWSTICKY "Klej\0"
#if defined(CPUARM)
- #define TR_CSWRANGE "Rnge\0"
- #define TR_CSWSTAY "Edge\0"
+ #define TR_CSWRANGE "Zasi\0"
+ #define TR_CSWSTAY "Brzeg\0"
#else
#define TR_CSWRANGE
#define TR_CSWSTAY
@@ -234,8 +246,10 @@
#define TR_CFN_TEST
#endif
+#define TR_CFN_RESERVE "[reserve]\0 "
+
#if defined(CPUARM)
- #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset ""Set \0 " TR_ADJUST_GVAR "Głośność\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST
+ #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset ""Set \0 " TR_ADJUST_GVAR "Głośność\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST
#else
@@ -264,14 +278,22 @@
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Ost1""Ost2""Chee""Rata""Tik\0""Syre""Dzwo""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1\0""Beep2\0""Beep3\0""Ostrz1""Ostrz1""Cheep\0""Ratata""Tick\0 ""Syrena""Dzwone""SciFi\0""Robot\0""Chirp\0""Tada\0 ""Krytcz""AlmZeg")
#define LEN_VTELEMCHNS "\004"
-#if defined(PCBTARANIS)
- #define TR_RSSI_0 "SWR\0"
- #define TR_RSSI_1 "RSSI"
+
+#if defined(CPUARM)
+ #define TR_TELEM_RESERVE "[--]"
+ #define TR_SWR "SWR\0"
+ #define TR_RX_BATT "RxBt"
+ #define TR_A3_A4 "A3\0 ""A4\0 "
+ #define TR_A3_A4_MIN "A3-\0""A4-\0"
#else
- #define TR_RSSI_0 "Tx\0 "
- #define TR_RSSI_1 "Rx\0 "
+ #define TR_TELEM_RESERVE
+ #define TR_SWR
+ #define TR_RX_BATT
+ #define TR_A3_A4
+ #define TR_A3_A4_MIN
#endif
-#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Moc+""Acc\0""Time"
+
+#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Moc+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
#define LENGTH_UNIT_IMP "ft\0"
#define SPEED_UNIT_IMP "mph"
@@ -307,7 +329,7 @@
#define TR_VALARMFN "<>"
#define LEN_VTELPROTO "\007"
-#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh""Halcyon"
+#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh"
#define LEN_VOLTSRC "\003"
#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
@@ -333,7 +355,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005"
-#define TR_VKEYS TR("Menu\0""Wyjdź""W dół""Wgórę""Wpraw""Wlewo", "Menu\0""Wyjdź""W dół""Wgórę""Wpraw""Wlewo")
+#define TR_VKEYS TR("Menu\0""Wyjdź""W dół""Wgórę""Wpraw""Wlewo", "Menu\0""Exit ""Enter ""Page ""Minus""Plus ")
#define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb"
@@ -399,7 +421,7 @@
#define TR_VTRAINERMODES "Trener""Uczeń\0"
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Utrzymuj\0""Własne\0 ""0 sygnału"
+#define TR_VFAILSAFE "Utrzymuj\0""Własne\0 ""0 sygnału""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -445,8 +467,8 @@
#define TR_ELIMITS TR("Limit+25%", "Kanał +/- 125%")
#define TR_ETRIMS TR("Trymery 100%", "Poszerzone Trymery")
#define TR_TRIMINC TR("Krok Trymera", "Krok trymera")
-#define TR_TTRACE TR("Źródło gazu", "Źródło gazu")
-#define TR_TTRIM TR("Trymer gazu", "Trymer gazu")
+#define TR_TTRACE TR("Źródło gazu", INDENT "Źródło gazu")
+#define TR_TTRIM TR("Trymer gazu", INDENT "Trymer gazu")
#define TR_BEEPCTR "(\043)Pikanie środka"
#define TR_PROTO INDENT"Protokól"
#define TR_PPMFRAME "Ramka PPM"
@@ -486,7 +508,7 @@
#define TR_DELAYUP TR("Opóznienie (+)", "Opóznienie(\43)")
#define TR_SLOWDOWN TR("Spowolnienie(-)", "Spowolnienie(\177)")
#define TR_SLOWUP TR("Spowolnienie(+)", "Spowolnienie(\176)")
-#define TR_MIXER "MIKSER"
+#define TR_MIXER "MIKSERY"
#define TR_CV "K"
#define TR_GV "ZG"
#define TR_ACHANNEL "A\004Kanał"
@@ -509,18 +531,19 @@
#define TR_MEMORYWARNING INDENT"Pełna pamięć'"
#define TR_ALARMWARNING INDENT"Wyłącz dźwięk"
#define TR_RENAVIG "Nawigacja potencjometrem"
-#define TR_THROTTLEREVERSE TR("Odwróć gaz", "Odwróć gaz")
-#define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Pik co minutę")
-#define TR_BEEPCOUNTDOWN TR(INDENT"Odliczanie", INDENT"Odliczanie")
+#define TR_THROTTLE_LABEL "Throttle"
+#define TR_THROTTLEREVERSE TR("Odwróć gaz", INDENT "Odwróć gaz")
+#define TR_MINUTEBEEP TR(INDENT "Minuta", INDENT "Pik co minutę")
+#define TR_BEEPCOUNTDOWN TR(INDENT "Odliczanie", INDENT "Odliczanie")
#define TR_PERSISTENT INDENT"Dokładny"
#define TR_BACKLIGHT_LABEL "Podświetlenie"
#define TR_BLDELAY INDENT"Czas trwania"
#define TR_BLONBRIGHTNESS INDENT"Jasnośc wł."
#define TR_BLOFFBRIGHTNESS INDENT"Jasność wył."
#define TR_SPLASHSCREEN "Logo ekranu"
-#define TR_THROTTLEWARNING "(\043)Gaz"
-#define TR_SWITCHWARNING "(\043)Przełącznik"
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("(\043)Gaz", INDENT "(\043)Gaz")
+#define TR_SWITCHWARNING TR("(\043)Przełącznik", INDENT "(\043)Przełącznik")
+#define TR_POTWARNING TR("Ostrz.Poten.", INDENT "Ostrzeż. Potencj.")
#define TR_TIMEZONE "Strefa czasowa"
#define TR_RXCHANNELORD TR("Kolejność kanałów", "Bazowa kolejność kanałów")
#define TR_SLAVE "Uczeń"
@@ -552,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER" >> Reset"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "KN"
#define TR_MODEL "MODEL"
#define TR_FP "FL"
@@ -596,6 +619,8 @@
#define TR_MENULOGICALSWITCH "PRZEŁ. LOGICZNY"
#define TR_MENULOGICALSWITCHES TR("PRZEŁ. LOG.", "PRZEŁ. LOGICZNE")
#define TR_MENUCUSTOMFUNC "FUNKCJE SPECJALNE"
+#define TR_MENUCUSTOMSCRIPTS "WŁASNE SKRYPTY"
+#define TR_MENUCUSTOMSCRIPT "WŁASNY SKRYPT"
#define TR_MENUTELEMETRY "TELEMETRIA"
#define TR_MENUTEMPLATES "SZABLONY"
#define TR_MENUSTAT "STATYSTYKA"
@@ -608,6 +633,9 @@
#define TR_LONGITUDE "Dł. geo."
#define TR_GPSCOORD "Typ koordynat GPS"
#define TR_VARIO "Wario"
+#define TR_PITCH_AT_ZERO INDENT "Ton przy Zerze"
+#define TR_PITCH_AT_MAX INDENT "Ton przy Max"
+#define TR_REPEAT_AT_ZERO INDENT "Powtórz przy Zerze"
#define TR_SHUTDOWN "Wyłączanie.."
#define TR_BATT_CALIB "Kalib:Baterii"
#define TR_CURRENT_CALIB " +=\006Kalibracja prądu"
@@ -625,6 +653,7 @@
#define TR_INCOMPATIBLE "Niekompatybilne"
#define TR_WARNING "UWAGA"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "Konwersja EEPROM"
#define TR_THROTTLEWARN "GAZ"
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "Przełącznik"
@@ -649,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "brak dźwięków na SD"
#define TR_NO_MODELS_ON_SD "brak modelu na SD"
#define TR_NO_BITMAPS_ON_SD "brak obrazków na SD"
+#define TR_NO_SCRIPTS_ON_SD "brak skryptów na SD"
#define TR_PLAY_FILE "Odtwórz"
#define TR_DELETE_FILE "Skasuj"
#define TR_COPY_FILE "Kopiuj"
#define TR_RENAME_FILE "Zmień nazwę"
#define TR_ASSIGN_BITMAP "Wybierz obrazek"
+#define TR_EXECUTE_FILE "Wykonaj"
#define TR_REMOVED " skasowane"
#define TR_SD_INFO "Informacje"
#define TR_SD_FORMAT "Formatuj"
@@ -669,14 +700,16 @@
#define TR_SD_SECTORS "Sektory :"
#define TR_SD_SIZE "Wielkość:"
#define TR_TYPE TR_SD_TYPE
-#define TR_GLOBAL_VARS "Zmienne globalne"
-#define TR_GLOBAL_V "GLOBAL V."
-#define TR_GLOBAL_VAR "Zmienna globalna"
+#define TR_GLOBAL_VARS "Zmienne Globalne"
+#define TR_GLOBAL_V "Zmien.Glob."
+#define TR_GLOBAL_VAR "Zmienna Globalna"
#define TR_MENUGLOBALVARS "ZMIENNE GLOBALNE"
#define TR_OWN "Własność"
#define TR_DATE "Data"
#define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "MONITOR KANAŁÓW"
+#define TR_PATH_TOO_LONG "Ścieżka za długa"
+#define TR_VIEW_TEXT "Pokaż tekst"
#define TR_INTERNALRF "Wewnętrzny moduł RF"
#define TR_EXTERNALRF "Zewnętrzny moduł RF"
#define TR_FAILSAFE "Tryb Failsafe"
@@ -714,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Zakres kanału"
#define TR_LOWALARM INDENT "Alarm niski"
#define TR_CRITICALALARM INDENT "Alarm krytyczny"
+#define TR_ENABLE_POPUP "Aktywuj Popup"
+#define TR_DISABLE_POPUP "Wyłącz Popup"
+#define TR_CURVE_PRESET "Predefinicja..."
+#define TR_PRESET "Predefinicja"
+#define TR_MIRROR "Lutro"
+#define TR_CLEAR "Wyczyść"
+#define TR_RESET "Resetuj"
+#define TR_COUNT "Punkty"
+#define TR_PT "pkt"
+#define TR_PTS "pkt"
+#define TR_SMOOTH "Gładka"
+#define TR_COPY_TRIMS_TO_OFS "Skopiuj Trymery Do Offsetu"
#define TR_PERSISTENT_MAH INDENT "Zapisz mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_PREFLIGHT "Lista Ostrzeżeń"
+#define TR_CHECKLIST INDENT "Pokaż Listę Ostrzeżeń"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Port szreg."
+#define TR_SCRIPT "Skrypt"
+#define TR_INPUTS "Wejścia"
+#define TR_OUTPUTS "Wyjścia"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Maks RSSI"
@@ -746,7 +795,7 @@
#endif
// Taranis column headers
-#define TR_PHASES_HEADERS { " Nazwa ", " Przełącznik ", " Trymery ", " Pojawianie się ", " Zanikanie " }
+#define TR_PHASES_HEADERS { " Nazwa ", " Przełącznik ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Pojawianie się ", " Zanikanie " }
#define TR_LIMITS_HEADERS { " Nazwa ", " Subtrim ", " Min ", " Max ", " Kierunek ", " Krzywa ", " Środek PPM ", " Tryb subtrim " }
#define TR_CSW_HEADERS { " Funkcja ", " Param. 1 ", " Param 2 ", " Param 2 ", " AND Przełącznik ", " Czas trwania ", " Opóźnienie " }
@@ -797,8 +846,8 @@
#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)"
#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)"
-#define TR_CHR_SHORT 's'
-#define TR_CHR_LONG 'l'
+#define TR_CHR_SHORT 'k'
+#define TR_CHR_LONG 'd'
#define TR_CHR_TOGGLE 't'
#define TR_CHR_HOUR 'h'
#define TR_CHR_INPUT 'I' // Values between A-I will work
@@ -810,5 +859,8 @@
#define TR_TOP_BAR "Górny Pasek"
#define TR_ALTITUDE INDENT "Wysokość"
+#define TR_SCALE "Skala"
+#define TR_VIEW_CHANNELS "Pokaż Kanały"
+#define TR_VIEW_NOTES "Pokaż Notki"
#define TR_MODS_FORBIDDEN "Modyfikacje zabronione!"
#define TR_UNLOCKED "Odblokowane"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index aba6456dd..928b1f681 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -72,7 +72,7 @@
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 "
#define LEN_POTTYPES "\017"
-#define TR_POTTYPES "Pot\0 ""Multipos Switch"
+#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch"
#define LEN_DATETIME "\005"
#define TR_DATETIME "DATA:""HORA:"
@@ -83,12 +83,24 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC "\006"
#define TR_VTRIMINC "Expo ""ExFino""Fino ""Medio ""Largo "
#define LEN_VBEEPCOUNTDOWN "\006"
#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0"
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Standard""Custom\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -98,7 +110,7 @@
#define TR_RETA123 "LPMA123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "LPMA12LR"
+ #define TR_RETA123 "LPMA123LR"
#else
#define TR_RETA123 "LPMA123"
#endif
@@ -234,8 +246,10 @@
#define TR_CFN_TEST
#endif
+#define TR_CFN_RESERVE "[reserve]\0 "
+
#if defined(CPUARM)
- #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0 " TR_CFN_TEST
+ #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0 " TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0 " TR_CFN_TEST
#else
@@ -264,14 +278,22 @@
#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 ""Avis1 ""Avis2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")
#define LEN_VTELEMCHNS "\004"
-#if defined(PCBTARANIS)
- #define TR_RSSI_0 "SWR\0"
- #define TR_RSSI_1 "RSSI"
+
+#if defined(CPUARM)
+ #define TR_TELEM_RESERVE "[--]"
+ #define TR_SWR "SWR\0"
+ #define TR_RX_BATT "RxBt"
+ #define TR_A3_A4 "A3\0 ""A4\0 "
+ #define TR_A3_A4_MIN "A3-\0""A4-\0"
#else
- #define TR_RSSI_0 "Tx\0 "
- #define TR_RSSI_1 "Rx\0 "
+ #define TR_TELEM_RESERVE
+ #define TR_SWR
+ #define TR_RX_BATT
+ #define TR_A3_A4
+ #define TR_A3_A4_MIN
#endif
-#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+""Acc\0""Hora"
+
+#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora"
#define LENGTH_UNIT_IMP "ft\0"
#define SPEED_UNIT_IMP "mph"
@@ -307,7 +329,7 @@
#define TR_VALARMFN "<>"
#define LEN_VTELPROTO "\007"
-#define TR_VTELPROTO "Nada\0 ""Hub\0 ""WSHHigh""Halcyon"
+#define TR_VTELPROTO "Nada\0 ""Hub\0 ""WSHHigh"
#define LEN_VOLTSRC "\003"
#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
@@ -399,7 +421,7 @@
#define TR_VTRAINERMODES "Master""Slave\0"
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses"
+#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -445,8 +467,8 @@
#define TR_ELIMITS "E.Limits"
#define TR_ETRIMS "E.Trims"
#define TR_TRIMINC "Trim Step"
-#define TR_TTRACE "T-Trace"
-#define TR_TTRIM "T-Trim"
+#define TR_TTRACE TR("T-Trace", INDENT "T-Trace")
+#define TR_TTRIM TR("T-Trim", INDENT "T-Trim")
#define TR_BEEPCTR "Ctr Beep"
#define TR_PROTO INDENT"Proto"
#define TR_PPMFRAME "PPM frame"
@@ -509,7 +531,8 @@
#define TR_MEMORYWARNING INDENT"Memoria Baixa"
#define TR_ALARMWARNING INDENT"Som Off"
#define TR_RENAVIG "RotEnc Navig"
-#define TR_THROTTLEREVERSE "Inverte Acel."
+#define TR_THROTTLE_LABEL "Throttle"
+#define TR_THROTTLEREVERSE TR("Inverte Acel.", INDENT "Inverte Acel.")
#define TR_MINUTEBEEP INDENT"Beep Minuto"
#define TR_BEEPCOUNTDOWN INDENT"Beep Regressivo"
#define TR_PERSISTENT INDENT"Persist."
@@ -518,9 +541,9 @@
#define TR_BLONBRIGHTNESS INDENT"ON Brightness"
#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness"
#define TR_SPLASHSCREEN "Splash screen"
-#define TR_THROTTLEWARNING "Avisa Acel"
-#define TR_SWITCHWARNING "Avisa Chav"
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("Avisa Acel", INDENT "Avisa Acel")
+#define TR_SWITCHWARNING TR("Avisa Chav", INDENT "Avisa Chav")
+#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE "Time Zone"
#define TR_RXCHANNELORD "Ordem Canal RX"
#define TR_SLAVE "Escravo"
@@ -552,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER" Reinicia"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODEL"
#define TR_FP "FP"
@@ -596,6 +619,8 @@
#define TR_MENULOGICALSWITCH "CHAVE ESPECIAL"
#define TR_MENULOGICALSWITCHES "CHAVES ESPECIAIS"
#define TR_MENUCUSTOMFUNC "FUNCAO ESPECIAL"
+#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS"
+#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT"
#define TR_MENUTELEMETRY "TELEMETRIA"
#define TR_MENUTEMPLATES "MODELOS"
#define TR_MENUSTAT "REGISTROS"
@@ -608,6 +633,9 @@
#define TR_LONGITUDE "Longitude"
#define TR_GPSCOORD "Gps Coords"
#define TR_VARIO "Vario"
+#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero"
+#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
+#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "DESLIGANDOo"
#define TR_BATT_CALIB "CALIBRAR BATT"
#define TR_CURRENT_CALIB "Corrente Calib"
@@ -625,6 +653,7 @@
#define TR_INCOMPATIBLE "Incompativel"
#define TR_WARNING "AVISO"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "EEPROM Converting"
#define TR_THROTTLEWARN "ACELERAD"
#define TR_ALARMSWARN "ALARMES"
#define TR_SWITCHWARN "CHAVES"
@@ -649,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "Sem Som no SD"
#define TR_NO_MODELS_ON_SD "Sem Modelo no SD"
#define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD"
+#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_PLAY_FILE "Play"
#define TR_DELETE_FILE "Apagar"
#define TR_COPY_FILE "Copiar"
#define TR_RENAME_FILE "Renomear"
#define TR_ASSIGN_BITMAP "Assign Bitmap"
+#define TR_EXECUTE_FILE "Execute"
#define TR_REMOVED "Remover"
#define TR_SD_INFO "Dados SD"
#define TR_SD_FORMAT "Formatar"
@@ -677,6 +708,8 @@
#define TR_DATE "Data"
#define TR_ROTARY_ENCODER "R.Encs"
#define TR_CHANNELS_MONITOR "CHANNELS MONITOR"
+#define TR_PATH_TOO_LONG "Path too long"
+#define TR_VIEW_TEXT "View text"
#define TR_INTERNALRF "Internal RF"
#define TR_EXTERNALRF "External RF"
#define TR_FAILSAFE "Failsafe mode"
@@ -714,10 +747,26 @@
#define TR_CHANNELRANGE INDENT "Channel Range"
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm"
+#define TR_ENABLE_POPUP "Enable Popup"
+#define TR_DISABLE_POPUP "Disable Popup"
+#define TR_CURVE_PRESET "Preset..."
+#define TR_PRESET "Preset"
+#define TR_MIRROR "Mirror"
+#define TR_CLEAR "Clear"
+#define TR_RESET "Reset"
+#define TR_COUNT "Count"
+#define TR_PT "pt"
+#define TR_PTS "pts"
+#define TR_SMOOTH "Smooth"
+#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset"
#define TR_PERSISTENT_MAH INDENT "Store mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_PREFLIGHT "Preflight Checks"
+#define TR_CHECKLIST INDENT "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port"
+#define TR_SCRIPT "Script"
+#define TR_INPUTS "Inputs"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -746,7 +795,7 @@
#endif
// Taranis column headers
-#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " }
+#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Symmetrical " }
#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
@@ -810,5 +859,8 @@
#define TR_TOP_BAR "Top Bar"
#define TR_ALTITUDE INDENT "Altitude"
+#define TR_SCALE "Scale"
+#define TR_VIEW_CHANNELS "View Channels"
+#define TR_VIEW_NOTES "View Notes"
#define TR_MODS_FORBIDDEN "Modifications forbidden!"
#define TR_UNLOCKED "Unlocked"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index e559b277f..38efc2bbb 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -72,7 +72,7 @@
#define TR_UART3MODES "Av\0 ""Spegling av S-Port""Debug\0 "
#define LEN_POTTYPES "\020"
-#define TR_POTTYPES "Potentiometer\0 ""Flerlägesväljare"
+#define TR_POTTYPES "Ingen\0 ""Potentiometer\0 ""Flerlägesväljare"
#define LEN_DATETIME "\005"
#define TR_DATETIME "DAG: ""TID: "
@@ -83,12 +83,24 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0")
+#define LEN_TARANIS_PROTOCOLS "\004"
+#define TR_TARANIS_PROTOCOLS "Av\0 ""PPM\0""XJT\0""DSM2"
+
+#define LEN_XJT_PROTOCOLS "\004"
+#define TR_XJT_PROTOCOLS "Av\0 ""D16\0""D8\0 ""LR12"
+
+#define LEN_DSM_PROTOCOLS "\004"
+#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
+
#define LEN_VTRIMINC TR("\006","\014")
#define TR_VTRIMINC TR("Expo\0 ""xFin\0 ""Fin\0 ""Medium""Grov\0 ","Exponentiell""Extra Fin\0 ""Fin\0 ""Medium\0 ""Grov\0 ")
#define LEN_VBEEPCOUNTDOWN "\006"
#define TR_VBEEPCOUNTDOWN "Tyst\0 Pip\0 Röst\0 "
+#define LEN_CURVE_TYPES "\010"
+#define TR_CURVE_TYPES "Normal\0 ""Special\0"
+
#define LEN_RETA123 "\001"
#if defined(PCBGRUVIN9X)
@@ -98,7 +110,7 @@
#define TR_RETA123 "RHGS123ab"
#endif
#elif defined(PCBTARANIS)
- #define TR_RETA123 "RHGS12HV"
+ #define TR_RETA123 "RHGS123HV"
#else
#define TR_RETA123 "RHGS123"
#endif
@@ -152,15 +164,15 @@
#if defined(PCBTARANIS)
#define TR_CSWTIMER "Timer"
- #define TR_CSWSTICKY "Stcky"
- #define TR_CSWRANGE "Range"
- #define TR_CSWSTAY "Edge\0"
+ #define TR_CSWSTICKY "Seg\0 "
+ #define TR_CSWRANGE "Vidd\0"
+ #define TR_CSWSTAY "Kant\0"
#else
#define TR_CSWTIMER "Tim\0 "
- #define TR_CSWSTICKY "Glue\0"
+ #define TR_CSWSTICKY "Seg\0 "
#if defined(CPUARM)
- #define TR_CSWRANGE "Rnge\0"
- #define TR_CSWSTAY "Edge\0"
+ #define TR_CSWRANGE "Vidd\0"
+ #define TR_CSWSTAY "Kant\0"
#else
#define TR_CSWRANGE
#define TR_CSWSTAY
@@ -168,7 +180,7 @@
#endif
#if defined(CPUARM)
- #define TR_CSWEQUAL "a=x\0 "
+ #define TR_CSWEQUAL "a=x\0 "
#else
#define TR_CSWEQUAL
#endif
@@ -183,7 +195,7 @@
#define LEN_VFSWFUNC "\012"
#if defined(VARIO)
- #define TR_VVARIO "Vario "
+ #define TR_VVARIO "Vario\0 "
#else
#define TR_VVARIO "[Vario] "
#endif
@@ -204,10 +216,10 @@
#if defined(PCBSKY9X)
#define TR_PLAY_TRACK "Spela Spår"
#else
- #define TR_PLAY_TRACK "Spela\0 "
+ #define TR_PLAY_TRACK "Spela upp\0"
#endif
#define TR_PLAY_BOTH "Spela Båda"
- #define TR_PLAY_VALUE "Spela Val "
+ #define TR_PLAY_VALUE "Säg Värdet"
#else
#define TR_PLAY_TRACK "[Sp. Spår]"
#define TR_PLAY_BOTH "[Sp. Båda]"
@@ -223,9 +235,9 @@
#endif
#ifdef GVARS
- #define TR_ADJUST_GVAR "Justera\0 "
+ #define TR_ADJUST_GVAR "Justera\0 "
#else
- #define TR_ADJUST_GVAR "[AdjustGV]"
+ #define TR_ADJUST_GVAR "[Just. GV]"
#endif
#ifdef DEBUG
@@ -234,12 +246,14 @@
#define TR_CFN_TEST
#endif
+#define TR_CFN_RESERVE "[reserve]\0"
+
#if defined(CPUARM)
- #define TR_VFSWFUNC "Säkra\0 ""Trainer\0 ""Sätt Trim\0""Nollställ\0""Set \0 " TR_ADJUST_GVAR "Volym\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_CFN_TEST
+ #define TR_VFSWFUNC "Säkra \0 ""Trainer\0 ""Sätt Trim\0""Nollställ\0""Sätt\0 " TR_ADJUST_GVAR "Volym\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
- #define TR_VFSWFUNC "Säkra\0 ""Trainer\0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_CFN_TEST
+ #define TR_VFSWFUNC "Säkra \0 ""Trainer \0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_CFN_TEST
#else
- #define TR_VFSWFUNC "Säkra\0 ""Trainer\0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Belysning\0" TR_CFN_TEST
+ #define TR_VFSWFUNC "Säkra \0 ""Trainer \0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Belysning\0" TR_CFN_TEST
#endif
#define LEN_VFSWRESET TR("\004", "\011")
@@ -264,14 +278,22 @@
#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")
#define LEN_VTELEMCHNS "\004"
-#if defined(PCBTARANIS)
- #define TR_RSSI_0 "SWR\0"
- #define TR_RSSI_1 "RSSI"
+
+#if defined(CPUARM)
+ #define TR_TELEM_RESERVE "[--]"
+ #define TR_SWR "SWR\0"
+ #define TR_RX_BATT "RxBt"
+ #define TR_A3_A4 "A3\0 ""A4\0 "
+ #define TR_A3_A4_MIN "A3-\0""A4-\0"
#else
- #define TR_RSSI_0 "Tx\0 "
- #define TR_RSSI_1 "Rx\0 "
+ #define TR_TELEM_RESERVE
+ #define TR_SWR
+ #define TR_RX_BATT
+ #define TR_A3_A4
+ #define TR_A3_A4_MIN
#endif
-#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Höjd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""ASpd""dTE\0""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Pwr+""Acc\0""Tid\0"
+
+#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Höjd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tid\0"
#define LENGTH_UNIT_IMP "ft\0"
#define SPEED_UNIT_IMP "mph"
@@ -390,7 +412,7 @@
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
#endif
-#define TR_VSRCRAW "---\0""Rod\0""Höj\0""Gas\0""Ske\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODER "MAX " TR_CYC_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" TR_SW_VSRCRAW
+#define TR_VSRCRAW "---\0""Rod\0""Hjd\0""Gas\0""Ske\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODER "MAX " TR_CYC_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" TR_SW_VSRCRAW
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "Av\0""ABS""GAs""GA%""GAt"
@@ -399,7 +421,7 @@
#define TR_VTRAINERMODES "Lärare""Elev\0."
#define LEN_VFAILSAFE "\011"
-#define TR_VFAILSAFE "Håll\0 ""Special\0 ""Pulsfritt"
+#define TR_VFAILSAFE "Lås Servo""Anpassat\0""Pulsfritt""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@@ -434,9 +456,9 @@
#define TR_MODELNAME "Modellnamn"
#define TR_PHASENAME "Lägesnamn "
#define TR_MIXNAME "Mixnamn "
-#define TR_INPUTNAME "Filternamn"
+#define TR_INPUTNAME "Inputnamn"
#if defined(PCBTARANIS)
- #define TR_EXPONAME "Linjenamn"
+ #define TR_EXPONAME "Radnamn"
#else
#define TR_EXPONAME "Exponamn"
#endif
@@ -445,10 +467,10 @@
#define TR_ELIMITS TR("Gränser++","Utökade Gränser")
#define TR_ETRIMS TR("Trimmar++","Utökade Trimmar")
#define TR_TRIMINC TR("Trimning","Trimökning")
-#define TR_TTRACE "Följ Gas"
-#define TR_TTRIM "Gastrim"
+#define TR_TTRACE TR("Följ Gas", INDENT "Följ Gas")
+#define TR_TTRIM TR("Gastrim", INDENT "Gastrim")
#define TR_BEEPCTR TR("Cent.pip", "Centerpip")
-#define TR_PROTO TR(INDENT"Proto",INDENT"Protokoll")
+#define TR_PROTO TR(INDENT "Proto", INDENT "Protokoll")
#define TR_PPMFRAME "PPM-paket"
#define TR_MS "ms"
#define TR_SWITCH "Brytare"
@@ -478,7 +500,7 @@
#define TR_TRIM "Trim"
#define TR_DREX "DRex"
#define TR_CURVE "Kurva"
-#define TR_FLMODE TR("Läge","Lägen")
+#define TR_FLMODE TR("Läge","Flyglägen")
#define TR_MIXWARNING "Varning"
#define TR_OFF "Av "
#define TR_MULTPX "Multpx"
@@ -486,7 +508,7 @@
#define TR_DELAYUP "Dröj Upp"
#define TR_SLOWDOWN "Trög Ned"
#define TR_SLOWUP "Trög Upp"
-#define TR_MIXER "Mixar"
+#define TR_MIXER "MIXAR"
#define TR_CV "KU"
#define TR_GV "GV"
#define TR_ACHANNEL "A\004kanal "
@@ -509,18 +531,19 @@
#define TR_MEMORYWARNING INDENT"Lite Minne"
#define TR_ALARMWARNING INDENT"Ljud Av"
#define TR_RENAVIG "RotEnc Navig"
-#define TR_THROTTLEREVERSE "Revers.Gas"
+#define TR_THROTTLE_LABEL "Gas"
+#define TR_THROTTLEREVERSE TR("Inv.Gas", INDENT "Inverterad Gas")
#define TR_MINUTEBEEP INDENT"Minutpip"
-#define TR_BEEPCOUNTDOWN INDENT"Räkna Ned"
+#define TR_BEEPCOUNTDOWN INDENT"Nedräkning"
#define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På")
#define TR_BACKLIGHT_LABEL "Belysning"
#define TR_BLDELAY INDENT"Av efter"
#define TR_BLONBRIGHTNESS INDENT"På Ljusstyrka"
#define TR_BLOFFBRIGHTNESS INDENT"Av Ljusstyrka"
#define TR_SPLASHSCREEN "Startbild"
-#define TR_THROTTLEWARNING "Gasvarning"
-#define TR_SWITCHWARNING TR("Bryt.varn.","Brytarvarning")
-#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
+#define TR_THROTTLEWARNING TR("Gasvarning", INDENT "Gasvarning")
+#define TR_SWITCHWARNING TR("Bryt.varn.", INDENT "Brytarvarning")
+#define TR_POTWARNING TR("Rattvarn.", INDENT "Rattvarning")
#define TR_TIMEZONE TR("Tidszon","GPS Tidszon")
#define TR_RXCHANNELORD "Kanaler i RX"
#define TR_SLAVE "Elev"
@@ -536,7 +559,7 @@
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
-#define TR_NODATA CENTER "NO DATA"
+#define TR_NODATA CENTER "DATA SAKNAS"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
@@ -552,7 +575,7 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER " Nollar"
-#define TR_PPM "PPM"
+#define TR_PPM_TRAINER "TR"
#define TR_CH "KN"
#define TR_MODEL "Modell"
#define TR_FP "FL"
@@ -566,41 +589,43 @@
#define TR_BADEEPROMDATA "Minnet kan inte tolkas"
#define TR_EEPROMFORMATTING "Minnet Nollställs"
#define TR_EEPROMOVERFLOW "Minnesfel"
-#define TR_MENURADIOSETUP "Inställningar"
-#define TR_MENUDATEANDTIME "Dag och Tid"
-#define TR_MENUTRAINER "Trainer (PPM in)"
-#define TR_MENUVERSION "Version"
-#define TR_MENUDIAG TR("Brytare","Test av Brytare")
-#define TR_MENUANA "Analoga Värden"
-#define TR_MENUCALIBRATION "Kalibrering"
+#define TR_MENURADIOSETUP "INSTÄLLNINGAR"
+#define TR_MENUDATEANDTIME "DAG OCH TID"
+#define TR_MENUTRAINER "TRAINER (PPM IN)"
+#define TR_MENUVERSION "VERSION"
+#define TR_MENUDIAG TR("BRYTARE","TEST AV BRYTARE")
+#define TR_MENUANA "ANALOGA VÄRDEN"
+#define TR_MENUCALIBRATION "KALIBRERING"
#define TR_TRIMS2OFFSETS "\004[Spara Trimvärden]"
-#define TR_MENUMODELSEL TR("Modell","Välj Modell")
-#define TR_MENUSETUP TR("Värden","Modellinställningar")
-#define TR_MENUFLIGHTPHASE "Flygläge"
-#define TR_MENUFLIGHTPHASES "Flyglägen"
-#define TR_MENUHELISETUP "Helikopter"
+#define TR_MENUMODELSEL TR("MODELL","VÄLJ MODELL")
+#define TR_MENUSETUP TR("VÄRDEN","MODELLINSTÄLLNINGAR")
+#define TR_MENUFLIGHTPHASE "FLYGLÄGE"
+#define TR_MENUFLIGHTPHASES "FLYGLÄGEN"
+#define TR_MENUHELISETUP "HELIKOPTER"
#if defined(PCBTARANIS)
- #define TR_MENUINPUTS TR("Filter","Filtrerad Insignal")
- #define TR_MENULIMITS "Gränser"
+ #define TR_MENUINPUTS "INPUT"
+ #define TR_MENULIMITS "SERVON"
#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ...
- #define TR_MENUINPUTS "Spakar"
- #define TR_MENULIMITS "Gränser"
+ #define TR_MENUINPUTS "SPAKAR"
+ #define TR_MENULIMITS "SERVON"
#else
- #define TR_MENUINPUTS TR("DR/Expo","DualRates/Expo")
- #define TR_MENULIMITS "Gränser"
+ #define TR_MENUINPUTS TR("DR/EXPO","DUALRATES/EXPO")
+ #define TR_MENULIMITS "SERVON"
#endif
-#define TR_MENUCURVES "Kurvor"
-#define TR_MENUCURVE "Kurva"
-#define TR_MENULOGICALSWITCH "Logisk Brytare"
-#define TR_MENULOGICALSWITCHES "Logiska Brytare"
-#define TR_MENUCUSTOMFUNC "BrytarFunktioner"
-#define TR_MENUTELEMETRY "Telemetri"
-#define TR_MENUTEMPLATES "Mallar"
-#define TR_MENUSTAT "Statistik"
-#define TR_MENUDEBUG "Debug"
-#define TR_RXNUM "RxNum"
+#define TR_MENUCURVES "KURVOR"
+#define TR_MENUCURVE "KURVA"
+#define TR_MENULOGICALSWITCH "LOGISK BRYTARE"
+#define TR_MENULOGICALSWITCHES "LOGISKA BRYTARE"
+#define TR_MENUCUSTOMFUNC "BRYTARFUNKTIONER"
+#define TR_MENUCUSTOMSCRIPTS "SPECIALKOD"
+#define TR_MENUCUSTOMSCRIPT "SPECIALKOD"
+#define TR_MENUTELEMETRY "TELEMETRI"
+#define TR_MENUTEMPLATES "MALLAR"
+#define TR_MENUSTAT "STATISTIK"
+#define TR_MENUDEBUG "DEBUG"
+#define TR_RXNUM TR("RxNum", "RxInställningar")
#define TR_SYNCMENU "Synk [MENU]"
#define TR_LIMIT INDENT"Nivå"
#define TR_MINRSSI "Min Rssi"
@@ -608,6 +633,9 @@
#define TR_LONGITUDE "Längdgrad"
#define TR_GPSCOORD TR("GPS-Koordinater", "GPS-koordinatsystem")
#define TR_VARIO TR("Vario", "Variometer")
+#define TR_PITCH_AT_ZERO INDENT "Ton vid Noll"
+#define TR_PITCH_AT_MAX INDENT "Ton vid Max"
+#define TR_REPEAT_AT_ZERO INDENT "Repetera vid Noll"
#define TR_SHUTDOWN "STäNGER AV"
#define TR_BATT_CALIB "Kalib. Batteri"
#define TR_CURRENT_CALIB "Kalib. Ström"
@@ -625,10 +653,11 @@
#define TR_INCOMPATIBLE "Inkompatibel"
#define TR_WARNING "VARNING"
#define TR_EEPROMWARN "EEPROM"
+#define TR_EEPROM_CONVERTING "EEPROM Konvertering"
#define TR_THROTTLEWARN "GAS"
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "BRYTARE"
-#define TR_INVERT_THR TR("Revers.Gas?", "Reversera Gasen?")
+#define TR_INVERT_THR TR("Invert.Gas?", "Invertera Gasen?")
#define TR_SPEAKER_VOLUME INDENT "Volym"
#define TR_LCD "LCD"
#define TR_BRIGHTNESS INDENT "Ljusstyrka"
@@ -649,11 +678,13 @@
#define TR_NO_SOUNDS_ON_SD "Inga ljud i SD"
#define TR_NO_MODELS_ON_SD "Ingen modell i SD"
#define TR_NO_BITMAPS_ON_SD "Ikoner saknas på SD"
+#define TR_NO_SCRIPTS_ON_SD "Programkod saknas på SD"
#define TR_PLAY_FILE "Spela"
#define TR_DELETE_FILE "Radera"
#define TR_COPY_FILE "Kopia"
#define TR_RENAME_FILE "Byt namn"
#define TR_ASSIGN_BITMAP "Tilldela ikon"
+#define TR_EXECUTE_FILE "Utför"
#define TR_REMOVED " raderad"
#define TR_SD_INFO "Information"
#define TR_SD_FORMAT "Format"
@@ -672,17 +703,19 @@
#define TR_GLOBAL_VARS "Globala Variabler"
#define TR_GLOBAL_V "GLOBAL V."
#define TR_GLOBAL_VAR "Global Variabel"
-#define TR_MENUGLOBALVARS "Globala Variabler"
+#define TR_MENUGLOBALVARS "GLOBALA VARIABLER"
#define TR_OWN "Egen"
#define TR_DATE "Datum"
#define TR_ROTARY_ENCODER "R.Enks"
#define TR_CHANNELS_MONITOR "Kanalöversikt"
-#define TR_INTERNALRF "Intern RF"
-#define TR_EXTERNALRF "Extern RF"
-#define TR_FAILSAFE "Failsafe-läge"
+#define TR_PATH_TOO_LONG "För lång sökväg"
+#define TR_VIEW_TEXT "Visa Text"
+#define TR_INTERNALRF "Intern Radio"
+#define TR_EXTERNALRF "Extern Radiomodul"
+#define TR_FAILSAFE "Failsafeläge"
#define TR_FAILSAFESET "FailsafeInställning"
#define TR_COUNTRYCODE "Landskod"
-#define TR_VOICELANG "Röst-språk"
+#define TR_VOICELANG "Röstspråk"
#define TR_UNITSSYSTEM "Enheter"
#define TR_EDIT "Redigera"
#define TR_INSERT_BEFORE "Addera Före"
@@ -698,11 +731,11 @@
#define TR_RESET_TELEMETRY "Nollställ Telemetri"
#define TR_STATISTICS "Statistik"
#define TR_ABOUT_US "Om Oss"
-#define TR_AND_SWITCH "AND Brytare"
+#define TR_AND_SWITCH "OCH Brytare"
#define TR_CF "BF"
#define TR_SPEAKER INDENT"Högtalare"
#define TR_BUZZER INDENT"Summer"
-#define TR_BYTES "bytes"
+#define TR_BYTES "byte"
#define TR_MODULE_BIND "[Bind]"
#define TR_MODULE_RANGE "[Testa]"
#define TR_RESET_BTN "[Nollställ]"
@@ -714,15 +747,31 @@
#define TR_CHANNELRANGE INDENT "Kanalområde"
#define TR_LOWALARM INDENT "Låg-alarm"
#define TR_CRITICALALARM INDENT "Kritiskt alarm"
-#define TR_PERSISTENT_MAH INDENT "Store mAh"
-#define TR_CHECKLIST "Display Checklist"
+#define TR_ENABLE_POPUP "Slå på Dialog"
+#define TR_DISABLE_POPUP "Slå av Dialog"
+#define TR_CURVE_PRESET "Lutning..."
+#define TR_PRESET "Lutning"
+#define TR_MIRROR "Spegla"
+#define TR_CLEAR "Töm"
+#define TR_RESET "Nollställ"
+#define TR_COUNT "Antal"
+#define TR_PT "pt"
+#define TR_PTS "pkt"
+#define TR_SMOOTH "Mjuk"
+#define TR_COPY_TRIMS_TO_OFS "Spara trimmar som offset"
+#define TR_PERSISTENT_MAH INDENT "Lagra mAh"
+#define TR_PREFLIGHT "Startkontroller"
+#define TR_CHECKLIST INDENT "Visa checklisa"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serieporten"
+#define TR_SCRIPT "Programkod"
+#define TR_INPUTS "Input"
+#define TR_OUTPUTS "Outputs"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
#define TR_MAVLINK_PC_RSSI_EN_LABEL "PC RSSI EN"
- #define TR_MAVMENUSETUP_TITLE "MavlinkInställningar"
+ #define TR_MAVMENUSETUP_TITLE "MAVLINKINSTÄLLNINGAR"
#define TR_MAVLINK_BAUD_LABEL "Baudrate"
#define TR_MAVLINK_INFOS "INFOS"
#define TR_MAVLINK_MODE "LÄGE"
@@ -746,9 +795,9 @@
#endif
// Taranis column headers
-#define TR_PHASES_HEADERS { " Namn ", " Brytare ", " Trimmar ", " Tona Upp ", " Tona Ned " }
+#define TR_PHASES_HEADERS { " Namn ", " Brytare ", " Rodertrim ", " Höjdrodertrim ", " Gastrim ", " Skevrodertrim ", " Tona Upp ", " Tona Ned " }
#define TR_LIMITS_HEADERS { " Namn ", " Offset ", " Min ", " Max ", " Riktning ", " PPM-centrum ", " Symmetriskt " }
-#define TR_CSW_HEADERS { " Funktion ", " V1 ", " V2 ", " V2 ", " AND Brytare ", " Tidslängd ", " Fördröj " }
+#define TR_CSW_HEADERS { " Funktion ", " V1 ", " V2 ", " V2 ", " OCH Brytare ", " Tidslängd ", " Fördröj " }
// About screen
#define TR_ABOUTUS "Om Oss"
@@ -792,6 +841,7 @@
#define TR_ABOUT_HARDWARE_3 ""
#endif
+
#define TR_ABOUT_PARENTS_1 "Ursprungsprojekt"
#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)"
#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)"
@@ -801,14 +851,17 @@
#define TR_CHR_LONG 'l'
#define TR_CHR_TOGGLE 't'
#define TR_CHR_HOUR 'h'
-#define TR_CHR_INPUT 'F' // Values between A-I will work
+#define TR_CHR_INPUT 'I' // Values between A-I will work
#define TR_BEEP_VOLUME "Volym Pip"
#define TR_WAV_VOLUME "Volym Wav"
#define TR_VARIO_VOLUME "Volym Vario"
#define TR_BG_VOLUME "Volym Bg"
-#define TR_TOP_BAR "Top Bar"
+#define TR_TOP_BAR "Titelraden"
#define TR_ALTITUDE INDENT "Höjd"
+#define TR_SCALE "Skala"
+#define TR_VIEW_CHANNELS "Visa Kanaler"
+#define TR_VIEW_NOTES "Visa Noteringars"
#define TR_MODS_FORBIDDEN "Modifikationer förbjudna!"
#define TR_UNLOCKED "Olåst"
diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp
index fb45783ab..1eb7e6107 100644
--- a/radio/src/translations/tts_cz.cpp
+++ b/radio/src/translations/tts_cz.cpp
@@ -129,7 +129,7 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp
index af09eeb53..62ff70f31 100644
--- a/radio/src/translations/tts_de.cpp
+++ b/radio/src/translations/tts_de.cpp
@@ -119,7 +119,7 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp
index c7cfcb79f..5810b4b3e 100644
--- a/radio/src/translations/tts_en.cpp
+++ b/radio/src/translations/tts_en.cpp
@@ -105,8 +105,8 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
}
#if defined(CPUARM)
- if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_SPEED && number >= 100))) {
- number /= 10;
+ if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp
index 9a9b7ca74..db1e8ff2b 100644
--- a/radio/src/translations/tts_es.cpp
+++ b/radio/src/translations/tts_es.cpp
@@ -143,7 +143,7 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp
index a5eca4723..17258042c 100644
--- a/radio/src/translations/tts_fr.cpp
+++ b/radio/src/translations/tts_fr.cpp
@@ -125,7 +125,7 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp
index 080b6ae10..b3d90e6b6 100644
--- a/radio/src/translations/tts_it.cpp
+++ b/radio/src/translations/tts_it.cpp
@@ -115,7 +115,7 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp
index 3772c6054..da5f2ffe6 100644
--- a/radio/src/translations/tts_pl.cpp
+++ b/radio/src/translations/tts_pl.cpp
@@ -138,7 +138,7 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp
index 0744cefd3..f48f59917 100644
--- a/radio/src/translations/tts_pt.cpp
+++ b/radio/src/translations/tts_pt.cpp
@@ -128,7 +128,7 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp
index c4c10c548..d8b029d62 100644
--- a/radio/src/translations/tts_se.cpp
+++ b/radio/src/translations/tts_se.cpp
@@ -93,7 +93,7 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp
index 1e10bddef..32d46dcb9 100644
--- a/radio/src/translations/tts_sk.cpp
+++ b/radio/src/translations/tts_sk.cpp
@@ -144,7 +144,7 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
#if defined(CPUARM)
if ((att & PREC1) && (unit == UNIT_FEET || (unit == UNIT_DIST && number >= 100))) {
- number /= 10;
+ number = div10_and_round(number);
att -= PREC1;
}
#endif
diff --git a/radio/util/addtr.py b/radio/util/addtr.py
index 2c4a45858..d62623e88 100644
--- a/radio/util/addtr.py
+++ b/radio/util/addtr.py
@@ -2,11 +2,7 @@
import sys, glob
-string = sys.argv[1]
-translation = sys.argv[2]
-after = sys.argv[3]
-
-def addLine(filename, newline):
+def addLine(filename, newline, after):
print filename, newline
lines = file(filename, 'r').readlines()
for i, line in enumerate(lines):
@@ -15,22 +11,27 @@ def addLine(filename, newline):
break
file(filename, 'w').writelines(lines)
-def modifyTranslations():
- for filename in ['translations/en.h'] + glob.glob('translations/*.h.txt'):
- newline = "#define " + string + " "*(23-len(string)) + '"' + translation + '"'
- addLine(filename, newline)
+def modifyTranslations(constant, translation, after):
+ for filename in glob.glob('translations/*.h.txt'):
+ newline = "#define " + constant + " "*(23-len(constant)) + '"' + translation + '"'
+ addLine(filename, newline, after+" ")
-def modifyDeclaration():
- newline = "extern const pm_char S" + string + "[];"
+def modifyDeclaration(constant, after):
+ newline = "extern const pm_char S" + constant + "[];"
filename = "translations.h"
- addLine(filename, newline)
+ addLine(filename, newline, after+"[];")
-def modifyDefinition():
- newline = "const pm_char S" + string + "[] PROGMEM = " + string + ";"
+def modifyDefinition(constant, after):
+ newline = "const pm_char S" + constant + "[] PROGMEM = " + constant + ";"
filename = "translations.cpp"
- addLine(filename, newline)
+ addLine(filename, newline, after+"[] ")
-modifyTranslations()
-modifyDeclaration()
-modifyDefinition()
+
+after = sys.argv[-1]
+for arg in sys.argv[1:-1]:
+ constant, translation = arg.split("=")
+ modifyTranslations(constant, translation, after)
+ modifyDeclaration(constant, after)
+ modifyDefinition(constant, after)
+ after = constant
diff --git a/radio/util/bin2lbm.py b/radio/util/bin2lbm.py
new file mode 100644
index 000000000..19b3bf0cf
--- /dev/null
+++ b/radio/util/bin2lbm.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+import sys
+
+filename = sys.argv[1]
+fileout = sys.argv[2]
+
+fr = open(filename, "rb")
+fw = open(fileout, "w")
+
+st = fr.read(16)
+
+while st:
+ for b in st:
+ fw.write("0x%02x," % ord(b))
+ fw.write("\n")
+ st = fr.read(16)
+
+fw.write("\n")
+fw.close()
diff --git a/sound/.gitignore b/sound/.gitignore
new file mode 100644
index 000000000..61c209432
--- /dev/null
+++ b/sound/.gitignore
@@ -0,0 +1 @@
+*.suo
diff --git a/sound/OpenTXSound.sln b/sound/OpenTXSound.sln
new file mode 100644
index 000000000..e31aff4ab
--- /dev/null
+++ b/sound/OpenTXSound.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTXRecorder", "recorder\OpenTXRecorder.csproj", "{8143D08D-1861-42DD-A861-56B15DE42A69}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTXspeaker", "speaker\OpenTXspeaker.csproj", "{BB2C7ECA-B4B9-4957-B7D9-B0C7817CA148}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Debug|x86.ActiveCfg = Debug|x86
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Debug|x86.Build.0 = Debug|x86
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Release|x86.ActiveCfg = Release|x86
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Release|x86.Build.0 = Release|x86
+ {BB2C7ECA-B4B9-4957-B7D9-B0C7817CA148}.Debug|x86.ActiveCfg = Debug|x86
+ {BB2C7ECA-B4B9-4957-B7D9-B0C7817CA148}.Debug|x86.Build.0 = Debug|x86
+ {BB2C7ECA-B4B9-4957-B7D9-B0C7817CA148}.Release|x86.ActiveCfg = Release|x86
+ {BB2C7ECA-B4B9-4957-B7D9-B0C7817CA148}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/sound/recorder/.gitignore b/sound/recorder/.gitignore
new file mode 100644
index 000000000..e307eca41
--- /dev/null
+++ b/sound/recorder/.gitignore
@@ -0,0 +1,4 @@
+/OpenTXrecorder.suo
+/bin/*
+/obj/*
+*.csproj.user
diff --git a/sound/recorder/App.xaml b/sound/recorder/App.xaml
new file mode 100644
index 000000000..bc0c857b7
--- /dev/null
+++ b/sound/recorder/App.xaml
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/sound/recorder/App.xaml.cs b/sound/recorder/App.xaml.cs
new file mode 100644
index 000000000..276e1c991
--- /dev/null
+++ b/sound/recorder/App.xaml.cs
@@ -0,0 +1,32 @@
+/* This file is part of OpenTX Recorder.
+ * OpenTX Recorder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Recorder 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Recorder. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace OpenTXrecorder
+{
+ ///
+ /// Interaction logic for App.xaml
+ ///
+ public partial class App : Application
+ {
+ }
+}
diff --git a/sound/recorder/GPLv3_Logo.png b/sound/recorder/GPLv3_Logo.png
new file mode 100644
index 000000000..ba78d4c49
Binary files /dev/null and b/sound/recorder/GPLv3_Logo.png differ
diff --git a/sound/recorder/MainWindow.xaml b/sound/recorder/MainWindow.xaml
new file mode 100644
index 000000000..7e88e25dd
--- /dev/null
+++ b/sound/recorder/MainWindow.xaml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sound/recorder/MainWindow.xaml.cs b/sound/recorder/MainWindow.xaml.cs
new file mode 100644
index 000000000..60eea1657
--- /dev/null
+++ b/sound/recorder/MainWindow.xaml.cs
@@ -0,0 +1,305 @@
+/* This file is part of OpenTX Recorder.
+ * OpenTX Recorder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Recorder 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Recorder. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Media;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Navigation;
+using System.Runtime.InteropServices;
+using WaveLib;
+using System.Net;
+
+
+namespace OpenTXrecorder
+{
+ public partial class MainWindow : Window
+ {
+ Environment env;
+ SentenceTables tables = new SentenceTables();
+ public Sentences sentences { get; set; }
+ public Languages languages { get; set; }
+
+ WavFileWriter filewriter;
+ WaveInRecorder recorder;
+ byte[] recordingBuffer;
+ static int recSamplerate = 16000; // 8000, 16000 or 32000
+ static int recBits = 16; // 8 or 16
+ static int recChannels = 1; // 1 or 2
+ static int recBuffersize = 1024 * 2;
+ public bool isRecording { get; set; }
+
+
+ public MainWindow()
+ {
+ this.DataContext = this;
+ sentences = new Sentences();
+ languages = new Languages();
+ recordingBuffer = new byte[recBuffersize];
+
+ InitializeComponent();
+
+ // Start by displaying Splash Screen
+ SplashScreen splash = new SplashScreen("recorder_logo.png");
+ splash.Show(true);
+ Thread.Sleep(1500);
+
+ languages.Add("English", "en");
+ languages.Add("Czech", "cz");
+ languages.Add("German", "de");
+ languages.Add("French", "fr");
+ languages.Add("Italian", "it");
+ languages.Add("Polish", "pl");
+ languages.Add("Portuguese", "pt");
+ languages.Add("Swedish", "se");
+ languages.Add("Slovak", "sk");
+ languages.Add("Spanish", "es");
+
+ env = new Environment(languages[0]);
+
+ cbLanguages.SelectedIndex = 0; // Note: Sets current langugage -> triggers loadlanguage()
+ }
+
+ private void loadLanguage()
+ {
+ string[] system_strings;
+ string[] other_strings;
+
+ try
+ {
+ system_strings = System.IO.File.ReadAllLines(env.systemSounds);
+ other_strings = System.IO.File.ReadAllLines(env.otherSounds);
+ }
+ catch (IOException)
+ {
+ system_strings = tables.default_system_strings[tables.toInt(env.lang.sName)];
+ other_strings = tables.default_other_strings[tables.toInt(env.lang.sName)];
+ }
+ sentences.Clear();
+
+ foreach (string str in system_strings)
+ sentences.Add(str, env.sysDir);
+
+ sentences.Add(@";^ System Sounds ^;", "");
+
+ foreach (string str in other_strings)
+ sentences.Add(str, env.baseDir);
+ }
+
+ private void saveLanguage()
+ {
+ System.IO.Directory.CreateDirectory(env.sysDir);
+ StreamWriter sw = File.CreateText(env.systemSounds);
+ int i;
+ for (i = 0; sentences[i].fileName != ""; i++)
+ {
+ sw.WriteLine(sentences[i].toRaw());
+ }
+ sw.Close();
+ sw = File.CreateText(env.otherSounds);
+ for (i++; i < sentences.Count; i++)
+ {
+ sw.WriteLine(sentences[i].toRaw());
+ }
+ sw.Close();
+ }
+
+ private void switchLanguage(object sender, SelectionChangedEventArgs e)
+ {
+ env = new Environment(((Language)e.AddedItems[0])); // AddedItems is a strange name. It contains the last selection
+ loadLanguage();
+ }
+
+ private void about(object sender, MouseButtonEventArgs e)
+ {
+ AboutWindow aboutWindow = new AboutWindow();
+ aboutWindow.ShowDialog();
+ }
+
+ private void addSentence(object sender, RoutedEventArgs e)
+ {
+ int i = 0;
+ string newFile;
+ do
+ {
+ newFile = "new_file_" + i.ToString();
+ i++;
+ }
+ while (env.fileExists(newFile));
+ sentences.Add(new Sentence(newFile + ";New Description;New Voice Message", env.baseDir));
+
+ // Extremely ugly - direct access to the listview to scroll down and select the new object
+ this.lvSentences.SelectedIndex = this.lvSentences.Items.Count - 1;
+ this.lvSentences.ScrollIntoView(this.lvSentences.SelectedItem);
+ }
+
+ private void play(object sender, EventArgs e)
+ {
+ if (this.lvSentences.SelectedItems.Count < 1)
+ return;
+
+ if (isRecording)
+ stop(null, null);
+
+ Sentence sentence = (Sentence)this.lvSentences.SelectedItem;
+ if (sentence.fileExists)
+ {
+ try
+ {
+ SoundPlayer player = new SoundPlayer(sentence.fullPath);
+ player.Play();
+ }
+ catch (Exception) { }; // Catch and disregard all media exceptions
+ }
+ }
+
+ private void record(object sender, RoutedEventArgs e)
+ {
+ if (this.lvSentences.SelectedItems.Count < 1) return;
+
+ if (isRecording)
+ stop(sender, e);
+ else
+ {
+ saveLanguage();
+ isRecording = true;
+ lblRecording.Visibility = System.Windows.Visibility.Visible;
+ Sentence sentence = (Sentence)this.lvSentences.SelectedItem;
+ string path = sentence.fullPath;
+ Directory.CreateDirectory(Path.GetDirectoryName(path)); // Create directory if it doesn't exist
+ System.IO.File.WriteAllText(path, ""); // Create and flush the file
+
+ filewriter = new WavFileWriter(path, recSamplerate, recBits, recChannels);
+ WaveFormat fmt = new WaveFormat(recSamplerate, recBits, recChannels);
+ recorder = new WaveInRecorder(-1, fmt, recBuffersize, this.DataArrived);
+ }
+ }
+
+ private void stop(object sender, RoutedEventArgs e)
+ {
+ if (!isRecording || this.lvSentences.SelectedItems.Count < 1)
+ return;
+
+ isRecording = false;
+ recorder.Close();
+ filewriter.Close();
+
+
+ int index = this.lvSentences.SelectedIndex;
+ lblRecording.Visibility = System.Windows.Visibility.Hidden;
+ Sentence sentence = (Sentence)this.lvSentences.SelectedItem;
+ loadLanguage(); // Called to refresh the sentence data of the current langugae
+ this.lvSentences.SelectedIndex = index;
+
+ wavProcessor processor = new wavProcessor();
+ int noiceLevel = (int)this.noiceLevelSlider.Value;
+ processor.StripSilence(sentence.fullPath, noiceLevel);
+ processor.ToneIn(sentence.fullPath);
+ processor.ToneOut(sentence.fullPath);
+ processor.SpeedUp(sentence.fullPath, (int)this.speedSlider.Value);
+ }
+
+ private void DataArrived(IntPtr data, int size)
+ {
+ Marshal.Copy(data, recordingBuffer, 0, size);
+ filewriter.Write(recordingBuffer, size);
+ }
+ }
+
+ public class Environment
+ {
+ public Language lang { get; set; }
+ public string baseDir { get { return @"SOUNDS\" + lang.sName + @"\"; } }
+ public string sysDir { get { return @"SOUNDS\" + lang.sName + @"\SYSTEM\"; } }
+ public string otherSounds { get { return baseDir + "other_sounds.txt"; } }
+ public string systemSounds { get { return sysDir + "system_sounds.txt"; } }
+
+ public bool fileExists(string fName)
+ {
+ if (File.Exists(System.AppDomain.CurrentDomain.BaseDirectory + baseDir + fName + ".wav"))
+ return true;
+ if (File.Exists(System.AppDomain.CurrentDomain.BaseDirectory + sysDir + fName + ".wav"))
+ return true;
+ return false;
+ }
+
+ public Environment(Language language)
+ {
+ lang = language;
+ }
+ }
+
+ // Data container classes
+
+ public class Languages : ObservableCollection
+ {
+ public void Add(string longer, string shorter)
+ {
+ this.Add(new Language { lName = longer, sName = shorter });
+ }
+ }
+
+ public class Language
+ {
+ public string lName { get; set; }
+ public string sName { get; set; }
+ }
+
+ public class Sentences : ObservableCollection
+ {
+ public void Add(string rawString, string dirPath)
+ {
+ this.Add(new Sentence(rawString, dirPath));
+ }
+ }
+
+ public class Sentence
+ {
+ public bool fileExists { get; set; }
+ public string fileName { get; set; }
+ public string description { get; set; }
+ public string voiceString { get; set; }
+ public string path { get; set; }
+
+ public Sentence(string rawString, string dirPath)
+ {
+ string[] words = rawString.Split(';');
+ fileName = words[0].TrimStart(' ', '\"');
+ description = words[1];
+ voiceString = words[2].TrimEnd('\"', ',', ' ');
+ path = dirPath;
+ fileExists = File.Exists(fullPath);
+ }
+
+ public string fullPath
+ {
+ get { return System.AppDomain.CurrentDomain.BaseDirectory + path + fileName + ".wav"; }
+ }
+
+ public string toRaw()
+ {
+ return "\"" + fileName + ";" + description + ";" + voiceString + "\",";
+ }
+ }
+
+}
diff --git a/sound/recorder/OpenTXRecorder.csproj b/sound/recorder/OpenTXRecorder.csproj
new file mode 100644
index 000000000..2070e1262
--- /dev/null
+++ b/sound/recorder/OpenTXRecorder.csproj
@@ -0,0 +1,172 @@
+
+
+
+ Debug
+ x86
+ 8.0.30703
+ 2.0
+ {8143D08D-1861-42DD-A861-56B15DE42A69}
+ WinExe
+ Properties
+ OpenTXrecorder
+ OpenTXrecorder
+ v4.0
+ Client
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ false
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ true
+
+
+ x86
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ x86
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ icon.ico
+
+
+
+
+
+
+
+
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ AboutWindow.xaml
+
+
+ App.xaml
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MainWindow.xaml
+ Code
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4 Client Profile %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sound/recorder/Program.cs b/sound/recorder/Program.cs
new file mode 100644
index 000000000..bed040a62
--- /dev/null
+++ b/sound/recorder/Program.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+using System.Net;
+using System.Runtime.InteropServices;
+
+using WaveLib;
+
+namespace AudioRecorder
+{
+ class Program
+ {
+ WavFileWriter filewriter;
+ byte[] tmparray;
+
+ void Go()
+ {
+ int samplerate = 16000;
+ int bits = 16; // 8 or 16
+ int channels = 1; // 1 or 2
+
+ filewriter = new WavFileWriter("out.wav", samplerate, bits, channels);
+
+ WaveFormat fmt = new WaveFormat(samplerate, bits, channels);
+
+ // devicenumber, wavformat, buffersize, callback
+ int buffersize = 16384;
+ WaveInRecorder rec = new WaveInRecorder(-1, fmt, buffersize, this.DataArrived);
+ tmparray = new byte[buffersize];
+
+ Console.WriteLine("Recording - press Enter to end");
+ Console.ReadLine();
+ rec.Close();
+
+ filewriter.Close();
+
+ Console.WriteLine("Bye");
+ }
+
+ private void DataArrived(IntPtr data, int size)
+ {
+ Console.WriteLine("DataArrived {0} bytes", size);
+ Marshal.Copy(data, tmparray, 0, size);
+ filewriter.Write(tmparray);
+ }
+
+ static void Main(string[] args)
+ {
+ new Program().Go();
+ }
+ }
+
+
+ class WavFileWriter
+ {
+ BinaryWriter filewriter;
+ long audiobyteswritten;
+
+ public WavFileWriter(string filename, int samplerate, int bits, int channels)
+ {
+ filewriter = new BinaryWriter(File.Open(filename, FileMode.Create));
+
+ filewriter.Write((uint)0x46464952); // "RIFF"
+ filewriter.Write((uint)0); // chunkisize (filled in when we close)
+ filewriter.Write((uint)0x45564157); // "WAVE"
+
+ // subchunk1
+ filewriter.Write((uint)0x20746d66); // "fmt "
+ filewriter.Write((uint)16);
+ filewriter.Write((UInt16)1);
+ filewriter.Write((UInt16)channels);
+ filewriter.Write((uint)samplerate);
+ filewriter.Write((uint)(channels*samplerate*bits/8));
+ filewriter.Write((UInt16)(channels*bits/8));
+ filewriter.Write((UInt16)bits);
+
+ // subchunk2
+ filewriter.Write((uint)0x61746164); // "data"
+ filewriter.Write((uint)0); // chunkisize (filled in when we close)
+ }
+
+ public void Write(byte[] data)
+ {
+ filewriter.Write(data);
+ audiobyteswritten += data.Length;
+ }
+
+ public void Close()
+ {
+ filewriter.Seek(4, SeekOrigin.Begin);
+ filewriter.Write((uint)(audiobyteswritten + 36)); // 36 = total size of chunk headers
+
+ filewriter.Seek(40, SeekOrigin.Begin);
+ filewriter.Write((uint)audiobyteswritten);
+
+ filewriter.Close();
+ }
+ }
+}
diff --git a/sound/recorder/Properties/AssemblyInfo.cs b/sound/recorder/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..4300c6a81
--- /dev/null
+++ b/sound/recorder/Properties/AssemblyInfo.cs
@@ -0,0 +1,71 @@
+/* This file is part of OpenTX Recorder.
+* OpenTX Recorder is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+
+* OpenTX Recorder 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.
+
+* You should have received a copy of the GNU General Public License
+* along with OpenTX Recorder. If not, see .
+*
+* Copyright 2014 Kjell Kernen */
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenTX Recorder")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("OpenTX Team")]
+[assembly: AssemblyProduct("OpenTX Recorder")]
+[assembly: AssemblyCopyright("Copyright © Kjell Kernen 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//CultureYouAreCodingWith in your .csproj file
+//inside a . For example, if you are using US english
+//in your source files, set the to en-US. Then uncomment
+//the NeutralResourceLanguage attribute below. Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]
diff --git a/sound/recorder/Properties/Resources.Designer.cs b/sound/recorder/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..04f945574
--- /dev/null
+++ b/sound/recorder/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace OpenTXrecorder.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenTXrecorder.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/sound/recorder/Properties/Resources.resx b/sound/recorder/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/sound/recorder/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/sound/recorder/Properties/Settings.Designer.cs b/sound/recorder/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..ffa4c812a
--- /dev/null
+++ b/sound/recorder/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace OpenTXrecorder.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/sound/recorder/Properties/Settings.settings b/sound/recorder/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/sound/recorder/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sound/recorder/WaveIn.cs b/sound/recorder/WaveIn.cs
new file mode 100644
index 000000000..449cae4ad
--- /dev/null
+++ b/sound/recorder/WaveIn.cs
@@ -0,0 +1,214 @@
+/* This file is part of OpenTX Recorder.
+ * OpenTX Recorder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This code 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Recorder. If not, see .
+ *
+ * Copyright 2014 Tomas Andersson */
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Runtime.InteropServices;
+
+namespace WaveLib
+{
+ public delegate void BufferDoneEventHandler(IntPtr data, int size);
+
+ internal class WaveInBuffer
+ {
+ private ManualResetEvent m_RecordEvent = new ManualResetEvent(false);
+ private IntPtr m_WaveIn;
+
+ private WaveNative.WaveHdr m_Header;
+ private byte[] m_HeaderData;
+ private GCHandle m_HeaderHandle;
+ private GCHandle m_HeaderDataHandle;
+
+ internal static void WaveInProc(IntPtr hdrvr, int uMsg, int dwUser, ref WaveNative.WaveHdr wavhdr, int dwParam2)
+ {
+ if (uMsg == WaveNative.MM_WIM_DATA)
+ {
+ GCHandle h = (GCHandle)wavhdr.dwUser;
+ WaveInBuffer buf = (WaveInBuffer)h.Target;
+ buf.OnCompleted();
+ }
+ }
+
+ public WaveInBuffer(IntPtr waveInHandle, int size)
+ {
+ m_WaveIn = waveInHandle;
+
+ m_HeaderHandle = GCHandle.Alloc(m_Header, GCHandleType.Pinned);
+ m_Header.dwUser = (IntPtr)GCHandle.Alloc(this);
+ m_HeaderData = new byte[size];
+ m_HeaderDataHandle = GCHandle.Alloc(m_HeaderData, GCHandleType.Pinned);
+ m_Header.lpData = m_HeaderDataHandle.AddrOfPinnedObject();
+ m_Header.dwBufferLength = size;
+ WaveInRecorder.ThrowOnError(WaveNative.waveInPrepareHeader(m_WaveIn, ref m_Header, Marshal.SizeOf(m_Header)));
+ }
+
+ public void Close()
+ {
+ WaveInRecorder.ThrowOnError(WaveNative.waveInUnprepareHeader(m_WaveIn, ref m_Header, Marshal.SizeOf(m_Header)));
+ m_HeaderHandle.Free();
+ m_Header.lpData = IntPtr.Zero;
+ m_HeaderDataHandle.Free();
+ }
+
+ public int Size
+ {
+ get { return m_Header.dwBufferLength; }
+ }
+
+ public IntPtr Data
+ {
+ get { return m_Header.lpData; }
+ }
+
+ public void Record()
+ {
+ m_RecordEvent.Reset();
+ WaveInRecorder.ThrowOnError(WaveNative.waveInAddBuffer(m_WaveIn, ref m_Header, Marshal.SizeOf(m_Header)));
+ }
+
+ public void WaitFor()
+ {
+ m_RecordEvent.WaitOne();
+ }
+
+ private void OnCompleted()
+ {
+ m_RecordEvent.Set();
+ }
+ }
+
+ public class WavFileWriter
+ {
+ BinaryWriter filewriter;
+ long audiobyteswritten;
+
+ public WavFileWriter(string filename, int samplerate, int bits, int channels)
+ {
+ filewriter = new BinaryWriter(File.Open(filename, FileMode.Create));
+
+ filewriter.Write((uint)0x46464952); // "RIFF"
+ filewriter.Write((uint)0); // chunkisize (filled in when we close)
+ filewriter.Write((uint)0x45564157); // "WAVE"
+
+ // subchunk1
+ filewriter.Write((uint)0x20746d66); // "fmt "
+ filewriter.Write((uint)16);
+ filewriter.Write((UInt16)1);
+ filewriter.Write((UInt16)channels);
+ filewriter.Write((uint)samplerate);
+ filewriter.Write((uint)(channels * samplerate * bits / 8));
+ filewriter.Write((UInt16)(channels * bits / 8));
+ filewriter.Write((UInt16)bits);
+
+ // subchunk2
+ filewriter.Write((uint)0x61746164); // "data"
+ filewriter.Write((uint)0); // chunkisize (filled in when we close)
+ }
+
+ public void Write(byte[] data, int size)
+ {
+ filewriter.Write(data, 0, size);
+ audiobyteswritten += size;
+ }
+
+ public void Close()
+ {
+ filewriter.Seek(4, SeekOrigin.Begin);
+ filewriter.Write((uint)(audiobyteswritten + 36)); // 36 = total size of chunk headers
+
+ filewriter.Seek(40, SeekOrigin.Begin);
+ filewriter.Write((uint)audiobyteswritten);
+
+ filewriter.Close();
+ }
+ }
+
+ public class WaveInRecorder
+ {
+ private IntPtr m_WaveIn;
+ private WaveInBuffer buffer1, buffer2;
+ private WaveInBuffer m_CurrentBuffer;
+ private Thread m_Thread;
+ private BufferDoneEventHandler m_DoneProc;
+ private bool m_Finished;
+
+ private WaveNative.WaveDelegate m_BufferProc = new WaveNative.WaveDelegate(WaveInBuffer.WaveInProc);
+
+ public static int DeviceCount
+ {
+ get { return WaveNative.waveInGetNumDevs(); }
+ }
+
+ public WaveInRecorder(int device, WaveFormat format, int bufferSize, BufferDoneEventHandler doneProc)
+ {
+ m_DoneProc = doneProc;
+ WaveInRecorder.ThrowOnError(WaveNative.waveInOpen(out m_WaveIn, device, format, m_BufferProc, 0, WaveNative.CALLBACK_FUNCTION));
+
+ buffer1 = new WaveInBuffer(m_WaveIn, bufferSize);
+ buffer2 = new WaveInBuffer(m_WaveIn, bufferSize);
+
+ buffer1.Record();
+ buffer2.Record();
+
+ m_CurrentBuffer = buffer1;
+
+ WaveInRecorder.ThrowOnError(WaveNative.waveInStart(m_WaveIn));
+ m_Thread = new Thread(new ThreadStart(ThreadProc));
+ m_Thread.Start();
+ }
+
+ public void Close()
+ {
+ m_Finished = true;
+ WaveInRecorder.ThrowOnError(WaveNative.waveInReset(m_WaveIn));
+
+ m_Thread.Join();
+ m_Thread = null;
+ m_DoneProc = null;
+
+ buffer1.WaitFor();
+ buffer2.WaitFor();
+
+ buffer1.Close();
+ buffer2.Close();
+
+ WaveInRecorder.ThrowOnError(WaveNative.waveInClose(m_WaveIn));
+ m_WaveIn = IntPtr.Zero;
+ }
+
+ private void ThreadProc()
+ {
+ while (!m_Finished)
+ {
+ m_CurrentBuffer = (m_CurrentBuffer == buffer1) ? buffer2 : buffer1;
+
+ m_CurrentBuffer.WaitFor();
+ m_DoneProc(m_CurrentBuffer.Data, m_CurrentBuffer.Size);
+
+ if (m_Finished) break;
+
+ m_CurrentBuffer.Record();
+ }
+ }
+
+ public static void ThrowOnError(int err)
+ {
+ if (err != WaveNative.MMSYSERR_NOERROR) throw new Exception(err.ToString());
+ }
+
+ }
+}
diff --git a/sound/recorder/WaveNative.cs b/sound/recorder/WaveNative.cs
new file mode 100644
index 000000000..1b35a4d15
--- /dev/null
+++ b/sound/recorder/WaveNative.cs
@@ -0,0 +1,129 @@
+// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
+// KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
+// PURPOSE.
+//
+// Email: ianier@hotmail.com
+//
+// Copyright (C) 1999-2003 Ianier Munoz. All Rights Reserved.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace WaveLib
+{
+ public enum WaveFormats
+ {
+ Pcm = 1,
+ Float = 3
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ public class WaveFormat
+ {
+ public short wFormatTag;
+ public short nChannels;
+ public int nSamplesPerSec;
+ public int nAvgBytesPerSec;
+ public short nBlockAlign;
+ public short wBitsPerSample;
+ public short cbSize;
+
+ public WaveFormat(int rate, int bits, int channels)
+ {
+ wFormatTag = (short)WaveFormats.Pcm;
+ nChannels = (short)channels;
+ nSamplesPerSec = rate;
+ wBitsPerSample = (short)bits;
+ cbSize = 0;
+
+ nBlockAlign = (short)(channels * (bits / 8));
+ nAvgBytesPerSec = nSamplesPerSec * nBlockAlign;
+ }
+ }
+
+ internal class WaveNative
+ {
+ // consts
+ public const int MMSYSERR_NOERROR = 0; // no error
+
+ public const int MM_WOM_OPEN = 0x3BB;
+ public const int MM_WOM_CLOSE = 0x3BC;
+ public const int MM_WOM_DONE = 0x3BD;
+
+ public const int MM_WIM_OPEN = 0x3BE;
+ public const int MM_WIM_CLOSE = 0x3BF;
+ public const int MM_WIM_DATA = 0x3C0;
+
+ public const int CALLBACK_FUNCTION = 0x00030000; // dwCallback is a FARPROC
+
+ public const int TIME_MS = 0x0001; // time in milliseconds
+ public const int TIME_SAMPLES = 0x0002; // number of wave samples
+ public const int TIME_BYTES = 0x0004; // current byte offset
+
+ // callbacks
+ public delegate void WaveDelegate(IntPtr hdrvr, int uMsg, int dwUser, ref WaveHdr wavhdr, int dwParam2);
+
+ // structs
+
+ [StructLayout(LayoutKind.Sequential)] public struct WaveHdr
+ {
+ public IntPtr lpData; // pointer to locked data buffer
+ public int dwBufferLength; // length of data buffer
+ public int dwBytesRecorded; // used for input only
+ public IntPtr dwUser; // for client's use
+ public int dwFlags; // assorted flags (see defines)
+ public int dwLoops; // loop control counter
+ public IntPtr lpNext; // PWaveHdr, reserved for driver
+ public int reserved; // reserved for driver
+ }
+
+ private const string mmdll = "winmm.dll";
+
+ // WaveOut calls
+ [DllImport(mmdll)]
+ public static extern int waveOutGetNumDevs();
+ [DllImport(mmdll)]
+ public static extern int waveOutPrepareHeader(IntPtr hWaveOut, ref WaveHdr lpWaveOutHdr, int uSize);
+ [DllImport(mmdll)]
+ public static extern int waveOutUnprepareHeader(IntPtr hWaveOut, ref WaveHdr lpWaveOutHdr, int uSize);
+ [DllImport(mmdll)]
+ public static extern int waveOutWrite(IntPtr hWaveOut, ref WaveHdr lpWaveOutHdr, int uSize);
+ [DllImport(mmdll)]
+ public static extern int waveOutOpen(out IntPtr hWaveOut, int uDeviceID, WaveFormat lpFormat, WaveDelegate dwCallback, int dwInstance, int dwFlags);
+ [DllImport(mmdll)]
+ public static extern int waveOutReset(IntPtr hWaveOut);
+ [DllImport(mmdll)]
+ public static extern int waveOutClose(IntPtr hWaveOut);
+ [DllImport(mmdll)]
+ public static extern int waveOutPause(IntPtr hWaveOut);
+ [DllImport(mmdll)]
+ public static extern int waveOutRestart(IntPtr hWaveOut);
+ [DllImport(mmdll)]
+ public static extern int waveOutGetPosition(IntPtr hWaveOut, out int lpInfo, int uSize);
+ [DllImport(mmdll)]
+ public static extern int waveOutSetVolume(IntPtr hWaveOut, int dwVolume);
+ [DllImport(mmdll)]
+ public static extern int waveOutGetVolume(IntPtr hWaveOut, out int dwVolume);
+
+ // WaveIn calls
+ [DllImport(mmdll)]
+ public static extern int waveInGetNumDevs();
+ [DllImport(mmdll)]
+ public static extern int waveInAddBuffer(IntPtr hwi, ref WaveHdr pwh, int cbwh);
+ [DllImport(mmdll)]
+ public static extern int waveInClose(IntPtr hwi);
+ [DllImport(mmdll)]
+ public static extern int waveInOpen(out IntPtr phwi, int uDeviceID, WaveFormat lpFormat, WaveDelegate dwCallback, int dwInstance, int dwFlags);
+ [DllImport(mmdll)]
+ public static extern int waveInPrepareHeader(IntPtr hWaveIn, ref WaveHdr lpWaveInHdr, int uSize);
+ [DllImport(mmdll)]
+ public static extern int waveInUnprepareHeader(IntPtr hWaveIn, ref WaveHdr lpWaveInHdr, int uSize);
+ [DllImport(mmdll)]
+ public static extern int waveInReset(IntPtr hwi);
+ [DllImport(mmdll)]
+ public static extern int waveInStart(IntPtr hwi);
+ [DllImport(mmdll)]
+ public static extern int waveInStop(IntPtr hwi);
+ }
+}
diff --git a/sound/recorder/aboutWindow.xaml b/sound/recorder/aboutWindow.xaml
new file mode 100644
index 000000000..95e440614
--- /dev/null
+++ b/sound/recorder/aboutWindow.xaml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sound/recorder/aboutWindow.xaml.cs b/sound/recorder/aboutWindow.xaml.cs
new file mode 100644
index 000000000..0dc7a04ca
--- /dev/null
+++ b/sound/recorder/aboutWindow.xaml.cs
@@ -0,0 +1,62 @@
+/* This file is part of OpenTX Recorder.
+ * OpenTX Recorder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Recorder 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Recorder. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Navigation;
+
+
+namespace OpenTXrecorder
+{
+ public partial class AboutWindow : Window
+ {
+ public AboutWindow()
+ {
+ InitializeComponent();
+ Assembly app = Assembly.GetExecutingAssembly();
+
+ AssemblyTitleAttribute title = (AssemblyTitleAttribute)app.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0];
+ AssemblyProductAttribute product = (AssemblyProductAttribute)app.GetCustomAttributes(typeof(AssemblyProductAttribute), false)[0];
+ AssemblyCopyrightAttribute copyright = (AssemblyCopyrightAttribute)app.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false)[0];
+ AssemblyCompanyAttribute company = (AssemblyCompanyAttribute)app.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0];
+ Version version = app.GetName().Version;
+
+ this.Title = String.Format("About {0}", title.Title);
+ this.lblProductName.Content = product.Product;
+ this.lblVersion.Content = String.Format("Version {0}", version.ToString());
+ this.lblCopyright.Content = copyright.Copyright.ToString();
+ this.lblCompanyName.Content = company.Company;
+ }
+
+ private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
+ {
+ Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
+ e.Handled = true;
+ }
+ }
+}
diff --git a/sound/recorder/clsWaveProcessor.cs b/sound/recorder/clsWaveProcessor.cs
new file mode 100644
index 000000000..858cc4c82
--- /dev/null
+++ b/sound/recorder/clsWaveProcessor.cs
@@ -0,0 +1,286 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Runtime.InteropServices;
+using WaveLib;
+
+
+public class wavProcessor
+{
+ public int Length;
+ public short Channels;
+ public int SampleRate;
+ public int DataLength;
+ public short BitsPerSample;
+
+ ///
+ /// Filter out silence or noise from start and end of wave file.
+ ///
+ /// Source wave file
+ /// Absolute value for noice threshold
+ /// True/False
+ public bool StripSilence(string strPath, int noiceLevel)
+ {
+ if ((strPath == null) || (strPath == ""))
+ return false;
+
+ // Read from file
+ wavProcessor wain = new wavProcessor();
+ if (!wain.WaveHeaderIN(@strPath)) return false;
+ byte[] arrfile = GetWAVEData(strPath);
+
+ int startpos = 0;
+ int endpos = arrfile.Length - 1;
+
+ // Check for silence at start
+ for (int j = 0; isSilence(arrfile, j, noiceLevel); j += 20)
+ startpos = j;
+
+ // Allow room for tone-in buffer
+ int buffer = wain.SampleRate * (wain.BitsPerSample / 8) / 32; // 1/32 seconds lead time
+ startpos = startpos - buffer;
+ if (startpos < 0)
+ startpos = 0;
+
+ // Check for silence at end. No need to check tone out buffer
+ for (int k = arrfile.Length - buffer; (k >= 0) && (isSilence(arrfile, k, noiceLevel)); k -= 20)
+ endpos = k;
+
+ // Allow room for tone-out buffer
+ endpos = endpos + buffer;
+ if (endpos > arrfile.Length)
+ endpos = arrfile.Length - 2;
+
+ if (startpos >= endpos)
+ return false;
+
+ byte[] newarr = new byte[endpos - startpos];
+ for (int ni = 0, m = startpos; ni < newarr.Length; m++, ni++)
+ newarr[ni] = arrfile[m];
+
+ // write file back
+ WavFileWriter writer = new WavFileWriter(@strPath, wain.SampleRate, wain.BitsPerSample, wain.Channels);
+ writer.Write(newarr, newarr.Length);
+ writer.Close();
+
+ return true;
+ }
+
+ // Helper function that checks if the next 10 samples is silence
+ private bool isSilence(byte[] buff, int index, int noiceLevel)
+ {
+ if (buff.Length <= (index + 20))
+ return false;
+
+ int totalSnd = 0;
+ for (int i = 0; i < 20; i += 2)
+ {
+ short snd = ComplementToSigned(ref buff, i + index);
+ if (snd < 0)
+ snd = (short)(snd * -1);
+ totalSnd += snd;
+ }
+ return (totalSnd < (10 * noiceLevel));
+ }
+
+ ///
+ /// Tone in wav file
+ ///
+ /// Source wave
+ /// True/False
+ public bool ToneIn(string strPath)
+ {
+ if ((strPath == null) || (strPath == ""))
+ return false;
+
+ // Read from file
+ wavProcessor wain = new wavProcessor();
+ if (!wain.WaveHeaderIN(@strPath)) return false;
+ byte[] arrfile = GetWAVEData(strPath);
+
+ // Calculate constants
+ int start = 0;
+ int end = wain.SampleRate * (wain.BitsPerSample / 8) / 16; // 1/16 seconds
+ int span = end - start;
+
+ //change volume
+ for (int j = start; j < end; j += 2)
+ {
+ short snd = ComplementToSigned(ref arrfile, j);
+ snd = Convert.ToInt16(snd * (j / span));
+ byte[] newval = SignedToComplement(snd);
+ arrfile[j] = newval[0];
+ arrfile[j + 1] = newval[1];
+ }
+ // write file back
+ WavFileWriter writer = new WavFileWriter(@strPath, wain.SampleRate, wain.BitsPerSample, wain.Channels);
+ writer.Write(arrfile, arrfile.Length);
+ writer.Close();
+
+ return true;
+ }
+ ///
+ /// Tone out wav file
+ ///
+ /// Source wave
+ /// True/False
+ public bool ToneOut(string strPath)
+ {
+ if ((strPath == null) || (strPath == ""))
+ return false;
+
+ // Read from file
+ wavProcessor wain = new wavProcessor();
+ if (!wain.WaveHeaderIN(@strPath)) return false;
+ byte[] arrfile = GetWAVEData(strPath);
+
+ // Calculate constants
+ int end = wain.Length;
+ int start = end - (wain.SampleRate * (wain.BitsPerSample / 8) / 16); // 1/16 seconds from end
+ int span = end - start;
+
+ //change volume
+ for (int j = start; j < arrfile.Length; j += 2)
+ {
+ short snd = ComplementToSigned(ref arrfile, j);
+ snd = Convert.ToInt16(snd * (end - j) / span);
+
+ byte[] newval = SignedToComplement(snd);
+ arrfile[j] = newval[0];
+ arrfile[j + 1] = newval[1];
+ }
+ // write file back
+ WavFileWriter writer = new WavFileWriter(@strPath, wain.SampleRate, wain.BitsPerSample, wain.Channels);
+ writer.Write(arrfile, arrfile.Length);
+ writer.Close();
+
+ return true;
+ }
+ ///
+ /// Speed up wav file to mimic Donald Duck
+ ///
+ /// Source wave
+ /// Speed between 0 and 19
+ /// True/False
+ public bool SpeedUp(string strPath, int speed)
+ {
+ if ((strPath == null) || (strPath == ""))
+ return false;
+
+ if ((speed < 0) || (speed > 19))
+ return false;
+
+ // Read from file
+ wavProcessor wain = new wavProcessor();
+ if (!wain.WaveHeaderIN(@strPath)) return false;
+ byte[] arrfile = GetWAVEData(strPath);
+ byte[] newfile = new byte[arrfile.Length];
+
+ int skip = 21-speed;
+ int j = 0;
+ for (int i = 0; i < arrfile.Length; i += 2)
+ {
+ if (skip > 20 || (((i/2) % skip) != 0))
+ {
+ newfile[j] = arrfile[i];
+ newfile[j + 1] = arrfile[i + 1];
+ j += 2;
+ }
+ }
+ // write file back
+ WavFileWriter writer = new WavFileWriter(@strPath, wain.SampleRate, wain.BitsPerSample, wain.Channels);
+ writer.Write(newfile, j);
+ writer.Close();
+ return true;
+ }
+
+ ///
+ /// Read the wave file header and store the key values in public variable.
+ ///
+ /// The physical path of wave file incl. file name for reading
+ /// True/False
+ private bool WaveHeaderIN(string strPath)
+ {
+ if (strPath == null) strPath = "";
+ if (strPath == "") return false;
+
+ FileStream fs = new FileStream(strPath, FileMode.Open, FileAccess.Read);
+
+ BinaryReader br = new BinaryReader(fs);
+ try
+ {
+ Length = (int)fs.Length - 8;
+ fs.Position = 22;
+ Channels = br.ReadInt16(); //1
+ fs.Position = 24;
+ SampleRate = br.ReadInt32(); //16000
+ fs.Position = 34;
+ BitsPerSample = br.ReadInt16(); //16
+ DataLength = (int)fs.Length - 44;
+ byte[] arrfile = new byte[fs.Length - 44];
+ fs.Position = 44;
+ fs.Read(arrfile, 0, arrfile.Length);
+ }
+ catch
+ {
+ return false;
+ }
+ finally
+ {
+ br.Close();
+ fs.Close();
+ }
+ return true;
+ }
+
+ ///
+ /// In stereo wave format, samples are stored in 2's complement. For Mono, it's necessary to
+ /// convert those samples to their equivalent signed value. This method is used
+ /// by other public methods to equilibrate wave formats of different files.
+ ///
+ /// Sample data in array
+ /// Array offset
+ /// Mono value as signed short
+ private short ComplementToSigned(ref byte[] bytArr, int intPos) // 2's complement to normal signed value
+ {
+ short snd = BitConverter.ToInt16(bytArr, intPos);
+ if (intPos >= bytArr.Length) return 0;
+ if (snd != 0)
+ snd = Convert.ToInt16((~snd | 1));
+ return snd;
+ }
+ ///
+ /// Convert signed sample value back to 2's complement value equivalent to Stereo. This method is used
+ /// by other public methods to equilibrate wave formats of different files.
+ ///
+ /// The mono signed value as short
+ /// Stereo 2's complement value as byte array
+ private byte[] SignedToComplement(short shtVal) //Convert to 2's complement and return as byte array of 2 bytes
+ {
+ byte[] bt = new byte[2];
+ shtVal = Convert.ToInt16((~shtVal | 1));
+ bt = BitConverter.GetBytes(shtVal);
+ return bt;
+ }
+ ///
+ /// Read the WAVE file then position to DADA segment and return the chunk as byte array
+ ///
+ /// Path of WAVE file
+ /// byte array
+ private byte[] GetWAVEData(string strWAVEPath)
+ {
+ try
+ {
+ FileStream fs = new FileStream(@strWAVEPath, FileMode.Open, FileAccess.Read);
+ byte[] arrfile = new byte[fs.Length - 44];
+ fs.Position = 44;
+ fs.Read(arrfile, 0, arrfile.Length);
+ fs.Close();
+ return arrfile;
+ }
+ catch (IOException ioex)
+ {
+ throw ioex;
+ }
+ }
+} // End of clsWaveProcessor class
diff --git a/sound/recorder/icon.ico b/sound/recorder/icon.ico
new file mode 100644
index 000000000..e81c703b7
Binary files /dev/null and b/sound/recorder/icon.ico differ
diff --git a/sound/recorder/play.png b/sound/recorder/play.png
new file mode 100644
index 000000000..15f2da559
Binary files /dev/null and b/sound/recorder/play.png differ
diff --git a/sound/recorder/record.png b/sound/recorder/record.png
new file mode 100644
index 000000000..7ee74f7fc
Binary files /dev/null and b/sound/recorder/record.png differ
diff --git a/sound/recorder/recorder_logo.png b/sound/recorder/recorder_logo.png
new file mode 100644
index 000000000..fddc22e3f
Binary files /dev/null and b/sound/recorder/recorder_logo.png differ
diff --git a/sound/recorder/recorder_logo.xcf b/sound/recorder/recorder_logo.xcf
new file mode 100644
index 000000000..190cceea5
Binary files /dev/null and b/sound/recorder/recorder_logo.xcf differ
diff --git a/sound/recorder/recorder_logo_small.png b/sound/recorder/recorder_logo_small.png
new file mode 100644
index 000000000..e69651d26
Binary files /dev/null and b/sound/recorder/recorder_logo_small.png differ
diff --git a/sound/recorder/sentencetables.cs b/sound/recorder/sentencetables.cs
new file mode 100644
index 000000000..a68b3f33c
--- /dev/null
+++ b/sound/recorder/sentencetables.cs
@@ -0,0 +1,2455 @@
+/* This file is part of OpenTX Recorder.
+ * OpenTX Recorder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Recorder 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Recorder. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace OpenTXrecorder
+{
+ public class SentenceTables
+ {
+ private static string[] default_pl_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;;1000",
+ "0110;TISIACE;tisiace",
+ "0111;JEDNA;jedna",
+ "0112;JEDNO;jedno",
+ "0113;DWIE;dwie",
+ "0114;CALA;cela",
+ "0115;CALE;cale",
+ "0116;CALYCH;calych",
+ "0117;MINUS;minus",
+
+ "0120;Female number;",
+ "0121;Female number;",
+ "0122;Female number;",
+ "0123;Female number;",
+ "0124;Female number;",
+ "0125;Female number;",
+ "0126;Female number;",
+ "0127;Female number;",
+ "0128;Female number;",
+ "0129;Female number;",
+
+ "0160;volt 1;wolt",
+ "0161;volt 2;wolty",
+ "0162;volt 3;",
+ "0163;volt 4;",
+ "0164;amps 1;",
+ "0165;amps 2;",
+ "0166;amps 3;",
+ "0167;amps 4;",
+ "0168;mps 1;",
+ "0169;mps 2;",
+ "0170;mps 3;",
+ "0171;mps 4;",
+ "0172;spare 1;",
+ "0173;spare 2;",
+ "0174;spare 3;",
+ "0175;spare 4;",
+ "0176;kmh 1;",
+ "0177;kmh 2;",
+ "0178;kmh 3;",
+ "0179;kmh 4;",
+ "0180;meter 1;",
+ "0181;meter 2;",
+ "0182;meter 3;",
+ "0183;meter 4;",
+ "0184;degrees 1;",
+ "0185;degrees 2;",
+ "0186;degrees 3;",
+ "0187;degrees 4;",
+ "0188;percent 1;",
+ "0189;percent 2;",
+ "0190;percent 3;",
+ "0191;percent 4;",
+ "0192;milliamps 1;",
+ "0193;milliamps 2;",
+ "0194;milliamps 3;",
+ "0195;milliamps 4;",
+ "0196;mAh 1;",
+ "0197;mAh 2;",
+ "0198;mAh 3;",
+ "0199;mAh 4;",
+ "0200;watt 1;",
+ "0201;watt 2;",
+ "0202;watt 3;",
+ "0203;watt 4;",
+ "0204;db 1;",
+ "0205;db 2;",
+ "0206;db 3;",
+ "0207;db 4;",
+ "0208;feet 1;",
+ "0209;feet 2;",
+ "0210;feet 3;",
+ "0211;feet 4;",
+ "0212;knot 1;",
+ "0213;knot 2;",
+ "0214;knot 3;",
+ "0215;knot 4;",
+ "0216;hours 1;",
+ "0217;hours 2;",
+ "0218;hours 3;",
+ "0219;hours 4;",
+ "0220;minutes 1;",
+ "0221;minutes 2;",
+ "0222;minutes 3;",
+ "0223;minutes 4;",
+ "0224;secondds 1;",
+ "0225;secondds 2;",
+ "0226;secondds 3;",
+ "0227;secondds 4;",
+ "0228;rpm 1;",
+ "0229;rpm 2;",
+ "0230;rpm 3;",
+ "0231;rpm 4;",
+ "0232;g 1;",
+ "0233;g 2;",
+ "0234;g 3;",
+ "0235;g 4;",
+ "0250;Timer1;",
+ "0251;Timer2;",
+ "0252;RSSI Tx;",
+ "0253;RSSI Rx;",
+ "0254;A1;",
+ "0255;A2;",
+ "0256;Altitude;",
+ "0257;RPM;",
+ "0258;Fuel;",
+ "0259;T1;",
+ "0260;T2;",
+ "0261;Speed;",
+ "0262;Distance;",
+ "0263;GPS Altitude;",
+ "0264;LiPo Elements;",
+ "0265;LiPo Total;",
+ "0266;VFAS;",
+ "0267;Current;",
+ "0268;Consumption;",
+ "0269;Telemetry Power;",
+ "0270;Accel X;",
+ "0271;Accel Y;",
+ "0272;Accel Z;",
+ "0217;HDG;",
+ "0218;Vario;",
+ };
+
+ private static string[] default_pl_other_strings =
+ {
+ "atti;attitude;",
+ "batcrit;battery critical;",
+ "batlow;low battery;",
+ "camcenter;camera center;",
+ "camfix;camera fixed;",
+ "cammanual;camera manual;",
+ "flapsdn;flaps down;",
+ "flapsup;flaps up;",
+ "fltmode1;flight mode 1;",
+ "fltmode2;flight mode 2;",
+ "fltmode3;flight mode 3;",
+ "fltmode4;flight mode 4;",
+ "fltmode5;flight mode 5;",
+ "fltmode6;flight mode 6;",
+ "fltmode7;flight mode 7;",
+ "fltmode8;flight mode 8;",
+ "fltmode9;flight mode 9;",
+ "fsoff;failsafe off;",
+ "fson;failsafe on;",
+ "geardn;gear down;",
+ "gearup;gear upp;",
+ "gps;gps;",
+ "hirates;hi rates;",
+ "htoff;head tracker off;",
+ "hton;head tracker on;",
+ "ioc;ioc;",
+ "iocoff;ioc off;",
+ "lowrates;lowrates;",
+ "manual;manual;",
+ "normal;normal;",
+ "nrmmod;normal mode;",
+ "thrhold;throttle locked;",
+ "thrrel;throttle released;",
+ };
+
+ private static string[] default_sk_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;jedna",
+ "0002;2;dva",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;1000;1000",
+ "0110;2000;dvetisíc;",
+ "0111;JEDEN;jeden",
+ "0112;JEDNO;jedno",
+ "0113;DVE;dve",
+ "0114;CELA;celá",
+ "0115;CELE;celá",
+ "0116;CELYCH;celýnch",
+ "0117;MINUS;minus",
+ "0118;volt 1;volt",
+ "0119;volt 2;volty",
+ "0120;volt 3;voltov",
+ "0121;volt 4;volta",
+ "0122;amps 1;ampér",
+ "0123;amps 2;ampére",
+ "0124;amps 3;ampérov",
+ "0125;amps 4;ampéra",
+ "0126;mps 1;meter za sekundu",
+ "0127;mps 2;metre za sekundu",
+ "0128;mps 3;metrov za sekundu",
+ "0129;mps 4;metra za sekundu",
+ "0130;spare 1;jednotka",
+ "0131;spare 2;jednotky",
+ "0132;spare 3;jednotiek",
+ "0133;spare 4;jednotky",
+ "0134;kmh 1;kilometer za hodinu",
+ "0135;kmh 2;kilometre za hodinu",
+ "0136;kmh 3;kilometrov za hodinu",
+ "0137;kmh 4;kilometra za hodinu",
+ "0138;meter 1;meter",
+ "0139;meter 2;metre",
+ "0140;meter 3;metrov",
+ "0141;meter 4;metra",
+ "0142;degrees 1;stupeň",
+ "0143;degrees 2;stupně",
+ "0144;degrees 3;stupňov",
+ "0145;degrees 4;stupňa",
+ "0146;percent 1;percento",
+ "0147;percent 2;percentá",
+ "0148;percent 3;percent",
+ "0149;percent 4;percenta",
+ "0150;milliamps 1;miliampér",
+ "0151;milliamps 2;miliampére",
+ "0152;milliamps 3;miliampérov",
+ "0153;milliamps 4;miliampéra",
+ "0154;mAh 1;miliampérhodina",
+ "0155;mAh 2;miliampérhodiny",
+ "0156;mAh 3;miliampérhodín",
+ "0157;mAh 4;miliampérhodiny",
+ "0158;watt 1;vat",
+ "0159;watt 2;vaty",
+ "0160;watt 3;vatov",
+ "0161;watt 4;vatu",
+ "0162;db 1;decibel",
+ "0163;db 2;decibely",
+ "0164;db 3;decibelov",
+ "0165;db 4;decibela",
+ "0166;feet 1;stopa",
+ "0167;feet 2;stopy",
+ "0168;feet 3;stuop",
+ "0169;feet 4;stopy",
+ "0170;knot 1;uzol",
+ "0171;knot 2;uzly",
+ "0172;knot 3;uzlov",
+ "0173;knot 4;uzla",
+ "0174;hours 1;hodina",
+ "0175;hours 2;hodiny",
+ "0176;hours 3;hodín",
+ "0177;hours 4;hodiny",
+ "0178;minutes 1;minůta",
+ "0179;minutes 2;minůty",
+ "0180;minutes 3;minůt",
+ "0181;minutes 4;minůty",
+ "0182;secondds 1;sekunda",
+ "0183;secondds 2;sekundy",
+ "0184;secondds 3;sekund",
+ "0185;secondds 4;sekundy",
+ "0186;rpm 1;otáčka za minůtu",
+ "0187;rpm 2;otáčky za minůtu",
+ "0188;rpm 3;otáčok za minůtu",
+ "0189;rpm 4;otáčky za minůtu",
+ "0190;g 1;gé",
+ "0191;g 2;gé",
+ "0192;g 3;gé",
+ "0193;g 4;gé",
+ "a1_org;a1 low;",
+ "a1_red;a1 critical;",
+ "a2_org;a2 low;",
+ "a2_red;a2 critical;",
+ "endtrim;maximum trim reached;",
+ "inactiv;inactivity alarm;",
+ "lowbatt;radio battery low;",
+ "midtrim;trim center;",
+ "rssi_org;rf signal low;",
+ "rssi_red;rf signal critical;",
+ "swalert;switch warning;",
+ "swr_red;radio antenna defective;",
+ "tada;Start Sound;",
+ "telemko;telemetry lost;",
+ "telemok;telemetry recover;",
+ "thralert;throttle warning;",
+ "timer10;10 seconds;",
+ "timer20;20 seconds;",
+ "timer30;30 seconds;",
+ "timerlt3;timer sound;"
+ };
+
+ private static string[] default_sk_other_strings =
+ {
+ "atti;attitude;",
+ "batcrit;battery critical;",
+ "batlow;low battery;",
+ "camcenter;camera center;",
+ "camfix;camera fixed;",
+ "cammanual;camera manual;",
+ "flapsdn;flaps down;",
+ "flapsup;flaps up;",
+ "fltmode1;flight mode 1;",
+ "fltmode2;flight mode 2;",
+ "fltmode3;flight mode 3;",
+ "fltmode4;flight mode 4;",
+ "fltmode5;flight mode 5;",
+ "fltmode6;flight mode 6;",
+ "fltmode7;flight mode 7;",
+ "fltmode8;flight mode 8;",
+ "fltmode9;flight mode 9;",
+ "fsoff;failsafe off;",
+ "fson;failsafe on;",
+ "geardn;gear down;",
+ "gearup;gear upp;",
+ "gps;gps;",
+ "hirates;hi rates;",
+ "htoff;head tracker off;",
+ "hton;head tracker on;",
+ "ioc;ioc;",
+ "iocoff;ioc off;",
+ "lowrates;lowrates;",
+ "manual;manual;",
+ "normal;normal;",
+ "nrmmod;normal mode;",
+ "thrhold;throttle locked;",
+ "thrrel;throttle released;"
+ };
+
+ private static string[] default_es_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;;ciento",
+ "0102;;doscientos",
+ "0103;;trescientos",
+ "0104;;cuatrocientos",
+ "0105;;quinientos",
+ "0106;;sescientos",
+ "0107;;setecientos",
+ "0108;;ochocientos",
+ "0109;;nuevecientos",
+ "0110;;mil",
+ "0111;;coma",
+ "0112;;un",
+ "0113;;una",
+ "0114;;y",
+ "0115;;meno",
+ "0116;;hora",
+ "0117;;horas",
+ "0118;;minuto",
+ "0119;;minutos",
+ "0120;;segundo",
+ "0121;;segundos",
+ "0122;;Voltio",
+ "0123;;ampério",
+ "0124;;metros por segundo",
+ "0125;;",
+ "0126;;kilómetro por hora",
+ "0127;;metros",
+ "0128;;grados",
+ "0129;;por ciento",
+ "0130;;miliamperios",
+ "0131;;miliamperios por hora",
+ "0132;;vatio",
+ "0133;;db",
+ "0134;;pés",
+ "0135;;nós",
+ "0136;;horas",
+ "0137;;minutos",
+ "0138;;segundos",
+ "0139;;RPM",
+ "0140;;g",
+ "0141;;cronómetro",
+ "0142;;cronómetro",
+ "0143;;transmisión",
+ "0144;;recepción",
+ "0145;;A1",
+ "0146;;A2",
+ "0147;;altitud",
+ "0148;;motor",
+ "0149;;combustible",
+ "0150;;temperatura",
+ "0151;;temperatura",
+ "0152;;velocidad",
+ "0153;;distancia",
+ "0154;;altitude",
+ "0155;;célula lipo",
+ "0156;;Total lipo",
+ "0157;;voltaje",
+ "0158;;corriente",
+ "0159;;consumo",
+ "0160;;potencia",
+ "0161;;aceleración X",
+ "0162;;aceleración Y",
+ "0163;;aceleración Z",
+ "0164;;dirección",
+ "0165;;variómetro",
+ "0166;;minimo",
+ "0167;;máximo",
+ "a1_org;;Alarma A1",
+ "a1_red;;A1 crítica",
+ "a2_org;;Alarma A2",
+ "a2_red;;A2 crítica",
+ "eebad;;eeprom corrompida",
+ "eeformat;;Formateo de eeprom en curso",
+ "endtrim;;trim al máximo",
+ "error;;error",
+ "highmah;;assorbimiento elevado",
+ "hightemp;;temperatura elevada",
+ "inactiv;;me tienes abandonada",
+ "lowbatt;;batería del transmisor baja",
+ "midpot;;potenciómetro centrado",
+ "midtrim;;trim centrado",
+ "rssi_org;;recepcion de señal baja",
+ "rssi_red;;recepción de señal crítica",
+ "swr_red;;Problemas con la antena del transmisor",
+ "swalert;;Los interruptores no están en la posición correcta, por favor corrijalo",
+ "tada;OpenTX Welcome sound;Bienvenida a OpenTX",
+ "telemko;;Sin telemetría",
+ "telemok;;Telemetría disponible",
+ "thralert;;El acelerador está activado, por favor, corrijalo",
+ "timer10;;10 segundos",
+ "timer20;;20 segundos",
+ "timer30;;30 segundos",
+ "timerlt3;;3 segundos"
+ };
+
+ private static string[] default_es_other_strings =
+ {
+ "attero;;aterrizaje",
+ "crowof;;crou, desligado",
+ "crowon;;crou, activo",
+ "engoff;;motor apagado",
+ "flapdn;;flaps abajo",
+ "flapup;;flaps arriba",
+ "fltmd1;;fase de vuelo 1",
+ "fltmd2;;fase de vuelo 2",
+ "fltmd3;;fase de vuelo 3",
+ "fltmd4;;fase de vuelo 4",
+ "fltmd5;;fase de vuelo 5",
+ "fltmd6;;fase de vuelo 6",
+ "fltmd7;;fase de vuelo 7",
+ "fltmd8;;fase de vuelo 8",
+ "fltmd9;;fase de vuelo 9",
+ "geardn;;tren abajo.",
+ "gearup;;tren arriba.",
+ "lowbat;;bateria baja",
+ "nrmmod;;modo de vuelo normal",
+ "spdmod;;modo de velocidad",
+ "thmmod;;modo de térmica",
+ "trnoff;;modo de entrenamiento deshabilitado",
+ "trnon;;modo de entrenamiento activado",
+ "tohigh;;muy alto",
+ "tolow;;muy bajo"
+ };
+
+ private static string[] default_pt_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;;cento",
+ "0102;;duzentos",
+ "0103;;trezentos",
+ "0104;;quatrocentos",
+ "0105;;quinhentos",
+ "0106;;seiscentos",
+ "0107;;setecentos",
+ "0108;;oitocentos",
+ "0109;;novecentos",
+ "0110;;mil",
+ "0111;;virgula",
+ "0112;;uma",
+ "0113;;duas",
+ "0114;;e",
+ "0115;;menos",
+ "0116;;hora",
+ "0117;;horas",
+ "0118;;minuto",
+ "0119;;minutos",
+ "0120;;segundo",
+ "0121;;segundos",
+ "0122;;Volt",
+ "0123;;ampére",
+ "0124;;metros por segundo",
+ "0125;;",
+ "0126;;quilômetros por hora",
+ "0127;;metros",
+ "0128;;graus",
+ "0129;;cento",
+ "0130;;miliamperes",
+ "0131;;miliamperes por hora",
+ "0132;;watt",
+ "0133;;db",
+ "0134;;pés",
+ "0135;;nós",
+ "0136;;horas",
+ "0137;;minutos",
+ "0138;;segundos",
+ "0139;;RPM",
+ "0140;;g",
+ "0141;;cronómetro",
+ "0142;;cronómetro",
+ "0143;;transmissão",
+ "0144;;recepção",
+ "0145;;A1",
+ "0146;;A2",
+ "0147;;altitude",
+ "0148;;motor",
+ "0149;;combustível",
+ "0150;;temperatura",
+ "0151;;temperatura",
+ "0152;;velocidade",
+ "0153;;distância",
+ "0154;;altitude",
+ "0155;;célula lipo",
+ "0156;;Total lipo",
+ "0157;;tensão",
+ "0158;;corrente",
+ "0159;;consumo",
+ "0160;;potência",
+ "0161;;aceleração X",
+ "0162;;aceleração Y",
+ "0163;;aceleração Z",
+ "0164;;Direcção",
+ "0165;;variómetro",
+ "0166;;mínimo",
+ "0167;;máximo",
+ "a1_org;;Alarme A1",
+ "a1_red;;A1 critica",
+ "a2_org;;Alarme A2",
+ "a2_red;;A2 critica",
+ "eebad;;eeprom corrompida",
+ "eeformat;;formatação da eeprom em curso",
+ "endtrim;;trim no máximo",
+ "error;;erro",
+ "highmah;;assorbimento elevato",
+ "hightemp;;temperatura elevata",
+ "inactiv;;atenção, o rádio foi esquecido ligado, por favor desligue-o",
+ "midtrim;;trim centrado",
+ "midpot;;potenciómetro centrado",
+ "lowbatt;;bateria do rádio fraca",
+ "rssi_org;;recepção de sinal muito baixa",
+ "rssi_red;;recepção de sinal crítica",
+ "swalert;;atenção, certifique-se que os interruptores estão na posição certa",
+ "swr_red;;Problema com a antena do transmissor",
+ "tada;;Bem-vindo ao OpenTX",
+ "thralert;;atenção,acelerador não está no mínimo",
+ "timer10;;10 segundos",
+ "timer20;;20 segundos",
+ "timer30;;30 segundos",
+ "timerlt3;;três segundo"
+ };
+
+ private static string[] default_pt_other_strings =
+ {
+ "attero;;aterragem",
+ "crowof;;crou, desligado",
+ "crowon;;crou, activo",
+ "engoff;;motor desligado",
+ "flapdn;;flaps estendidos",
+ "flapup;;flaps recolhidos",
+ "fltmd1;;fase de voo 1",
+ "fltmd2;;fase de voo 2",
+ "fltmd3;;fase de voo 3",
+ "fltmd4;;fase de voo 4",
+ "fltmd5;;fase de voo 5",
+ "fltmd6;;fase de vôo 6",
+ "fltmd7;;fase de voo 7",
+ "fltmd8;;fase de voo 8",
+ "fltmd9;;fase de voo 9",
+ "geardn;;trem, em baixo.",
+ "gearup;;trem, em cima.",
+ "lowbat;;bateria fraca",
+ "nrmmod;;modo de voo normal",
+ "sigcrt;;sinal crítico",
+ "siglow;;sinal baixo",
+ "spdmod;;modo de velocidade",
+ "thmmod;;modo de térmica",
+ "trnoff;;modo de treino desligado",
+ "trnon;;modo de treino ligado",
+ "tohigh;;muito alto",
+ "tolow;;muito baixo"
+ };
+
+ private static string[] default_cz_system_strings =
+ {
+ "0000;0;nula",
+ "0001;1;jedna",
+ "0002;2;dva",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;;sto",
+ "0101;;dvěsta",
+ "0102;;třista",
+ "0103;;čtyřista",
+ "0104;;pětset",
+ "0105;;šestset",
+ "0106;;sedmset",
+ "0107;;osmset",
+ "0108;;devětset",
+ "0109;;tisíc",
+ "0110;;tisíce",
+ "0111;;jeden",
+ "0112;;jedno",
+ "0113;;dvě",
+ "0114;;celá",
+ "0115;;celé",
+ "0116;;celých",
+ "0117;;mínus",
+ "0118;;volt",
+ "0119;;volty",
+ "0120;;voltů",
+ "0121;;voltu",
+ "0122;;ampér",
+ "0123;;ampéry",
+ "0124;;ampérů",
+ "0125;;ampéru",
+ "0126;;metr za sekundu",
+ "0127;;metry za sekundu",
+ "0128;;metrů za sekundu",
+ "0129;;metru za sekundu",
+ "0130;;jednotka",
+ "0131;;jednotky",
+ "0132;;jednotek",
+ "0133;;jednotky",
+ "0134;;kilometr za hodinu",
+ "0135;;kilometry za hodinu",
+ "0136;;kilometrů za hodinu",
+ "0137;;kilometru za hodinu",
+ "0138;;metr",
+ "0139;;metry",
+ "0140;;metrů",
+ "0141;;metru",
+ "0142;;stupeň",
+ "0143;;stupně",
+ "0144;;stupňů",
+ "0145;;stupně",
+ "0146;;procento",
+ "0147;;procenta",
+ "0148;;procento",
+ "0149;;procenta",
+ "0150;;miliampér",
+ "0151;;miliampéry",
+ "0152;;miliampérů",
+ "0153;;miliampéru",
+ "0154;;miliampérhodina",
+ "0155;;miliampérhodiny",
+ "0156;;miliampérhodin",
+ "0157;;miliampérhodiny",
+ "0158;;vat",
+ "0159;;vaty",
+ "0160;;vatů",
+ "0161;;vatu",
+ "0162;;decibel",
+ "0163;;decibely",
+ "0164;;decibelů",
+ "0165;;decibelu",
+ "0166;;stopa",
+ "0167;;stopy",
+ "0168;;stop",
+ "0169;;stopy",
+ "0170;;uzel",
+ "0171;;uzly",
+ "0172;;uzlů",
+ "0173;;uzlu",
+ "0174;;hodina",
+ "0175;;hodiny",
+ "0176;;hodin",
+ "0177;;hodiny",
+ "0178;;minuta",
+ "0179;;minuty",
+ "0180;;minut",
+ "0181;;minuty",
+ "0182;;sekunda",
+ "0183;;sekundy",
+ "0184;;sekund",
+ "0185;;sekundy",
+ "0186;;otáčka za minutu",
+ "0187;;otáčky za minutu",
+ "0188;;otáček za minutu",
+ "0189;;otáčky za minutu",
+ "0190;;gé",
+ "0191;;gé",
+ "0192;;gé",
+ "0193;;gé",
+ "a1_org;;A1,nízká",
+ "a1_red;;A1,kritická",
+ "a2_org;;A2,nízká",
+ "a2_red;;A2,kritická",
+ "eebad;;neplatná eeprom",
+ "endtrim;;maximum trimu",
+ "inactiv;;zapoměl jsi na mě!",
+ "lowbatt;;baterie rádia je vybitá",
+ "midtrim;;střed trimu",
+ "rssi_org;;nízký RF signál",
+ "rssi_red;;kritický RF signál",
+ "swalert;;přepínače nejsou ve výchozí poloze",
+ "swr_red;;problém s anténou rádia",
+ "tada;;Oupn najn iks",
+ "telemko;;telemetrie ztracena",
+ "telemok;;telemetrie je funkční",
+ "thralert;;plyn není na nule",
+ "timer10;;deset sekund",
+ "timer20;;dvacet sekund",
+ "timer30;;třicet sekund",
+ "timerlt3;;tři sekund!"
+ };
+
+ private static string[] default_cz_other_strings =
+ {
+ "bytvybita;;baterie modelu je vybitá",
+ "klapky0;;klapky jsou vypnuty",
+ "klapky1;;klapky jsou zapnuty",
+ "ksignal;;kritický signál!",
+ "motor0;;motor je vypnut",
+ "motor1;;motor je aktivován",
+ "nizko;;jsi příliš nízko",
+ "nsignal;;nízký signál!",
+ "palivo;;dochází palivo",
+ "podvozek0;;podvozek je zasunut",
+ "podvozek1;;podvozek je vysunut",
+ "r_norm;;normální režim aktivován",
+ "r_pristani;;režim přistání aktivován",
+ "r_rychly;;rychlý režim aktivován",
+ "r_start;;režim start aktivován",
+ "r_termik;;termický režim aktivován",
+ "stpovolen;;start povolen",
+ "trener0;;trenér je vypnutý",
+ "trener1;;trenér je zapnut",
+ "vario0;;vario je zapnuto",
+ "vario1;;vario je vypnuto",
+ "vysoko;;jsi příliš vysoko"
+ };
+
+ private static string[] default_en_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;thousand;thousand",
+ "0111;minus;minus",
+ "0112;point;point",
+ "0115;volt;volt",
+ "0116;volts;volts",
+ "0117;amp;ampere",
+ "0118;amps;ampere",
+ "0119;meter per second;meter per second",
+ "0120;meters per second;meters per second",
+ "0123;kmh;k-m-h",
+ "0124;kmh;k-m-h",
+ "0125;meter;meter",
+ "0126;meters;meters",
+ "0127;degree;degree",
+ "0128;degrees;degrees",
+ "0129;percent;percent",
+ "0130;percent;percent",
+ "0131;milliamp;milliamp",
+ "0132;milliamps;milliamps",
+ "0133;mah;m-a-h",
+ "0134;mah;m-a-h",
+ "0135;watt;watt",
+ "0136;watts;watts",
+ "0137;db;db",
+ "0138;db;db",
+ "0140;feet;feet",
+ "0141;knot;knot",
+ "0142;knots;knots",
+ "0143;hour;hour",
+ "0144;hours;hours",
+ "0145;minute;minute",
+ "0146;minutes;minutes",
+ "0147;second;second",
+ "0148;seconds;seconds",
+ "0149;rpm;r-p-m",
+ "0150;rpm;r-p-m",
+ "0151;g;gee",
+ "0152;g;gees",
+ "0160;point zero;point zero",
+ "0161;point one;point one",
+ "0162;point two;point two",
+ "0163;point three;point three",
+ "0164;point four;point four",
+ "0165;point five;point five",
+ "0166;point six;point six",
+ "0167;point seven;point seven",
+ "0168;point eight;point eight",
+ "0169;point nine;point nine",
+ "a1_org;a1 low;a1 low",
+ "a1_red;a1 critical;a1 critical",
+ "a2_org;a2 low;a2 low",
+ "a2_red;a2 critical;a2 critical",
+ "endtrim;maximum trim reached;maximum trim reached",
+ "inactiv;inactivity alarm;inactivity alarm",
+ "lowbatt;radio battery low;radio battery low",
+ "midtrim;trim center;center",
+ "rssi_org;rf signal low;rf signal low",
+ "rssi_red;rf signal critical;rf signal critical",
+ "swalert;switch warning;switch warning",
+ "swr_red;radio antenna defective;radio antenna defective",
+ "tada;Start Sound;welcome to open T-X",
+ "telemko;telemetry lost;telemetry lost",
+ "telemok;telemetry recover;telemetry recover",
+ "thralert;throttle warning;throttle warning",
+ "timer10;10 seconds;10 seconds",
+ "timer20;20 seconds;20 seconds",
+ "timer30;30 seconds;30 seconds",
+ "timerlt3;timer sound;3 seconds"
+ };
+
+ private static string[] default_en_other_strings =
+ {
+ "atti;attitude;attitude",
+ "batcrit;battery critical;battery critical",
+ "batlow;low battery;low battery",
+ "camcenter;camera center;camera center",
+ "camfix;camera fixed;camera fixed",
+ "cammanual;camera manual;camera manual",
+ "capacity;capacity;capacity",
+ "engdis;engine disabled;engine disabled",
+ "engoff;engine off;engine off",
+ "engon;engine on;engine on",
+ "flaps1;flaps 1;flaps 1",
+ "flaps2;flaps 2;flaps 2",
+ "flapsdn;flaps down;flaps down",
+ "flapsup;flaps up;flaps up",
+ "fltmode1;flight mode one;flight mode one",
+ "fltmode2;flight mode two;flight mode two",
+ "fltmode3;flight mode three;flight mode three",
+ "fltmode4;flight mode four;flight mode four",
+ "fltmode5;flight mode five;flight mode five",
+ "fltmode6;flight mode six;flight mode six",
+ "fltmode7;flight mode seven;flight mode seven",
+ "fltmode8;flight mode eight;flight mode eight",
+ "fsoff;failsafe off;failsafe off",
+ "fson;failsafe on;failsafe on",
+ "geardn;gear down;gear down",
+ "gearup;gear upp;gear upp",
+ "gps;gps;G-P-S",
+ "horn;horn sound;eeeeeeeee",
+ "hirates;hi rates;hi rates",
+ "htoff;head tracker off;head tracker off",
+ "hton;head tracker on;head tracker on",
+ "ioc;ioc;ioc",
+ "iocoff;ioc off;ioc off",
+ "lowrates;lowrates;lowrates",
+ "manual;manual;manual",
+ "normal;normal;normal",
+ "nrmmod;normal mode;normal mode",
+ "pouet;small horn;ee , ee",
+ "shutter;camera shutter sound;klick",
+ "thrhold;throttle locked;throttle locked",
+ "thrrel;throttle released;throttle released",
+ "wizz;wizzing sound;shiss"
+ };
+
+ private static string[] default_se_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;en",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;tjugoen",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;trettioen",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;fyrtioen",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;femtioen",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;sextioen",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;sjuttioen",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;åttioen",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;nittioen",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;thousand;tusen",
+ "0111;minus;minus",
+ "0112;point;komma",
+ "0115;volt;volt",
+ "0116;volts;volt",
+ "0117;amp;ampere",
+ "0118;amps;ampere",
+ "0119;meter per second;meter per sekund",
+ "0120;meters per second;meter per sekund",
+ "0123;kmh;kilometer i timmen",
+ "0124;kmh;kilometer i timmen",
+ "0125;meter;meter",
+ "0126;meters;meter",
+ "0127;degree;grad",
+ "0128;degrees;grader",
+ "0129;percent;procent",
+ "0130;percent;procent",
+ "0131;milliamp;milliampere",
+ "0132;milliamps;milliampere",
+ "0133;mah;milliampere-timme",
+ "0134;mah;milliampere-timmar",
+ "0135;watt;watt",
+ "0136;watts;watt",
+ "0137;db;dessibell",
+ "0138;db;dessibell",
+ "0140;feet;fot",
+ "0141;knot;knop",
+ "0142;knots;knop",
+ "0143;hour;timme",
+ "0144;hours;timmar",
+ "0145;minute;minut",
+ "0146;minutes;minuter",
+ "0147;second;sekund",
+ "0148;seconds;sekunder",
+ "0149;rpm;varv i minuten",
+ "0150;rpm;varv i minuten",
+ "0151;g;g",
+ "0152;g;g",
+ "0160;point zero;komma noll",
+ "0161;point one;komma en",
+ "0162;point two;komma två",
+ "0163;point three;komma tre",
+ "0164;point four;komma fyra",
+ "0165;point five;komma fem",
+ "0166;point six;komma sex",
+ "0167;point seven;komma sju",
+ "0168;point eight;komma åtta",
+ "0169;point nine;komma nio",
+ "a1_org;a1 low;a1 låg",
+ "a1_red;a1 critical;a1 kritisk",
+ "a2_org;a2 low;a2 låg",
+ "a2_red;a2 critical;a2 kritisk",
+ "endtrim;maximum trim reached;maximum trim",
+ "inact;inactivity alarm;inaktivitets-larm",
+ "lowbat;radio battery low;Låg radiobatterispänning",
+ "midtrim;trim center;center",
+ "rssi_org;rf signal low;Svag radio-signal",
+ "rssi_red;rf signal critical;Kritisk radio-signal",
+ "swalert;switch warning;brytar-varning",
+ "swr_red;;radio-antennen är defekt",
+ "tada;;Välkommen till open Te Ex",
+ "telemko;;telemetri förlorad",
+ "telemok;;telemetri åter",
+ "thralert;;gas-varning",
+ "timer10;;10 sekunder",
+ "timer20;;20 sekunder",
+ "timer30;;30 sekunder",
+ "timerlt3;timer sound;3 sekunder"
+ };
+
+ private static string[] default_se_other_strings =
+ {
+ "atti;;lutning",
+ "batcrit;;kritisk batteri-nivå",
+ "batlow;;låg batteri-nivå",
+ "camcenter;;kamera centrerad",
+ "cammanual;;manuell kamera-kontroll",
+ "capacity;;kapacitet",
+ "engdis;;motor säkrad",
+ "engoff;;motor avslagen",
+ "engon;;motor på",
+ "flaps1;;flaps läge, ett",
+ "flaps2;;flaps läge två",
+ "flapsdn;;flaps ned",
+ "flapsup;;flaps upp",
+ "fltmode1;;flyg-läge, ett",
+ "fltmode2;;flyg-läge två",
+ "fltmode3;;flyg-läge tre",
+ "fltmode4;;flyg-läge fyra",
+ "fltmode5;;flyg-läge fem",
+ "fltmode6;;flyg-läge sex",
+ "fltmode7;;flyg-läge sju",
+ "fltmode8;;flyg-läge åtta",
+ "fsoff;;fäjlsäif avslagen",
+ "fson;;fäjlsäif på",
+ "geardn;;landningsställ ned",
+ "gearup;;landningsställ upp",
+ "gps;;GPS",
+ "hirates;;höga nivåer",
+ "htoff;;head tracker avslagen",
+ "hton;;head tracker på",
+ "horn;horn sound;eeeeeeeee",
+ "ioc;;i o c",
+ "iocoff;;i o c avslagen",
+ "lowrates;;låga nivåer",
+ "manual;;manuell",
+ "normal;;normal",
+ "nrmmod;;normalt läge",
+ "pouet;small horn;ee , ee",
+ "shutter;camera shutter sound;klick",
+ "thrhold;;gas säkrad",
+ "thrrel;;gas osäkrad",
+ "speed;;hastighet",
+ "start;;start",
+ "thermal;;termik",
+ "wizz;wizzing sound;shiss"
+ };
+
+ private static string[] default_it_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;mila;mila",
+ "0102;mille;mille",
+ "0103;virgola;virgola",
+ "0104;un;un",
+ "0105;e;e",
+ "0106;meno;meno",
+ "0107;ora;ora",
+ "0108;ore;ore",
+ "0109;minuto;minuto",
+ "0110;minuti;minuti",
+ "0111;secondo;secondo",
+ "0112;secondi;secondi",
+ "0113;;volt",
+ "0114;;ampere",
+ "0115;;metri per secondo",
+ "0116;;",
+ "0117;;chilometri/ora",
+ "0118;;metri",
+ "0119;;gradi",
+ "0120;;percento",
+ "0121;;milliampere",
+ "0122;;milliampere/ora",
+ "0123;;watt",
+ "0124;;db",
+ "0125;;piedi",
+ "0126;;nodi",
+ "0127;;ore",
+ "0128;;minuti",
+ "0129;;secondi",
+ "0130;;R P M",
+ "0131;;g",
+ "0132;;timer",
+ "0133;;timer",
+ "0134;;trasmissione",
+ "0135;;ricezione",
+ "0136;;A1",
+ "0137;;A2",
+ "0138;;altitudine",
+ "0139;;motore",
+ "0140;;carburante",
+ "0141;;temperatura",
+ "0142;;temperatura",
+ "0143;;velocità",
+ "0144;;distanza",
+ "0145;;altitudine",
+ "0146;;cella lipo",
+ "0147;;totale lipo",
+ "0148;;tensione",
+ "0149;;corrente",
+ "0150;;consumo",
+ "0151;;potenza",
+ "0152;;accellerazione X",
+ "0153;;accellerazione Y",
+ "0154;;accellerazione Z",
+ "0155;;direzione",
+ "0156;;variometro",
+ "0157;;minimo",
+ "0158;;massimo",
+ "a1_org;A1 in allarme;A1 in allarme",
+ "a1_red;A1 critico;A1 critico",
+ "a2_org;A2 in allarme;A2 in allarme",
+ "a2_red;A2 critico;A2 critico",
+ "eebad;eeprom corrotta;eeprom corrotta",
+ "eeformat;formattazone eeprom in corso;formattazone eeprom in corso",
+ "endtrim;massimo trim raggiunto;massimo trim raggiunto",
+ "error;errore;errore",
+ "highmah;assorbimento elevato;assorbimento elevato",
+ "hightemp;temperatura elevata;temperatura elevata",
+ "inactiv;radio inattiva controllare;radio inattiva controllare",
+ "lowbatt;batteria della radio scarica;batteria della radio scarica",
+ "midpot;potenziometro centrato;potenziometro centrato",
+ "midtrim;trim centrato;trim centrato",
+ "rssi_org;Segnale radio basso;Segnale radio basso",
+ "rssi_red;Segnale radio critico;Segnale radio critico",
+ "swalert;interruttori non in posizione, verificare;interruttori non in posizione, verificare",
+ "swr_red;Problema all'antenna della radio;Problema all'antenna della radio",
+ "tada;;Benvenuto",
+ "telemko;Telemetria assente;Telemetria assente",
+ "telemok;Telemetria disponibile;Telemetria disponibile",
+ "thralert;controllo motore non in posizione, verificare;controllo motore non in posizione, verificare",
+ "timer10;dieci secondi;dieci secondi",
+ "timer20;venti secondi;venti secondi",
+ "timer30;trenta secondi;trenta secondi",
+ "timerlt3;timer sound;3 secondi"
+ };
+
+ private static string[] default_it_other_strings =
+ {
+ "attero;;atterraggiio",
+ "crowof;;crow off",
+ "crowon;;crow on",
+ "engoff;;motore spento",
+ "flapdn;;flap estesi",
+ "flapup;;flap rientrati",
+ "fltmd1;;fase di volo 1",
+ "fltmd2;;fase di volo 2",
+ "fltmd3;;fase di volo 3",
+ "fltmd4;;fase di volo 4",
+ "fltmd5;;fase di volo 5",
+ "fltmd6;;fase di volo 6",
+ "fltmd7;;fase di volo 7",
+ "fltmd8;;fase di volo 8",
+ "fltmd9;;fase di volo 9",
+ "geardn;;carrello aperto",
+ "gearup;;carrello chiuso",
+ "gps;;GPS",
+ "lowbat;;batteria scarica",
+ "nrmmod;;modo volo normale",
+ "spdmod;;modo velocità",
+ "thmmod;;modo termica",
+ "tohigh;;troppo alto",
+ "tolow;;troppo basso",
+ "trnoff;;modalità maestro disattiva",
+ "trnon;;modalità maestro attiva"
+ };
+
+ private static string[] default_de_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;ein",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;1000;tausend",
+ "0102;;comma;comma",
+ "0103;;und",
+ "0104;;minus",
+ "0105;;uhr",
+ "0106;;minute",
+ "0107;;minuten",
+ "0108;;sekunde",
+ "0109;;sekunden",
+ "0110;;Volt",
+ "0111;;Ampere",
+ "0112;;Meter pro sekunde",
+ "0113;;",
+ "0114;;kilometer pro stunde",
+ "0115;;Meter",
+ "0116;;Grad",
+ "0117;;Prozent",
+ "0118;;Milliampere",
+ "0119;;Milliampere pro stunde",
+ "0120;;Watt",
+ "0121;;db",
+ "0122;;Fuesse",
+ "0123;;Knoten",
+ "0124;;Uhr",
+ "0125;;Minuten",
+ "0126;;Secunden",
+ "0127;;R P M",
+ "0128;;g",
+ "0129;;Timer",
+ "0130;;Timer",
+ "0131;;Sendung",
+ "0132;;Empfang",
+ "0133;;A1",
+ "0134;;A2",
+ "0135;;Hoehe",
+ "0136;;Motor",
+ "0137;;Treibstoff",
+ "0138;;Temperatur",
+ "0139;;Temperatur",
+ "0140;;Geschwindigkeit",
+ "0141;;Ferne",
+ "0142;;Hoehe",
+ "0143;;Lipo-Zelle",
+ "0144;;Zellen gesamt",
+ "0145;;Spannung",
+ "0146;;Strom",
+ "0147;;Verbrauch",
+ "0148;;Power",
+ "0149;;Beschleunigung X",
+ "0150;;Beschleunigung Y",
+ "0151;;Beschleunigung Z",
+ "0152;;Richtung",
+ "0153;;Variometer",
+ "0154;;Minimum",
+ "0155;;Maximum",
+ "a1_org;;A1 schlecht!",
+ "a1_red;;A1 kritisch!",
+ "a2_org;;A2 schlecht!",
+ "a2_red;;A2 kritisch!",
+ "eebad;;Das EEPROM ist fehlerhaft",
+ "eeformat;;Das EEPROM ist immer formatiert",
+ "endtrim;;Maximale trimmung erreicht",
+ "error;;fehler",
+ "highmah;;Senderstrom ist zu hoch!",
+ "hightemp;;Sendertemperatur ist zu hoch!",
+ "inactiv;;Sender ist inaktiv,bitte Ueberpruefen Sie",
+ "lowbatt;;Senderakku niedrig",
+ "midtrim;;Trim zentriert",
+ "midpot;;Poti zentriert",
+ "rssi_org;;Funksignal schlecht!",
+ "rssi_red;;Funksignal kritisch!",
+ "swr_red;;Problem mit der sender Antenna",
+ "swalert;;Schalten fehlpositioniert, bitte pruefen",
+ "tada;Welcome sound;Willkommen",
+ "thralert;;Gaskanal nicht Null, bitte pruefen",
+ "timer10;;10 sekunden",
+ "timer20;;20 sekunden",
+ "timer30;;30 sekunden",
+ "timerlt3;;Noch drei Sekunden" };
+
+ private static string[] default_de_other_strings =
+ {
+ "attero;;Landung",
+ "crowof;;crow aus",
+ "crowon;;crow ein",
+ "engoff;;Motor aus",
+ "flapdn;;Klappen ausgefahren",
+ "flapup;;Klappen eingefahren",
+ "fltmd1;;Regime 1",
+ "fltmd2;;Regime 2",
+ "fltmd3;;Regime 3",
+ "fltmd4;;Regime 4",
+ "fltmd5;;Regime 5",
+ "fltmd6;;Regime 6",
+ "fltmd7;;Regime 7",
+ "fltmd8;;Regime 8",
+ "fltmd9;;Regime 9",
+ "geardn;;Fahrwerk ausgefahren",
+ "gearup;;Fahrwerk eingezogen",
+ "horn;horn sound;eeeeeeeee",
+ "lowbat;;Batterie schwach",
+ "nrmmod;;Normal-Modus ist aktiviert",
+ "pouet;small horn;ee , ee",
+ "shutter;camera shutter sound;klick",
+ "spdmod;;Schnell-Modus ist aktiviert",
+ "thmmod;;Thermik-Modus ist aktiviert",
+ "trnon;;Trainer-Modus ein",
+ "trnoff;;Trainer-Modus aus",
+ "tohigh;;zu hoch",
+ "tolow;;zu niedrig",
+ "wizz;wizzing sound;shiss"
+ };
+
+ private static string[] default_fr_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;1000;Mille",
+ "0110;;une",
+ "0111;11;onze",
+ "0112;21;21",
+ "0113;31;31",
+ "0114;41;41",
+ "0115;51;51",
+ "0116;61;61",
+ "0117;71;71",
+ "0118;81;81",
+ "0119;.;virgule",
+ "0120;&;et",
+ "0121;-;moins",
+ "0122;<>;bip",
+ "0123;<>;bip",
+ "0124;<>;bip",
+ "0125;V;volts",
+ "0126;A;ampères",
+ "0127;ms;mètres par seconde",
+ "0128;<>;bip",
+ "0129;kmh;kilomètre heure",
+ "0130;m;mètres",
+ "0131;;degrés",
+ "0132;%;pourcent",
+ "0133;mA;milliampère",
+ "0134;mAH;milliampères heure",
+ "0135;W;watt",
+ "0136;dB;db",
+ "0137;;pied",
+ "0138;;noeud",
+ "0139;h;heure",
+ "0140;min;minute",
+ "0141;sec;secondes",
+ "0142;;taux par minute",
+ "0143;G;g",
+ "0144;<>;bip",
+ "0144;<>;bip",
+ "0146;timer;chrono",
+ "0147;<>;bip",
+ "0148;;tension",
+ "0149;;tension",
+ "0150;;émission",
+ "0151;;réception",
+ "0152;;altitude",
+ "0153;;moteur",
+ "0154;;carburant",
+ "0155;;temperature",
+ "0156;;temperature",
+ "0157;;vitesse",
+ "0158;;distance",
+ "0159;;attitude",
+ "0160;;élément lipo",
+ "0161;;total lipo",
+ "0162;;tension",
+ "0163;;courant",
+ "0164;;consomation",
+ "0165;;puissance",
+ "0166;;accelération x",
+ "0167;;accelération y",
+ "0168;;accelération z",
+ "0169;;orientation",
+ "0170;;vario",
+ "0171;<>;bip",
+ "0172;<>;bip",
+ "0173;<>;bip",
+ "0174;<>;bip",
+ "0175;<>;bip",
+ "0176;<>;bip",
+ "0177;<>;bip",
+ "0178;<>;bip",
+ "0179;<>;bip",
+ "0180;.0;virgule 0",
+ "0181;.1;virgule 1",
+ "0182;.2;virgule 2",
+ "0183;.3;virgule 3",
+ "0184;.4;virgule 4",
+ "0185;.5;virgule 5",
+ "0186;.6;virgule 6",
+ "0187;.7;virgule 7",
+ "0188;.8;virgule 8",
+ "0189;.9;virgule 9",
+ "190;<>;bip",
+ "a1_org;a1 low;a1 bas",
+ "a1_red;a1 critical;a1 critique",
+ "a2_org;a2 low;a2 bas",
+ "a2_red;a2 critical;a2 critique",
+ "eebad;memoire basse;niveau mémoire bas",
+ "endtrim;trim maximum atteint;trim maximum atteint",
+ "inact;inactivity alarm;alarme d'innactivité",
+ "lowbat;radio battery low;batterie transmetteur faible",
+ "midtrim;trim center;trim centré",
+ "rssi_org;rf signal low;signal recepteur faible",
+ "rssi_red;rf signal critical;signal recepteur critique",
+ "swalert;switch warning;interupteur mal positionné",
+ "swr_red;radio antenna defective;antenne emeteur defectueuse",
+ "tada;welcome to opentx;Bienvenue sur Open tx",
+ "telemko;telemetry lost;télémétrie perdue",
+ "telemok;telemetry recover;télémétrie retrouvée",
+ "thralert;throttle warning;mettre les gaz a 0",
+ "timer10;10 seconds;10 secondes",
+ "timer20;20 seconds;20 secondes",
+ "timer30;30 seconds;30 secondes",
+ "timerlt3;3 seconds;3 secondes"
+ };
+
+ private static string[] default_fr_other_strings =
+ {
+ "attero;;atterrissage",
+ "atti;attitude;attitude",
+ "batcrit;battery critical;niveau batterie critique",
+ "batlow;low battery;niveau batterie bas",
+ "camcenter;camera center;caméra centrée",
+ "cammanual;camera manual;caméra manuelle",
+ "capacity;capacity;capacité",
+ "engdis;engine disabled;moteur calé",
+ "engoff;engine off;moteur coupé",
+ "engon;engine on;moteur démarré",
+ "flaps1;flaps 1;volets 1",
+ "flaps2;flaps 2;volets 2",
+ "flapsdn;flaps down;volets sortis",
+ "flapsup;flaps up;volets rentrés",
+ "fltmode0;phase de vol 0;phase de vol 0",
+ "fltmode1;phase de vol 1;phase de vol 1",
+ "fltmode2;phase de vol 2;phase de vol 2",
+ "fltmode3;phase de vol 3;phase de vol 3",
+ "fltmode4;phase de vol 4;phase de vol 4",
+ "fltmode5;phase de vol 5;phase de vol 5",
+ "fltmode6;phase de vol 6;phase de vol 6",
+ "fltmode7;phase de vol 7;phase de vol 7",
+ "fltmode8;phase de vol 8;phase de vol 8",
+ "fsoff;failsafe off;failsafe coupé",
+ "fson;failsafe on;failsafe activé",
+ "geardn;gear down;train sorti",
+ "gearup;gear upp;train rentré",
+ "gps;gps;gps",
+ "hirates;hi rates;taux élevé",
+ "htoff;head tracker off;suivi tète désactivé",
+ "hton;head tracker on;suivi tète activé",
+ "ioc;ioc;i o c",
+ "iocoff;ioc off;i o c coupé",
+ "lowrates;lowrates;taux faible",
+ "manual;manual;manuel",
+ "normal;normal;normal",
+ "nrmmod;normal mode;mode normal",
+ "thrhold;throttle locked;gaz bloqués","thrrel;throttle released;gaz relachés",
+ "trnoff;;fin écolage",
+ "trnon;;écolage",
+ };
+
+ public string[][] default_system_strings = new string[10][];
+ public string[][] default_other_strings = new string[10][];
+
+ public int toInt(string langStr)
+ {
+ if (langStr == "cz") return 1;
+ if (langStr == "de") return 2;
+ if (langStr == "es") return 3;
+ if (langStr == "fr") return 4;
+ if (langStr == "it") return 5;
+ if (langStr == "pl") return 6;
+ if (langStr == "pt") return 7;
+ if (langStr == "se") return 8;
+ if (langStr == "sk") return 9;
+ else return 0; //English default
+ }
+
+ public SentenceTables()
+ {
+ default_other_strings[toInt("cz")] = default_cz_other_strings;
+ default_system_strings[toInt("cz")] = default_cz_system_strings;
+
+ default_other_strings[toInt("de")] = default_de_other_strings;
+ default_system_strings[toInt("de")] = default_de_system_strings;
+
+ default_other_strings[toInt("en")] = default_en_other_strings;
+ default_system_strings[toInt("en")] = default_en_system_strings;
+
+ default_other_strings[toInt("es")] = default_es_other_strings;
+ default_system_strings[toInt("es")] = default_es_system_strings;
+
+ default_other_strings[toInt("fr")] = default_fr_other_strings;
+ default_system_strings[toInt("fr")] = default_fr_system_strings;
+
+ default_other_strings[toInt("it")] = default_it_other_strings;
+ default_system_strings[toInt("it")] = default_it_system_strings;
+
+ default_other_strings[toInt("pl")] = default_pl_other_strings;
+ default_system_strings[toInt("pl")] = default_pl_system_strings;
+
+ default_other_strings[toInt("pt")] = default_pt_other_strings;
+ default_system_strings[toInt("pt")] = default_pt_system_strings;
+
+ default_other_strings[toInt("se")] = default_se_other_strings;
+ default_system_strings[toInt("se")] = default_se_system_strings;
+
+ default_other_strings[toInt("sk")] = default_sk_other_strings;
+ default_system_strings[toInt("sk")] = default_sk_system_strings;
+ }
+ }
+}
diff --git a/sound/recorder/stop.png b/sound/recorder/stop.png
new file mode 100644
index 000000000..d931243bd
Binary files /dev/null and b/sound/recorder/stop.png differ
diff --git a/sound/speaker/.gitignore b/sound/speaker/.gitignore
new file mode 100644
index 000000000..ebd53ae98
--- /dev/null
+++ b/sound/speaker/.gitignore
@@ -0,0 +1,3 @@
+/OpenTXspeaker.suo
+/bin/*
+/obj/*
diff --git a/sound/speaker/App.xaml b/sound/speaker/App.xaml
new file mode 100644
index 000000000..c38764331
--- /dev/null
+++ b/sound/speaker/App.xaml
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/sound/speaker/App.xaml.cs b/sound/speaker/App.xaml.cs
new file mode 100644
index 000000000..aa83c3a9e
--- /dev/null
+++ b/sound/speaker/App.xaml.cs
@@ -0,0 +1,32 @@
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Speaker. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace OpenTXspeak
+{
+ ///
+ /// Interaction logic for App.xaml
+ ///
+ public partial class App : Application
+ {
+ }
+}
diff --git a/sound/speaker/GPLv3_Logo.png b/sound/speaker/GPLv3_Logo.png
new file mode 100644
index 000000000..ba78d4c49
Binary files /dev/null and b/sound/speaker/GPLv3_Logo.png differ
diff --git a/sound/speaker/MainWindow.xaml b/sound/speaker/MainWindow.xaml
new file mode 100644
index 000000000..312a13593
--- /dev/null
+++ b/sound/speaker/MainWindow.xaml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Install Voices
+
+
+
+
diff --git a/sound/speaker/MainWindow.xaml.cs b/sound/speaker/MainWindow.xaml.cs
new file mode 100644
index 000000000..22d8dddfb
--- /dev/null
+++ b/sound/speaker/MainWindow.xaml.cs
@@ -0,0 +1,235 @@
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Speaker. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Speech.Synthesis;
+using System.Speech.AudioFormat;
+
+namespace OpenTXspeak
+{
+ public partial class MainWindow : Window
+ {
+ SentenceTables tables = new SentenceTables();
+ Languages languages = new Languages();
+ Language curLang;
+ Sentences sentences = new Sentences();
+ SpeechSynthesizer synth = new SpeechSynthesizer();
+ int added_files = 0;
+
+ public MainWindow()
+ {
+ SplashScreen splash = new SplashScreen("speaker_logo.png");
+ splash.Show(true);
+ Thread.Sleep(1500);
+
+ InitializeComponent();
+
+ lvSentences.ItemsSource = sentences;
+ cbLanguages.ItemsSource = languages;
+
+ foreach (InstalledVoice voice in synth.GetInstalledVoices())
+ {
+ cbVoices.Items.Add(voice.VoiceInfo.Name);
+ }
+ cbVoices.SelectedIndex = 0;
+
+ languages.Add("English", "en");
+ languages.Add("Czech", "cz");
+ languages.Add("German", "de");
+ languages.Add("French", "fr");
+ languages.Add("Italian", "it");
+ languages.Add("Polish", "pl");
+ languages.Add("Portuguese", "pt");
+ languages.Add("Swedish", "se");
+ languages.Add("Slovak", "sk");
+ languages.Add("Spanish", "es");
+ curLang = languages[0];
+ cbLanguages.SelectedIndex = 0; // Note: Sets current langugage -> triggers loadlanguage()
+ }
+
+ private void loadLanguage()
+ {
+ string[] system_strings;
+ string[] other_strings;
+
+ try
+ {
+ system_strings = System.IO.File.ReadAllLines(@"SOUNDS\" + curLang.sName + @"\SYSTEM\system_sounds.txt");
+ other_strings = System.IO.File.ReadAllLines(@"SOUNDS\" + curLang.sName + @"\other_sounds.txt");
+ }
+ catch (IOException)
+ {
+ system_strings = tables.default_system_strings[tables.toInt(curLang.sName)];
+ other_strings = tables.default_other_strings[tables.toInt(curLang.sName)];
+ }
+ sentences.RemoveRange(0, sentences.Count);
+
+ foreach (string str in system_strings)
+ sentences.Add(str);
+
+ sentences.Add(@";^ System Sounds ^;");
+
+ foreach (string str in other_strings)
+ sentences.Add(str);
+
+ lvSentences.Items.Refresh(); // Workaround - Two way binding is better
+ }
+
+ private void cbLanguages_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ curLang = (Language)e.AddedItems[0];
+ loadLanguage();
+ }
+
+ private void lvSentences_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+ {
+ if (this.lvSentences.SelectedItems.Count < 1)
+ return;
+
+ synth.SetOutputToDefaultAudioDevice();
+ synth.Rate = (int)this.voiceRateSlider.Value;
+ synth.Volume = (int)this.voiceVolumeSlider.Value;
+
+ Sentence sentence = (Sentence)this.lvSentences.SelectedItem;
+ synth.SelectVoice(cbVoices.Text);
+ try { synth.Speak(sentence.voiceString); }
+ catch (Exception){} // Workaround - Some TTS engines crashes on destruction
+ }
+
+ private void openTXLogo_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ AboutWindow aboutWindow = new AboutWindow();
+ aboutWindow.ShowDialog();
+ }
+
+ private void InstallVoices_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ InstallVoicesWindow installVoicesWindow = new InstallVoicesWindow();
+ installVoicesWindow.ShowDialog();
+ }
+
+ private void buttonPlay_Click(object sender, RoutedEventArgs e)
+ {
+ lvSentences_MouseDoubleClick(sender, null);
+ }
+
+ private void buttonAddItem_Click(object sender, RoutedEventArgs e)
+ {
+ added_files++;
+ sentences.Add(new Sentence("new_file_" + added_files.ToString() + ";New Description;New Voice Message"));
+ this.lvSentences.Items.Refresh();
+ this.lvSentences.SelectedIndex = this.lvSentences.Items.Count - 1;
+ this.lvSentences.ScrollIntoView(this.lvSentences.SelectedItem);
+ }
+
+ private void buttonSaveFiles_Click(object sender, RoutedEventArgs e)
+ {
+ Cursor oldCursor = this.Cursor;
+ this.Cursor = Cursors.Wait;
+
+ synth.SelectVoice(cbVoices.Text);
+ synth.Rate = (int)this.fileRateSlider.Value;
+ synth.Volume = (int)this.fileVolumeSlider.Value;
+
+ int sampleRate = 32000;
+ if ((bool)this.rb16khz.IsChecked)
+ sampleRate = 16000;
+ else if ((bool)this.rb8khz.IsChecked)
+ sampleRate = 8000;
+
+ SpeechAudioFormatInfo audioFormat = new SpeechAudioFormatInfo(sampleRate, AudioBitsPerSample.Sixteen, AudioChannel.Mono);
+
+ System.IO.Directory.CreateDirectory(@"SOUNDS\" + curLang.sName + @"\SYSTEM");
+ StreamWriter sw = File.CreateText(@"SOUNDS\" + curLang.sName + @"\SYSTEM\system_sounds.txt");
+ int i;
+ for (i = 0; sentences[i].fileName != ""; i++)
+ {
+ sw.WriteLine(sentences[i].toRaw());
+ synth.SetOutputToWaveFile(@"SOUNDS\" + curLang.sName + @"\SYSTEM\" + sentences[i].fileName + ".wav", audioFormat);
+ try { synth.Speak(sentences[i].voiceString); }
+ catch (Exception){} // Workaround - Some TTS engines crashes on destruction
+ }
+ sw.Close();
+ sw = File.CreateText(@"SOUNDS\" + curLang.sName + @"\other_sounds.txt");
+ for (i++; i < sentences.Count; i++)
+ {
+ sw.WriteLine(sentences[i].toRaw());
+ synth.SetOutputToWaveFile(@"SOUNDS\" + curLang.sName + @"\" + sentences[i].fileName + ".wav", audioFormat);
+ try { synth.Speak(sentences[i].voiceString); }
+ catch (Exception){} // Workaround - Some TTS engines crashes on destruction
+ }
+ sw.Close();
+ synth.SetOutputToNull(); // Workaround - The synth does not release the sound file like it should
+ this.Cursor = oldCursor;
+ }
+ }
+
+ public class Language
+ {
+ public string lName { get; set; }
+ public string sName { get; set; }
+ }
+
+ public class Languages : List
+ {
+ public void Add(string longer, string shorter)
+ {
+ this.Add(new Language { lName = longer, sName = shorter });
+ }
+ }
+
+ public class Sentence
+ {
+ public string fileName { get; set; }
+ public string description { get; set; }
+ public string voiceString { get; set; }
+
+ public Sentence(string rawString)
+ {
+ string[] words = rawString.Split(';');
+ fileName = words[0].TrimStart(' ', '\"');
+ description = words[1];
+ voiceString = words[2].TrimEnd('\"', ',', ' ');
+ }
+
+ public string toRaw()
+ {
+ return "\"" +fileName + ";" + description + ";" + voiceString + "\",";
+ }
+ }
+
+ public class Sentences : List
+ {
+ public void Add(string rawString)
+ {
+ this.Add(new Sentence(rawString));
+ }
+ }
+}
diff --git a/sound/speaker/OpenTXspeaker.csproj b/sound/speaker/OpenTXspeaker.csproj
new file mode 100644
index 000000000..2d82a5211
--- /dev/null
+++ b/sound/speaker/OpenTXspeaker.csproj
@@ -0,0 +1,168 @@
+
+
+
+ Debug
+ x86
+ 8.0.30703
+ 2.0
+ {BB2C7ECA-B4B9-4957-B7D9-B0C7817CA148}
+ WinExe
+ Properties
+ OpenTXspeaker
+ OpenTXspeaker
+ v4.0
+ Client
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ x86
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ x86
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ icon.ico
+
+
+
+
+
+
+
+
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ AboutWindow.xaml
+
+
+ App.xaml
+
+
+ installvoices.xaml
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MainWindow.xaml
+ Code
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4 Client Profile %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 3.1
+ true
+
+
+
+
+
\ No newline at end of file
diff --git a/sound/speaker/OpenTXspeaker.sln b/sound/speaker/OpenTXspeaker.sln
new file mode 100644
index 000000000..5e3ae972f
--- /dev/null
+++ b/sound/speaker/OpenTXspeaker.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTXspeaker", "OpenTXspeaker.csproj", "{8143D08D-1861-42DD-A861-56B15DE42A69}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Debug|x86.ActiveCfg = Debug|x86
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Debug|x86.Build.0 = Debug|x86
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Release|x86.ActiveCfg = Release|x86
+ {8143D08D-1861-42DD-A861-56B15DE42A69}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/sound/speaker/Properties/AssemblyInfo.cs b/sound/speaker/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..f09239ca6
--- /dev/null
+++ b/sound/speaker/Properties/AssemblyInfo.cs
@@ -0,0 +1,71 @@
+/* This file is part of OpenTX Speaker.
+* OpenTX Speaker is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+
+* OpenTX Speaker 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.
+
+* You should have received a copy of the GNU General Public License
+* along with OpenTX Speaker. If not, see .
+*
+* Copyright 2014 Kjell Kernen */
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenTX Speaker")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("OpenTX Team")]
+[assembly: AssemblyProduct("OpenTX Speaker")]
+[assembly: AssemblyCopyright("Copyright © Kjell Kernen 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//CultureYouAreCodingWith in your .csproj file
+//inside a . For example, if you are using US english
+//in your source files, set the to en-US. Then uncomment
+//the NeutralResourceLanguage attribute below. Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.3")]
+[assembly: AssemblyFileVersion("1.3")]
diff --git a/sound/speaker/Properties/Resources.Designer.cs b/sound/speaker/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..d139db43b
--- /dev/null
+++ b/sound/speaker/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace OpenTXspeaker.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenTXspeaker.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/sound/speaker/Properties/Resources.resx b/sound/speaker/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/sound/speaker/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/sound/speaker/Properties/Settings.Designer.cs b/sound/speaker/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..c53e24567
--- /dev/null
+++ b/sound/speaker/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace OpenTXspeaker.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/sound/speaker/Properties/Settings.settings b/sound/speaker/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/sound/speaker/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sound/speaker/aboutWindow.xaml b/sound/speaker/aboutWindow.xaml
new file mode 100644
index 000000000..c808ba688
--- /dev/null
+++ b/sound/speaker/aboutWindow.xaml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sound/speaker/aboutWindow.xaml.cs b/sound/speaker/aboutWindow.xaml.cs
new file mode 100644
index 000000000..99df8fc5b
--- /dev/null
+++ b/sound/speaker/aboutWindow.xaml.cs
@@ -0,0 +1,62 @@
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Speaker. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Navigation;
+
+
+namespace OpenTXspeak
+{
+ public partial class AboutWindow : Window
+ {
+ public AboutWindow()
+ {
+ InitializeComponent();
+ Assembly app = Assembly.GetExecutingAssembly();
+
+ AssemblyTitleAttribute title = (AssemblyTitleAttribute)app.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0];
+ AssemblyProductAttribute product = (AssemblyProductAttribute)app.GetCustomAttributes(typeof(AssemblyProductAttribute), false)[0];
+ AssemblyCopyrightAttribute copyright = (AssemblyCopyrightAttribute)app.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false)[0];
+ AssemblyCompanyAttribute company = (AssemblyCompanyAttribute)app.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0];
+ Version version = app.GetName().Version;
+
+ this.Title = String.Format("About {0}", title.Title);
+ this.lblProductName.Content = product.Product;
+ this.lblVersion.Content = String.Format("Version {0}", version.ToString());
+ this.lblCopyright.Content = copyright.Copyright.ToString();
+ this.lblCompanyName.Content = company.Company;
+ }
+
+ private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
+ {
+ Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
+ e.Handled = true;
+ }
+ }
+}
diff --git a/sound/speaker/eSpeak.png b/sound/speaker/eSpeak.png
new file mode 100644
index 000000000..49229b648
Binary files /dev/null and b/sound/speaker/eSpeak.png differ
diff --git a/sound/speaker/icon.ico b/sound/speaker/icon.ico
new file mode 100644
index 000000000..e81c703b7
Binary files /dev/null and b/sound/speaker/icon.ico differ
diff --git a/sound/speaker/installvoices.xaml b/sound/speaker/installvoices.xaml
new file mode 100644
index 000000000..4e25f5cc6
--- /dev/null
+++ b/sound/speaker/installvoices.xaml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sound/speaker/installvoices.xaml.cs b/sound/speaker/installvoices.xaml.cs
new file mode 100644
index 000000000..cb997c88f
--- /dev/null
+++ b/sound/speaker/installvoices.xaml.cs
@@ -0,0 +1,53 @@
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Speaker. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Navigation;
+
+
+
+namespace OpenTXspeak
+{
+ ///
+ /// Interaction logic for installvoices.xaml
+ ///
+ public partial class InstallVoicesWindow : Window
+ {
+ public InstallVoicesWindow()
+ {
+ InitializeComponent();
+ }
+
+ private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
+ {
+ Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
+ e.Handled = true;
+ }
+
+ }
+}
diff --git a/sound/speaker/sentencetables.cs b/sound/speaker/sentencetables.cs
new file mode 100644
index 000000000..416c2dad0
--- /dev/null
+++ b/sound/speaker/sentencetables.cs
@@ -0,0 +1,2455 @@
+/* This file is part of OpenTX Speaker.
+ * OpenTX Speaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OpenTX Speaker 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.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OpenTX Speaker. If not, see .
+ *
+ * Copyright 2014 Kjell Kernen */
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace OpenTXspeak
+{
+ public class SentenceTables
+ {
+ private static string[] default_pl_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;;1000",
+ "0110;TISIACE;tisiace",
+ "0111;JEDNA;jedna",
+ "0112;JEDNO;jedno",
+ "0113;DWIE;dwie",
+ "0114;CALA;cela",
+ "0115;CALE;cale",
+ "0116;CALYCH;calych",
+ "0117;MINUS;minus",
+
+ "0120;Female number;",
+ "0121;Female number;",
+ "0122;Female number;",
+ "0123;Female number;",
+ "0124;Female number;",
+ "0125;Female number;",
+ "0126;Female number;",
+ "0127;Female number;",
+ "0128;Female number;",
+ "0129;Female number;",
+
+ "0160;volt 1;wolt",
+ "0161;volt 2;wolty",
+ "0162;volt 3;",
+ "0163;volt 4;",
+ "0164;amps 1;",
+ "0165;amps 2;",
+ "0166;amps 3;",
+ "0167;amps 4;",
+ "0168;mps 1;",
+ "0169;mps 2;",
+ "0170;mps 3;",
+ "0171;mps 4;",
+ "0172;spare 1;",
+ "0173;spare 2;",
+ "0174;spare 3;",
+ "0175;spare 4;",
+ "0176;kmh 1;",
+ "0177;kmh 2;",
+ "0178;kmh 3;",
+ "0179;kmh 4;",
+ "0180;meter 1;",
+ "0181;meter 2;",
+ "0182;meter 3;",
+ "0183;meter 4;",
+ "0184;degrees 1;",
+ "0185;degrees 2;",
+ "0186;degrees 3;",
+ "0187;degrees 4;",
+ "0188;percent 1;",
+ "0189;percent 2;",
+ "0190;percent 3;",
+ "0191;percent 4;",
+ "0192;milliamps 1;",
+ "0193;milliamps 2;",
+ "0194;milliamps 3;",
+ "0195;milliamps 4;",
+ "0196;mAh 1;",
+ "0197;mAh 2;",
+ "0198;mAh 3;",
+ "0199;mAh 4;",
+ "0200;watt 1;",
+ "0201;watt 2;",
+ "0202;watt 3;",
+ "0203;watt 4;",
+ "0204;db 1;",
+ "0205;db 2;",
+ "0206;db 3;",
+ "0207;db 4;",
+ "0208;feet 1;",
+ "0209;feet 2;",
+ "0210;feet 3;",
+ "0211;feet 4;",
+ "0212;knot 1;",
+ "0213;knot 2;",
+ "0214;knot 3;",
+ "0215;knot 4;",
+ "0216;hours 1;",
+ "0217;hours 2;",
+ "0218;hours 3;",
+ "0219;hours 4;",
+ "0220;minutes 1;",
+ "0221;minutes 2;",
+ "0222;minutes 3;",
+ "0223;minutes 4;",
+ "0224;secondds 1;",
+ "0225;secondds 2;",
+ "0226;secondds 3;",
+ "0227;secondds 4;",
+ "0228;rpm 1;",
+ "0229;rpm 2;",
+ "0230;rpm 3;",
+ "0231;rpm 4;",
+ "0232;g 1;",
+ "0233;g 2;",
+ "0234;g 3;",
+ "0235;g 4;",
+ "0250;Timer1;",
+ "0251;Timer2;",
+ "0252;RSSI Tx;",
+ "0253;RSSI Rx;",
+ "0254;A1;",
+ "0255;A2;",
+ "0256;Altitude;",
+ "0257;RPM;",
+ "0258;Fuel;",
+ "0259;T1;",
+ "0260;T2;",
+ "0261;Speed;",
+ "0262;Distance;",
+ "0263;GPS Altitude;",
+ "0264;LiPo Elements;",
+ "0265;LiPo Total;",
+ "0266;VFAS;",
+ "0267;Current;",
+ "0268;Consumption;",
+ "0269;Telemetry Power;",
+ "0270;Accel X;",
+ "0271;Accel Y;",
+ "0272;Accel Z;",
+ "0217;HDG;",
+ "0218;Vario;",
+ };
+
+ private static string[] default_pl_other_strings =
+ {
+ "atti;attitude;",
+ "batcrit;battery critical;",
+ "batlow;low battery;",
+ "camcenter;camera center;",
+ "camfix;camera fixed;",
+ "cammanual;camera manual;",
+ "flapsdn;flaps down;",
+ "flapsup;flaps up;",
+ "fltmode1;flight mode 1;",
+ "fltmode2;flight mode 2;",
+ "fltmode3;flight mode 3;",
+ "fltmode4;flight mode 4;",
+ "fltmode5;flight mode 5;",
+ "fltmode6;flight mode 6;",
+ "fltmode7;flight mode 7;",
+ "fltmode8;flight mode 8;",
+ "fltmode9;flight mode 9;",
+ "fsoff;failsafe off;",
+ "fson;failsafe on;",
+ "geardn;gear down;",
+ "gearup;gear upp;",
+ "gps;gps;",
+ "hirates;hi rates;",
+ "htoff;head tracker off;",
+ "hton;head tracker on;",
+ "ioc;ioc;",
+ "iocoff;ioc off;",
+ "lowrates;lowrates;",
+ "manual;manual;",
+ "normal;normal;",
+ "nrmmod;normal mode;",
+ "thrhold;throttle locked;",
+ "thrrel;throttle released;",
+ };
+
+ private static string[] default_sk_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;jedna",
+ "0002;2;dva",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;1000;1000",
+ "0110;2000;dvetisíc;",
+ "0111;JEDEN;jeden",
+ "0112;JEDNO;jedno",
+ "0113;DVE;dve",
+ "0114;CELA;celá",
+ "0115;CELE;celá",
+ "0116;CELYCH;celýnch",
+ "0117;MINUS;minus",
+ "0118;volt 1;volt",
+ "0119;volt 2;volty",
+ "0120;volt 3;voltov",
+ "0121;volt 4;volta",
+ "0122;amps 1;ampér",
+ "0123;amps 2;ampére",
+ "0124;amps 3;ampérov",
+ "0125;amps 4;ampéra",
+ "0126;mps 1;meter za sekundu",
+ "0127;mps 2;metre za sekundu",
+ "0128;mps 3;metrov za sekundu",
+ "0129;mps 4;metra za sekundu",
+ "0130;spare 1;jednotka",
+ "0131;spare 2;jednotky",
+ "0132;spare 3;jednotiek",
+ "0133;spare 4;jednotky",
+ "0134;kmh 1;kilometer za hodinu",
+ "0135;kmh 2;kilometre za hodinu",
+ "0136;kmh 3;kilometrov za hodinu",
+ "0137;kmh 4;kilometra za hodinu",
+ "0138;meter 1;meter",
+ "0139;meter 2;metre",
+ "0140;meter 3;metrov",
+ "0141;meter 4;metra",
+ "0142;degrees 1;stupeň",
+ "0143;degrees 2;stupně",
+ "0144;degrees 3;stupňov",
+ "0145;degrees 4;stupňa",
+ "0146;percent 1;percento",
+ "0147;percent 2;percentá",
+ "0148;percent 3;percent",
+ "0149;percent 4;percenta",
+ "0150;milliamps 1;miliampér",
+ "0151;milliamps 2;miliampére",
+ "0152;milliamps 3;miliampérov",
+ "0153;milliamps 4;miliampéra",
+ "0154;mAh 1;miliampérhodina",
+ "0155;mAh 2;miliampérhodiny",
+ "0156;mAh 3;miliampérhodín",
+ "0157;mAh 4;miliampérhodiny",
+ "0158;watt 1;vat",
+ "0159;watt 2;vaty",
+ "0160;watt 3;vatov",
+ "0161;watt 4;vatu",
+ "0162;db 1;decibel",
+ "0163;db 2;decibely",
+ "0164;db 3;decibelov",
+ "0165;db 4;decibela",
+ "0166;feet 1;stopa",
+ "0167;feet 2;stopy",
+ "0168;feet 3;stuop",
+ "0169;feet 4;stopy",
+ "0170;knot 1;uzol",
+ "0171;knot 2;uzly",
+ "0172;knot 3;uzlov",
+ "0173;knot 4;uzla",
+ "0174;hours 1;hodina",
+ "0175;hours 2;hodiny",
+ "0176;hours 3;hodín",
+ "0177;hours 4;hodiny",
+ "0178;minutes 1;minůta",
+ "0179;minutes 2;minůty",
+ "0180;minutes 3;minůt",
+ "0181;minutes 4;minůty",
+ "0182;secondds 1;sekunda",
+ "0183;secondds 2;sekundy",
+ "0184;secondds 3;sekund",
+ "0185;secondds 4;sekundy",
+ "0186;rpm 1;otáčka za minůtu",
+ "0187;rpm 2;otáčky za minůtu",
+ "0188;rpm 3;otáčok za minůtu",
+ "0189;rpm 4;otáčky za minůtu",
+ "0190;g 1;gé",
+ "0191;g 2;gé",
+ "0192;g 3;gé",
+ "0193;g 4;gé",
+ "a1_org;a1 low;",
+ "a1_red;a1 critical;",
+ "a2_org;a2 low;",
+ "a2_red;a2 critical;",
+ "endtrim;maximum trim reached;",
+ "inactiv;inactivity alarm;",
+ "lowbatt;radio battery low;",
+ "midtrim;trim center;",
+ "rssi_org;rf signal low;",
+ "rssi_red;rf signal critical;",
+ "swalert;switch warning;",
+ "swr_red;radio antenna defective;",
+ "tada;Start Sound;",
+ "telemko;telemetry lost;",
+ "telemok;telemetry recover;",
+ "thralert;throttle warning;",
+ "timer10;10 seconds;",
+ "timer20;20 seconds;",
+ "timer30;30 seconds;",
+ "timerlt3;timer sound;"
+ };
+
+ private static string[] default_sk_other_strings =
+ {
+ "atti;attitude;",
+ "batcrit;battery critical;",
+ "batlow;low battery;",
+ "camcenter;camera center;",
+ "camfix;camera fixed;",
+ "cammanual;camera manual;",
+ "flapsdn;flaps down;",
+ "flapsup;flaps up;",
+ "fltmode1;flight mode 1;",
+ "fltmode2;flight mode 2;",
+ "fltmode3;flight mode 3;",
+ "fltmode4;flight mode 4;",
+ "fltmode5;flight mode 5;",
+ "fltmode6;flight mode 6;",
+ "fltmode7;flight mode 7;",
+ "fltmode8;flight mode 8;",
+ "fltmode9;flight mode 9;",
+ "fsoff;failsafe off;",
+ "fson;failsafe on;",
+ "geardn;gear down;",
+ "gearup;gear upp;",
+ "gps;gps;",
+ "hirates;hi rates;",
+ "htoff;head tracker off;",
+ "hton;head tracker on;",
+ "ioc;ioc;",
+ "iocoff;ioc off;",
+ "lowrates;lowrates;",
+ "manual;manual;",
+ "normal;normal;",
+ "nrmmod;normal mode;",
+ "thrhold;throttle locked;",
+ "thrrel;throttle released;"
+ };
+
+ private static string[] default_es_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;;ciento",
+ "0102;;doscientos",
+ "0103;;trescientos",
+ "0104;;cuatrocientos",
+ "0105;;quinientos",
+ "0106;;sescientos",
+ "0107;;setecientos",
+ "0108;;ochocientos",
+ "0109;;nuevecientos",
+ "0110;;mil",
+ "0111;;coma",
+ "0112;;un",
+ "0113;;una",
+ "0114;;y",
+ "0115;;meno",
+ "0116;;hora",
+ "0117;;horas",
+ "0118;;minuto",
+ "0119;;minutos",
+ "0120;;segundo",
+ "0121;;segundos",
+ "0122;;Voltio",
+ "0123;;ampério",
+ "0124;;metros por segundo",
+ "0125;;",
+ "0126;;kilómetro por hora",
+ "0127;;metros",
+ "0128;;grados",
+ "0129;;por ciento",
+ "0130;;miliamperios",
+ "0131;;miliamperios por hora",
+ "0132;;vatio",
+ "0133;;db",
+ "0134;;pés",
+ "0135;;nós",
+ "0136;;horas",
+ "0137;;minutos",
+ "0138;;segundos",
+ "0139;;RPM",
+ "0140;;g",
+ "0141;;cronómetro",
+ "0142;;cronómetro",
+ "0143;;transmisión",
+ "0144;;recepción",
+ "0145;;A1",
+ "0146;;A2",
+ "0147;;altitud",
+ "0148;;motor",
+ "0149;;combustible",
+ "0150;;temperatura",
+ "0151;;temperatura",
+ "0152;;velocidad",
+ "0153;;distancia",
+ "0154;;altitude",
+ "0155;;célula lipo",
+ "0156;;Total lipo",
+ "0157;;voltaje",
+ "0158;;corriente",
+ "0159;;consumo",
+ "0160;;potencia",
+ "0161;;aceleración X",
+ "0162;;aceleración Y",
+ "0163;;aceleración Z",
+ "0164;;dirección",
+ "0165;;variómetro",
+ "0166;;minimo",
+ "0167;;máximo",
+ "a1_org;;Alarma A1",
+ "a1_red;;A1 crítica",
+ "a2_org;;Alarma A2",
+ "a2_red;;A2 crítica",
+ "eebad;;eeprom corrompida",
+ "eeformat;;Formateo de eeprom en curso",
+ "endtrim;;trim al máximo",
+ "error;;error",
+ "highmah;;assorbimiento elevado",
+ "hightemp;;temperatura elevada",
+ "inactiv;;me tienes abandonada",
+ "lowbatt;;batería del transmisor baja",
+ "midpot;;potenciómetro centrado",
+ "midtrim;;trim centrado",
+ "rssi_org;;recepcion de señal baja",
+ "rssi_red;;recepción de señal crítica",
+ "swr_red;;Problemas con la antena del transmisor",
+ "swalert;;Los interruptores no están en la posición correcta, por favor corrijalo",
+ "tada;OpenTX Welcome sound;Bienvenida a OpenTX",
+ "telemko;;Sin telemetría",
+ "telemok;;Telemetría disponible",
+ "thralert;;El acelerador está activado, por favor, corrijalo",
+ "timer10;;10 segundos",
+ "timer20;;20 segundos",
+ "timer30;;30 segundos",
+ "timerlt3;;3 segundos"
+ };
+
+ private static string[] default_es_other_strings =
+ {
+ "attero;;aterrizaje",
+ "crowof;;crou, desligado",
+ "crowon;;crou, activo",
+ "engoff;;motor apagado",
+ "flapdn;;flaps abajo",
+ "flapup;;flaps arriba",
+ "fltmd1;;fase de vuelo 1",
+ "fltmd2;;fase de vuelo 2",
+ "fltmd3;;fase de vuelo 3",
+ "fltmd4;;fase de vuelo 4",
+ "fltmd5;;fase de vuelo 5",
+ "fltmd6;;fase de vuelo 6",
+ "fltmd7;;fase de vuelo 7",
+ "fltmd8;;fase de vuelo 8",
+ "fltmd9;;fase de vuelo 9",
+ "geardn;;tren abajo.",
+ "gearup;;tren arriba.",
+ "lowbat;;bateria baja",
+ "nrmmod;;modo de vuelo normal",
+ "spdmod;;modo de velocidad",
+ "thmmod;;modo de térmica",
+ "trnoff;;modo de entrenamiento deshabilitado",
+ "trnon;;modo de entrenamiento activado",
+ "tohigh;;muy alto",
+ "tolow;;muy bajo"
+ };
+
+ private static string[] default_pt_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;;cento",
+ "0102;;duzentos",
+ "0103;;trezentos",
+ "0104;;quatrocentos",
+ "0105;;quinhentos",
+ "0106;;seiscentos",
+ "0107;;setecentos",
+ "0108;;oitocentos",
+ "0109;;novecentos",
+ "0110;;mil",
+ "0111;;virgula",
+ "0112;;uma",
+ "0113;;duas",
+ "0114;;e",
+ "0115;;menos",
+ "0116;;hora",
+ "0117;;horas",
+ "0118;;minuto",
+ "0119;;minutos",
+ "0120;;segundo",
+ "0121;;segundos",
+ "0122;;Volt",
+ "0123;;ampére",
+ "0124;;metros por segundo",
+ "0125;;",
+ "0126;;quilômetros por hora",
+ "0127;;metros",
+ "0128;;graus",
+ "0129;;cento",
+ "0130;;miliamperes",
+ "0131;;miliamperes por hora",
+ "0132;;watt",
+ "0133;;db",
+ "0134;;pés",
+ "0135;;nós",
+ "0136;;horas",
+ "0137;;minutos",
+ "0138;;segundos",
+ "0139;;RPM",
+ "0140;;g",
+ "0141;;cronómetro",
+ "0142;;cronómetro",
+ "0143;;transmissão",
+ "0144;;recepção",
+ "0145;;A1",
+ "0146;;A2",
+ "0147;;altitude",
+ "0148;;motor",
+ "0149;;combustível",
+ "0150;;temperatura",
+ "0151;;temperatura",
+ "0152;;velocidade",
+ "0153;;distância",
+ "0154;;altitude",
+ "0155;;célula lipo",
+ "0156;;Total lipo",
+ "0157;;tensão",
+ "0158;;corrente",
+ "0159;;consumo",
+ "0160;;potência",
+ "0161;;aceleração X",
+ "0162;;aceleração Y",
+ "0163;;aceleração Z",
+ "0164;;Direcção",
+ "0165;;variómetro",
+ "0166;;mínimo",
+ "0167;;máximo",
+ "a1_org;;Alarme A1",
+ "a1_red;;A1 critica",
+ "a2_org;;Alarme A2",
+ "a2_red;;A2 critica",
+ "eebad;;eeprom corrompida",
+ "eeformat;;formatação da eeprom em curso",
+ "endtrim;;trim no máximo",
+ "error;;erro",
+ "highmah;;assorbimento elevato",
+ "hightemp;;temperatura elevata",
+ "inactiv;;atenção, o rádio foi esquecido ligado, por favor desligue-o",
+ "midtrim;;trim centrado",
+ "midpot;;potenciómetro centrado",
+ "lowbatt;;bateria do rádio fraca",
+ "rssi_org;;recepção de sinal muito baixa",
+ "rssi_red;;recepção de sinal crítica",
+ "swalert;;atenção, certifique-se que os interruptores estão na posição certa",
+ "swr_red;;Problema com a antena do transmissor",
+ "tada;;Bem-vindo ao OpenTX",
+ "thralert;;atenção,acelerador não está no mínimo",
+ "timer10;;10 segundos",
+ "timer20;;20 segundos",
+ "timer30;;30 segundos",
+ "timerlt3;;três segundo"
+ };
+
+ private static string[] default_pt_other_strings =
+ {
+ "attero;;aterragem",
+ "crowof;;crou, desligado",
+ "crowon;;crou, activo",
+ "engoff;;motor desligado",
+ "flapdn;;flaps estendidos",
+ "flapup;;flaps recolhidos",
+ "fltmd1;;fase de voo 1",
+ "fltmd2;;fase de voo 2",
+ "fltmd3;;fase de voo 3",
+ "fltmd4;;fase de voo 4",
+ "fltmd5;;fase de voo 5",
+ "fltmd6;;fase de vôo 6",
+ "fltmd7;;fase de voo 7",
+ "fltmd8;;fase de voo 8",
+ "fltmd9;;fase de voo 9",
+ "geardn;;trem, em baixo.",
+ "gearup;;trem, em cima.",
+ "lowbat;;bateria fraca",
+ "nrmmod;;modo de voo normal",
+ "sigcrt;;sinal crítico",
+ "siglow;;sinal baixo",
+ "spdmod;;modo de velocidade",
+ "thmmod;;modo de térmica",
+ "trnoff;;modo de treino desligado",
+ "trnon;;modo de treino ligado",
+ "tohigh;;muito alto",
+ "tolow;;muito baixo"
+ };
+
+ private static string[] default_cz_system_strings =
+ {
+ "0000;0;nula",
+ "0001;1;jedna",
+ "0002;2;dva",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;;sto",
+ "0101;;dvěsta",
+ "0102;;třista",
+ "0103;;čtyřista",
+ "0104;;pětset",
+ "0105;;šestset",
+ "0106;;sedmset",
+ "0107;;osmset",
+ "0108;;devětset",
+ "0109;;tisíc",
+ "0110;;tisíce",
+ "0111;;jeden",
+ "0112;;jedno",
+ "0113;;dvě",
+ "0114;;celá",
+ "0115;;celé",
+ "0116;;celých",
+ "0117;;mínus",
+ "0118;;volt",
+ "0119;;volty",
+ "0120;;voltů",
+ "0121;;voltu",
+ "0122;;ampér",
+ "0123;;ampéry",
+ "0124;;ampérů",
+ "0125;;ampéru",
+ "0126;;metr za sekundu",
+ "0127;;metry za sekundu",
+ "0128;;metrů za sekundu",
+ "0129;;metru za sekundu",
+ "0130;;jednotka",
+ "0131;;jednotky",
+ "0132;;jednotek",
+ "0133;;jednotky",
+ "0134;;kilometr za hodinu",
+ "0135;;kilometry za hodinu",
+ "0136;;kilometrů za hodinu",
+ "0137;;kilometru za hodinu",
+ "0138;;metr",
+ "0139;;metry",
+ "0140;;metrů",
+ "0141;;metru",
+ "0142;;stupeň",
+ "0143;;stupně",
+ "0144;;stupňů",
+ "0145;;stupně",
+ "0146;;procento",
+ "0147;;procenta",
+ "0148;;procento",
+ "0149;;procenta",
+ "0150;;miliampér",
+ "0151;;miliampéry",
+ "0152;;miliampérů",
+ "0153;;miliampéru",
+ "0154;;miliampérhodina",
+ "0155;;miliampérhodiny",
+ "0156;;miliampérhodin",
+ "0157;;miliampérhodiny",
+ "0158;;vat",
+ "0159;;vaty",
+ "0160;;vatů",
+ "0161;;vatu",
+ "0162;;decibel",
+ "0163;;decibely",
+ "0164;;decibelů",
+ "0165;;decibelu",
+ "0166;;stopa",
+ "0167;;stopy",
+ "0168;;stop",
+ "0169;;stopy",
+ "0170;;uzel",
+ "0171;;uzly",
+ "0172;;uzlů",
+ "0173;;uzlu",
+ "0174;;hodina",
+ "0175;;hodiny",
+ "0176;;hodin",
+ "0177;;hodiny",
+ "0178;;minuta",
+ "0179;;minuty",
+ "0180;;minut",
+ "0181;;minuty",
+ "0182;;sekunda",
+ "0183;;sekundy",
+ "0184;;sekund",
+ "0185;;sekundy",
+ "0186;;otáčka za minutu",
+ "0187;;otáčky za minutu",
+ "0188;;otáček za minutu",
+ "0189;;otáčky za minutu",
+ "0190;;gé",
+ "0191;;gé",
+ "0192;;gé",
+ "0193;;gé",
+ "a1_org;;A1,nízká",
+ "a1_red;;A1,kritická",
+ "a2_org;;A2,nízká",
+ "a2_red;;A2,kritická",
+ "eebad;;neplatná eeprom",
+ "endtrim;;maximum trimu",
+ "inactiv;;zapoměl jsi na mě!",
+ "lowbatt;;baterie rádia je vybitá",
+ "midtrim;;střed trimu",
+ "rssi_org;;nízký RF signál",
+ "rssi_red;;kritický RF signál",
+ "swalert;;přepínače nejsou ve výchozí poloze",
+ "swr_red;;problém s anténou rádia",
+ "tada;;Oupn najn iks",
+ "telemko;;telemetrie ztracena",
+ "telemok;;telemetrie je funkční",
+ "thralert;;plyn není na nule",
+ "timer10;;deset sekund",
+ "timer20;;dvacet sekund",
+ "timer30;;třicet sekund",
+ "timerlt3;;tři sekund!"
+ };
+
+ private static string[] default_cz_other_strings =
+ {
+ "bytvybita;;baterie modelu je vybitá",
+ "klapky0;;klapky jsou vypnuty",
+ "klapky1;;klapky jsou zapnuty",
+ "ksignal;;kritický signál!",
+ "motor0;;motor je vypnut",
+ "motor1;;motor je aktivován",
+ "nizko;;jsi příliš nízko",
+ "nsignal;;nízký signál!",
+ "palivo;;dochází palivo",
+ "podvozek0;;podvozek je zasunut",
+ "podvozek1;;podvozek je vysunut",
+ "r_norm;;normální režim aktivován",
+ "r_pristani;;režim přistání aktivován",
+ "r_rychly;;rychlý režim aktivován",
+ "r_start;;režim start aktivován",
+ "r_termik;;termický režim aktivován",
+ "stpovolen;;start povolen",
+ "trener0;;trenér je vypnutý",
+ "trener1;;trenér je zapnut",
+ "vario0;;vario je zapnuto",
+ "vario1;;vario je vypnuto",
+ "vysoko;;jsi příliš vysoko"
+ };
+
+ private static string[] default_en_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;thousand;thousand",
+ "0111;minus;minus",
+ "0112;point;point",
+ "0115;volt;volt",
+ "0116;volts;volts",
+ "0117;amp;ampere",
+ "0118;amps;ampere",
+ "0119;meter per second;meter per second",
+ "0120;meters per second;meters per second",
+ "0123;kmh;k-m-h",
+ "0124;kmh;k-m-h",
+ "0125;meter;meter",
+ "0126;meters;meters",
+ "0127;degree;degree",
+ "0128;degrees;degrees",
+ "0129;percent;percent",
+ "0130;percent;percent",
+ "0131;milliamp;milliamp",
+ "0132;milliamps;milliamps",
+ "0133;mah;m-a-h",
+ "0134;mah;m-a-h",
+ "0135;watt;watt",
+ "0136;watts;watts",
+ "0137;db;db",
+ "0138;db;db",
+ "0140;feet;feet",
+ "0141;knot;knot",
+ "0142;knots;knots",
+ "0143;hour;hour",
+ "0144;hours;hours",
+ "0145;minute;minute",
+ "0146;minutes;minutes",
+ "0147;second;second",
+ "0148;seconds;seconds",
+ "0149;rpm;r-p-m",
+ "0150;rpm;r-p-m",
+ "0151;g;gee",
+ "0152;g;gees",
+ "0160;point zero;point zero",
+ "0161;point one;point one",
+ "0162;point two;point two",
+ "0163;point three;point three",
+ "0164;point four;point four",
+ "0165;point five;point five",
+ "0166;point six;point six",
+ "0167;point seven;point seven",
+ "0168;point eight;point eight",
+ "0169;point nine;point nine",
+ "a1_org;a1 low;a1 low",
+ "a1_red;a1 critical;a1 critical",
+ "a2_org;a2 low;a2 low",
+ "a2_red;a2 critical;a2 critical",
+ "endtrim;maximum trim reached;maximum trim reached",
+ "inactiv;inactivity alarm;inactivity alarm",
+ "lowbatt;radio battery low;radio battery low",
+ "midtrim;trim center;center",
+ "rssi_org;rf signal low;rf signal low",
+ "rssi_red;rf signal critical;rf signal critical",
+ "swalert;switch warning;switch warning",
+ "swr_red;radio antenna defective;radio antenna defective",
+ "tada;Start Sound;welcome to open T-X",
+ "telemko;telemetry lost;telemetry lost",
+ "telemok;telemetry recover;telemetry recover",
+ "thralert;throttle warning;throttle warning",
+ "timer10;10 seconds;10 seconds",
+ "timer20;20 seconds;20 seconds",
+ "timer30;30 seconds;30 seconds",
+ "timerlt3;timer sound;3 seconds"
+ };
+
+ private static string[] default_en_other_strings =
+ {
+ "atti;attitude;attitude",
+ "batcrit;battery critical;battery critical",
+ "batlow;low battery;low battery",
+ "camcenter;camera center;camera center",
+ "camfix;camera fixed;camera fixed",
+ "cammanual;camera manual;camera manual",
+ "capacity;capacity;capacity",
+ "engdis;engine disabled;engine disabled",
+ "engoff;engine off;engine off",
+ "engon;engine on;engine on",
+ "flaps1;flaps 1;flaps 1",
+ "flaps2;flaps 2;flaps 2",
+ "flapsdn;flaps down;flaps down",
+ "flapsup;flaps up;flaps up",
+ "fltmode1;flight mode one;flight mode one",
+ "fltmode2;flight mode two;flight mode two",
+ "fltmode3;flight mode three;flight mode three",
+ "fltmode4;flight mode four;flight mode four",
+ "fltmode5;flight mode five;flight mode five",
+ "fltmode6;flight mode six;flight mode six",
+ "fltmode7;flight mode seven;flight mode seven",
+ "fltmode8;flight mode eight;flight mode eight",
+ "fsoff;failsafe off;failsafe off",
+ "fson;failsafe on;failsafe on",
+ "geardn;gear down;gear down",
+ "gearup;gear upp;gear upp",
+ "gps;gps;G-P-S",
+ "horn;horn sound;eeeeeeeee",
+ "hirates;hi rates;hi rates",
+ "htoff;head tracker off;head tracker off",
+ "hton;head tracker on;head tracker on",
+ "ioc;ioc;ioc",
+ "iocoff;ioc off;ioc off",
+ "lowrates;lowrates;lowrates",
+ "manual;manual;manual",
+ "normal;normal;normal",
+ "nrmmod;normal mode;normal mode",
+ "pouet;small horn;ee , ee",
+ "shutter;camera shutter sound;klick",
+ "thrhold;throttle locked;throttle locked",
+ "thrrel;throttle released;throttle released",
+ "wizz;wizzing sound;shiss"
+ };
+
+ private static string[] default_se_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;en",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;tjugoen",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;trettioen",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;fyrtioen",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;femtioen",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;sextioen",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;sjuttioen",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;åttioen",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;nittioen",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;thousand;tusen",
+ "0111;minus;minus",
+ "0112;point;komma",
+ "0115;volt;volt",
+ "0116;volts;volt",
+ "0117;amp;ampere",
+ "0118;amps;ampere",
+ "0119;meter per second;meter per sekund",
+ "0120;meters per second;meter per sekund",
+ "0123;kmh;kilometer i timmen",
+ "0124;kmh;kilometer i timmen",
+ "0125;meter;meter",
+ "0126;meters;meter",
+ "0127;degree;grad",
+ "0128;degrees;grader",
+ "0129;percent;procent",
+ "0130;percent;procent",
+ "0131;milliamp;milliampere",
+ "0132;milliamps;milliampere",
+ "0133;mah;milliampere-timme",
+ "0134;mah;milliampere-timmar",
+ "0135;watt;watt",
+ "0136;watts;watt",
+ "0137;db;dessibell",
+ "0138;db;dessibell",
+ "0140;feet;fot",
+ "0141;knot;knop",
+ "0142;knots;knop",
+ "0143;hour;timme",
+ "0144;hours;timmar",
+ "0145;minute;minut",
+ "0146;minutes;minuter",
+ "0147;second;sekund",
+ "0148;seconds;sekunder",
+ "0149;rpm;varv i minuten",
+ "0150;rpm;varv i minuten",
+ "0151;g;g",
+ "0152;g;g",
+ "0160;point zero;komma noll",
+ "0161;point one;komma en",
+ "0162;point two;komma två",
+ "0163;point three;komma tre",
+ "0164;point four;komma fyra",
+ "0165;point five;komma fem",
+ "0166;point six;komma sex",
+ "0167;point seven;komma sju",
+ "0168;point eight;komma åtta",
+ "0169;point nine;komma nio",
+ "a1_org;a1 low;a1 låg",
+ "a1_red;a1 critical;a1 kritisk",
+ "a2_org;a2 low;a2 låg",
+ "a2_red;a2 critical;a2 kritisk",
+ "endtrim;maximum trim reached;maximum trim",
+ "inact;inactivity alarm;inaktivitets-larm",
+ "lowbat;radio battery low;Låg radiobatterispänning",
+ "midtrim;trim center;center",
+ "rssi_org;rf signal low;Svag radio-signal",
+ "rssi_red;rf signal critical;Kritisk radio-signal",
+ "swalert;switch warning;brytar-varning",
+ "swr_red;;radio-antennen är defekt",
+ "tada;;Välkommen till open Te Ex",
+ "telemko;;telemetri förlorad",
+ "telemok;;telemetri åter",
+ "thralert;;gas-varning",
+ "timer10;;10 sekunder",
+ "timer20;;20 sekunder",
+ "timer30;;30 sekunder",
+ "timerlt3;timer sound;3 sekunder"
+ };
+
+ private static string[] default_se_other_strings =
+ {
+ "atti;;lutning",
+ "batcrit;;kritisk batteri-nivå",
+ "batlow;;låg batteri-nivå",
+ "camcenter;;kamera centrerad",
+ "cammanual;;manuell kamera-kontroll",
+ "capacity;;kapacitet",
+ "engdis;;motor säkrad",
+ "engoff;;motor avslagen",
+ "engon;;motor på",
+ "flaps1;;flaps läge, ett",
+ "flaps2;;flaps läge två",
+ "flapsdn;;flaps ned",
+ "flapsup;;flaps upp",
+ "fltmode1;;flyg-läge, ett",
+ "fltmode2;;flyg-läge två",
+ "fltmode3;;flyg-läge tre",
+ "fltmode4;;flyg-läge fyra",
+ "fltmode5;;flyg-läge fem",
+ "fltmode6;;flyg-läge sex",
+ "fltmode7;;flyg-läge sju",
+ "fltmode8;;flyg-läge åtta",
+ "fsoff;;fäjlsäif avslagen",
+ "fson;;fäjlsäif på",
+ "geardn;;landningsställ ned",
+ "gearup;;landningsställ upp",
+ "gps;;GPS",
+ "hirates;;höga nivåer",
+ "htoff;;head tracker avslagen",
+ "hton;;head tracker på",
+ "horn;horn sound;eeeeeeeee",
+ "ioc;;i o c",
+ "iocoff;;i o c avslagen",
+ "lowrates;;låga nivåer",
+ "manual;;manuell",
+ "normal;;normal",
+ "nrmmod;;normalt läge",
+ "pouet;small horn;ee , ee",
+ "shutter;camera shutter sound;klick",
+ "thrhold;;gas säkrad",
+ "thrrel;;gas osäkrad",
+ "speed;;hastighet",
+ "start;;start",
+ "thermal;;termik",
+ "wizz;wizzing sound;shiss"
+ };
+
+ private static string[] default_it_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;mila;mila",
+ "0102;mille;mille",
+ "0103;virgola;virgola",
+ "0104;un;un",
+ "0105;e;e",
+ "0106;meno;meno",
+ "0107;ora;ora",
+ "0108;ore;ore",
+ "0109;minuto;minuto",
+ "0110;minuti;minuti",
+ "0111;secondo;secondo",
+ "0112;secondi;secondi",
+ "0113;;volt",
+ "0114;;ampere",
+ "0115;;metri per secondo",
+ "0116;;",
+ "0117;;chilometri/ora",
+ "0118;;metri",
+ "0119;;gradi",
+ "0120;;percento",
+ "0121;;milliampere",
+ "0122;;milliampere/ora",
+ "0123;;watt",
+ "0124;;db",
+ "0125;;piedi",
+ "0126;;nodi",
+ "0127;;ore",
+ "0128;;minuti",
+ "0129;;secondi",
+ "0130;;R P M",
+ "0131;;g",
+ "0132;;timer",
+ "0133;;timer",
+ "0134;;trasmissione",
+ "0135;;ricezione",
+ "0136;;A1",
+ "0137;;A2",
+ "0138;;altitudine",
+ "0139;;motore",
+ "0140;;carburante",
+ "0141;;temperatura",
+ "0142;;temperatura",
+ "0143;;velocità",
+ "0144;;distanza",
+ "0145;;altitudine",
+ "0146;;cella lipo",
+ "0147;;totale lipo",
+ "0148;;tensione",
+ "0149;;corrente",
+ "0150;;consumo",
+ "0151;;potenza",
+ "0152;;accellerazione X",
+ "0153;;accellerazione Y",
+ "0154;;accellerazione Z",
+ "0155;;direzione",
+ "0156;;variometro",
+ "0157;;minimo",
+ "0158;;massimo",
+ "a1_org;A1 in allarme;A1 in allarme",
+ "a1_red;A1 critico;A1 critico",
+ "a2_org;A2 in allarme;A2 in allarme",
+ "a2_red;A2 critico;A2 critico",
+ "eebad;eeprom corrotta;eeprom corrotta",
+ "eeformat;formattazone eeprom in corso;formattazone eeprom in corso",
+ "endtrim;massimo trim raggiunto;massimo trim raggiunto",
+ "error;errore;errore",
+ "highmah;assorbimento elevato;assorbimento elevato",
+ "hightemp;temperatura elevata;temperatura elevata",
+ "inactiv;radio inattiva controllare;radio inattiva controllare",
+ "lowbatt;batteria della radio scarica;batteria della radio scarica",
+ "midpot;potenziometro centrato;potenziometro centrato",
+ "midtrim;trim centrato;trim centrato",
+ "rssi_org;Segnale radio basso;Segnale radio basso",
+ "rssi_red;Segnale radio critico;Segnale radio critico",
+ "swalert;interruttori non in posizione, verificare;interruttori non in posizione, verificare",
+ "swr_red;Problema all'antenna della radio;Problema all'antenna della radio",
+ "tada;;Benvenuto",
+ "telemko;Telemetria assente;Telemetria assente",
+ "telemok;Telemetria disponibile;Telemetria disponibile",
+ "thralert;controllo motore non in posizione, verificare;controllo motore non in posizione, verificare",
+ "timer10;dieci secondi;dieci secondi",
+ "timer20;venti secondi;venti secondi",
+ "timer30;trenta secondi;trenta secondi",
+ "timerlt3;timer sound;3 secondi"
+ };
+
+ private static string[] default_it_other_strings =
+ {
+ "attero;;atterraggiio",
+ "crowof;;crow off",
+ "crowon;;crow on",
+ "engoff;;motore spento",
+ "flapdn;;flap estesi",
+ "flapup;;flap rientrati",
+ "fltmd1;;fase di volo 1",
+ "fltmd2;;fase di volo 2",
+ "fltmd3;;fase di volo 3",
+ "fltmd4;;fase di volo 4",
+ "fltmd5;;fase di volo 5",
+ "fltmd6;;fase di volo 6",
+ "fltmd7;;fase di volo 7",
+ "fltmd8;;fase di volo 8",
+ "fltmd9;;fase di volo 9",
+ "geardn;;carrello aperto",
+ "gearup;;carrello chiuso",
+ "gps;;GPS",
+ "lowbat;;batteria scarica",
+ "nrmmod;;modo volo normale",
+ "spdmod;;modo velocità",
+ "thmmod;;modo termica",
+ "tohigh;;troppo alto",
+ "tolow;;troppo basso",
+ "trnoff;;modalità maestro disattiva",
+ "trnon;;modalità maestro attiva"
+ };
+
+ private static string[] default_de_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;ein",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;1000;tausend",
+ "0102;;comma;comma",
+ "0103;;und",
+ "0104;;minus",
+ "0105;;uhr",
+ "0106;;minute",
+ "0107;;minuten",
+ "0108;;sekunde",
+ "0109;;sekunden",
+ "0110;;Volt",
+ "0111;;Ampere",
+ "0112;;Meter pro sekunde",
+ "0113;;",
+ "0114;;kilometer pro stunde",
+ "0115;;Meter",
+ "0116;;Grad",
+ "0117;;Prozent",
+ "0118;;Milliampere",
+ "0119;;Milliampere pro stunde",
+ "0120;;Watt",
+ "0121;;db",
+ "0122;;Fuesse",
+ "0123;;Knoten",
+ "0124;;Uhr",
+ "0125;;Minuten",
+ "0126;;Secunden",
+ "0127;;R P M",
+ "0128;;g",
+ "0129;;Timer",
+ "0130;;Timer",
+ "0131;;Sendung",
+ "0132;;Empfang",
+ "0133;;A1",
+ "0134;;A2",
+ "0135;;Hoehe",
+ "0136;;Motor",
+ "0137;;Treibstoff",
+ "0138;;Temperatur",
+ "0139;;Temperatur",
+ "0140;;Geschwindigkeit",
+ "0141;;Ferne",
+ "0142;;Hoehe",
+ "0143;;Lipo-Zelle",
+ "0144;;Zellen gesamt",
+ "0145;;Spannung",
+ "0146;;Strom",
+ "0147;;Verbrauch",
+ "0148;;Power",
+ "0149;;Beschleunigung X",
+ "0150;;Beschleunigung Y",
+ "0151;;Beschleunigung Z",
+ "0152;;Richtung",
+ "0153;;Variometer",
+ "0154;;Minimum",
+ "0155;;Maximum",
+ "a1_org;;A1 schlecht!",
+ "a1_red;;A1 kritisch!",
+ "a2_org;;A2 schlecht!",
+ "a2_red;;A2 kritisch!",
+ "eebad;;Das EEPROM ist fehlerhaft",
+ "eeformat;;Das EEPROM ist immer formatiert",
+ "endtrim;;Maximale trimmung erreicht",
+ "error;;fehler",
+ "highmah;;Senderstrom ist zu hoch!",
+ "hightemp;;Sendertemperatur ist zu hoch!",
+ "inactiv;;Sender ist inaktiv,bitte Ueberpruefen Sie",
+ "lowbatt;;Senderakku niedrig",
+ "midtrim;;Trim zentriert",
+ "midpot;;Poti zentriert",
+ "rssi_org;;Funksignal schlecht!",
+ "rssi_red;;Funksignal kritisch!",
+ "swr_red;;Problem mit der sender Antenna",
+ "swalert;;Schalten fehlpositioniert, bitte pruefen",
+ "tada;Welcome sound;Willkommen",
+ "thralert;;Gaskanal nicht Null, bitte pruefen",
+ "timer10;;10 sekunden",
+ "timer20;;20 sekunden",
+ "timer30;;30 sekunden",
+ "timerlt3;;Noch drei Sekunden" };
+
+ private static string[] default_de_other_strings =
+ {
+ "attero;;Landung",
+ "crowof;;crow aus",
+ "crowon;;crow ein",
+ "engoff;;Motor aus",
+ "flapdn;;Klappen ausgefahren",
+ "flapup;;Klappen eingefahren",
+ "fltmd1;;Regime 1",
+ "fltmd2;;Regime 2",
+ "fltmd3;;Regime 3",
+ "fltmd4;;Regime 4",
+ "fltmd5;;Regime 5",
+ "fltmd6;;Regime 6",
+ "fltmd7;;Regime 7",
+ "fltmd8;;Regime 8",
+ "fltmd9;;Regime 9",
+ "geardn;;Fahrwerk ausgefahren",
+ "gearup;;Fahrwerk eingezogen",
+ "horn;horn sound;eeeeeeeee",
+ "lowbat;;Batterie schwach",
+ "nrmmod;;Normal-Modus ist aktiviert",
+ "pouet;small horn;ee , ee",
+ "shutter;camera shutter sound;klick",
+ "spdmod;;Schnell-Modus ist aktiviert",
+ "thmmod;;Thermik-Modus ist aktiviert",
+ "trnon;;Trainer-Modus ein",
+ "trnoff;;Trainer-Modus aus",
+ "tohigh;;zu hoch",
+ "tolow;;zu niedrig",
+ "wizz;wizzing sound;shiss"
+ };
+
+ private static string[] default_fr_system_strings =
+ {
+ "0000;0;0",
+ "0001;1;1",
+ "0002;2;2",
+ "0003;3;3",
+ "0004;4;4",
+ "0005;5;5",
+ "0006;6;6",
+ "0007;7;7",
+ "0008;8;8",
+ "0009;9;9",
+ "0010;10;10",
+ "0011;11;11",
+ "0012;12;12",
+ "0013;13;13",
+ "0014;14;14",
+ "0015;15;15",
+ "0016;16;16",
+ "0017;17;17",
+ "0018;18;18",
+ "0019;19;19",
+ "0020;20;20",
+ "0021;21;21",
+ "0022;22;22",
+ "0023;23;23",
+ "0024;24;24",
+ "0025;25;25",
+ "0026;26;26",
+ "0027;27;27",
+ "0028;28;28",
+ "0029;29;29",
+ "0030;30;30",
+ "0031;31;31",
+ "0032;32;32",
+ "0033;33;33",
+ "0034;34;34",
+ "0035;35;35",
+ "0036;36;36",
+ "0037;37;37",
+ "0038;38;38",
+ "0039;39;39",
+ "0040;40;40",
+ "0041;41;41",
+ "0042;42;42",
+ "0043;43;43",
+ "0044;44;44",
+ "0045;45;45",
+ "0046;46;46",
+ "0047;47;47",
+ "0048;48;48",
+ "0049;49;49",
+ "0050;50;50",
+ "0051;51;51",
+ "0052;52;52",
+ "0053;53;53",
+ "0054;54;54",
+ "0055;55;55",
+ "0056;56;56",
+ "0057;57;57",
+ "0058;58;58",
+ "0059;59;59",
+ "0060;60;60",
+ "0061;61;61",
+ "0062;62;62",
+ "0063;63;63",
+ "0064;64;64",
+ "0065;65;65",
+ "0066;66;66",
+ "0067;67;67",
+ "0068;68;68",
+ "0069;69;69",
+ "0070;70;70",
+ "0071;71;71",
+ "0072;72;72",
+ "0073;73;73",
+ "0074;74;74",
+ "0075;75;75",
+ "0076;76;76",
+ "0077;77;77",
+ "0078;78;78",
+ "0079;79;79",
+ "0080;80;80",
+ "0081;81;81",
+ "0082;82;82",
+ "0083;83;83",
+ "0084;84;84",
+ "0085;85;85",
+ "0086;86;86",
+ "0087;87;87",
+ "0088;88;88",
+ "0089;89;89",
+ "0090;90;90",
+ "0091;91;91",
+ "0092;92;92",
+ "0093;93;93",
+ "0094;94;94",
+ "0095;95;95",
+ "0096;96;96",
+ "0097;97;97",
+ "0098;98;98",
+ "0099;99;99",
+ "0100;100;100",
+ "0101;200;200",
+ "0102;300;300",
+ "0103;400;400",
+ "0104;500;500",
+ "0105;600;600",
+ "0106;700;700",
+ "0107;800;800",
+ "0108;900;900",
+ "0109;1000;Mille",
+ "0110;;une",
+ "0111;11;onze",
+ "0112;21;21",
+ "0113;31;31",
+ "0114;41;41",
+ "0115;51;51",
+ "0116;61;61",
+ "0117;71;71",
+ "0118;81;81",
+ "0119;.;virgule",
+ "0120;&;et",
+ "0121;-;moins",
+ "0122;<>;bip",
+ "0123;<>;bip",
+ "0124;<>;bip",
+ "0125;V;volts",
+ "0126;A;ampères",
+ "0127;ms;mètres par seconde",
+ "0128;<>;bip",
+ "0129;kmh;kilomètre heure",
+ "0130;m;mètres",
+ "0131;;degrés",
+ "0132;%;pourcent",
+ "0133;mA;milliampère",
+ "0134;mAH;milliampères heure",
+ "0135;W;watt",
+ "0136;dB;db",
+ "0137;;pied",
+ "0138;;noeud",
+ "0139;h;heure",
+ "0140;min;minute",
+ "0141;sec;secondes",
+ "0142;;taux par minute",
+ "0143;G;g",
+ "0144;<>;bip",
+ "0144;<>;bip",
+ "0146;timer;chrono",
+ "0147;<>;bip",
+ "0148;;tension",
+ "0149;;tension",
+ "0150;;émission",
+ "0151;;réception",
+ "0152;;altitude",
+ "0153;;moteur",
+ "0154;;carburant",
+ "0155;;temperature",
+ "0156;;temperature",
+ "0157;;vitesse",
+ "0158;;distance",
+ "0159;;attitude",
+ "0160;;élément lipo",
+ "0161;;total lipo",
+ "0162;;tension",
+ "0163;;courant",
+ "0164;;consomation",
+ "0165;;puissance",
+ "0166;;accelération x",
+ "0167;;accelération y",
+ "0168;;accelération z",
+ "0169;;orientation",
+ "0170;;vario",
+ "0171;<>;bip",
+ "0172;<>;bip",
+ "0173;<>;bip",
+ "0174;<>;bip",
+ "0175;<>;bip",
+ "0176;<>;bip",
+ "0177;<>;bip",
+ "0178;<>;bip",
+ "0179;<>;bip",
+ "0180;.0;virgule 0",
+ "0181;.1;virgule 1",
+ "0182;.2;virgule 2",
+ "0183;.3;virgule 3",
+ "0184;.4;virgule 4",
+ "0185;.5;virgule 5",
+ "0186;.6;virgule 6",
+ "0187;.7;virgule 7",
+ "0188;.8;virgule 8",
+ "0189;.9;virgule 9",
+ "190;<>;bip",
+ "a1_org;a1 low;a1 bas",
+ "a1_red;a1 critical;a1 critique",
+ "a2_org;a2 low;a2 bas",
+ "a2_red;a2 critical;a2 critique",
+ "eebad;memoire basse;niveau mémoire bas",
+ "endtrim;trim maximum atteint;trim maximum atteint",
+ "inact;inactivity alarm;alarme d'innactivité",
+ "lowbat;radio battery low;batterie transmetteur faible",
+ "midtrim;trim center;trim centré",
+ "rssi_org;rf signal low;signal recepteur faible",
+ "rssi_red;rf signal critical;signal recepteur critique",
+ "swalert;switch warning;interupteur mal positionné",
+ "swr_red;radio antenna defective;antenne emeteur defectueuse",
+ "tada;welcome to opentx;Bienvenue sur Open tx",
+ "telemko;telemetry lost;télémétrie perdue",
+ "telemok;telemetry recover;télémétrie retrouvée",
+ "thralert;throttle warning;mettre les gaz a 0",
+ "timer10;10 seconds;10 secondes",
+ "timer20;20 seconds;20 secondes",
+ "timer30;30 seconds;30 secondes",
+ "timerlt3;3 seconds;3 secondes"
+ };
+
+ private static string[] default_fr_other_strings =
+ {
+ "attero;;atterrissage",
+ "atti;attitude;attitude",
+ "batcrit;battery critical;niveau batterie critique",
+ "batlow;low battery;niveau batterie bas",
+ "camcenter;camera center;caméra centrée",
+ "cammanual;camera manual;caméra manuelle",
+ "capacity;capacity;capacité",
+ "engdis;engine disabled;moteur calé",
+ "engoff;engine off;moteur coupé",
+ "engon;engine on;moteur démarré",
+ "flaps1;flaps 1;volets 1",
+ "flaps2;flaps 2;volets 2",
+ "flapsdn;flaps down;volets sortis",
+ "flapsup;flaps up;volets rentrés",
+ "fltmode0;phase de vol 0;phase de vol 0",
+ "fltmode1;phase de vol 1;phase de vol 1",
+ "fltmode2;phase de vol 2;phase de vol 2",
+ "fltmode3;phase de vol 3;phase de vol 3",
+ "fltmode4;phase de vol 4;phase de vol 4",
+ "fltmode5;phase de vol 5;phase de vol 5",
+ "fltmode6;phase de vol 6;phase de vol 6",
+ "fltmode7;phase de vol 7;phase de vol 7",
+ "fltmode8;phase de vol 8;phase de vol 8",
+ "fsoff;failsafe off;failsafe coupé",
+ "fson;failsafe on;failsafe activé",
+ "geardn;gear down;train sorti",
+ "gearup;gear upp;train rentré",
+ "gps;gps;gps",
+ "hirates;hi rates;taux élevé",
+ "htoff;head tracker off;suivi tète désactivé",
+ "hton;head tracker on;suivi tète activé",
+ "ioc;ioc;i o c",
+ "iocoff;ioc off;i o c coupé",
+ "lowrates;lowrates;taux faible",
+ "manual;manual;manuel",
+ "normal;normal;normal",
+ "nrmmod;normal mode;mode normal",
+ "thrhold;throttle locked;gaz bloqués","thrrel;throttle released;gaz relachés",
+ "trnoff;;fin écolage",
+ "trnon;;écolage",
+ };
+
+ public string[][] default_system_strings = new string[10][];
+ public string[][] default_other_strings = new string[10][];
+
+ public int toInt(string langStr)
+ {
+ if (langStr == "cz") return 1;
+ if (langStr == "de") return 2;
+ if (langStr == "es") return 3;
+ if (langStr == "fr") return 4;
+ if (langStr == "it") return 5;
+ if (langStr == "pl") return 6;
+ if (langStr == "pt") return 7;
+ if (langStr == "se") return 8;
+ if (langStr == "sk") return 9;
+ else return 0; //English default
+ }
+
+ public SentenceTables()
+ {
+ default_other_strings[toInt("cz")] = default_cz_other_strings;
+ default_system_strings[toInt("cz")] = default_cz_system_strings;
+
+ default_other_strings[toInt("de")] = default_de_other_strings;
+ default_system_strings[toInt("de")] = default_de_system_strings;
+
+ default_other_strings[toInt("en")] = default_en_other_strings;
+ default_system_strings[toInt("en")] = default_en_system_strings;
+
+ default_other_strings[toInt("es")] = default_es_other_strings;
+ default_system_strings[toInt("es")] = default_es_system_strings;
+
+ default_other_strings[toInt("fr")] = default_fr_other_strings;
+ default_system_strings[toInt("fr")] = default_fr_system_strings;
+
+ default_other_strings[toInt("it")] = default_it_other_strings;
+ default_system_strings[toInt("it")] = default_it_system_strings;
+
+ default_other_strings[toInt("pl")] = default_pl_other_strings;
+ default_system_strings[toInt("pl")] = default_pl_system_strings;
+
+ default_other_strings[toInt("pt")] = default_pt_other_strings;
+ default_system_strings[toInt("pt")] = default_pt_system_strings;
+
+ default_other_strings[toInt("se")] = default_se_other_strings;
+ default_system_strings[toInt("se")] = default_se_system_strings;
+
+ default_other_strings[toInt("sk")] = default_sk_other_strings;
+ default_system_strings[toInt("sk")] = default_sk_system_strings;
+ }
+ }
+}
diff --git a/sound/speaker/speaker_logo.png b/sound/speaker/speaker_logo.png
new file mode 100644
index 000000000..5aeb279c3
Binary files /dev/null and b/sound/speaker/speaker_logo.png differ
diff --git a/sound/speaker/speaker_logo.xcf b/sound/speaker/speaker_logo.xcf
new file mode 100644
index 000000000..b98d7f636
Binary files /dev/null and b/sound/speaker/speaker_logo.xcf differ
diff --git a/sound/speaker/speaker_logo_small.png b/sound/speaker/speaker_logo_small.png
new file mode 100644
index 000000000..c02af4b53
Binary files /dev/null and b/sound/speaker/speaker_logo_small.png differ
| | |
|