rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #855 from samcook/frsky-heading 

Frsky telemetry heading without GPS
This commit is contained in:
Dominic Clifton 2015-05-14 20:00:21 +01:00
parent 8174517789 6776f9c02d
commit d58387c44a
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/telemetry/frsky.c
View File

@ -302,12 +302,18 @@ static void sendLatLong(int32_t coord[2])
serialize16(coord[LON] < 0 ? 'W' : 'E');
}
static void sendFakeLatLong(void)
static void sendFakeLatLong(bool useGpsNoFixValues)
{
// Heading is only displayed on OpenTX if non-zero lat/long is also sent
int32_t coord[2] = {0,0};
coord[LAT] = (telemetryConfig->gpsNoFixLatitude * GPS_DEGREES_DIVIDER);
coord[LON] = (telemetryConfig->gpsNoFixLongitude * GPS_DEGREES_DIVIDER);
if (useGpsNoFixValues) {
coord[LAT] = (telemetryConfig->gpsNoFixLatitude * GPS_DEGREES_DIVIDER);
coord[LON] = (telemetryConfig->gpsNoFixLongitude * GPS_DEGREES_DIVIDER);
} else {
coord[LAT] = (1 * GPS_DEGREES_DIVIDER);
coord[LON] = (1 * GPS_DEGREES_DIVIDER);
}
sendLatLong(coord);
}
@ -315,17 +321,15 @@ static void sendFakeLatLong(void)
#ifdef GPS
static void sendGPSLatLong(void)
{
// Don't set dummy GPS data, if we already had a GPS fix
// it can be usefull to keep last valid coordinates
static uint8_t gpsFixOccured = 0;
//Dummy data if no 3D fix, this way we can display heading in Taranis
if (STATE(GPS_FIX) || gpsFixOccured == 1) {
// If we have ever had a fix, send the last known lat/long
gpsFixOccured = 1;
sendLatLong(GPS_coord);
} else {
// Send dummy GPS Data in order to display compass value
sendFakeLatLong();
// otherwise send fake lat/long in order to display compass value
sendFakeLatLong(true);
}
}
#endif
@ -521,14 +525,11 @@ void handleFrSkyTelemetry(rxConfig_t *rxConfig, uint16_t deadband3d_throttle)
sendSatalliteSignalQualityAsTemperature2();
sendGPSLatLong();
}
else if (telemetryConfig->gpsNoFixLatitude != 0 && telemetryConfig->gpsNoFixLongitude != 0) {
sendFakeLatLong();
else {
sendFakeLatLong(false);
}
#else
// Send GPS information to display compass information
if (telemetryConfig->gpsNoFixLatitude != 0 && telemetryConfig->gpsNoFixLongitude != 0) {
sendFakeLatLong();
}
sendFakeLatLong(false);
#endif
sendTelemetryTail();