Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 20:35:17 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/next' into

Browse source 
bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/gui/menu_model.cpp
This commit is contained in:
Bertrand Songis 2014-02-05 08:01:40 +01:00
commit 873d2c4377
54 changed files with 32441 additions and 30508 deletions
Download patch file Download diff file Expand all files Collapse all files

3
DONATIONS.txt
View file

@ -312,3 +312,6 @@ Dietmar Drees
Bradley Murchie Bradley Murchie
Richard Fahie Richard Fahie
James Kaufman James Kaufman
Henry Deucker
Christian Fuchs
Arold Reinders

54
companion/src/comparedialog.cpp
View file

@ -83,7 +83,6 @@ void compareDialog::printDiff()
printCurves(); printCurves();
printGvars(); printGvars();
printSwitches(); printSwitches();
printSafetySwitches();
printFSwitches(); printFSwitches();
printFrSky(); printFrSky();
te->scrollToAnchor("1"); te->scrollToAnchor("1");
@ -1097,7 +1096,7 @@ void compareDialog::printFSwitches()
if (g_model1->funcSw[i].swtch.type) { if (g_model1->funcSw[i].swtch.type) {
str.append(doTC(g_model1->funcSw[i].swtch.toString(),color1)); str.append(doTC(g_model1->funcSw[i].swtch.toString(),color1));
str.append(doTC(getFuncName(g_model1->funcSw[i].func),color1)); str.append(doTC(getFuncName(g_model1->funcSw[i].func),color1));
str.append(doTC(FuncParam(g_model1->funcSw[i].func,g_model1->funcSw[i].param,g_model1->funcSw[i].paramarm, g_model1->funcSw[i].adjustMode),color1)); str.append(doTC(g_model1->funcSw[i].paramToString(),color1));
int index=g_model1->funcSw[i].func; int index=g_model1->funcSw[i].func;
if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) { if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
str.append(doTC(QString("%1").arg(g_model1->funcSw[i].repeatParam),color1)); str.append(doTC(QString("%1").arg(g_model1->funcSw[i].repeatParam),color1));
@ -1116,7 +1115,7 @@ void compareDialog::printFSwitches()
if (g_model2->funcSw[i].swtch.type) { if (g_model2->funcSw[i].swtch.type) {
str.append(doTC(g_model2->funcSw[i].swtch.toString(),color2)); str.append(doTC(g_model2->funcSw[i].swtch.toString(),color2));
str.append(doTC(getFuncName(g_model2->funcSw[i].func),color2)); str.append(doTC(getFuncName(g_model2->funcSw[i].func),color2));
str.append(doTC(FuncParam(g_model2->funcSw[i].func,g_model2->funcSw[i].param,g_model2->funcSw[i].paramarm, g_model2->funcSw[i].adjustMode),color2)); str.append(doTC(g_model2->funcSw[i].paramToString(),color2));
int index=g_model2->funcSw[i].func; int index=g_model2->funcSw[i].func;
if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) { if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
str.append(doTC(QString("%1").arg(g_model2->funcSw[i].repeatParam),color2)); str.append(doTC(QString("%1").arg(g_model2->funcSw[i].repeatParam),color2));
@ -1142,55 +1141,6 @@ void compareDialog::printFSwitches()
te->append(str); te->append(str);
} }
void compareDialog::printSafetySwitches()
{
QString color1;
QString color2;
int sc=0;
QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-before:always;\" width=\"100%\">";
str.append("<tr><td><h2>"+tr("Safety Switches")+"</h2></td></tr>");
str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\"><tr>");
str.append("<td width=\"8%\" align=\"center\"><b>"+tr("Switch")+"</b></td>");
str.append("<td width=\"37%\" align=\"center\"><b>"+tr("Value")+"</b></td>");
str.append("<td width=\"10%\">&nbsp;</td>");
str.append("<td width=\"8%\" align=\"center\"><b>"+tr("Switch")+"</b></td>");
str.append("<td width=\"37%\" align=\"center\"><b>"+tr("Value")+"</b></td>");
str.append("</tr>");
for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++)
{
if ((g_model1->safetySw[i].swtch.type!=SWITCH_TYPE_NONE)||(g_model2->safetySw[i].swtch.type!=SWITCH_TYPE_NONE)) {
if ((g_model1->safetySw[i].swtch!=g_model2->safetySw[i].swtch)||(g_model1->safetySw[i].val!=g_model2->safetySw[i].val)) {
color1="green";
color2="red";
} else {
color1="grey";
color2="grey";
}
str.append("<tr>");
if (g_model1->safetySw[i].swtch.type) {
str.append(doTC(g_model1->safetySw[i].swtch.toString(),color1));
str.append(doTC(QString::number(g_model1->safetySw[i].val),color1));
}
else {
str.append("<td>&nbsp;</td><td>&nbsp;</td>");
}
str.append(doTC(tr("CH")+QString("%1").arg(i+1),"",true));
if (g_model2->safetySw[i].swtch.type) {
str.append(doTC(g_model2->safetySw[i].swtch.toString(),color2));
str.append(doTC(QString::number(g_model2->safetySw[i].val),color2));
} else {
str.append("<td>&nbsp;</td><td>&nbsp;</td>");
}
str.append("</tr>");
sc++;
}
}
str.append("</table></td></tr></table>");
str.append("<br>");
if (sc!=0)
te->append(str);
}
void compareDialog::printFrSky() void compareDialog::printFrSky()
{ {
QString color; QString color;

143
companion/src/eeprominterface.cpp
View file

@ -345,6 +345,149 @@ QString CurveReference::toString()
} }
} }
#if 0
QStringList FuncSwData::toStringList()
{
QStringList result;
QStringList qs;
result << swtch.toString();
result << funcToString();
if (func < FuncInstantTrim) {
result << QString("%1").arg(param);
}
else if (func==FuncPlaySound) {
qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt" << "AlmClk" ;
if (param>=0 && param<(int)qs.count())
result << qs.at(param);
else
result << QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if (func==FuncPlayHaptic) {
qs << "0" << "1" << "2" << "3";
if (param>=0 && param<(int)qs.count())
result << qs.at(param);
else
result << QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if (func==FuncReset) {
qs.append( QObject::tr("Timer1"));
qs.append( QObject::tr("Timer2"));
qs.append( QObject::tr("All"));
qs.append( QObject::tr("Telemetry"));
if (param>=0 && param<(int)qs.count())
result << qs.at(param);
else
result << QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
RawSource item(param);
result << item.toString();
}
else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
if ( GetEepromInterface()->getCapability(VoicesAsNumbers)) {
result << QString("%1").arg(param);
} else {
result << paramarm;
}
}
else if ((func>FuncBackgroundMusicPause) && (func<FuncCount)) {
switch (adjustMode) {
case 0:
result << QObject::tr("Value ")+QString("%1").arg(param);
break;
case 1:
result << RawSource(param).toString();
break;
case 2:
result << RawSource(param).toString();
break;
case 3:
if (param==0) {
result << QObject::tr("Decr:")+QString(" -1");
}
else {
result << QObject::tr("Incr:")+QString(" +1");
}
break;
default:
break;
}
}
return result;
}
#endif
QString FuncSwData::paramToString()
{
QStringList qs;
if (func <= FuncInstantTrim) {
return QString("%1").arg(param);
}
else if (func==FuncPlaySound) {
qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt" << "AlmClk" ;
if (param>=0 && param<(int)qs.count())
return qs.at(param);
else
return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if (func==FuncPlayHaptic) {
qs << "0" << "1" << "2" << "3";
if (param>=0 && param<(int)qs.count())
return qs.at(param);
else
return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if (func==FuncReset) {
qs.append( QObject::tr("Timer1"));
qs.append( QObject::tr("Timer2"));
qs.append( QObject::tr("All"));
qs.append( QObject::tr("Telemetry"));
if (param>=0 && param<(int)qs.count())
return qs.at(param);
else
return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
RawSource item(param);
return item.toString();
}
else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
if ( GetEepromInterface()->getCapability(VoicesAsNumbers)) {
return QString("%1").arg(param);
} else {
return paramarm;
}
}
else if ((func>FuncBackgroundMusicPause) && (func<FuncCount)) {
switch (adjustMode) {
case 0:
return QObject::tr("Value ")+QString("%1").arg(param);
break;
case 1:
return RawSource(param).toString();
break;
case 2:
return RawSource(param).toString();
break;
case 3:
if (param==0) {
return QObject::tr("Decr:")+QString(" -1");
}
else {
return QObject::tr("Incr:")+QString(" +1");
}
break;
default:
return "";
}
}
return "";
}
GeneralSettings::GeneralSettings() GeneralSettings::GeneralSettings()
{ {
memset(this, 0, sizeof(GeneralSettings)); memset(this, 0, sizeof(GeneralSettings));

16
companion/src/eeprominterface.h
View file

@ -72,7 +72,6 @@ const uint8_t modn12x3[4][4]= {
#define C9X_MAX_POINTS 17 #define C9X_MAX_POINTS 17
#define C9X_MAX_GVARS 9 #define C9X_MAX_GVARS 9
#define C9X_MAX_ENCODERS 2 #define C9X_MAX_ENCODERS 2
#define NUM_SAFETY_CHNOUT 16
#define C9X_NUM_CHNOUT 32 // number of real output channels #define C9X_NUM_CHNOUT 32 // number of real output channels
#define C9X_NUM_CSW 32 // number of custom switches #define C9X_NUM_CSW 32 // number of custom switches
#define C9X_MAX_CUSTOM_FUNCTIONS 32 // number of functions assigned to switches #define C9X_MAX_CUSTOM_FUNCTIONS 32 // number of functions assigned to switches
@ -629,18 +628,9 @@ class CustomSwData { // Custom Switches data
void clear() { memset(this, 0, sizeof(CustomSwData)); } void clear() { memset(this, 0, sizeof(CustomSwData)); }
}; };
class SafetySwData { // Custom Switches data
public:
SafetySwData() { clear(); }
RawSwitch swtch;
int val;
void clear() { memset(this, 0, sizeof(SafetySwData)); }
};
enum AssignFunc { enum AssignFunc {
FuncSafetyCh1 = 0, FuncSafetyCh1 = 0,
FuncSafetyCh16 = FuncSafetyCh1+15, FuncSafetyCh32 = FuncSafetyCh1+C9X_NUM_CHNOUT-1,
FuncTrainer, FuncTrainer,
FuncTrainerRUD, FuncTrainerRUD,
FuncTrainerELE, FuncTrainerELE,
@ -675,6 +665,8 @@ class FuncSwData { // Function Switches data
unsigned int adjustMode; unsigned int adjustMode;
int repeatParam; int repeatParam;
void clear() { memset(this, 0, sizeof(FuncSwData)); } void clear() { memset(this, 0, sizeof(FuncSwData)); }
QString paramToString();
QStringList toStringList();
}; };
class PhaseData { class PhaseData {
@ -896,11 +888,9 @@ class ModelData {
CurveData curves[C9X_MAX_CURVES]; CurveData curves[C9X_MAX_CURVES];
CustomSwData customSw[C9X_NUM_CSW]; CustomSwData customSw[C9X_NUM_CSW];
FuncSwData funcSw[C9X_MAX_CUSTOM_FUNCTIONS]; FuncSwData funcSw[C9X_MAX_CUSTOM_FUNCTIONS];
SafetySwData safetySw[C9X_NUM_CHNOUT];
SwashRingData swashRingData; SwashRingData swashRingData;
unsigned int thrTraceSrc; unsigned int thrTraceSrc;
int8_t traineron; // 0 disable trainer, 1 allow trainer int8_t traineron; // 0 disable trainer, 1 allow trainer
int8_t t2throttle; // Start timer2 using throttle
unsigned int modelId; unsigned int modelId;
unsigned int switchWarningStates; unsigned int switchWarningStates;
// TODO structure // TODO structure

14
companion/src/firmwares/er9x/er9xeeprom.cpp
View file

@ -298,14 +298,6 @@ t_Er9xSafetySwData::t_Er9xSafetySwData()
memset(this, 0, sizeof(t_Er9xSafetySwData)); memset(this, 0, sizeof(t_Er9xSafetySwData));
} }
t_Er9xSafetySwData::operator SafetySwData ()
{
SafetySwData c9x;
c9x.swtch = er9xToSwitch(swtch);
c9x.val = val;
return c9x;
}
t_Er9xFrSkyChannelData::t_Er9xFrSkyChannelData() t_Er9xFrSkyChannelData::t_Er9xFrSkyChannelData()
{ {
memset(this, 0, sizeof(t_Er9xFrSkyChannelData)); memset(this, 0, sizeof(t_Er9xFrSkyChannelData));
@ -381,7 +373,7 @@ t_Er9xModelData::operator ModelData ()
break; break;
} }
c9x.traineron= traineron; c9x.traineron= traineron;
c9x.t2throttle = t2throttle; // c9x.t2throttle = t2throttle;
c9x.moduleData[0].ppmFrameLength=ppmFrameLength; c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH; c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
c9x.thrTrim = thrTrim; c9x.thrTrim = thrTrim;
@ -471,8 +463,8 @@ t_Er9xModelData::operator ModelData ()
for (int i=0; i<ER9X_NUM_CSW; i++) for (int i=0; i<ER9X_NUM_CSW; i++)
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<ER9X_NUM_CHNOUT; i++) // for (int i=0; i<ER9X_NUM_CHNOUT; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.frsky = frsky; c9x.frsky = frsky;
c9x.frsky.usrProto=FrSkyUsrProto; c9x.frsky.usrProto=FrSkyUsrProto;

1
companion/src/firmwares/er9x/er9xeeprom.h
View file

@ -168,7 +168,6 @@ PACK(typedef struct t_Er9xSafetySwData { // Custom Switches data
int8_t swtch; int8_t swtch;
int8_t val; int8_t val;
operator SafetySwData();
t_Er9xSafetySwData(); t_Er9xSafetySwData();
}) Er9xSafetySwData; }) Er9xSafetySwData;

24
companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
View file

@ -406,27 +406,11 @@ t_Ersky9xSafetySwData_v10::t_Ersky9xSafetySwData_v10()
memset(this, 0, sizeof(t_Ersky9xSafetySwData_v10)); memset(this, 0, sizeof(t_Ersky9xSafetySwData_v10));
} }
t_Ersky9xSafetySwData_v10::operator SafetySwData ()
{
SafetySwData c9x;
c9x.swtch = er9xToSwitch(swtch);
c9x.val = val;
return c9x;
}
t_Ersky9xSafetySwData_v11::t_Ersky9xSafetySwData_v11() t_Ersky9xSafetySwData_v11::t_Ersky9xSafetySwData_v11()
{ {
memset(this, 0, sizeof(t_Ersky9xSafetySwData_v11)); memset(this, 0, sizeof(t_Ersky9xSafetySwData_v11));
} }
t_Ersky9xSafetySwData_v11::operator SafetySwData ()
{
SafetySwData c9x;
c9x.swtch = ersky9xToSwitch(opt.ss.swtch);
c9x.val = opt.ss.val;
return c9x;
}
t_Ersky9xFrSkyChannelData_v10::t_Ersky9xFrSkyChannelData_v10() t_Ersky9xFrSkyChannelData_v10::t_Ersky9xFrSkyChannelData_v10()
{ {
memset(this, 0, sizeof(t_Ersky9xFrSkyChannelData_v10)); memset(this, 0, sizeof(t_Ersky9xFrSkyChannelData_v10));
@ -612,8 +596,8 @@ t_Ersky9xModelData_v10::operator ModelData ()
for (int i=0; i<ERSKY9X_NUM_CSW_V10; i++) for (int i=0; i<ERSKY9X_NUM_CSW_V10; i++)
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<ERSKY9X_NUM_CHNOUT_V10; i++) // for (int i=0; i<ERSKY9X_NUM_CHNOUT_V10; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.frsky = frsky; c9x.frsky = frsky;
c9x.frsky.usrProto=FrSkyUsrProto; c9x.frsky.usrProto=FrSkyUsrProto;
@ -733,8 +717,8 @@ t_Ersky9xModelData_v11::operator ModelData ()
for (int i=0; i<ERSKY9X_NUM_CSW_V11; i++) for (int i=0; i<ERSKY9X_NUM_CSW_V11; i++)
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<ERSKY9X_NUM_CHNOUT_V11; i++) // for (int i=0; i<ERSKY9X_NUM_CHNOUT_V11; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.frsky = frsky; c9x.frsky = frsky;
c9x.frsky.usrProto=FrSkyUsrProto; c9x.frsky.usrProto=FrSkyUsrProto;

2
companion/src/firmwares/ersky9x/ersky9xeeprom.h
View file

@ -210,7 +210,6 @@ PACK(typedef struct t_Ersky9xSafetySwData_v10 { // Custom Switches data
int8_t swtch; int8_t swtch;
int8_t val; int8_t val;
operator SafetySwData();
t_Ersky9xSafetySwData_v10(); t_Ersky9xSafetySwData_v10();
}) Ersky9xSafetySwData_v10; }) Ersky9xSafetySwData_v10;
@ -230,7 +229,6 @@ PACK(typedef struct t_Ersky9xSafetySwData_v11 { // Custom Switches data
} vs ; } vs ;
} opt ; } opt ;
operator SafetySwData();
t_Ersky9xSafetySwData_v11(); t_Ersky9xSafetySwData_v11();
}) Ersky9xSafetySwData_v11; }) Ersky9xSafetySwData_v11;

