diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp
index 872176214..cfb94d62f 100644
--- a/companion/src/printdialog.cpp
+++ b/companion/src/printdialog.cpp
@@ -696,39 +696,94 @@ void PrintDialog::printFrSky()
{
int tc=0;
QString str = "";
- str.append(""+tr("Telemetry Settings")+" |
");
- str.append("| | "+tr("Alarm 1")+" | "+tr("Alarm 2")+" |
");
- str.append("| "+tr("Analog")+" | "+tr("Unit")+" | "+tr("Scale")+" | "+tr("Offset")+" | ");
- str.append(""+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" | ");
- str.append(""+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" |
");
- FrSkyData *fd=&g_model->frsky;
- for (int i=0; i<2; i++) {
- if (fd->channels[i].ratio!=0) {
- tc++;
- float ratio=(fd->channels[i].ratio/(fd->channels[i].type==0 ?10.0:1));
- str.append("| "+tr("A%1").arg(i+1)+" | "+getFrSkyUnits(fd->channels[i].type)+" | "+QString::number(ratio,10,(fd->channels[i].type==0 ? 1:0))+" | "+QString::number((fd->channels[i].offset*ratio)/255,10,(fd->channels[i].type==0 ? 1:0))+" | ");
- str.append(""+getFrSkyAlarmType(fd->channels[i].alarms[0].level)+" | ");
- str.append("");
- str.append((fd->channels[i].alarms[0].greater==1) ? ">" : "<");
- str.append(" | "+QString::number(ratio*(fd->channels[i].alarms[0].value/255.0+fd->channels[i].offset/255.0),10,(fd->channels[i].type==0 ? 1:0))+" | ");
- str.append(""+getFrSkyAlarmType(fd->channels[i].alarms[1].level)+" | ");
- str.append("");
- str.append((fd->channels[i].alarms[1].greater==1) ? ">" : "<");
- str.append(" | "+QString::number(ratio*(fd->channels[i].alarms[1].value/255.0+fd->channels[i].offset/255.0),10,(fd->channels[i].type==0 ? 1:0))+" |
");
+
+ if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+ str.append(""+tr("Telemetry Settings")+" |
");
+ str.append("");
+ str.append(doTC(tr("Analog"),"", true));
+ str.append(doTC(tr("Range"),"", true));
+ str.append(doTC(tr("Offset"),"", true));
+ str.append("
");
+
+ FrSkyData *fd=&g_model->frsky;
+ for (int i=0; i<2; i++) {
+ if (fd->channels[i].ratio!=0) {
+ tc++;
+ float ratio=(fd->channels[i].ratio/(fd->channels[i].type==0 ?10.0:1));
+ QString unit = " " + getFrSkyUnits(fd->channels[i].type);
+ str.append("");
+ str.append(doTL(tr("A%1").arg(i+1), "", true));
+ str.append(doTC(QString::number(ratio,10,(fd->channels[i].type==0 ? 1:0))+unit, "green"));
+ str.append(doTC(QString::number((fd->channels[i].offset*ratio)/255,10,(fd->channels[i].type==0 ? 1:0))+unit, "green"));
+ str.append("
");
+ }
}
+
+ str.append(" |
");
+ str.append("");
+ str.append(doTC(tr("Alarms"),"", true));
+ str.append(doTC(tr("Low Alarm"),"", true));
+ str.append(doTC(tr("Critical Alarm"),"", true));
+ str.append("
");
+ str.append("");
+ str.append(doTL(tr("RSSI"),"", true));
+ str.append(doTC(QString::number(fd->rssiAlarms[0].value,10),"green"));
+ str.append(doTC(QString::number(fd->rssiAlarms[1].value,10),"green"));
+ str.append("
");
+ for (int i=0; i<2; i++) {
+ if (fd->channels[i].ratio!=0) {
+ float ratio=(fd->channels[i].ratio/(fd->channels[i].type==0 ?10.0:1));
+ QString unit = " " + getFrSkyUnits(fd->channels[i].type);
+ str.append("");
+ str.append(doTL(tr("A%1").arg(i+1), "", true));
+ str.append(doTC(QString::number(ratio*(fd->channels[i].alarms[0].value/255.0+fd->channels[i].offset/255.0),10,(fd->channels[i].type==0 ? 1:0))+unit, "green"));
+ str.append(doTC(QString::number(ratio*(fd->channels[i].alarms[1].value/255.0+fd->channels[i].offset/255.0),10,(fd->channels[i].type==0 ? 1:0))+unit, "green"));
+ str.append("
");
+ }
+ }
+
+ //TODO preferrably in new tables
+ str.append(" |
");
+ //str.append("| "+tr("Frsky serial protocol")+" | "+getFrSkyProtocol(fd->usrProto)+" |
");
+ //str.append("| "+tr("Units system")+" | "+getFrSkyMeasure(fd->imperial)+" |
");
+ str.append("| "+tr("Blades")+" | "+QString("%1").arg(fd->blades)+" |
");
+ str.append(" |
");
+ }
+ else { //other boards
+ str.append(""+tr("Telemetry Settings")+" |
");
+ str.append("| | "+tr("Alarm 1")+" | "+tr("Alarm 2")+" |
");
+ str.append("| "+tr("Analog")+" | "+tr("Unit")+" | "+tr("Scale")+" | "+tr("Offset")+" | ");
+ str.append(""+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" | ");
+ str.append(""+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" |
");
+ FrSkyData *fd=&g_model->frsky;
+ for (int i=0; i<2; i++) {
+ if (fd->channels[i].ratio!=0) {
+ tc++;
+ float ratio=(fd->channels[i].ratio/(fd->channels[i].type==0 ?10.0:1));
+ str.append("| "+tr("A%1").arg(i+1)+" | "+getFrSkyUnits(fd->channels[i].type)+" | "+QString::number(ratio,10,(fd->channels[i].type==0 ? 1:0))+" | "+QString::number((fd->channels[i].offset*ratio)/255,10,(fd->channels[i].type==0 ? 1:0))+" | ");
+ str.append(""+getFrSkyAlarmType(fd->channels[i].alarms[0].level)+" | ");
+ str.append("");
+ str.append((fd->channels[i].alarms[0].greater==1) ? ">" : "<");
+ str.append(" | "+QString::number(ratio*(fd->channels[i].alarms[0].value/255.0+fd->channels[i].offset/255.0),10,(fd->channels[i].type==0 ? 1:0))+" | ");
+ str.append(""+getFrSkyAlarmType(fd->channels[i].alarms[1].level)+" | ");
+ str.append("");
+ str.append((fd->channels[i].alarms[1].greater==1) ? ">" : "<");
+ str.append(" | "+QString::number(ratio*(fd->channels[i].alarms[1].value/255.0+fd->channels[i].offset/255.0),10,(fd->channels[i].type==0 ? 1:0))+" |
");
+ }
+ }
+ str.append(" |
");
+ str.append("| | "+tr("Alarm 1")+" | "+tr("Alarm 2")+" |
");
+ str.append("| "+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" | ");
+ str.append(""+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" |
");
+ str.append("| "+tr("RSSI Alarm")+" | ");
+ str.append(""+getFrSkyAlarmType(fd->rssiAlarms[0].level)+" | < | "+QString::number(fd->rssiAlarms[0].value,10)+" | ");
+ str.append(""+getFrSkyAlarmType(fd->rssiAlarms[1].level)+" | < | "+QString::number(fd->rssiAlarms[1].value,10)+" |
");
+ str.append(" |
");
+ str.append("| "+tr("Frsky serial protocol")+" | "+getFrSkyProtocol(fd->usrProto)+" |
");
+ str.append("| "+tr("Units system")+" | "+getFrSkyMeasure(fd->imperial)+" |
");
+ str.append("| "+tr("Blades")+" | "+fd->blades+" |
");
+ str.append(" |
");
}
- str.append(" |
");
- str.append("| | "+tr("Alarm 1")+" | "+tr("Alarm 2")+" |
");
- str.append("| "+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" | ");
- str.append(""+tr("Type")+" | "+tr("Condition")+" | "+tr("Value")+" |
");
- str.append("| "+tr("RSSI Alarm")+" | ");
- str.append(""+getFrSkyAlarmType(fd->rssiAlarms[0].level)+" | < | "+QString::number(fd->rssiAlarms[0].value,10)+" | ");
- str.append(""+getFrSkyAlarmType(fd->rssiAlarms[1].level)+" | < | "+QString::number(fd->rssiAlarms[1].value,10)+" |
");
- str.append(" |
");
- str.append("| "+tr("Frsky serial protocol")+" | "+getFrSkyProtocol(fd->usrProto)+" |
");
- str.append("| "+tr("Units system")+" | "+getFrSkyMeasure(fd->imperial)+" |
");
- str.append("| "+tr("Blades")+" | "+fd->blades+" |
");
- str.append(" |
");
#if 0
if (firmware->getCapability(TelemetryBars) || (firmware->getCapability(TelemetryCSFields))) {
int cols=firmware->getCapability(TelemetryColsCSFields);