Skip to content

Commit 5624f27

Browse files
vrankivranki
committed
Minor fixes
1 parent 9f765f5 commit 5624f27

File tree

3 files changed

+47
-37
lines changed

3 files changed

+47
-37
lines changed

‎clients/extplane-client-qt/extplaneconnection.cpp‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -125,44 +125,45 @@ void ExtPlaneConnection::receivedLineSlot(QString & line) {
125125
} else { // Handle updates
126126
if(line.startsWith("EXTPLANE-WARNING")) {
127127
emit extplaneWarning(line.mid(17));
128-
}
129-
QStringList cmd = line.split(" ", QString::SkipEmptyParts);
130-
if(cmd.size()>=2) { // Normally 3, but can be 2 if a data dataref updates to be empty
131-
if(cmd.value(0)=="EXTPLANE-VERSION" && cmd.length() == 2) {
132-
INFO << "Connected to ExtPlane version" << cmd.value(1);
133-
m_extplaneVersion = cmd.value(1).toInt(); // Nothing done with this currently.
134-
} else {
135-
ClientDataRef *ref = dataRefs.value(cmd.value(1));
136-
if(ref) {
137-
if ((cmd.value(0)=="ufa" || cmd.value(0)=="uia") && cmd.size() == 3) {
138-
// Array dataref
139-
QString arrayString = cmd.value(2);
140-
Q_ASSERT(arrayString[0]=='[' && arrayString[arrayString.length()-1]==']');
141-
arrayString = arrayString.mid(1, arrayString.length()-2);
142-
QStringList arrayValues = arrayString.split(',');
143-
ref->updateValue(arrayValues);
144-
} else if (((cmd.value(0)=="uf") || (cmd.value(0)=="ui") || (cmd.value(0)=="ud") ) && cmd.size() == 3) {
145-
// Single value dataref
146-
ref->updateValue(cmd.value(2));
147-
} else if (cmd.value(0)=="ub") { // cmd size can be 2 or 3
148-
// Data dataref
149-
if(ref->dataFormat().contains("binary")) {
150-
QByteArray rawArray = QByteArray::fromBase64(cmd.value(2).toUtf8());
151-
QStringList values;
152-
for(int i=0;i<rawArray.size();i++) {
153-
char value = rawArray[i];
154-
values.append(QChar(value));
128+
} else {
129+
QStringList cmd = line.split(" ", QString::SkipEmptyParts);
130+
if(cmd.size()>=2) { // Normally 3, but can be 2 if a data dataref updates to be empty
131+
if(cmd.value(0)=="EXTPLANE-VERSION" && cmd.length() == 2) {
132+
INFO << "Connected to ExtPlane version" << cmd.value(1);
133+
m_extplaneVersion = cmd.value(1).toInt(); // Nothing done with this currently.
134+
} else {
135+
ClientDataRef *ref = dataRefs.value(cmd.value(1));
136+
if(ref) {
137+
if ((cmd.value(0)=="ufa" || cmd.value(0)=="uia") && cmd.size() == 3) {
138+
// Array dataref
139+
QString arrayString = cmd.value(2);
140+
Q_ASSERT(arrayString[0]=='[' && arrayString[arrayString.length()-1]==']');
141+
arrayString = arrayString.mid(1, arrayString.length()-2);
142+
QStringList arrayValues = arrayString.split(',');
143+
ref->updateValue(arrayValues);
144+
} else if (((cmd.value(0)=="uf") || (cmd.value(0)=="ui") || (cmd.value(0)=="ud") ) && cmd.size() == 3) {
145+
// Single value dataref
146+
ref->updateValue(cmd.value(2));
147+
} else if (cmd.value(0)=="ub") { // cmd size can be 2 or 3
148+
// Data dataref
149+
if(ref->dataFormat().contains("binary")) {
150+
QByteArray rawArray = QByteArray::fromBase64(cmd.value(2).toUtf8());
151+
QStringList values;
152+
for(int i=0;i<rawArray.size();i++) {
153+
char value = rawArray[i];
154+
values.append(QChar(value));
155+
}
156+
ref->updateValue(values);
157+
} else {
158+
// Base64 decoded value, if value defined - empty string otherwise
159+
ref->updateValue((cmd.size() == 3) ? QByteArray::fromBase64(cmd.value(2).toUtf8()) : QString());
155160
}
156-
ref->updateValue(values);
157161
} else {
158-
// Base64 decoded value, if value defined - empty string otherwise
159-
ref->updateValue((cmd.size() == 3) ? QByteArray::fromBase64(cmd.value(2).toUtf8()) : QString());
162+
INFO << "Unsupported ref type " << cmd.value(0);
160163
}
161164
} else {
162-
INFO << "Unsupported ref type " << cmd.value(0);
165+
INFO << "Ref not subscribed " << cmd.value(2);
163166
}
164-
} else {
165-
INFO << "Ref not subscribed " << cmd.value(2);
166167
}
167168
}
168169
}

‎clients/extplane-client-qt/simulatedextplaneconnection.cpp‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,13 @@ ClientDataRef *SimulatedExtPlaneConnection::createDataRef(QString name, double a
9999
simRef = new SimulatedDataRef(this, -90, 90, 10.0, false, 0, name);
100100
} else if(name=="sim/cockpit2/gauges/indicators/roll_electric_deg_pilot") {
101101
simRef = new SimulatedDataRef(this, -30, 30, 10.0, false, 0, name);
102+
} else if(name=="sim/flightmodel/forces/g_nrml") {
103+
simRef = new SimulatedDataRef(this, -2, 4, 50.0, false, 0, name);
102104
} else if(name=="sim/cockpit2/gauges/indicators/slip_deg") {
103105
simRef = new SimulatedDataRef(this, -10, 10, 10.0, false, 0, name);
106+
} else if(name=="sim/cockpit2/gauges/indicators/turn_rate_heading_deg_pilot"
107+
|| name=="sim/flightmodel/misc/turnrate_noroll") {
108+
simRef = new SimulatedDataRef(this, -10, 10, 10.0, false, 0, name);
104109
} else if(name=="sim/cockpit2/gauges/indicators/heading_AHARS_deg_mag_pilot") {
105110
simRef = new SimulatedDataRef(this, 0, 360, 20.0, false, 0, name);
106111
} else if(name=="sim/cockpit2/radios/actuators/hsi_obs_deg_mag_pilot") {
@@ -112,7 +117,7 @@ ClientDataRef *SimulatedExtPlaneConnection::createDataRef(QString name, double a
112117
} else if(name=="sim/cockpit2/autopilot/heading_dial_deg_mag_pilot") {
113118
simRef = new SimulatedDataRef(this, -360, 360, 30.0, false, 0, name);
114119
} else if(name=="sim/cockpit2/engine/indicators/engine_speed_rpm") {
115-
simRef = new SimulatedDataRef(this, 0, 10000, 5.0, false, 4, name);
120+
simRef = new SimulatedDataRef(this, 0, 2000, 15.0, false, 4, name);
116121
} else if(name=="sim/aircraft/view/acf_tailnum") {
117122
simRef = new AlternatingSimulatedDataRef(this, "EXTPL1,EXTPL2",5.0, name);
118123
} else if(name=="sim/aircraft/view/acf_descrip") {
@@ -127,10 +132,16 @@ ClientDataRef *SimulatedExtPlaneConnection::createDataRef(QString name, double a
127132
simRef = new SimulatedDataRef(this, 1, 4, 20.0, true, 0, name);
128133
} else if(name=="sim/cockpit2/engine/indicators/N1_percent") {
129134
simRef = new SimulatedDataRef(this, 0, 100, 10.0, false, 8, name); // X-Plane seems to return 8 engines no matter what
135+
} else if(name=="sim/cockpit2/engine/indicators/N2_percent") {
136+
simRef = new SimulatedDataRef(this, 0, 100, 20.0, false, 8, name); // X-Plane seems to return 8 engines no matter what
130137
} else if(name=="sim/cockpit2/engine/indicators/EPR_ratio") {
131138
simRef = new SimulatedDataRef(this, 1.0, 2.2, 10.0, false, 8, name); // X-Plane seems to return 8 engines no matter what
132139
} else if(name=="sim/cockpit2/engine/indicators/EGT_deg_C") {
133140
simRef = new SimulatedDataRef(this, 0.0, 800, 100.0, false, 8, name); // X-Plane seems to return 8 engines no matter what
141+
} else if(name=="sim/cockpit2/engine/indicators/fuel_flow_kg_sec") {
142+
simRef = new SimulatedDataRef(this, 0.0, 5, 500.0, false, 8, name); // X-Plane seems to return 8 engines no matter what
143+
} else if(name=="sim/aircraft/engine/acf_RSC_redline_eng") {
144+
simRef = new SimulatedDataRef(this, 280, 280, 1.0, false, 8, name);
134145
} else if(name=="sim/cockpit2/EFIS/map_range") {
135146
simRef = new SimulatedDataRef(this, 1*2, 6*2, 1*2, true, 0, name);
136147
} else if(name=="sim/cockpit/warnings/annunciators/master_caution") {
@@ -162,7 +173,7 @@ void SimulatedExtPlaneConnection::unsubscribeDataRef(ClientDataRef *ref) {
162173
}
163174

164175
void SimulatedExtPlaneConnection::writeLine(QString line) {
165-
Q_UNUSED(line);
176+
Q_UNUSED(line)
166177
//qDebug() << Q_FUNC_INFO << line << "(simulated)";
167178
}
168179

‎extplane-server/tcpclient.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ void TcpClient::readClient() {
113113
sendRef(ref); // Force update
114114
}
115115
if(command == "get") ref->setUnsubscribeAfterChange();
116-
} else {
117-
extplaneWarning(QString("Ref not found: %1").arg(refName));
118116
}
119117
} else { // Ref already subscribed - update accuracy
120118
INFO << "Updating " << refName << " accuracy to " << accuracy;

0 commit comments

Comments
 (0)