24
companion/src/firmwares/gruvin9x/gruvin9xeeprom.cpp
View file

@ -332,14 +332,6 @@ Gruvin9xFuncSwData::operator FuncSwData ()
return c9x; return c9x;
} }
t_Gruvin9xSafetySwData::operator SafetySwData ()
{
SafetySwData c9x;
c9x.swtch = gruvin9xToSwitch(swtch);
c9x.val = val;
return c9x;
}
t_Gruvin9xSwashRingData::t_Gruvin9xSwashRingData() t_Gruvin9xSwashRingData::t_Gruvin9xSwashRingData()
{ {
memset(this, 0, sizeof(t_Gruvin9xSwashRingData)); memset(this, 0, sizeof(t_Gruvin9xSwashRingData));
@ -489,8 +481,8 @@ t_Gruvin9xModelData_v102::operator ModelData ()
for (int i=0; i<G9X_NUM_CSW; i++) for (int i=0; i<G9X_NUM_CSW; i++)
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<G9X_NUM_CHNOUT; i++) // for (int i=0; i<G9X_NUM_CHNOUT; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.swashRingData = swashR; c9x.swashRingData = swashR;
c9x.frsky = frsky; c9x.frsky = frsky;
return c9x; return c9x;
@ -560,8 +552,8 @@ t_Gruvin9xModelData_v103::operator ModelData ()
for (int i=0; i<G9X_NUM_CSW; i++) for (int i=0; i<G9X_NUM_CSW; i++)
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<G9X_NUM_CHNOUT; i++) // for (int i=0; i<G9X_NUM_CHNOUT; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.swashRingData = swashR; c9x.swashRingData = swashR;
c9x.frsky = frsky; c9x.frsky = frsky;
return c9x; return c9x;
@ -650,8 +642,8 @@ t_Gruvin9xModelData_v105::operator ModelData ()
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<G9X_NUM_FSW; i++) for (int i=0; i<G9X_NUM_FSW; i++)
c9x.funcSw[i] = funcSw[i]; c9x.funcSw[i] = funcSw[i];
for (int i=0; i<G9X_NUM_CHNOUT; i++) // for (int i=0; i<G9X_NUM_CHNOUT; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.swashRingData = swashR; c9x.swashRingData = swashR;
c9x.frsky = frsky; c9x.frsky = frsky;
@ -734,8 +726,8 @@ t_Gruvin9xModelData_v106::operator ModelData ()
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<G9X_NUM_FSW; i++) for (int i=0; i<G9X_NUM_FSW; i++)
c9x.funcSw[i] = funcSw[i]; c9x.funcSw[i] = funcSw[i];
for (int i=0; i<G9X_NUM_CHNOUT; i++) // for (int i=0; i<G9X_NUM_CHNOUT; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.swashRingData = swashR; c9x.swashRingData = swashR;
c9x.frsky = frsky; c9x.frsky = frsky;

1
companion/src/firmwares/gruvin9x/gruvin9xeeprom.h
View file

@ -199,7 +199,6 @@ PACK(typedef struct t_Gruvin9xSafetySwData { // Safety Switches data
int8_t swtch; int8_t swtch;
int8_t val; int8_t val;
operator SafetySwData();
t_Gruvin9xSafetySwData() { memset(this, 0, sizeof(t_Gruvin9xSafetySwData)); } t_Gruvin9xSafetySwData() { memset(this, 0, sizeof(t_Gruvin9xSafetySwData)); }
}) Gruvin9xSafetySwData; }) Gruvin9xSafetySwData;

2
companion/src/firmwares/opentx/open9xSky9xeeprom.cpp
View file

@ -577,7 +577,7 @@ t_Open9xArmFuncSwData_v208::operator FuncSwData ()
FuncSwData c9x; FuncSwData c9x;
c9x.swtch = open9xArmToSwitch(swtch); c9x.swtch = open9xArmToSwitch(swtch);
c9x.func = (AssignFunc)(func); c9x.func = (AssignFunc)(func);
if (c9x.func <= FuncSafetyCh16) { if (c9x.func <= FuncSafetyCh32) {
c9x.enabled=param & 0x01; c9x.enabled=param & 0x01;
c9x.param = (param>>1)<<1; c9x.param = (param>>1)<<1;
} }

16
companion/src/firmwares/opentx/open9xStockeeprom.cpp
View file

@ -662,14 +662,6 @@ t_Open9xFuncSwData_v210::operator FuncSwData ()
return c9x; return c9x;
} }
t_Open9xSafetySwData::operator SafetySwData ()
{
SafetySwData c9x;
c9x.swtch = open9xStockToSwitch(swtch);
c9x.val = val;
return c9x;
}
t_Open9xSwashRingData_v208::operator SwashRingData () t_Open9xSwashRingData_v208::operator SwashRingData ()
{ {
SwashRingData c9x; SwashRingData c9x;
@ -993,8 +985,8 @@ t_Open9xModelData_v201::operator ModelData ()
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<12; i++) for (int i=0; i<12; i++)
c9x.funcSw[i] = funcSw[i]; c9x.funcSw[i] = funcSw[i];
for (int i=0; i<O9X_NUM_CHNOUT; i++) // for (int i=0; i<O9X_NUM_CHNOUT; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.swashRingData = swashR; c9x.swashRingData = swashR;
c9x.frsky = frsky; c9x.frsky = frsky;
@ -1067,8 +1059,8 @@ t_Open9xModelData_v202::operator ModelData ()
c9x.customSw[i] = customSw[i]; c9x.customSw[i] = customSw[i];
for (int i=0; i<12; i++) for (int i=0; i<12; i++)
c9x.funcSw[i] = funcSw[i]; c9x.funcSw[i] = funcSw[i];
for (int i=0; i<O9X_NUM_CHNOUT; i++) // for (int i=0; i<O9X_NUM_CHNOUT; i++)
c9x.safetySw[i] = safetySw[i]; // c9x.safetySw[i] = safetySw[i];
c9x.swashRingData = swashR; c9x.swashRingData = swashR;
c9x.frsky = frsky; c9x.frsky = frsky;
c9x.moduleData[0].ppmFrameLength = ppmFrameLength; c9x.moduleData[0].ppmFrameLength = ppmFrameLength;

1
companion/src/firmwares/opentx/open9xStockeeprom.h
View file

@ -244,7 +244,6 @@ PACK(typedef struct t_Open9xSafetySwData { // Safety Switches data
int8_t swtch; int8_t swtch;
int8_t val; int8_t val;
operator SafetySwData();
t_Open9xSafetySwData() { memset(this, 0, sizeof(t_Open9xSafetySwData)); } t_Open9xSafetySwData() { memset(this, 0, sizeof(t_Open9xSafetySwData)); }
}) Open9xSafetySwData; }) Open9xSafetySwData;

