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

Don’t spam simulator with dummy values on telemetry reset anymore (#4933)

Browse source 
* Don’t spam simulator with dummy values on telemetry reset anymore, simulator can be used if needed

* Ditch more dummies
This commit is contained in:
Andre Bernet 2017-05-18 09:11:48 +04:00 • committed by Bertrand Songis
parent 4d23292ad3
commit 8eea072cd1
1 changed files with 1 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

35
radio/src/telemetry/telemetry.cpp
View file

@ -320,19 +320,12 @@ void telemetryReset()
telemetryData.hub.gpsFix = -1;
#endif
#if defined(SIMU)
#if defined(CPUARM)
telemetryData.swr.value = 30;
telemetryData.rssi.value = 75;
#else
#if defined(SIMU) && !defined(CPUARM)
telemetryData.rssi[0].value = 75;
telemetryData.rssi[1].value = 75;
telemetryData.analog[TELEM_ANA_A1].set(120, UNIT_VOLTS);
telemetryData.analog[TELEM_ANA_A2].set(240, UNIT_VOLTS);
#endif
#if !defined(CPUARM)
telemetryData.hub.fuelLevel = 75;
telemetryData.hub.rpm = 12000;
telemetryData.hub.vfas = 100;
@ -381,32 +374,6 @@ void telemetryReset()
telemetryData.hub.current = 55;
telemetryData.hub.maxCurrent = 65;
#endif
#endif
/*Add some default sensor values to the simulator*/
#if defined(CPUARM) && defined(SIMU)
for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
const TelemetrySensor & sensor = g_model.telemetrySensors[i];
switch (sensor.id)
{
case RSSI_ID:
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, RSSI_ID, 0, sensor.instance , 75, UNIT_RAW, 0);
break;
case ADC1_ID:
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, ADC1_ID, 0, sensor.instance, 100, UNIT_RAW, 0);
break;
case ADC2_ID:
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, ADC2_ID, 0, sensor.instance, 245, UNIT_RAW, 0);
break;
case SWR_ID:
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, SWR_ID, 0, sensor.instance, 30, UNIT_RAW, 0);
break;
case BATT_ID:
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, BATT_ID, 0, sensor.instance, 100, UNIT_RAW, 0);
break;
}
}
#endif
}
#if defined(CPUARM)