piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #5090: periodically update sensor ratios from the radio when the telemetry simulator is running. (#5110)

Browse Source
This commit is contained in:
Damjan Adamic
2017-07-30 09:56:16 +02:00
committed by Bertrand Songis
parent 4dcd49a516
commit 3436273fdf
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/telemetrysimu.cpp
+9 -3
View File
@@ -211,9 +211,7 @@ void TelemetrySimulator::setupDataFields()
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);
ui->A2_ratio->setValue(simulator->getSensorRatio(ADC2_ID) / 10.0);
refreshSensorRatios();
}
void setSportPacketCrc(uint8_t * packet)
@@ -252,6 +250,13 @@ bool generateSportPacket(uint8_t * packet, uint8_t dataId, uint8_t prim, uint16_
return true;
}
void TelemetrySimulator::refreshSensorRatios()
{
ui->rxbt_ratio->setValue(simulator->getSensorRatio(BATT_ID) / 10.0);
ui->A1_ratio->setValue(simulator->getSensorRatio(ADC1_ID) / 10.0);
ui->A2_ratio->setValue(simulator->getSensorRatio(ADC2_ID) / 10.0);
}
void TelemetrySimulator::generateTelemetryFrame()
{
static int item = 0;
@@ -268,6 +273,7 @@ void TelemetrySimulator::generateTelemetryFrame()
#if defined(XJT_VERSION_ID)
generateSportPacket(buffer, 1, DATA_FRAME, XJT_VERSION_ID, 11);
#endif
refreshSensorRatios(); // placed here in order to call this less often
break;
case 1:
companion/src/simulation/telemetrysimu.h
+1
View File
@@ -67,6 +67,7 @@ class TelemetrySimulator : public QWidget
void onStop();
void onPositionIndicatorChanged(int value);
void onReplayRateChanged(int value);
void refreshSensorRatios();
void generateTelemetryFrame();
protected: