From e6c7d6ad08c7c4e40803e19a72950b08ddba0efc Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 19 May 2019 11:53:30 +0200 Subject: [PATCH] Temporary fix for Sky9X compilation issue --- radio/src/telemetry/telemetry_sensors.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp index 560cb5570..4d222e0a7 100644 --- a/radio/src/telemetry/telemetry_sensors.cpp +++ b/radio/src/telemetry/telemetry_sensors.cpp @@ -355,11 +355,19 @@ void TelemetryItem::eval(const TelemetrySensor & sensor) } } uint32_t angle = abs(gpsItem.gps.latitude - gpsItem.pilotLatitude); +#if defined(PCBSKY9X) //TODO remove when sky9x issue is understood + uint32_t dist = (PRECALCULATED_EARTH_RADIUS_CONSTANT * angle) / 1000000; +#else uint32_t dist = ((uint64_t)PRECALCULATED_EARTH_RADIUS_CONSTANT * angle) / 1000000; +#endif uint32_t result = dist * dist; angle = abs(gpsItem.gps.longitude - gpsItem.pilotLongitude); - dist = ((uint64_t ) gpsItem.distFromEarthAxis * angle) / 1000000; +#if defined(PCBSKY9X) + dist = (gpsItem.distFromEarthAxis * angle) / 1000000; +#else + dist = ((uint64_t)gpsItem.distFromEarthAxis * angle) / 1000000; +#endif result += dist * dist; // Length on ground (ignoring curvature of the earth)