diff --git a/companion/src/simulation/telemetrysimu.cpp b/companion/src/simulation/telemetrysimu.cpp index 2c9806ffa..aff8fee51 100644 --- a/companion/src/simulation/telemetrysimu.cpp +++ b/companion/src/simulation/telemetrysimu.cpp @@ -147,31 +147,32 @@ void TelemetrySimulator::closeEvent(QCloseEvent *event) void TelemetrySimulator::showEvent(QShowEvent *event) { - SET_INSTANCE(rxbt_inst, BATT_ID, 0); - SET_INSTANCE(rssi_inst, RSSI_ID, 24); - SET_INSTANCE(swr_inst, SWR_ID, 24); - SET_INSTANCE(a1_inst, ADC1_ID, 0); - SET_INSTANCE(a2_inst, ADC2_ID, 0); - SET_INSTANCE(a3_inst, A3_FIRST_ID, 0); - SET_INSTANCE(a4_inst, A4_FIRST_ID, 0); - SET_INSTANCE(t1_inst, T1_FIRST_ID, 0); - SET_INSTANCE(t2_inst, T2_FIRST_ID, 0); - SET_INSTANCE(rpm_inst, RPM_FIRST_ID, DATA_ID_RPM); - SET_INSTANCE(fuel_inst, FUEL_FIRST_ID, 0); - SET_INSTANCE(aspd_inst, AIR_SPEED_FIRST_ID, 0); - SET_INSTANCE(vvspd_inst, VARIO_FIRST_ID, DATA_ID_VARIO); - SET_INSTANCE(valt_inst, ALT_FIRST_ID, DATA_ID_VARIO); - SET_INSTANCE(fasv_inst, VFAS_FIRST_ID, DATA_ID_FAS); - SET_INSTANCE(fasc_inst, CURR_FIRST_ID, DATA_ID_FAS); - SET_INSTANCE(cells_inst, CELLS_FIRST_ID, DATA_ID_FLVSS); - SET_INSTANCE(gpsa_inst, GPS_ALT_FIRST_ID, DATA_ID_GPS); - SET_INSTANCE(gpss_inst, GPS_SPEED_FIRST_ID, DATA_ID_GPS); - SET_INSTANCE(gpsc_inst, GPS_COURS_FIRST_ID, DATA_ID_GPS); - SET_INSTANCE(gpst_inst, GPS_TIME_DATE_FIRST_ID, DATA_ID_GPS); - SET_INSTANCE(gpsll_inst, GPS_LONG_LATI_FIRST_ID, DATA_ID_GPS); - SET_INSTANCE(accx_inst, ACCX_FIRST_ID, 0); - SET_INSTANCE(accy_inst, ACCY_FIRST_ID, 0); - SET_INSTANCE(accz_inst, ACCZ_FIRST_ID, 0); + SET_INSTANCE(rxbt_inst, BATT_ID, 0); + SET_INSTANCE(rssi_inst, RSSI_ID, 24); + SET_INSTANCE(swr_inst, SWR_ID, 24); + SET_INSTANCE(a1_inst, ADC1_ID, 0); + SET_INSTANCE(a2_inst, ADC2_ID, 0); + SET_INSTANCE(a3_inst, A3_FIRST_ID, 0); + SET_INSTANCE(a4_inst, A4_FIRST_ID, 0); + SET_INSTANCE(t1_inst, T1_FIRST_ID, 0); + SET_INSTANCE(t2_inst, T2_FIRST_ID, 0); + SET_INSTANCE(rpm_inst, RPM_FIRST_ID, DATA_ID_RPM); + SET_INSTANCE(fuel_inst, FUEL_FIRST_ID, 0); + SET_INSTANCE(fuel_qty_inst, FUEL_QTY_FIRST_ID, 0); + SET_INSTANCE(aspd_inst, AIR_SPEED_FIRST_ID, 0); + SET_INSTANCE(vvspd_inst, VARIO_FIRST_ID, DATA_ID_VARIO); + SET_INSTANCE(valt_inst, ALT_FIRST_ID, DATA_ID_VARIO); + SET_INSTANCE(fasv_inst, VFAS_FIRST_ID, DATA_ID_FAS); + SET_INSTANCE(fasc_inst, CURR_FIRST_ID, DATA_ID_FAS); + SET_INSTANCE(cells_inst, CELLS_FIRST_ID, DATA_ID_FLVSS); + SET_INSTANCE(gpsa_inst, GPS_ALT_FIRST_ID, DATA_ID_GPS); + SET_INSTANCE(gpss_inst, GPS_SPEED_FIRST_ID, DATA_ID_GPS); + SET_INSTANCE(gpsc_inst, GPS_COURS_FIRST_ID, DATA_ID_GPS); + SET_INSTANCE(gpst_inst, GPS_TIME_DATE_FIRST_ID, DATA_ID_GPS); + SET_INSTANCE(gpsll_inst, GPS_LONG_LATI_FIRST_ID, DATA_ID_GPS); + SET_INSTANCE(accx_inst, ACCX_FIRST_ID, 0); + SET_INSTANCE(accy_inst, ACCY_FIRST_ID, 0); + SET_INSTANCE(accz_inst, ACCZ_FIRST_ID, 0); ui->rxbt_ratio->setValue(simulator->getSensorRatio(BATT_ID) / 10.0); ui->A1_ratio->setValue(simulator->getSensorRatio(ADC1_ID) / 10.0); @@ -283,7 +284,7 @@ void TelemetrySimulator::generateTelemetryFrame() case 10: if (ui->rpm->value() > 0) - generateSportPacket(buffer, ui->rpm_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, RPM_FIRST_ID, LIMIT(0, ui->rpm->value(), 0xFFFF)); + generateSportPacket(buffer, ui->rpm_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, RPM_FIRST_ID, LIMIT(0, ui->rpm->value(), 0x7FFFFFFF)); break; case 11: @@ -383,6 +384,11 @@ void TelemetrySimulator::generateTelemetryFrame() generateSportPacket(buffer, ui->accz_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, ACCZ_FIRST_ID, LIMIT(-0x7FFFFFFF, ui->accz->value() * 100.0, 0x7FFFFFFF)); break; + case 26: + if (ui->fuel_qty->value() > 0) + generateSportPacket(buffer, ui->fuel_qty_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, FUEL_QTY_FIRST_ID, LIMIT(0, ui->fuel_qty->value() * 100.0, 0xFFFFFF)); + break; + default: item = 0; return; @@ -596,6 +602,7 @@ TelemetrySimulator::LogPlaybackController::LogPlaybackController(Ui::TelemetrySi colToFuncMap.insert("Tmp2(@F)", T2_DEGF); colToFuncMap.insert("RPM(rpm)", RPM); colToFuncMap.insert("Fuel(%)", FUEL); + colToFuncMap.insert("Fuel(ml)", FUEL_QTY); colToFuncMap.insert("VSpd(m/s)", VSPD_MS); colToFuncMap.insert("VSpd(f/s)", VSPD_FS); colToFuncMap.insert("Alt(ft)", ALT_FEET); @@ -890,6 +897,9 @@ void TelemetrySimulator::LogPlaybackController::setUiDataValues() case FUEL: ui->fuel->setValue(columnData[info.dataIndex].toDouble()); break; + case FUEL_QTY: + ui->fuel_qty->setValue(columnData[info.dataIndex].toDouble()); + break; case VSPD_MS: ui->vspeed->setValue(columnData[info.dataIndex].toDouble()); break; diff --git a/companion/src/simulation/telemetrysimu.h b/companion/src/simulation/telemetrysimu.h index 9582e3d32..c987bb3ea 100644 --- a/companion/src/simulation/telemetrysimu.h +++ b/companion/src/simulation/telemetrysimu.h @@ -80,6 +80,7 @@ class TelemetrySimulator : public QDialog ACCX, ACCY, ACCZ, + FUEL_QTY, }; QMap colToFuncMap; // contains all 'known' column headings and how they are to be processed Ui::TelemetrySimulator * ui; diff --git a/companion/src/simulation/telemetrysimu.ui b/companion/src/simulation/telemetrysimu.ui index 5317f2b97..0c897fb1c 100644 --- a/companion/src/simulation/telemetrysimu.ui +++ b/companion/src/simulation/telemetrysimu.ui @@ -1360,7 +1360,7 @@ Timestamp - 65535 + 2147483647 @@ -1520,23 +1520,20 @@ Timestamp - - + + 8 - - <html><head/><body><p><br/></p></body></html> - - VSpd + Fuel Qty - + 8 @@ -1545,35 +1542,26 @@ Timestamp - + 8 - - 2 - - - -16777215.000000000000000 - - 16777215.000000000000000 - - - 0.100000000000000 + 100000.000000000000000 - + 8 - m/s + ml @@ -1632,7 +1620,7 @@ Timestamp - + 8 @@ -1642,12 +1630,12 @@ Timestamp <html><head/><body><p><br/></p></body></html> - Alt + VSpd - + 8 @@ -1656,7 +1644,7 @@ Timestamp - + 8 @@ -1677,14 +1665,14 @@ Timestamp - + 8 - Meters + m/s @@ -1742,7 +1730,64 @@ Timestamp - + + + + + 8 + + + + <html><head/><body><p><br/></p></body></html> + + + Alt + + + + + + + + 8 + + + + + + + + + 8 + + + + 2 + + + -16777215.000000000000000 + + + 16777215.000000000000000 + + + 0.100000000000000 + + + + + + + + 8 + + + + Meters + + + + @@ -1812,6 +1857,8 @@ Timestamp accy accz_inst accz + fuel_qty_inst + fuel_qty