47
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -1237,7 +1237,13 @@ class CustomFunctionsConversionTable: public ConversionTable {
{ {
int val=0; int val=0;
if (IS_ARM(board) || version < 213) { if (version >= 216) {
for (int i=0; i<32; i++) {
addConversion(i, val);
}
val++;
}
else if (IS_ARM(board) || version < 213) {
for (int i=0; i<16; i++) { for (int i=0; i<16; i++) {
addConversion(val, val); addConversion(val, val);
val++; val++;
@ -1249,12 +1255,46 @@ class CustomFunctionsConversionTable: public ConversionTable {
} }
val+=4; val+=4;
} }
if (version >= 216) {
addConversion(FuncTrainer, val);
addConversion(FuncTrainerRUD, val);
addConversion(FuncTrainerELE, val);
addConversion(FuncTrainerTHR, val);
addConversion(FuncTrainerAIL, val);
val++;
}
else {
addConversion(FuncTrainer, val++); addConversion(FuncTrainer, val++);
addConversion(FuncTrainerRUD, val++); addConversion(FuncTrainerRUD, val++);
addConversion(FuncTrainerELE, val++); addConversion(FuncTrainerELE, val++);
addConversion(FuncTrainerTHR, val++); addConversion(FuncTrainerTHR, val++);
addConversion(FuncTrainerAIL, val++); addConversion(FuncTrainerAIL, val++);
}
addConversion(FuncInstantTrim, val++); addConversion(FuncInstantTrim, val++);
if (version >= 216) {
addConversion(FuncReset, val++);
for (int i=0; i<MAX_GVARS(board, version); i++)
addConversion(FuncAdjustGV1+i, val);
val++;
if (IS_ARM(board))
addConversion(FuncVolume, val++);
addConversion(FuncPlaySound, val++);
addConversion(FuncPlayPrompt, val++);
if (version >= 213 && !IS_ARM(board))
addConversion(FuncPlayBoth, val++);
addConversion(FuncPlayValue, val++);
if (IS_ARM(board)) {
addConversion(FuncBackgroundMusic, val++);
addConversion(FuncBackgroundMusicPause, val++);
}
addConversion(FuncVario, val++);
addConversion(FuncPlayHaptic, val++);
if (board == BOARD_GRUVIN9X || IS_ARM(board) )
addConversion(FuncLogs, val++);
addConversion(FuncBacklight, val++);
}
else {
addConversion(FuncPlaySound, val++); addConversion(FuncPlaySound, val++);
if (!IS_TARANIS(board)) if (!IS_TARANIS(board))
addConversion(FuncPlayHaptic, val++); addConversion(FuncPlayHaptic, val++);
@ -1276,6 +1316,7 @@ class CustomFunctionsConversionTable: public ConversionTable {
for (int i=0; i<5; i++) for (int i=0; i<5; i++)
addConversion(FuncAdjustGV1+i, val++); addConversion(FuncAdjustGV1+i, val++);
} }
}
}; };
template <int N> template <int N>
@ -1436,7 +1477,7 @@ class CustomFunctionField: public TransformedField {
if (version >= 213) if (version >= 213)
_union_param = fn.repeatParam / 10; _union_param = fn.repeatParam / 10;
} }
else if (fn.func <= FuncSafetyCh16) { else if (fn.func <= FuncSafetyCh32) {
if (version >= 213) if (version >= 213)
_union_param += ((fn.func % 4) << 1); _union_param += ((fn.func % 4) << 1);
} }
@ -1518,7 +1559,7 @@ class CustomFunctionField: public TransformedField {
if (version >= 213) if (version >= 213)
fn.repeatParam = _union_param * 10; fn.repeatParam = _union_param * 10;
} }
else if (fn.func <= FuncSafetyCh16) { else if (fn.func <= FuncSafetyCh32) {
if (version >= 213) { if (version >= 213) {
fn.func = AssignFunc(((fn.func >> 2) << 2) + ((_union_param >> 1) & 0x03)); fn.func = AssignFunc(((fn.func >> 2) << 2) + ((_union_param >> 1) & 0x03));
} }

247
companion/src/helpers.cpp
View file

@ -129,7 +129,7 @@ QString getRepeatString(unsigned int val)
QString getFuncName(unsigned int val) QString getFuncName(unsigned int val)
{ {
if (val < NUM_SAFETY_CHNOUT) { if (val < C9X_NUM_CHNOUT) {
return QObject::tr("Safety %1").arg(RawSource(SOURCE_TYPE_CH, val).toString()); return QObject::tr("Safety %1").arg(RawSource(SOURCE_TYPE_CH, val).toString());
} }
else if (val == FuncTrainer) else if (val == FuncTrainer)
@ -290,186 +290,6 @@ QString getProtocolStr(const int proto)
return CHECK_IN_ARRAY(strings, proto); return CHECK_IN_ARRAY(strings, proto);
} }
void populateFuncCB(QComboBox *b, unsigned int value)
{
b->clear();
for (unsigned int i = 0; i < FuncCount; i++) {
b->addItem(getFuncName(i));
if (!GetEepromInterface()->getCapability(HasVolume)) {
if (i==FuncVolume || i==FuncBackgroundMusic || i==FuncBackgroundMusicPause) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
}
if ((i==FuncPlayHaptic) && !GetEepromInterface()->getCapability(Haptic)) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
if ((i==FuncPlayBoth) && !GetEepromInterface()->getCapability(HasBeeper)) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
if ((i==FuncLogs) && !GetEepromInterface()->getCapability(HasSDLogs)) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
}
b->setCurrentIndex(value);
b->setMaxVisibleItems(10);
}
QString FuncParam(uint function, int value, QString paramT,unsigned int adjustmode)
{
QStringList qs;
if (function <= FuncInstantTrim) {
return QString("%1").arg(value);
}
else if (function==FuncPlaySound) {
qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt" << "AlmClk" ;
if (value>=0 && value<(int)qs.count())
return qs.at(value);
else
return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if (function==FuncPlayHaptic) {
qs << "0" << "1" << "2" << "3";
if (value>=0 && value<(int)qs.count())
return qs.at(value);
else
return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if (function==FuncReset) {
qs.append( QObject::tr("Timer1"));
qs.append( QObject::tr("Timer2"));
qs.append( QObject::tr("All"));
qs.append( QObject::tr("Telemetry"));
if (value>=0 && value<(int)qs.count())
return qs.at(value);
else
return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
}
else if ((function==FuncVolume)|| (function==FuncPlayValue)) {
RawSource item(value);
return item.toString();
}
else if ((function==FuncPlayPrompt) || (function==FuncPlayBoth)) {
if ( GetEepromInterface()->getCapability(VoicesAsNumbers)) {
return QString("%1").arg(value);
} else {
return paramT;
}
} else if ((function>FuncBackgroundMusicPause) && (function<FuncCount)) {
switch (adjustmode) {
case 0:
return QObject::tr("Value ")+QString("%1").arg(value);
break;
case 1:
return RawSource(value).toString();
break;
case 2:
return RawSource(value).toString();
break;
case 3:
if (value==0) {
return QObject::tr("Decr:")+QString(" -1");
} else {
return QObject::tr("Incr:")+QString(" +1");
}
break;
default:
return "";
}
}
return "";
}
void populateFuncParamArmTCB(QComboBox *b, ModelData * g_model, char * value, QStringList & paramsList)
{
b->clear();
b->addItem("----");
QString currentvalue(value);
foreach ( QString entry, paramsList ) {
b->addItem(entry);
if (entry==currentvalue) {
b->setCurrentIndex(b->count()-1);
}
}
}
void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, unsigned int value, unsigned int adjustmode)
{
QStringList qs;
b->clear();
if (function==FuncPlaySound) {
qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt" << "AlmClk" ;
b->addItems(qs);
b->setCurrentIndex(value);
}
else if (function==FuncPlayHaptic) {
qs << "0" << "1" << "2" << "3";
b->addItems(qs);
b->setCurrentIndex(value);
}
else if (function==FuncReset) {
qs.append( QObject::tr("Timer1"));
qs.append( QObject::tr("Timer2"));
qs.append( QObject::tr("All"));
qs.append( QObject::tr("Telemetry"));
int reCount = GetEepromInterface()->getCapability(RotaryEncoders);
if (reCount == 1) {
qs.append( QObject::tr("Rotary Encoder"));
}
else if (reCount == 2) {
qs.append( QObject::tr("REa"));
qs.append( QObject::tr("REb"));
}
b->addItems(qs);
b->setCurrentIndex(value);
}
else if (function==FuncVolume) {
populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_TRIMS);
}
else if (function==FuncPlayValue) {
populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRYEXT);
}
else if (function>=FuncAdjustGV1 && function<=FuncAdjustGVLast) {
switch (adjustmode) {
case 1:
populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_TRIMS|POPULATE_SWITCHES);
break;
case 2:
populateSourceCB(b, RawSource(value), model, POPULATE_GVARS);
break;
case 3:
b->clear();
b->addItem("-1", 0);
b->addItem("+1", 1);
b->setCurrentIndex(value);
break;
}
}
else {
b->hide();
}
}
void populateGVmodeCB(QComboBox *b, unsigned int value)
{
b->clear();
b->addItem(QObject::tr("Value"));
b->addItem(QObject::tr("Source"));
b->addItem(QObject::tr("GVAR"));
b->addItem(QObject::tr("Increment"));
b->setCurrentIndex(value);
}
void populatePhasesCB(QComboBox *b, int value) void populatePhasesCB(QComboBox *b, int value)
{ {
for (int i=-GetEepromInterface()->getCapability(FlightPhases); i<=GetEepromInterface()->getCapability(FlightPhases); i++) { for (int i=-GetEepromInterface()->getCapability(FlightPhases); i<=GetEepromInterface()->getCapability(FlightPhases); i++) {
@ -842,28 +662,6 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, unsigned long attr,
return; return;
} }
#if 0
// TODO check ... I removed negative toggle switches in the FW, no?
if (attr & POPULATE_MSWITCHES) {
if (attr & POPULATE_ONOFF) {
item = RawSwitch(SWITCH_TYPE_ONM, 1);
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
for (int i=-GetEepromInterface()->getCapability(CustomSwitches); i<0; i++) {
item = RawSwitch(SWITCH_TYPE_MOMENT_VIRTUAL, i);
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
for (int i=-GetEepromInterface()->getCapability(SwitchesPositions); i<0; i++) {
item = RawSwitch(SWITCH_TYPE_MOMENT_SWITCH, i);
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
}
#endif
if (attr & POPULATE_ONOFF) { if (attr & POPULATE_ONOFF) {
item = RawSwitch(SWITCH_TYPE_OFF); item = RawSwitch(SWITCH_TYPE_OFF);
if (GetEepromInterface()->isAvailable(item, context)) { if (GetEepromInterface()->isAvailable(item, context)) {
@ -922,51 +720,14 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, unsigned long attr,
if (item == value) b->setCurrentIndex(b->count()-1); if (item == value) b->setCurrentIndex(b->count()-1);
} }
if (attr & POPULATE_MSWITCHES) { #if 0
for (int i=1; i<=GetEepromInterface()->getCapability(SwitchesPositions); i++) { // TODO One ?
item = RawSwitch(SWITCH_TYPE_MOMENT_SWITCH, i);
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
for (int i=1; i<=GetEepromInterface()->getCapability(CustomSwitches); i++) {
item = RawSwitch(SWITCH_TYPE_MOMENT_VIRTUAL, i);
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
}
if (attr & POPULATE_MSWITCHES) {
if (attr & POPULATE_ONOFF) { if (attr & POPULATE_ONOFF) {
item = RawSwitch(SWITCH_TYPE_ONM); item = RawSwitch(SWITCH_TYPE_ONM);
b->addItem(item.toString(), item.toValue()); b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1); if (item == value) b->setCurrentIndex(b->count()-1);
} }
if (IS_ARM(GetEepromInterface()->getBoard())) { #endif
item = RawSwitch(SWITCH_TYPE_TRN,0);
if (GetEepromInterface()->isAvailable(item, context)) {
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
item = RawSwitch(SWITCH_TYPE_TRN,1);
if (GetEepromInterface()->isAvailable(item, context)) {
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
}
if (GetEepromInterface()->getBoard()==BOARD_SKY9X) {
item = RawSwitch(SWITCH_TYPE_REA,0);
if (GetEepromInterface()->isAvailable(item, context)) {
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
item = RawSwitch(SWITCH_TYPE_REA,1);
if (GetEepromInterface()->isAvailable(item, context)) {
b->addItem(item.toString(), item.toValue());
if (item == value) b->setCurrentIndex(b->count()-1);
}
}
}
b->setMaxVisibleItems(10); b->setMaxVisibleItems(10);
} }

8
companion/src/helpers.h
View file

@ -80,14 +80,8 @@ class CurveGroup : public QObject {
}; };
#define POPULATE_ONOFF 0x01 #define POPULATE_ONOFF 0x01
#define POPULATE_MSWITCHES 0x02 #define POPULATE_AND_SWITCHES 0x02
#define POPULATE_AND_SWITCHES 0x04
void populateSwitchCB(QComboBox *b, const RawSwitch & value, unsigned long attr=0, UseContext context=DefaultContext); void populateSwitchCB(QComboBox *b, const RawSwitch & value, unsigned long attr=0, UseContext context=DefaultContext);
void populateFuncCB(QComboBox *b, unsigned int value);
void populateGVmodeCB(QComboBox *b, unsigned int value);
QString FuncParam(uint function, int value, QString paramT="",unsigned int adjustmode=0);
void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, unsigned int value, unsigned int adjustmode=0);
void populateFuncParamArmTCB(QComboBox *b, ModelData * g_model, char * value, QStringList & paramsList);
void populatePhasesCB(QComboBox *b, int value); void populatePhasesCB(QComboBox *b, int value);
void populateTrimUseCB(QComboBox *b, unsigned int phase); void populateTrimUseCB(QComboBox *b, unsigned int phase);
void populateGvarUseCB(QComboBox *b, unsigned int phase); void populateGvarUseCB(QComboBox *b, unsigned int phase);

BIN
companion/src/images/splasht.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Before After
Before After

160
companion/src/mainwindow.cpp
View file

@ -641,6 +641,42 @@ void MainWindow::closeEvent(QCloseEvent *event)
} }
} }
void MainWindow::setLanguage(QString langString)
{
QSettings settings;
settings.setValue("locale", langString );
QMessageBox msgBox;
msgBox.setText(tr("The selected language will be used the next time you start Companion."));
msgBox.setIcon(QMessageBox::Information);
msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
msgBox.exec();
}
void MainWindow::setTheme(int index)
{
QSettings settings;
settings.setValue("theme", index );
QMessageBox msgBox;
msgBox.setText(tr("The new theme will be loaded the next time you start Companion."));
msgBox.setIcon(QMessageBox::Information);
msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
msgBox.exec();
}
void MainWindow::setIconThemeSize(int index)
{
QSettings settings;
settings.setValue("icon_size", index );
QMessageBox msgBox;
msgBox.setText(tr("The icon size will be used the next time you start Companion."));
msgBox.setIcon(QMessageBox::Information);
msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
msgBox.exec();
}
void MainWindow::newFile() void MainWindow::newFile()
{ {
MdiChild *child = createMdiChild(); MdiChild *child = createMdiChild();
@ -648,6 +684,7 @@ void MainWindow::newFile()
child->show(); child->show();
} }
void MainWindow::openFile() void MainWindow::openFile()
{ {
QSettings settings; QSettings settings;
@ -1630,7 +1667,7 @@ void MainWindow::createActions()
logsAct->setStatusTip(tr("Open log file")); logsAct->setStatusTip(tr("Open log file"));
connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile())); connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile()));
preferencesAct = new QAction(CompanionIcon("preferences.png"), tr("&Preferences..."), this); preferencesAct = new QAction(CompanionIcon("preferences.png"), tr("&General Preferences..."), this);
preferencesAct->setStatusTip(tr("Edit general preferences")); preferencesAct->setStatusTip(tr("Edit general preferences"));
connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences())); connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
@ -1655,7 +1692,7 @@ void MainWindow::createActions()
compareAct->setEnabled(false); compareAct->setEnabled(false);
connect(compareAct, SIGNAL(triggered()), this, SLOT(compare())); connect(compareAct, SIGNAL(triggered()), this, SLOT(compare()));
customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Customize your &TX..."), this); customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Configure transmitter start screen..."), this);
customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX")); customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX"));
connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash())); connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash()));
@ -1708,7 +1745,7 @@ void MainWindow::createActions()
burnFromFlashAct->setStatusTip(tr("Read firmware from transmitter")); burnFromFlashAct->setStatusTip(tr("Read firmware from transmitter"));
connect(burnFromFlashAct,SIGNAL(triggered()),this,SLOT(burnFromFlash())); connect(burnFromFlashAct,SIGNAL(triggered()),this,SLOT(burnFromFlash()));
burnConfigAct = new QAction(CompanionIcon("configure.png"), tr("&Configure..."), this); burnConfigAct = new QAction(CompanionIcon("configure.png"), tr("&Configure connection software..."), this);
burnConfigAct->setStatusTip(tr("Configure software for reading from and writing to the transmitter")); burnConfigAct->setStatusTip(tr("Configure software for reading from and writing to the transmitter"));
connect(burnConfigAct,SIGNAL(triggered()),this,SLOT(burnConfig())); connect(burnConfigAct,SIGNAL(triggered()),this,SLOT(burnConfig()));
EEPROMInterface *eepromInterface = GetEepromInterface(); EEPROMInterface *eepromInterface = GetEepromInterface();
@ -1754,6 +1791,79 @@ void MainWindow::createActions()
connect(profileActs[i], SIGNAL(triggered()), this, SLOT(loadProfile())); connect(profileActs[i], SIGNAL(triggered()), this, SLOT(loadProfile()));
} }
updateProfilesActions(); updateProfilesActions();
classicThemeAct = new QAction(tr("Classic"), this);
classicThemeAct->setStatusTip(tr("The multicolor classical Companion icon theme"));
connect(classicThemeAct, SIGNAL(triggered()), this, SLOT(setClassicTheme()));
monoThemeAct = new QAction("Monochrome",this);
monoThemeAct->setStatusTip(tr("A monochrome black icon theme"));
connect(monoThemeAct, SIGNAL(triggered()), this, SLOT(setMonochromeTheme()));
monoWhiteThemeAct = new QAction("MonoWhite",this);
monoWhiteThemeAct->setStatusTip(tr("A monochrome white icon theme"));
connect(monoWhiteThemeAct, SIGNAL(triggered()), this, SLOT(setMonoWhiteTheme()));
monoBlueThemeAct = new QAction("MonoBlue",this);
monoBlueThemeAct->setStatusTip(tr("A monochrome blue icon theme"));
connect(monoBlueThemeAct, SIGNAL(triggered()), this, SLOT(setMonoBlueTheme()));
smallIconAct = new QAction(tr("Small"),this);
smallIconAct->setStatusTip(tr("Use small toolbar icons"));
connect(smallIconAct, SIGNAL(triggered()), this, SLOT(setSmallIconThemeSize()));
normalIconAct = new QAction(this);
normalIconAct->setStatusTip(tr("Use normal size toolbar icons"));
normalIconAct->setText(tr("Normal"));
connect(normalIconAct, SIGNAL(triggered()), this, SLOT(setNormalIconThemeSize()));
bigIconAct = new QAction(this);
bigIconAct->setStatusTip(tr("Use big toolbar icons"));
bigIconAct->setText(tr("Big"));
connect(bigIconAct, SIGNAL(triggered()), this, SLOT(setBigIconThemeSize()));
hugeIconAct = new QAction(this);
hugeIconAct->setStatusTip(tr("Use huge toolbar icons"));
hugeIconAct->setText(tr("Huge"));
connect(hugeIconAct, SIGNAL(triggered()), this, SLOT(setHugeIconThemeSize()));
defaultLanguageAct = new QAction(tr("System default language"),this);
defaultLanguageAct->setStatusTip(tr("Use system default language in menus"));
connect(defaultLanguageAct, SIGNAL(triggered()), this, SLOT(setDefaultLanguage()));
czechLanguageAct = new QAction(tr("Czech"),this);
czechLanguageAct->setStatusTip(tr("Use Czech in menus"));
connect(czechLanguageAct, SIGNAL(triggered()), this, SLOT(setCZLanguage()));
germanLanguageAct = new QAction(tr("German"),this);
germanLanguageAct->setStatusTip(tr("Use German in menus"));
connect(germanLanguageAct, SIGNAL(triggered()), this, SLOT(setDELanguage()));
englishLanguageAct = new QAction(tr("English"),this);
englishLanguageAct->setStatusTip(tr("Use English in menus"));
connect(englishLanguageAct, SIGNAL(triggered()), this, SLOT(setENLanguage()));
frenchLanguageAct = new QAction(tr("French"),this);
frenchLanguageAct->setStatusTip(tr("Use French in menus"));
connect(frenchLanguageAct, SIGNAL(triggered()), this, SLOT(setFRLanguage()));
italianLanguageAct = new QAction(tr("Italian"),this);
italianLanguageAct->setStatusTip(tr("Use Italian in menus"));
connect(italianLanguageAct, SIGNAL(triggered()), this, SLOT(setITLanguage()));
hebrewLanguageAct = new QAction(tr("Hebrew"),this);
hebrewLanguageAct->setStatusTip(tr("Use Hebrew in menus"));
connect(hebrewLanguageAct, SIGNAL(triggered()), this, SLOT(setHELanguage()));
polishLanguageAct = new QAction(tr("Polish"),this);
polishLanguageAct->setStatusTip(tr("Use Polish in menus"));
connect(polishLanguageAct, SIGNAL(triggered()), this, SLOT(setPLLanguage()));
portugueseLanguageAct = new QAction(tr("Portuguese"),this);
portugueseLanguageAct->setStatusTip(tr("Use Portuguese in menus"));
connect(portugueseLanguageAct, SIGNAL(triggered()), this, SLOT(setPTLanguage()));
swedishLanguageAct = new QAction(tr("Swedish"),this);
swedishLanguageAct->setStatusTip(tr("Use Swedish in menus"));
connect(swedishLanguageAct, SIGNAL(triggered()), this, SLOT(setSELanguage()));
russianLanguageAct = new QAction(tr("Russian"),this);
russianLanguageAct->setStatusTip(tr("Use Russian in menus"));
connect(russianLanguageAct, SIGNAL(triggered()), this, SLOT(setRULanguage()));
} }
void MainWindow::createMenus() void MainWindow::createMenus()
@ -1761,6 +1871,9 @@ void MainWindow::createMenus()
{ {
QMenu *recentFileMenu=new QMenu(tr("Recent Files")); QMenu *recentFileMenu=new QMenu(tr("Recent Files"));
QMenu *profilesMenu=new QMenu(tr("Firmware Profiles")); QMenu *profilesMenu=new QMenu(tr("Firmware Profiles"));
QMenu *languageMenu=new QMenu(tr("Set Menu Language"));
QMenu *themeMenu=new QMenu(tr("Set Icon Theme"));
QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"));
fileMenu = menuBar()->addMenu(tr("&File")); fileMenu = menuBar()->addMenu(tr("&File"));
fileMenu->addAction(newAct); fileMenu->addAction(newAct);
@ -1778,7 +1891,6 @@ void MainWindow::createMenus()
fileMenu->addAction(printAct); fileMenu->addAction(printAct);
fileMenu->addAction(compareAct); fileMenu->addAction(compareAct);
fileMenu->addSeparator(); fileMenu->addSeparator();
fileMenu->addAction(preferencesAct);
fileMenu->addMenu(profilesMenu); fileMenu->addMenu(profilesMenu);
profilesMenu->setIcon(CompanionIcon("profiles.png")); profilesMenu->setIcon(CompanionIcon("profiles.png"));
@ -1791,6 +1903,34 @@ void MainWindow::createMenus()
editMenu->addAction(copyAct); editMenu->addAction(copyAct);
editMenu->addAction(pasteAct); editMenu->addAction(pasteAct);
settingsMenu = menuBar()->addMenu(tr("&Settings"));
settingsMenu->addMenu(languageMenu);
languageMenu->addAction(defaultLanguageAct);
languageMenu->addAction(englishLanguageAct);
languageMenu->addAction(czechLanguageAct);
languageMenu->addAction(germanLanguageAct);
languageMenu->addAction(frenchLanguageAct);
languageMenu->addAction(hebrewLanguageAct);
languageMenu->addAction(italianLanguageAct);
languageMenu->addAction(polishLanguageAct);
languageMenu->addAction(portugueseLanguageAct);
languageMenu->addAction(swedishLanguageAct);
languageMenu->addAction(russianLanguageAct);
settingsMenu->addMenu(themeMenu);
themeMenu->addAction(classicThemeAct);
themeMenu->addAction(monoThemeAct);
themeMenu->addAction(monoBlueThemeAct);
themeMenu->addAction(monoWhiteThemeAct);
settingsMenu->addMenu(iconThemeSizeMenu);
iconThemeSizeMenu->addAction(smallIconAct);
iconThemeSizeMenu->addAction(normalIconAct);
iconThemeSizeMenu->addAction(bigIconAct);
iconThemeSizeMenu->addAction(hugeIconAct);
settingsMenu->addSeparator();
settingsMenu->addAction(preferencesAct);
settingsMenu->addAction(customizeSplashAct);
settingsMenu->addAction(burnConfigAct);
burnMenu = menuBar()->addMenu(tr("&Read/Write")); burnMenu = menuBar()->addMenu(tr("&Read/Write"));
burnMenu->addAction(burnToAct); burnMenu->addAction(burnToAct);
burnMenu->addAction(burnFromAct); burnMenu->addAction(burnFromAct);
@ -1801,9 +1941,7 @@ void MainWindow::createMenus()
burnMenu->addAction(burnToFlashAct); burnMenu->addAction(burnToFlashAct);
burnMenu->addAction(burnFromFlashAct); burnMenu->addAction(burnFromFlashAct);
burnMenu->addSeparator(); burnMenu->addSeparator();
burnMenu->addAction(customizeSplashAct);
burnMenu->addSeparator(); burnMenu->addSeparator();
burnMenu->addAction(burnConfigAct);
EEPROMInterface *eepromInterface = GetEepromInterface(); EEPROMInterface *eepromInterface = GetEepromInterface();
if (!IS_ARM(eepromInterface->getBoard())) { if (!IS_ARM(eepromInterface->getBoard())) {
burnMenu->addAction(burnFusesAct); burnMenu->addAction(burnFusesAct);
@ -1968,14 +2106,6 @@ QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName)
return 0; return 0;
} }
void MainWindow::switchLayoutDirection()
{
if (layoutDirection() == Qt::LeftToRight)
qApp->setLayoutDirection(Qt::RightToLeft);
else
qApp->setLayoutDirection(Qt::LeftToRight);
}
void MainWindow::setActiveSubWindow(QWidget *window) void MainWindow::setActiveSubWindow(QWidget *window)
{ {
if (!window) if (!window)
@ -2143,3 +2273,5 @@ void MainWindow::autoClose()
{ {
this->close(); this->close();
} }

47
companion/src/mainwindow.h
View file

@ -82,6 +82,31 @@ public slots:
void unloadProfile(); void unloadProfile();
private slots: private slots:
void setLanguage(QString langString);
void setDefaultLanguage() {setLanguage("");};
void setCZLanguage() {setLanguage("cs_CZ");};
void setDELanguage() {setLanguage("de_DE");};
void setENLanguage() {setLanguage("en");};
void setFRLanguage() {setLanguage("fr_FR");};
void setITLanguage() {setLanguage("it_IT");};
void setHELanguage() {setLanguage("he_IL");};
void setPLLanguage() {setLanguage("pl_PL");};
void setPTLanguage() {setLanguage("pt_PT");};
void setRULanguage() {setLanguage("ru_RU");};
void setSELanguage() {setLanguage("sv_SE");};
void setTheme(int index);
void setClassicTheme() {setTheme(0);};
void setMonochromeTheme(){setTheme(1);};
void setMonoWhiteTheme() {setTheme(2);};
void setMonoBlueTheme() {setTheme(3);};
void setIconThemeSize(int index);
void setSmallIconThemeSize() {setIconThemeSize(0);};
void setNormalIconThemeSize() {setIconThemeSize(1);};
void setBigIconThemeSize() {setIconThemeSize(2);};
void setHugeIconThemeSize() {setIconThemeSize(3);};
void checkForUpdates(bool ignoreSettings, QString & fwId); void checkForUpdates(bool ignoreSettings, QString & fwId);
void checkForUpdateFinished(QNetworkReply * reply); void checkForUpdateFinished(QNetworkReply * reply);
void displayWarnings(); void displayWarnings();
@ -121,7 +146,6 @@ private slots:
void preferences(); void preferences();
void updateMenus(); void updateMenus();
MdiChild *createMdiChild(); MdiChild *createMdiChild();
void switchLayoutDirection();
void setActiveSubWindow(QWidget *window); void setActiveSubWindow(QWidget *window);
QMenu * createRecentFileMenu(); QMenu * createRecentFileMenu();
QMenu * createProfilesMenu(); QMenu * createProfilesMenu();
@ -153,7 +177,6 @@ private:
QStringList GetSendFlashCommand(const QString &filename); QStringList GetSendFlashCommand(const QString &filename);
int getEpromVersion(QString fileName); int getEpromVersion(QString fileName);
bool convertEEPROM(QString backupFile, QString restoreFile, QString flashFile); bool convertEEPROM(QString backupFile, QString restoreFile, QString flashFile);
bool isValidEEPROM(QString eepromfile); bool isValidEEPROM(QString eepromfile);
@ -183,6 +206,7 @@ private:
QMenu *fileMenu; QMenu *fileMenu;
QMenu *editMenu; QMenu *editMenu;
QMenu *settingsMenu;
QMenu *burnMenu; QMenu *burnMenu;
QMenu *helpMenu; QMenu *helpMenu;
QToolBar *fileToolBar; QToolBar *fileToolBar;
@ -222,6 +246,25 @@ private:
QAction *logsAct; QAction *logsAct;
QAction *recentFileActs[MAX_RECENT]; QAction *recentFileActs[MAX_RECENT];
QAction *profileActs[MAX_PROFILES]; QAction *profileActs[MAX_PROFILES];
QAction *classicThemeAct;
QAction *monoThemeAct;
QAction *monoBlueThemeAct;
QAction *monoWhiteThemeAct;
QAction *smallIconAct;
QAction *normalIconAct;
QAction *bigIconAct;
QAction *hugeIconAct;
QAction *defaultLanguageAct;
QAction *englishLanguageAct;
QAction *czechLanguageAct;
QAction *germanLanguageAct;
QAction *frenchLanguageAct;
QAction *italianLanguageAct;
QAction *hebrewLanguageAct;
QAction *polishLanguageAct;
QAction *portugueseLanguageAct;
QAction *swedishLanguageAct;
QAction *russianLanguageAct;
QString fwToUpdate; QString fwToUpdate;
QToolButton * profileButton; QToolButton * profileButton;
}; };

122
companion/src/modeledit/customfunctions.cpp
View file

@ -95,7 +95,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
fswtchSwtch[i]->setProperty("index", i); fswtchSwtch[i]->setProperty("index", i);
connect(fswtchSwtch[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited())); connect(fswtchSwtch[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
gridLayout->addWidget(fswtchSwtch[i], i+1, 1); gridLayout->addWidget(fswtchSwtch[i], i+1, 1);
populateSwitchCB(fswtchSwtch[i], model.funcSw[i].swtch, POPULATE_MSWITCHES|POPULATE_ONOFF); populateSwitchCB(fswtchSwtch[i], model.funcSw[i].swtch, POPULATE_ONOFF);
// The function // The function
fswtchFunc[i] = new QComboBox(this); fswtchFunc[i] = new QComboBox(this);
@ -286,7 +286,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
int index = fswtchFunc[i]->currentIndex(); int index = fswtchFunc[i]->currentIndex();
if (index>=FuncSafetyCh1 && index<=FuncSafetyCh16) { if (index>=FuncSafetyCh1 && index<=FuncSafetyCh32) {
fswtchParam[i]->setDecimals(0); fswtchParam[i]->setDecimals(0);
fswtchParam[i]->setSingleStep(1); fswtchParam[i]->setSingleStep(1);
fswtchParam[i]->setMinimum(-125); fswtchParam[i]->setMinimum(-125);
@ -457,7 +457,7 @@ void CustomFunctionsPanel::fswPaste()
FuncSwData *fsw = &model.funcSw[selectedFunction]; FuncSwData *fsw = &model.funcSw[selectedFunction];
memcpy(fsw, fswData.mid(0, sizeof(FuncSwData)).constData(), sizeof(FuncSwData)); memcpy(fsw, fswData.mid(0, sizeof(FuncSwData)).constData(), sizeof(FuncSwData));
// TODO update switch and func // TODO update switch and func
populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, POPULATE_MSWITCHES|POPULATE_ONOFF); populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, POPULATE_ONOFF);
populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func); populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func);
refreshCustomFunction(selectedFunction); refreshCustomFunction(selectedFunction);
emit modified(); emit modified();
@ -468,7 +468,7 @@ void CustomFunctionsPanel::fswDelete()
{ {
model.funcSw[selectedFunction].clear(); model.funcSw[selectedFunction].clear();
// TODO update switch and func // TODO update switch and func
populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, POPULATE_MSWITCHES|POPULATE_ONOFF); populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, POPULATE_ONOFF);
populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func); populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func);
refreshCustomFunction(selectedFunction); refreshCustomFunction(selectedFunction);
emit modified(); emit modified();
@ -508,3 +508,117 @@ void CustomFunctionsPanel::fsw_customContextMenuRequested(QPoint pos)
contextMenu.exec(globalPos); contextMenu.exec(globalPos);
} }
void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
{
b->clear();
for (unsigned int i=0; i<FuncCount; i++) {
b->addItem(getFuncName(i));
if (!GetEepromInterface()->getCapability(HasVolume)) {
if (i==FuncVolume || i==FuncBackgroundMusic || i==FuncBackgroundMusicPause) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
}
if ((i==FuncPlayHaptic) && !GetEepromInterface()->getCapability(Haptic)) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
if ((i==FuncPlayBoth) && !GetEepromInterface()->getCapability(HasBeeper)) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
if ((i==FuncLogs) && !GetEepromInterface()->getCapability(HasSDLogs)) {
QModelIndex index = b->model()->index(i, 0);
QVariant v(0);
b->model()->setData(index, v, Qt::UserRole - 1);
}
}
b->setCurrentIndex(value);
b->setMaxVisibleItems(10);
}
void CustomFunctionsPanel::populateGVmodeCB(QComboBox *b, unsigned int value)
{
b->clear();
b->addItem(QObject::tr("Value"));
b->addItem(QObject::tr("Source"));
b->addItem(QObject::tr("GVAR"));
b->addItem(QObject::tr("Increment"));
b->setCurrentIndex(value);
}
void CustomFunctionsPanel::populateFuncParamArmTCB(QComboBox *b, ModelData * g_model, char * value, QStringList & paramsList)
{
b->clear();
b->addItem("----");
QString currentvalue(value);
foreach ( QString entry, paramsList ) {
b->addItem(entry);
if (entry==currentvalue) {
b->setCurrentIndex(b->count()-1);
}
}
}
void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, unsigned int value, unsigned int adjustmode)
{
QStringList qs;
b->clear();
if (function==FuncPlaySound) {
qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt" << "AlmClk" ;
b->addItems(qs);
b->setCurrentIndex(value);
}
else if (function==FuncPlayHaptic) {
qs << "0" << "1" << "2" << "3";
b->addItems(qs);
b->setCurrentIndex(value);
}
else if (function==FuncReset) {
qs.append( QObject::tr("Timer1"));
qs.append( QObject::tr("Timer2"));
qs.append( QObject::tr("All"));
qs.append( QObject::tr("Telemetry"));
int reCount = GetEepromInterface()->getCapability(RotaryEncoders);
if (reCount == 1) {
qs.append( QObject::tr("Rotary Encoder"));
}
else if (reCount == 2) {
qs.append( QObject::tr("REa"));
qs.append( QObject::tr("REb"));
}
b->addItems(qs);
b->setCurrentIndex(value);
}
else if (function==FuncVolume) {
populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_TRIMS);
}
else if (function==FuncPlayValue) {
populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRYEXT);
}
else if (function>=FuncAdjustGV1 && function<=FuncAdjustGVLast) {
switch (adjustmode) {
case 1:
populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_TRIMS|POPULATE_SWITCHES);
break;
case 2:
populateSourceCB(b, RawSource(value), model, POPULATE_GVARS);
break;
case 3:
b->clear();
b->addItem("-1", 0);
b->addItem("+1", 1);
b->setCurrentIndex(value);
break;
}
}
else {
b->hide();
}
}

5
companion/src/modeledit/customfunctions.h
View file

@ -55,6 +55,11 @@ class CustomFunctionsPanel : public ModelPanel
void fswCut(); void fswCut();
private: private:
void populateFuncCB(QComboBox *b, unsigned int value);
void populateGVmodeCB(QComboBox *b, unsigned int value);
void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, unsigned int value, unsigned int adjustmode=0);
void populateFuncParamArmTCB(QComboBox *b, ModelData * g_model, char * value, QStringList & paramsList);
GeneralSettings & generalSettings; GeneralSettings & generalSettings;
bool phononLock; bool phononLock;
QComboBox * fswtchSwtch[C9X_MAX_CUSTOM_FUNCTIONS]; QComboBox * fswtchSwtch[C9X_MAX_CUSTOM_FUNCTIONS];

32
companion/src/preferencesdialog.cpp
View file

@ -40,7 +40,6 @@ preferencesDialog::preferencesDialog(QWidget *parent) :
connect(OptionCheckBox[i], SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool))); connect(OptionCheckBox[i], SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
} }
populateLocale();
initSettings(); initSettings();
connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged())); connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
connect(this, SIGNAL(accepted()), this, SLOT(writeValues())); connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
@ -254,11 +253,6 @@ void preferencesDialog::firmwareChanged()
void preferencesDialog::writeValues() void preferencesDialog::writeValues()
{ {
QSettings settings; QSettings settings;
if (ui->locale_QB->currentIndex() > 0)
settings.setValue("locale", ui->locale_QB->itemData(ui->locale_QB->currentIndex()));
else
settings.remove("locale");
settings.setValue("default_channel_order", ui->channelorderCB->currentIndex()); settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
settings.setValue("default_mode", ui->stickmodeCB->currentIndex()); settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
settings.setValue("cpu_id", ui->CPU_ID_LE->text()); settings.setValue("cpu_id", ui->CPU_ID_LE->text());
@ -267,8 +261,6 @@ void preferencesDialog::writeValues()
settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked()); settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked()); settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked());
settings.setValue("show_splash", ui->showSplash->isChecked()); settings.setValue("show_splash", ui->showSplash->isChecked());
settings.setValue("theme", ui->theme_CB->currentIndex());
settings.setValue("icon_size", ui->iconSize_CB->currentIndex());
settings.setValue("simuSW", ui->simuSW->isChecked()); settings.setValue("simuSW", ui->simuSW->isChecked());
settings.setValue("history_size", ui->historySize->value()); settings.setValue("history_size", ui->historySize->value());
settings.setValue("burnFirmware", ui->burnFirmware->isChecked()); settings.setValue("burnFirmware", ui->burnFirmware->isChecked());
@ -387,9 +379,6 @@ void preferencesDialog::populateFirmwareOptions(const FirmwareInfo * firmware)
void preferencesDialog::initSettings() void preferencesDialog::initSettings()
{ {
QSettings settings; QSettings settings;
int i = ui->locale_QB->findData(settings.value("locale"));
if (i < 0) i = 0;
ui->locale_QB->setCurrentIndex(i);
ui->snapshotClipboardCKB->setChecked(settings.value("snapshot_to_clipboard", false).toBool()); ui->snapshotClipboardCKB->setChecked(settings.value("snapshot_to_clipboard", false).toBool());
if (ui->snapshotClipboardCKB->isChecked()) { if (ui->snapshotClipboardCKB->isChecked()) {
ui->snapshotPath->setDisabled(true); ui->snapshotPath->setDisabled(true);
@ -408,8 +397,6 @@ void preferencesDialog::initSettings()
ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool()); ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool());
ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool()); ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool());
ui->showSplash->setChecked(settings.value("show_splash", true).toBool()); ui->showSplash->setChecked(settings.value("show_splash", true).toBool());
ui->theme_CB->setCurrentIndex(settings.value("theme", 1).toInt());
ui->iconSize_CB->setCurrentIndex(settings.value("icon_size", 2).toInt());
ui->historySize->setValue(settings.value("history_size", 10).toInt()); ui->historySize->setValue(settings.value("history_size", 10).toInt());
ui->backLightColor->setCurrentIndex(settings.value("backLight", 0).toInt()); ui->backLightColor->setCurrentIndex(settings.value("backLight", 0).toInt());
ui->startupCheck_fw->setChecked(settings.value("startup_check_fw", true).toBool()); ui->startupCheck_fw->setChecked(settings.value("startup_check_fw", true).toBool());
@ -501,25 +488,6 @@ void preferencesDialog::initSettings()
firmwareChanged(); firmwareChanged();
} }
void preferencesDialog::populateLocale()
{
ui->ProfSave_PB->setEnabled(true);
ui->locale_QB->clear();
ui->locale_QB->addItem("System default language", "");
ui->locale_QB->addItem("English", "en");
QStringList strl = QApplication::arguments();
if (!strl.count()) return;
QDir directory = QDir(":/");
QStringList files = directory.entryList(QStringList("companion_*.qm"), QDir::Files | QDir::NoSymLinks);
foreach(QString file, files) {
QLocale loc(file.mid(10, 2));
ui->locale_QB->addItem(QLocale::languageToString(loc.language()), loc.name());
}
}
void preferencesDialog::on_fw_dnld_clicked() void preferencesDialog::on_fw_dnld_clicked()
{ {
MainWindow * mw = (MainWindow *)this->parent(); MainWindow * mw = (MainWindow *)this->parent();

367
companion/src/preferencesdialog.ui
View file

@ -25,7 +25,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Preferences</string> <string>Preferences</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0,0,1,0"> <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0,0,0,0">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum> <enum>QLayout::SetMinimumSize</enum>
</property> </property>
@ -35,7 +35,84 @@
<property name="margin"> <property name="margin">
<number>4</number> <number>4</number>
</property> </property>
<item row="3" column="1" colspan="4"> <item row="31" column="1" colspan="2">
<widget class="QComboBox" name="stickmodeCB">
<property name="whatsThis">
<string>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
</string>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<item>
<property name="text">
<string>Mode 1 (RUD ELE THR AIL)</string>
</property>
</item>
<item>
<property name="text">
<string>Mode 2 (RUD THR ELE AIL)</string>
</property>
</item>
<item>
<property name="text">
<string>Mode 3 (AIL ELE THR RUD)</string>
</property>
</item>
<item>
<property name="text">
<string>Mode 4 (AIL THR ELE RUD)</string>
</property>
</item>
</widget>
</item>
<item row="14" column="1">
<widget class="QComboBox" name="backLightColor">
<item>
<property name="text">
<string>Blue</string>
</property>
</item>
<item>
<property name="text">
<string>Green</string>
</property>
</item>
<item>
<property name="text">
<string>Red</string>
</property>
</item>
<item>
<property name="text">
<string>Orange</string>
</property>
</item>
<item>
<property name="text">
<string>Yellow</string>
</property>
</item>
</widget>
</item>
<item row="2" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_10"> <layout class="QHBoxLayout" name="horizontalLayout_10">
<item> <item>
<widget class="QLineEdit" name="backupPath"> <widget class="QLineEdit" name="backupPath">
@ -60,7 +137,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Automatic Backup Folder</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@ -73,7 +157,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="1" colspan="4"> <item row="15" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QCheckBox" name="joystickChkB"> <widget class="QCheckBox" name="joystickChkB">
@ -101,14 +185,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> <item row="1" column="1" colspan="4">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Automatic Backup Folder</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<widget class="QSpinBox" name="historySize"> <widget class="QSpinBox" name="historySize">
@ -151,14 +228,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="0" colspan="5"> <item row="5" column="0" colspan="5">
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0"> <item row="14" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@ -174,7 +251,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="4" rowspan="7"> <item row="6" column="4" rowspan="7">
<layout class="QGridLayout" name="gridLayout_3" columnstretch="0,0"> <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,0">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="imageLabel"> <widget class="QLabel" name="imageLabel">
@ -229,43 +306,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="15" column="2" colspan="2"> <item row="14" column="2" colspan="2">
<widget class="QCheckBox" name="simuSW"> <widget class="QCheckBox" name="simuSW">
<property name="text"> <property name="text">
<string>Remember switches in simulator</string> <string>Remember switches in simulator</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1"> <item row="6" column="1" colspan="3">
<widget class="QComboBox" name="backLightColor">
<item>
<property name="text">
<string>Blue</string>
</property>
</item>
<item>
<property name="text">
<string>Green</string>
</property>
</item>
<item>
<property name="text">
<string>Red</string>
</property>
</item>
<item>
<property name="text">
<string>Orange</string>
</property>
</item>
<item>
<property name="text">
<string>Yellow</string>
</property>
</item>
</widget>
</item>
<item row="7" column="1" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
@ -302,27 +350,21 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="17" column="0"> <item row="16" column="0">
<widget class="QLabel" name="label_19"> <widget class="QLabel" name="label_19">
<property name="text"> <property name="text">
<string>Simulator capture folder</string> <string>Simulator capture folder</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="17" column="0" colspan="5">
<widget class="QLabel" name="label"> <widget class="Line" name="line_2">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <enum>Qt::Horizontal</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Language (requires restart)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="32" column="4"> <item row="31" column="4">
<widget class="QComboBox" name="channelorderCB"> <widget class="QComboBox" name="channelorderCB">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@ -466,7 +508,7 @@ This is used by the templated to determine which channel goes to what number out
</item> </item>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@ -479,7 +521,7 @@ This is used by the templated to determine which channel goes to what number out
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1" colspan="3"> <item row="12" column="1" colspan="3">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>1</number> <number>1</number>
@ -503,7 +545,7 @@ This is used by the templated to determine which channel goes to what number out
</item> </item>
</layout> </layout>
</item> </item>
<item row="25" column="1" colspan="4"> <item row="24" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item> <item>
<widget class="QLabel" name="FwInfo"> <widget class="QLabel" name="FwInfo">
@ -527,7 +569,7 @@ This is used by the templated to determine which channel goes to what number out
</item> </item>
</layout> </layout>
</item> </item>
<item row="13" column="0"> <item row="12" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@ -540,7 +582,7 @@ This is used by the templated to determine which channel goes to what number out
</property> </property>
</widget> </widget>
</item> </item>
<item row="38" column="0" colspan="5"> <item row="37" column="0" colspan="5">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
@ -583,7 +625,7 @@ This is used by the templated to determine which channel goes to what number out
</item> </item>
</layout> </layout>
</item> </item>
<item row="27" column="1" colspan="4"> <item row="26" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,0"> <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,0">
<item> <item>
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
@ -610,7 +652,7 @@ This is used by the templated to determine which channel goes to what number out
</item> </item>
</layout> </layout>
</item> </item>
<item row="33" column="1" colspan="4"> <item row="32" column="1" colspan="4">
<layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,1,0,0"> <layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,1,0,0">
<item row="1" column="4"> <item row="1" column="4">
<widget class="QPushButton" name="export_PB"> <widget class="QPushButton" name="export_PB">
@ -658,7 +700,7 @@ This is used by the templated to determine which channel goes to what number out
</item> </item>
</layout> </layout>
</item> </item>
<item row="17" column="1" colspan="4"> <item row="16" column="1" colspan="4">
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QGridLayout" name="gridLayout_8">
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>1</number> <number>1</number>
@ -689,7 +731,7 @@ This is used by the templated to determine which channel goes to what number out
</item> </item>
</layout> </layout>
</item> </item>
<item row="32" column="0"> <item row="31" column="0">
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@ -702,7 +744,7 @@ This is used by the templated to determine which channel goes to what number out
</property> </property>
</widget> </widget>
</item> </item>
<item row="32" column="3"> <item row="31" column="3">
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@ -718,62 +760,14 @@ This is used by the templated to determine which channel goes to what number out
</property> </property>
</widget> </widget>
</item> </item>
<item row="32" column="1" colspan="2"> <item row="32" column="0">
<widget class="QComboBox" name="stickmodeCB">
<property name="whatsThis">
<string>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
</string>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<item>
<property name="text">
<string>Mode 1 (RUD ELE THR AIL)</string>
</property>
</item>
<item>
<property name="text">
<string>Mode 2 (RUD THR ELE AIL)</string>
</property>
</item>
<item>
<property name="text">
<string>Mode 3 (AIL ELE THR RUD)</string>
</property>
</item>
<item>
<property name="text">
<string>Mode 4 (AIL THR ELE RUD)</string>
</property>
</item>
</widget>
</item>
<item row="33" column="0">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>Profile slot</string> <string>Profile slot</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="28" column="1" colspan="4"> <item row="27" column="1" colspan="4">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -789,7 +783,7 @@ Mode 4:
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="26" column="1" colspan="4"> <item row="25" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,0"> <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,0">
<item> <item>
<widget class="QLabel" name="label_18"> <widget class="QLabel" name="label_18">
@ -816,7 +810,7 @@ Mode 4:
</item> </item>
</layout> </layout>
</item> </item>
<item row="22" column="1" colspan="4"> <item row="21" column="1" colspan="4">
<layout class="QGridLayout" name="gridLayout_5" columnstretch="1,0,0,0,0"> <layout class="QGridLayout" name="gridLayout_5" columnstretch="1,0,0,0,0">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum> <enum>QLayout::SetMaximumSize</enum>
@ -907,7 +901,7 @@ May be different from firmware language</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="22" column="0"> <item row="21" column="0">
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
@ -947,7 +941,7 @@ May be different from firmware language</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@ -960,14 +954,7 @@ May be different from firmware language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="0" colspan="5"> <item row="23" column="1" colspan="4">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="24" column="1" colspan="4">
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0,0,0">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum> <enum>QLayout::SetMaximumSize</enum>
@ -1520,7 +1507,7 @@ May be different from firmware language</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="10" column="0"> <item row="9" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@ -1533,7 +1520,7 @@ May be different from firmware language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1" colspan="3"> <item row="9" column="1" colspan="3">
<widget class="QComboBox" name="splashincludeCB"> <widget class="QComboBox" name="splashincludeCB">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -1554,116 +1541,6 @@ May be different from firmware language</string>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="4"> <item row="0" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QComboBox" name="locale_QB"/>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Theme</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="theme_CB">
<property name="toolTip">
<string>Requires restart</string>
</property>
<item>
<property name="text">
<string>Classic</string>
</property>
</item>
<item>
<property name="text">
<string>Monochrome</string>
</property>
</item>
<item>
<property name="text">
<string>MonoWhite</string>
</property>
</item>
<item>
<property name="text">
<string>MonoBlue</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Icon size</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="iconSize_CB">
<property name="toolTip">
<string>Requires restart</string>
</property>
<item>
<property name="text">
<string>Small</string>
</property>
</item>
<item>
<property name="text">
<string>Normal</string>
</property>
</item>
<item>
<property name="text">
<string>Big</string>
</property>
</item>
<item>
<property name="text">
<string>Huge</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="1" column="1" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,0,0"> <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,0,0">
<item> <item>
<widget class="QCheckBox" name="showSplash"> <widget class="QCheckBox" name="showSplash">
@ -1710,7 +1587,7 @@ May be different from firmware language</string>
</item> </item>
</layout> </layout>
</item> </item>
<item row="16" column="0"> <item row="15" column="0">
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
@ -1723,14 +1600,14 @@ May be different from firmware language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QLabel" name="ge_label"> <widget class="QLabel" name="ge_label">
<property name="text"> <property name="text">
<string>Google Earth Executable</string> <string>Google Earth Executable</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" colspan="4"> <item row="3" column="1" colspan="4">
<layout class="QHBoxLayout" name="ge_layout"> <layout class="QHBoxLayout" name="ge_layout">
<item> <item>
<widget class="QLineEdit" name="ge_lineedit"> <widget class="QLineEdit" name="ge_lineedit">

30
companion/src/printdialog.cpp
View file

@ -54,7 +54,6 @@ printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QS
printCurves(); printCurves();
printGvars(); printGvars();
printSwitches(); printSwitches();
printSafetySwitches();
printFSwitches(); printFSwitches();
printFrSky(); printFrSky();
@ -693,33 +692,6 @@ void printDialog::printGvars()
} }
} }
void printDialog::printSafetySwitches()
{
int sc=0;
QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
str.append("<tr><td><h2>"+tr("Safety Switches")+"</h2></td></tr>");
str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3><tr>");
str.append("<td width=\"60\">&nbsp;</td>");
str.append(doTC(tr("Switch"), "", true));
str.append(doTL(tr("Value"), "", true));
str.append("</tr>");
for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++)
{
if (g_model->safetySw[i].swtch.type) {
str.append("<tr>");
str.append(doTC(tr("CH")+QString("%1").arg(i+1),"",true));
str.append(doTC(g_model->safetySw[i].swtch.toString(),"green"));
str.append(doTC(QString::number(g_model->safetySw[i].val),"green"));
str.append("</tr>");
sc++;
}
}
str.append("</table></td></tr></table>");
str.append("<br>");
if (sc!=0)
te->append(str);
}
void printDialog::printFSwitches() void printDialog::printFSwitches()
{ {
int sc=0; int sc=0;
@ -737,7 +709,7 @@ void printDialog::printFSwitches()
str.append("<tr>"); str.append("<tr>");
str.append(doTC(g_model->funcSw[i].swtch.toString(),"green")); str.append(doTC(g_model->funcSw[i].swtch.toString(),"green"));
str.append(doTC(getFuncName(g_model->funcSw[i].func),"green")); str.append(doTC(getFuncName(g_model->funcSw[i].func),"green"));
str.append(doTC(FuncParam(g_model->funcSw[i].func,g_model->funcSw[i].param,g_model->funcSw[i].paramarm, g_model->funcSw[i].adjustMode),"green")); str.append(doTC(g_model->funcSw[i].paramToString(),"green"));
int index=g_model->funcSw[i].func; int index=g_model->funcSw[i].func;
if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) { if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
str.append(doTC(QString("%1").arg(g_model->funcSw[i].repeatParam),"green")); str.append(doTC(QString("%1").arg(g_model->funcSw[i].repeatParam),"green"));

66
companion/src/simulatordialog.ui
View file

@ -555,6 +555,7 @@ QPushButton:checked {
border-radius: 4px; border-radius: 4px;
border-color: black; border-color: black;
padding: 2px; padding: 2px;
} }
QPushButton:checked { QPushButton:checked {
@ -1262,7 +1263,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_1"> <widget class="QLabel" name="labelCSW_1">
<property name="text"> <property name="text">
<string>CS1</string> <string>LS1</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1293,7 +1294,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_2"> <widget class="QLabel" name="labelCSW_2">
<property name="text"> <property name="text">
<string>CS2</string> <string>LS2</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1324,7 +1325,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_3"> <widget class="QLabel" name="labelCSW_3">
<property name="text"> <property name="text">
<string>CS3</string> <string>LS3</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1355,7 +1356,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_4"> <widget class="QLabel" name="labelCSW_4">
<property name="text"> <property name="text">
<string>CS4</string> <string>LS4</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1386,7 +1387,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_5"> <widget class="QLabel" name="labelCSW_5">
<property name="text"> <property name="text">
<string>CS5</string> <string>LS5</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1417,7 +1418,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_6"> <widget class="QLabel" name="labelCSW_6">
<property name="text"> <property name="text">
<string>CS6</string> <string>LS6</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1448,7 +1449,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_7"> <widget class="QLabel" name="labelCSW_7">
<property name="text"> <property name="text">
<string>CS7</string> <string>LS7</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1479,7 +1480,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_8"> <widget class="QLabel" name="labelCSW_8">
<property name="text"> <property name="text">
<string>CS8</string> <string>LS8</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1510,7 +1511,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_9"> <widget class="QLabel" name="labelCSW_9">
<property name="text"> <property name="text">
<string>CS9</string> <string>LS9</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1541,7 +1542,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_10"> <widget class="QLabel" name="labelCSW_10">
<property name="text"> <property name="text">
<string>CSA</string> <string>LSA</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1572,7 +1573,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_11"> <widget class="QLabel" name="labelCSW_11">
<property name="text"> <property name="text">
<string>CSB</string> <string>LSB</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1603,7 +1604,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_12"> <widget class="QLabel" name="labelCSW_12">
<property name="text"> <property name="text">
<string>CSC</string> <string>LSC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1634,7 +1635,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_13"> <widget class="QLabel" name="labelCSW_13">
<property name="text"> <property name="text">
<string>CSD</string> <string>LSD</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1665,7 +1666,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_14"> <widget class="QLabel" name="labelCSW_14">
<property name="text"> <property name="text">
<string>CSE</string> <string>LSE</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1696,7 +1697,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_15"> <widget class="QLabel" name="labelCSW_15">
<property name="text"> <property name="text">
<string>CSF</string> <string>LSF</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1727,7 +1728,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_16"> <widget class="QLabel" name="labelCSW_16">
<property name="text"> <property name="text">
<string>CSG</string> <string>LSG</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1758,7 +1759,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_17"> <widget class="QLabel" name="labelCSW_17">
<property name="text"> <property name="text">
<string>CSH</string> <string>LSH</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1789,7 +1790,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_18"> <widget class="QLabel" name="labelCSW_18">
<property name="text"> <property name="text">
<string>CSI</string> <string>LSI</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1820,7 +1821,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_19"> <widget class="QLabel" name="labelCSW_19">
<property name="text"> <property name="text">
<string>CSJ</string> <string>LSJ</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1851,7 +1852,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_20"> <widget class="QLabel" name="labelCSW_20">
<property name="text"> <property name="text">
<string>CSK</string> <string>LSK</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1882,7 +1883,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_21"> <widget class="QLabel" name="labelCSW_21">
<property name="text"> <property name="text">
<string>CSL</string> <string>LSL</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1913,7 +1914,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_22"> <widget class="QLabel" name="labelCSW_22">
<property name="text"> <property name="text">
<string>CSM</string> <string>LSM</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1944,7 +1945,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_23"> <widget class="QLabel" name="labelCSW_23">
<property name="text"> <property name="text">
<string>CSN</string> <string>LSN</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1975,7 +1976,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_24"> <widget class="QLabel" name="labelCSW_24">
<property name="text"> <property name="text">
<string>CSO</string> <string>LSO</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2006,7 +2007,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_25"> <widget class="QLabel" name="labelCSW_25">
<property name="text"> <property name="text">
<string>CSP</string> <string>LSP</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2037,7 +2038,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_26"> <widget class="QLabel" name="labelCSW_26">
<property name="text"> <property name="text">
<string>CSQ</string> <string>LSQ</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2068,7 +2069,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_27"> <widget class="QLabel" name="labelCSW_27">
<property name="text"> <property name="text">
<string>CSR</string> <string>LSR</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2099,7 +2100,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_28"> <widget class="QLabel" name="labelCSW_28">
<property name="text"> <property name="text">
<string>CSS</string> <string>LSS</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2130,7 +2131,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_29"> <widget class="QLabel" name="labelCSW_29">
<property name="text"> <property name="text">
<string>CST</string> <string>LST</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2161,7 +2162,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_30"> <widget class="QLabel" name="labelCSW_30">
<property name="text"> <property name="text">
<string>CSU</string> <string>LSU</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2192,7 +2193,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_31"> <widget class="QLabel" name="labelCSW_31">
<property name="text"> <property name="text">
<string>CSV</string> <string>LSV</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2223,7 +2224,7 @@ QPushButton:checked {
<item> <item>
<widget class="QLabel" name="labelCSW_32"> <widget class="QLabel" name="labelCSW_32">
<property name="text"> <property name="text">
<string>CSW</string> <string>LSW</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3052,6 +3053,7 @@ border-radius: 4px;
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>

8249
companion/src/translations/companion_cs.ts
View file

File diff suppressed because it is too large Load diff

8257
companion/src/translations/companion_de.ts
View file

File diff suppressed because it is too large Load diff

8152
companion/src/translations/companion_fr.ts
View file

File diff suppressed because it is too large Load diff

8727
companion/src/translations/companion_he.ts
View file

File diff suppressed because it is too large Load diff

8100
companion/src/translations/companion_it.ts
View file

File diff suppressed because it is too large Load diff

1158
companion/src/translations/companion_pl.ts
View file

File diff suppressed because it is too large Load diff

8380
companion/src/translations/companion_pt.ts
View file

File diff suppressed because it is too large Load diff

8565
companion/src/translations/companion_ru.ts
View file

File diff suppressed because it is too large Load diff

1564
companion/src/translations/companion_sv.ts
View file

File diff suppressed because it is too large Load diff

65
companion/src/xsimulatordialog.ui
View file

@ -2311,6 +2311,7 @@ border-radius: 4px;
</widget> </widget>
</item> </item>
<item row="4" column="4"> <item row="4" column="4">
<widget class="QSlider" name="chnout_13"> <widget class="QSlider" name="chnout_13">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -2893,7 +2894,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_20"> <widget class="QLabel" name="labelCSW_20">
<property name="text"> <property name="text">
<string>CSK</string> <string>LSK</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2924,7 +2925,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_12"> <widget class="QLabel" name="labelCSW_12">
<property name="text"> <property name="text">
<string>CSC</string> <string>LSC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2955,7 +2956,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_13"> <widget class="QLabel" name="labelCSW_13">
<property name="text"> <property name="text">
<string>CSD</string> <string>LSD</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -2986,7 +2987,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_7"> <widget class="QLabel" name="labelCSW_7">
<property name="text"> <property name="text">
<string>CS7</string> <string>LS7</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3017,7 +3018,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_21"> <widget class="QLabel" name="labelCSW_21">
<property name="text"> <property name="text">
<string>CSL</string> <string>LSL</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3048,7 +3049,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_11"> <widget class="QLabel" name="labelCSW_11">
<property name="text"> <property name="text">
<string>CSB</string> <string>LSB</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3079,7 +3080,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_1"> <widget class="QLabel" name="labelCSW_1">
<property name="text"> <property name="text">
<string>CS1</string> <string>LS1</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3110,7 +3111,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_17"> <widget class="QLabel" name="labelCSW_17">
<property name="text"> <property name="text">
<string>CSH</string> <string>LSH</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3141,7 +3142,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_16"> <widget class="QLabel" name="labelCSW_16">
<property name="text"> <property name="text">
<string>CSG</string> <string>LSG</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3172,7 +3173,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_14"> <widget class="QLabel" name="labelCSW_14">
<property name="text"> <property name="text">
<string>CSE</string> <string>LSE</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3203,7 +3204,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_15"> <widget class="QLabel" name="labelCSW_15">
<property name="text"> <property name="text">
<string>CSF</string> <string>LSF</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3234,7 +3235,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_8"> <widget class="QLabel" name="labelCSW_8">
<property name="text"> <property name="text">
<string>CS8</string> <string>LS8</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3265,7 +3266,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_9"> <widget class="QLabel" name="labelCSW_9">
<property name="text"> <property name="text">
<string>CS9</string> <string>LS9</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3296,7 +3297,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_10"> <widget class="QLabel" name="labelCSW_10">
<property name="text"> <property name="text">
<string>CSA</string> <string>LSA</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3327,7 +3328,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_22"> <widget class="QLabel" name="labelCSW_22">
<property name="text"> <property name="text">
<string>CSM</string> <string>LSM</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3358,7 +3359,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_19"> <widget class="QLabel" name="labelCSW_19">
<property name="text"> <property name="text">
<string>CSJ</string> <string>LSJ</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3389,7 +3390,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_18"> <widget class="QLabel" name="labelCSW_18">
<property name="text"> <property name="text">
<string>CSI</string> <string>LSI</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3420,7 +3421,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_4"> <widget class="QLabel" name="labelCSW_4">
<property name="text"> <property name="text">
<string>CS4</string> <string>LS4</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3451,7 +3452,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_5"> <widget class="QLabel" name="labelCSW_5">
<property name="text"> <property name="text">
<string>CS5</string> <string>LS5</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3482,7 +3483,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_2"> <widget class="QLabel" name="labelCSW_2">
<property name="text"> <property name="text">
<string>CS2</string> <string>LS2</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3513,7 +3514,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_3"> <widget class="QLabel" name="labelCSW_3">
<property name="text"> <property name="text">
<string>CS3</string> <string>LS3</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3544,7 +3545,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_6"> <widget class="QLabel" name="labelCSW_6">
<property name="text"> <property name="text">
<string>CS6</string> <string>LS6</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3575,7 +3576,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_23"> <widget class="QLabel" name="labelCSW_23">
<property name="text"> <property name="text">
<string>CSN</string> <string>LSN</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3606,7 +3607,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_24"> <widget class="QLabel" name="labelCSW_24">
<property name="text"> <property name="text">
<string>CSO</string> <string>LSO</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3637,7 +3638,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_25"> <widget class="QLabel" name="labelCSW_25">
<property name="text"> <property name="text">
<string>CSP</string> <string>LSP</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3668,7 +3669,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_26"> <widget class="QLabel" name="labelCSW_26">
<property name="text"> <property name="text">
<string>CSQ</string> <string>LSQ</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3699,7 +3700,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_27"> <widget class="QLabel" name="labelCSW_27">
<property name="text"> <property name="text">
<string>CSR</string> <string>LSR</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3730,7 +3731,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_28"> <widget class="QLabel" name="labelCSW_28">
<property name="text"> <property name="text">
<string>CSS</string> <string>LSS</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3761,7 +3762,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_29"> <widget class="QLabel" name="labelCSW_29">
<property name="text"> <property name="text">
<string>CST</string> <string>LST</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3792,7 +3793,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_30"> <widget class="QLabel" name="labelCSW_30">
<property name="text"> <property name="text">
<string>CSU</string> <string>LSU</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3823,7 +3824,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_31"> <widget class="QLabel" name="labelCSW_31">
<property name="text"> <property name="text">
<string>CSV</string> <string>LSV</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3854,7 +3855,7 @@ border-radius: 4px;
<item> <item>
<widget class="QLabel" name="labelCSW_32"> <widget class="QLabel" name="labelCSW_32">
<property name="text"> <property name="text">
<string>CSW</string> <string>LSW</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>

12
radio/src/gui/menu_general.cpp
View file

@ -1037,19 +1037,17 @@ void menuGeneralVersion(uint8_t event)
{ {
SIMPLE_MENU(STR_MENUVERSION, menuTabDiag, e_Vers, 1); SIMPLE_MENU(STR_MENUVERSION, menuTabDiag, e_Vers, 1);
lcd_putsLeft(2*FH, stamp1); lcd_putsLeft(2*FH, vers_stamp);
lcd_putsLeft(3*FH, stamp2);
lcd_putsLeft(4*FH, stamp3);
#if defined(PCBSKY9X) && !defined(REVA) #if defined(PCBSKY9X) && !defined(REVA)
if (Coproc_valid == 1) { if (Coproc_valid == 1) {
lcd_putsLeft(5*FH, PSTR("CoPr:")); lcd_putsLeft(6*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 5*FH, Coproc_read); lcd_outdez8(10*FW, 6*FH, Coproc_read);
} }
else { else {
lcd_putsLeft(5*FH, PSTR("CoPr: ---")); lcd_putsLeft(6*FH, PSTR("CoPr: ---"));
} }
#endif #endif
lcd_putsLeft(7*FH, eeprom_stamp);
} }
void displayKeyState(uint8_t x, uint8_t y, EnumKeys key) void displayKeyState(uint8_t x, uint8_t y, EnumKeys key)

9
radio/src/gui/menu_model.cpp
View file

@ -2271,7 +2271,8 @@ void DrawCurve(uint8_t offset=0)
uint8_t i = 0; uint8_t i = 0;
do { do {
point_t point = getPoint(i++); point_t point = getPoint(i);
i++;
if (point.x == 0) break; if (point.x == 0) break;
lcd_filled_rect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square lcd_filled_rect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square
} while(1); } while(1);
@ -3239,7 +3240,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SRC_POS 4*FW-1 #define MIX_LINE_SRC_POS 4*FW-1
#if LCD_W >= 212 #if LCD_W >= 212
#define EXPO_LINE_WEIGHT_POS 8*FW+1 #define EXPO_LINE_WEIGHT_POS 8*FW+3
#define EXPO_LINE_SRC_POS 9*FW-2 #define EXPO_LINE_SRC_POS 9*FW-2
#define EXPO_LINE_CURVE_POS 12*FW+4 #define EXPO_LINE_CURVE_POS 12*FW+4
#define EXPO_LINE_SWITCH_POS 17*FW-1 #define EXPO_LINE_SWITCH_POS 17*FW-1
@ -3251,7 +3252,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SWITCH_POS 16*FW+1 #define MIX_LINE_SWITCH_POS 16*FW+1
#define MIX_LINE_DELAY_POS 19*FW+2 #define MIX_LINE_DELAY_POS 19*FW+2
#elif defined(CPUARM) #elif defined(CPUARM)
#define EXPO_LINE_WEIGHT_POS 7*FW-1 #define EXPO_LINE_WEIGHT_POS 7*FW+1
#define EXPO_LINE_EXPO_POS 10*FW+5 #define EXPO_LINE_EXPO_POS 10*FW+5
#define EXPO_LINE_SWITCH_POS 11*FW+2 #define EXPO_LINE_SWITCH_POS 11*FW+2
#define EXPO_LINE_SIDE_POS 14*FW+2 #define EXPO_LINE_SIDE_POS 14*FW+2
@ -3263,7 +3264,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SWITCH_POS 16*FW #define MIX_LINE_SWITCH_POS 16*FW
#define MIX_LINE_DELAY_POS 19*FW+7 #define MIX_LINE_DELAY_POS 19*FW+7
#else #else
#define EXPO_LINE_WEIGHT_POS 7*FW-1 #define EXPO_LINE_WEIGHT_POS 7*FW+1
#define EXPO_LINE_EXPO_POS 11*FW #define EXPO_LINE_EXPO_POS 11*FW
#define EXPO_LINE_SWITCH_POS 11*FW+4 #define EXPO_LINE_SWITCH_POS 11*FW+4
#if MAX_PHASES == 6 #if MAX_PHASES == 6

4
radio/src/gui/view_statistics.cpp
View file

@ -57,15 +57,13 @@ void menuStatisticsView(uint8_t event)
return; return;
} }
lcd_puts( 1*FW, FH*1, STR_TM1TM2); lcd_puts( 1*FW, FH*0, STR_TOTTM1TM2THRTHP);
putsTime( 5*FW+5*FWNUM+1, FH*1, timersStates[0].val, 0, 0); putsTime( 5*FW+5*FWNUM+1, FH*1, timersStates[0].val, 0, 0);
putsTime( 12*FW+5*FWNUM+1, FH*1, timersStates[1].val, 0, 0); putsTime( 12*FW+5*FWNUM+1, FH*1, timersStates[1].val, 0, 0);
lcd_puts( 1*FW, FH*2, STR_THRTHP);
putsTime( 5*FW+5*FWNUM+1, FH*2, s_timeCumThr, 0, 0); putsTime( 5*FW+5*FWNUM+1, FH*2, s_timeCumThr, 0, 0);
putsTime( 12*FW+5*FWNUM+1, FH*2, s_timeCum16ThrP/16, 0, 0); putsTime( 12*FW+5*FWNUM+1, FH*2, s_timeCum16ThrP/16, 0, 0);
lcd_puts( 17*FW, FH*0, STR_TOT);
putsTime( 12*FW+5*FWNUM+1, FH*0, s_timeCumTot, 0, 0); putsTime( 12*FW+5*FWNUM+1, FH*0, s_timeCumTot, 0, 0);
#if defined(PCBTARANIS) #if defined(PCBTARANIS)

23
radio/src/lcd.cpp
View file

@ -64,7 +64,8 @@ void lcd_img(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t idx, LcdFlags
for (uint8_t yb = 0; yb < hb; yb++) { for (uint8_t yb = 0; yb < hb; yb++) {
uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ]; uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ];
for (xcoord_t i=0; i<w; i++){ for (xcoord_t i=0; i<w; i++){
uint8_t b = pgm_read_byte(q++); uint8_t b = pgm_read_byte(q);
q++;
ASSERT_IN_DISPLAY(p); ASSERT_IN_DISPLAY(p);
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
uint8_t val = inv ? ~b : b; uint8_t val = inv ? ~b : b;
@ -199,7 +200,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
b1 = ~b1; b1 = ~b1;
b2 = ~b2; b2 = ~b2;
} }
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
if (&p[LCD_W+1] < DISPLAY_END) { if (&p[LCD_W+1] < DISPLAY_END) {
LCD_BYTE_FILTER(p, ~(0xff << ym8), b1 << ym8); LCD_BYTE_FILTER(p, ~(0xff << ym8), b1 << ym8);
uint8_t *r = p + LCD_W; uint8_t *r = p + LCD_W;
@ -220,7 +221,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
} }
else if (flags & SMLSIZE) { else if (flags & SMLSIZE) {
q = (c < 0xC0) ? &font_4x6[(c-0x20)*5] : &font_4x6_extra[(c-0xC0)*5]; q = (c < 0xC0) ? &font_4x6[(c-0x20)*5] : &font_4x6_extra[(c-0xC0)*5];
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
for (int8_t i=0; i<=6; i++) { for (int8_t i=0; i<=6; i++) {
uint8_t b = 0; uint8_t b = 0;
if (!i) { if (!i) {
@ -247,7 +248,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
} }
else if (flags & TINSIZE) { else if (flags & TINSIZE) {
q = &font_3x5[((uint16_t)c-0x2D)*3]; q = &font_3x5[((uint16_t)c-0x2D)*3];
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
for (int8_t i=0; i<=4; i++) { for (int8_t i=0; i<=4; i++) {
uint8_t b = 0; uint8_t b = 0;
if (!i) { if (!i) {
@ -273,7 +274,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
} }
#endif #endif
else { else {
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
#if defined(BOLD_FONT) && defined(CPUM64) && !defined(EXTSTD) #if defined(BOLD_FONT) && defined(CPUM64) && !defined(EXTSTD)
uint8_t bb = 0; uint8_t bb = 0;
if (inv) bb = 0xff; if (inv) bb = 0xff;
@ -360,11 +361,9 @@ void lcd_putsiAtt(xcoord_t x, uint8_t y,const pm_char * s,uint8_t idx, LcdFlags
void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlags mode) void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlags mode)
{ {
#if defined(CPUARM)
xcoord_t orig_x = x; xcoord_t orig_x = x;
#endif
bool setx = false; bool setx = false;
while(len!=0) { while(len--) {
unsigned char c; unsigned char c;
switch (mode & (BSS+ZCHAR)) { switch (mode & (BSS+ZCHAR)) {
case BSS: case BSS:
@ -394,21 +393,20 @@ void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlag
else if (c == 0x1F) { //X-coord prefix else if (c == 0x1F) { //X-coord prefix
setx = true; setx = true;
} }
#if defined(CPUARM)
else if (c == 0x1E) { //NEWLINE else if (c == 0x1E) { //NEWLINE
x = orig_x; x = orig_x;
y += FH; y += FH;
#if defined(CPUARM)
if (mode & DBLSIZE) y += FH; if (mode & DBLSIZE) y += FH;
else if (mode & MIDSIZE) y += 4; else if (mode & MIDSIZE) y += 4;
else if (mode & SMLSIZE) y--; else if (mode & SMLSIZE) y--;
#endif
if (y >= LCD_H) break; if (y >= LCD_H) break;
} }
#endif
else { else {
x += (c*FW/2); //EXTENDED SPACE x += (c*FW/2); //EXTENDED SPACE
} }
s++; s++;
len--;
} }
lcdLastPos = x; lcdLastPos = x;
lcdNextPos = x; lcdNextPos = x;
@ -671,7 +669,7 @@ void lcd_hlineStip(xcoord_t x, uint8_t y, xcoord_t w, uint8_t pat, LcdFlags att)
uint8_t *p = &displayBuf[ y / 8 * LCD_W + x ]; uint8_t *p = &displayBuf[ y / 8 * LCD_W + x ];
uint8_t msk = BITMASK(y%8); uint8_t msk = BITMASK(y%8);
while(w) { while(w--) {
if(pat&1) { if(pat&1) {
lcd_mask(p, msk, att); lcd_mask(p, msk, att);
pat = (pat >> 1) | 0x80; pat = (pat >> 1) | 0x80;
@ -679,7 +677,6 @@ void lcd_hlineStip(xcoord_t x, uint8_t y, xcoord_t w, uint8_t pat, LcdFlags att)
else { else {
pat = pat >> 1; pat = pat >> 1;
} }
w--;
p++; p++;
} }
} }

8
radio/src/opentx.cpp
View file

@ -4845,8 +4845,9 @@ void stack_paint()
p = (unsigned char *) STACKPTR ; p = (unsigned char *) STACKPTR ;
q = &__bss_end ; q = &__bss_end ;
p -= 2 ; p -= 2 ;
while ( p > q ) while ( p > q ) {
*p-- = 0x55 ; *p-- = 0x55 ;
}
} }
uint16_t stack_free() uint16_t stack_free()
@ -4854,10 +4855,7 @@ uint16_t stack_free()
unsigned char *p ; unsigned char *p ;
p = &__bss_end + 1 ; p = &__bss_end + 1 ;
while ( *p == 0x55 ) while ( *p++ == 0x55 );
{
p+= 1 ;
}
return p - &__bss_end ; return p - &__bss_end ;
} }
#endif #endif

5
radio/src/opentx.h
View file

@ -1196,10 +1196,7 @@ extern int8_t calcRESXto100(int16_t x);
#define TMR_VAROFS 5 #define TMR_VAROFS 5
extern const char stamp1[]; extern const char vers_stamp[];
extern const char stamp2[];
extern const char stamp3[];
extern const char eeprom_stamp[];
extern uint8_t g_vbat100mV; extern uint8_t g_vbat100mV;
#define g_blinkTmr10ms (*(uint8_t*)&g_tmr10ms) #define g_blinkTmr10ms (*(uint8_t*)&g_tmr10ms)

7
radio/src/stamp.cpp
View file

@ -40,11 +40,8 @@
#define STR2(s) #s #define STR2(s) #s
#define DEFNUMSTR(s) STR2(s) #define DEFNUMSTR(s) STR2(s)
const pm_char stamp1[] PROGMEM = "VERS: " VERS_STR;
const pm_char stamp2[] PROGMEM = "DATE: " DATE_STR;
const pm_char stamp3[] PROGMEM = "TIME: " TIME_STR;
#if defined(PCBSTD) #if defined(PCBSTD)
const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(EEPROM_VARIANT); 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);
#else #else
const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER); 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);
#endif #endif

4
radio/src/translations.cpp
View file

@ -245,9 +245,7 @@ const pm_char STR_RXBATT[] PROGMEM = TR_RXBATT;
const pm_char STR_TX[] PROGMEM = TR_TXnRX; const pm_char STR_TX[] PROGMEM = TR_TXnRX;
const pm_char STR_ACCEL[] PROGMEM = TR_ACCEL; const pm_char STR_ACCEL[] PROGMEM = TR_ACCEL;
const pm_char STR_NODATA[] PROGMEM = TR_NODATA; const pm_char STR_NODATA[] PROGMEM = TR_NODATA;
const pm_char STR_TM1TM2[] PROGMEM = TR_TM1TM2; const pm_char STR_TOTTM1TM2THRTHP[] PROGMEM = TR_TOTTM1TM2THRTHP;
const pm_char STR_THRTHP[] PROGMEM = TR_THRTHP;
const pm_char STR_TOT[] PROGMEM = TR_TOT;
const pm_char STR_TMR1LATMAXUS[] PROGMEM = TR_TMR1LATMAXUS; const pm_char STR_TMR1LATMAXUS[] PROGMEM = TR_TMR1LATMAXUS;
const pm_char STR_TMR1LATMINUS[] PROGMEM = TR_TMR1LATMINUS; const pm_char STR_TMR1LATMINUS[] PROGMEM = TR_TMR1LATMINUS;
const pm_char STR_TMR1JITTERUS[] PROGMEM = TR_TMR1JITTERUS; const pm_char STR_TMR1JITTERUS[] PROGMEM = TR_TMR1JITTERUS;

4
radio/src/translations.h
View file

@ -399,9 +399,7 @@ extern const pm_char STR_TX[];
#define STR_RX (STR_TX+OFS_RX) #define STR_RX (STR_TX+OFS_RX)
extern const pm_char STR_ACCEL[]; extern const pm_char STR_ACCEL[];
extern const pm_char STR_NODATA[]; extern const pm_char STR_NODATA[];
extern const pm_char STR_TM1TM2[]; extern const pm_char STR_TOTTM1TM2THRTHP[];
extern const pm_char STR_THRTHP[];
extern const pm_char STR_TOT[];
extern const pm_char STR_TMR1LATMAXUS[]; extern const pm_char STR_TMR1LATMAXUS[];
extern const pm_char STR_TMR1LATMINUS[]; extern const pm_char STR_TMR1LATMINUS[];
extern const pm_char STR_TMR1JITTERUS[]; extern const pm_char STR_TMR1JITTERUS[];

14
radio/src/translations/cz.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Dolů""Nhoru""Vprvo""Vlevo", " Menu"" Exit""Enter"" Page"" Plus""Mínus") #define TR_VKEYS TR("Menu\0""Exit\0""Dolů\0""Nhoru""Vprvo""Vlevo", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Mínus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -494,17 +494,15 @@
#define TR_CAL "Kal." #define TR_CAL "Kal."
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\007" TR_ENTER " = START" #define TR_MENUTOSTART CENTER "\010" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\001Nastav páky na střed", CENTER "\002Nastav páky na střed") #define TR_SETMIDPOINT TR(CENTER "\003Nastav páky na střed", CENTER "\004Nastav páky na střed")
#define TR_MOVESTICKSPOTS TR(CENTER "\004Hýbej pákami/poty", "\007Hýbej pákami i potenciometry") #define TR_MOVESTICKSPOTS TR(CENTER "\005Hýbej pákami/poty", "\010Hýbej pákami i potenciometry")
#define TR_RXBATT "Rx Bat.:" #define TR_RXBATT "Rx Bat.:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"

16
radio/src/translations/de.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Down"" Up""Right"" Left", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Down\0""Up\0 ""Right""Left\0", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "DGa""DGb" //Digitalgeber a und b = Drehgeber #define TR_VRENCODERS "DGa""DGb" //Digitalgeber a und b = Drehgeber
@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[EXIT]" #define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" > Weiter" #define TR_MENUWHENDONE CENTER"\010"TR_ENTER" > Weiter"
#define TR_FREE "frei" #define TR_FREE "frei"
#define TR_DELETEMODEL "Modell l\203schen?" #define TR_DELETEMODEL "Modell l\203schen?"
#define TR_COPYINGMODEL "Kopiere Modell" #define TR_COPYINGMODEL "Kopiere Modell"
@ -494,17 +494,15 @@
#define TR_CAL "Kal." #define TR_CAL "Kal."
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006"TR_ENTER" zum Start" #define TR_MENUTOSTART CENTER"\007"TR_ENTER" zum Start"
#define TR_SETMIDPOINT CENTER"Sticks+Potis auf Mitte" #define TR_SETMIDPOINT CENTER"\002Sticks+Potis auf Mitte"
#define TR_MOVESTICKSPOTS CENTER"Sticks+Potis bewegen" #define TR_MOVESTICKSPOTS CENTER"\003Sticks+Potis bewegen"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"NO DATA" #define TR_NODATA CENTER"NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"

12
radio/src/translations/en.h
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -309,7 +309,7 @@
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0" #define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Down"" Up""Right"" Left", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Down\0""Up\0 ""Right""Left\0", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -499,17 +499,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER " TO START" #define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START"
#define TR_SETMIDPOINT TR(CENTER "\003SET STICKS MIDPOINT",CENTER "\003CENTER STICKS/SLIDERS") #define TR_SETMIDPOINT TR(CENTER "\004SET STICKS MIDPOINT",CENTER "\004CENTER STICKS/SLIDERS")
#define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS" #define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"

16
radio/src/translations/es.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0" #define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu""Salir""Abajo""Arrib""Dcha.""Izqd.", " Menu""Salir""Enter""Pgna.""Mas ""Menos") #define TR_VKEYS TR("Menu\0""Salir""Abajo""Arrib""Dcha.""Izqd.", "Menu\0""Salir""Enter""Pgna.""Mas\0 ""Menos")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER "\010[SALIR]" #define TR_POPUPS TR_ENTER "\010[SALIR]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER "AL ACABAR " #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR "
#define TR_FREE "libre" #define TR_FREE "libre"
#define TR_DELETEMODEL "BORRAR MODELO" #define TR_DELETEMODEL "BORRAR MODELO"
#define TR_COPYINGMODEL "Copiando modelo.." #define TR_COPYINGMODEL "Copiando modelo.."
@ -494,17 +494,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER "EMPEZAR" #define TR_MENUTOSTART CENTER "\010" TR_ENTER " EMPEZAR"
#define TR_SETMIDPOINT CENTER "\003STICKS AL CENTRO" #define TR_SETMIDPOINT TR(CENTER "\007STICKS AL CENTRO",CENTER "\010STICKS AL CENTRO")
#define TR_MOVESTICKSPOTS CENTER "\006MOVER STICKS/POTS" #define TR_MOVESTICKSPOTS CENTER "\006MOVER STICKS/POTS"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "SIN DATOS" #define TR_NODATA CENTER "SIN DATOS"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
@ -527,7 +525,7 @@
#define TR_EEPROMLOWMEM "EEPROM mem.baja" #define TR_EEPROMLOWMEM "EEPROM mem.baja"
#define TR_ALERT "\016ALERTA" #define TR_ALERT "\016ALERTA"
#define TR_PRESSANYKEYTOSKIP "Pulsar tecla omitir" #define TR_PRESSANYKEYTOSKIP "Pulsar tecla omitir"
#define TR_THROTTLENOTIDLE "Aceler.Activado" #define TR_THROTTLENOTIDLE "Aceler. Activado"
#define TR_ALARMSDISABLED "Alarmas Desact." #define TR_ALARMSDISABLED "Alarmas Desact."
#define TR_PRESSANYKEY TR("\010Pulsa una Tecla", "Pulsa una Tecla") #define TR_PRESSANYKEY TR("\010Pulsa una Tecla", "Pulsa una Tecla")
#define TR_BADEEPROMDATA "Datos EEprom mal" #define TR_BADEEPROMDATA "Datos EEprom mal"

8
radio/src/translations/fr.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Bas"" Haut""Droit""Gauch", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -502,9 +502,7 @@
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA "NO DATA" #define TR_NODATA "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"

16
radio/src/translations/it.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menù"" EXIT"" DN "" UP"" SX"" DX", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menù\0""EXIT\0""DN\0 ""UP\0 ""SX\0 ""DX\0 ", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\004[EXIT]" #define TR_POPUPS TR_ENTER"\004[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" Conferma" #define TR_MENUWHENDONE CENTER"\007"TR_ENTER" Conferma"
#define TR_FREE " Disp." #define TR_FREE " Disp."
#define TR_DELETEMODEL "Elimina modello?" #define TR_DELETEMODEL "Elimina modello?"
#define TR_COPYINGMODEL "Copia in corso.." #define TR_COPYINGMODEL "Copia in corso.."
@ -494,17 +494,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " per Cal." #define TR_MENUTOSTART CENTER"\011" TR_ENTER " per Cal."
#define TR_SETMIDPOINT CENTER"\011SETTA CENTRO" #define TR_SETMIDPOINT CENTER"\012SETTA CENTRO"
#define TR_MOVESTICKSPOTS CENTER"\006MUOVI STICK/POT" #define TR_MOVESTICKSPOTS CENTER"\010MUOVI STICK/POT"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"DATI ASSENTI" #define TR_NODATA CENTER"DATI ASSENTI"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"

16
radio/src/translations/pl.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu""Wyjdź""W dół""Wgórę""Wpraw""Wlewo", " Menu""Wyjdź""W dół""Wgórę""Wpraw""Wlewo") #define TR_VKEYS TR("Menu\0""Wyjdź""W dół""Wgórę""Wpraw""Wlewo", "Menu\0""Wyjdź""W dół""Wgórę""Wpraw""Wlewo")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[WYJŚCIE]" #define TR_POPUPS TR_ENTER"\010[WYJŚCIE]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER "\007"TR_ENTER" > DALEJ" #define TR_MENUWHENDONE CENTER "\012"TR_ENTER" > DALEJ"
#define TR_FREE TR("wolne:", "wolne") #define TR_FREE TR("wolne:", "wolne")
#define TR_DELETEMODEL "SKASUJ MODEL" #define TR_DELETEMODEL "SKASUJ MODEL"
#define TR_COPYINGMODEL "Kopiuj model.." #define TR_COPYINGMODEL "Kopiuj model.."
@ -494,17 +494,15 @@
#define TR_CAL "Kal." #define TR_CAL "Kal."
#define TR_VTRIM "Trymer- +" #define TR_VTRIM "Trymer- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\007" TR_ENTER " = START" #define TR_MENUTOSTART CENTER "\011" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\001Ustaw drążki/potencj na środku","\005Ustaw drązki/potencj na środku") #define TR_SETMIDPOINT TR(CENTER "\002Ustaw drążki/potencj","\010Ustaw drązki/potencj na środku")
#define TR_MOVESTICKSPOTS TR(CENTER "\004Poruszaj drążkami i potenc.","\010Poruszaj drążkami i potenc.") #define TR_MOVESTICKSPOTS TR(CENTER "Poruszaj drążkami i pot","\014Poruszaj drążkami i potenc.")
#define TR_RXBATT "Rx Bat.:" #define TR_RXBATT "Rx Bat.:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+12) #define STR_US (STR_TMR1LATMAXUS+12)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"

14
radio/src/translations/pt.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Sair""Desce"" Sobe""Direi""Esqda", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Sair\0""Desce""Sobe\0""Direi""Esqda", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -494,17 +494,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " INICIAR" #define TR_MENUTOSTART CENTER"\011" TR_ENTER " INICIAR"
#define TR_SETMIDPOINT CENTER"\005CENTRAR STICK/POT" #define TR_SETMIDPOINT TR(CENTER"\005CENTRAR STICK/POT",CENTER"\006CENTRAR STICK/POT")
#define TR_MOVESTICKSPOTS CENTER"\005MOVER STICKS/POTs" #define TR_MOVESTICKSPOTS TR(CENTER"\005MOVER STICKS/POTs",CENTER"\006MOVER STICKS/POTs")
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"SEM DADOS" #define TR_NODATA CENTER"SEM DADOS"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"

48
radio/src/translations/se.h.txt
View file

@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@ -68,11 +68,11 @@
#define LEN_TRNCHN "\003" #define LEN_TRNCHN "\003"
#define TR_TRNCHN "KN1KN2KN3KN4" #define TR_TRNCHN "KN1KN2KN3KN4"
#define LEN_UART3MODES "\017" #define LEN_UART3MODES "\022"
#define TR_UART3MODES "Av\0 ""S-Port-spegel\0 ""Debug\0 " #define TR_UART3MODES "Av\0 ""Spegling av S-Port""Debug\0 "
#define LEN_POTTYPES "\017" #define LEN_POTTYPES "\020"
#define TR_POTTYPES "Pot\0 ""Multipos Switch" #define TR_POTTYPES "Potentiometer\0 ""Flerlägesväljare"
#define LEN_DATETIME "\005" #define LEN_DATETIME "\005"
#define TR_DATETIME "DAG: ""TID: " #define TR_DATETIME "DAG: ""TID: "
@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Ned"" Upp""Höger""Vänst", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Ned\0 ""Upp\0 ""Höger""Vänst", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@ -362,7 +362,7 @@
#define TR_VTMRMODES "Av\0""ABS""GAs""GA%""GAt" #define TR_VTMRMODES "Av\0""ABS""GAs""GA%""GAt"
#define LEN_VTRAINERMODES "\006" #define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Master""Slav\0." #define TR_VTRAINERMODES "Lärare""Elev\0."
#define LEN_VFAILSAFE "\011" #define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Håll\0 ""Special\0 ""Pulsfritt" #define TR_VFAILSAFE "Håll\0 ""Special\0 ""Pulsfritt"
@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[EXIT]" #define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " Avslutar " #define TR_MENUWHENDONE CENTER "\011" TR_ENTER " Avslutar "
#define TR_FREE "kvar" #define TR_FREE "kvar"
#define TR_DELETEMODEL "Radera Modell" #define TR_DELETEMODEL "Radera Modell"
#define TR_COPYINGMODEL "Kopierar Modell " #define TR_COPYINGMODEL "Kopierar Modell "
@ -488,23 +488,21 @@
#define TR_SWITCHWARNING TR("Bryt.varn.","Brytarvarning") #define TR_SWITCHWARNING TR("Bryt.varn.","Brytarvarning")
#define TR_TIMEZONE TR("Tidszon","GPS Tidszon") #define TR_TIMEZONE TR("Tidszon","GPS Tidszon")
#define TR_RXCHANNELORD "Kanaler i RX" #define TR_RXCHANNELORD "Kanaler i RX"
#define TR_SLAVE "Slav" #define TR_SLAVE "Elev"
#define TR_MODESRC " Läge\004% Källa" #define TR_MODESRC " Läge\004% Källa"
#define TR_MULTIPLIER "Styrka" #define TR_MULTIPLIER "Styrka"
#define TR_CAL "Kalib." #define TR_CAL "Kalib."
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER " Startar " #define TR_MENUTOSTART CENTER "\011" TR_ENTER " Startar "
#define TR_SETMIDPOINT CENTER "\010Centrera Allt" #define TR_SETMIDPOINT TR(CENTER "\012Centrera Allt",CENTER "\013Centrera Allt")
#define TR_MOVESTICKSPOTS CENTER "\004Rör Rattar/Spakar" #define TR_MOVESTICKSPOTS TR(CENTER "\005Rör Rattar/Spakar",CENTER "\006Rör Rattar/Spakar")
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
@ -524,15 +522,15 @@
#define TR_MODEL "Modell" #define TR_MODEL "Modell"
#define TR_FP "FL" #define TR_FP "FL"
#define TR_MIX "MIX" #define TR_MIX "MIX"
#define TR_EEPROMLOWMEM "EEPROM low mem" #define TR_EEPROMLOWMEM "Minnesbrist"
#define TR_ALERT "\016OBS" #define TR_ALERT "\016OBS"
#define TR_PRESSANYKEYTOSKIP "Tryck ned en knapp" #define TR_PRESSANYKEYTOSKIP "Tryck ned en knapp"
#define TR_THROTTLENOTIDLE "Gasen är påslagen!" #define TR_THROTTLENOTIDLE "Gasen är påslagen!"
#define TR_ALARMSDISABLED "Alarmen Avstängda!" #define TR_ALARMSDISABLED "Alarmen Avstängda!"
#define TR_PRESSANYKEY TR("Tryck ned en knapp", "Tryck ned en knapp") #define TR_PRESSANYKEY "Tryck ned en knapp"
#define TR_BADEEPROMDATA "EEprom Datafel " #define TR_BADEEPROMDATA "Minnet kan inte tolkas"
#define TR_EEPROMFORMATTING "Formaterar EEprom" #define TR_EEPROMFORMATTING "Minnet Nollställs"
#define TR_EEPROMOVERFLOW "Fel i EEprom" #define TR_EEPROMOVERFLOW "Minnesfel"
#define TR_MENURADIOSETUP "Inställningar" #define TR_MENURADIOSETUP "Inställningar"
#define TR_MENUDATEANDTIME "Dag och Tid" #define TR_MENUDATEANDTIME "Dag och Tid"
#define TR_MENUTRAINER "Trainer (PPM in)" #define TR_MENUTRAINER "Trainer (PPM in)"
@ -548,7 +546,7 @@
#define TR_MENUHELISETUP "Helikopter" #define TR_MENUHELISETUP "Helikopter"
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define TR_MENUINPUTS "Filter" #define TR_MENUINPUTS TR("Filter","Filtrerad Insignal")
#define TR_MENULIMITS "Gränser" #define TR_MENULIMITS "Gränser"
#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... #elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ...
#define TR_MENUINPUTS "Spakar" #define TR_MENUINPUTS "Spakar"
@ -682,9 +680,9 @@
#define TR_CRITICALALARM INDENT "Kritiskt alarm" #define TR_CRITICALALARM INDENT "Kritiskt alarm"
#define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serieport" #define TR_UART3MODE "Serieporten"
#define TR_POT1TYPE "S1 Type" #define TR_POT1TYPE "S1-ratten"
#define TR_POT2TYPE "S2 Type" #define TR_POT2TYPE "S2-ratten"
#if defined(MAVLINK) #if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@ -705,7 +703,7 @@
#define TR_MAVLINK_BEARING "Bäring" #define TR_MAVLINK_BEARING "Bäring"
#define TR_MAVLINK_ALTITUDE "Höjd" #define TR_MAVLINK_ALTITUDE "Höjd"
#define TR_MAVLINK_GPS "GPS" #define TR_MAVLINK_GPS "GPS"
#define TR_MAVLINK_NO_FIX "NO Fix" #define TR_MAVLINK_NO_FIX "EJ Lås"
#define TR_MAVLINK_SAT "SAT" #define TR_MAVLINK_SAT "SAT"
#define TR_MAVLINK_HDOP "HDOP" #define TR_MAVLINK_HDOP "HDOP"
#define TR_MAVLINK_LAT "LAT" #define TR_MAVLINK_LAT "LAT"