From 48024e512e3c3fcd6af874fc0ef8e4ce2397f1b1 Mon Sep 17 00:00:00 2001 From: Michael Hope Date: Wed, 20 May 2015 05:10:24 +0200 Subject: [PATCH] various: use float instead of double. Add 'f' suffixes to some constants so they don't get silently promoted to double. Use roundf() instead of round(). Saves 208 bytes of flash. Signed-off-by: Michael Hope --- src/main/flight/autotune.c | 6 +++--- src/main/sensors/battery.c | 2 +- src/main/telemetry/frsky.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/flight/autotune.c b/src/main/flight/autotune.c index e3f51d318d..17f3a21e4a 100644 --- a/src/main/flight/autotune.c +++ b/src/main/flight/autotune.c @@ -184,10 +184,10 @@ static void autotuneLogAngleTargets(float currentAngle) eventData.targetAngleAtPeak = (int) targetAngleAtPeak; // currentAngle is integer decidegrees divided by 10, so just reverse that process to get an integer again: - eventData.currentAngle = round(currentAngle * 10); + eventData.currentAngle = roundf(currentAngle * 10); // the peak angles are only ever set to currentAngle, so they get the same treatment: - eventData.firstPeakAngle = round(firstPeakAngle * 10); - eventData.secondPeakAngle = round(secondPeakAngle * 10); + eventData.firstPeakAngle = roundf(firstPeakAngle * 10); + eventData.secondPeakAngle = roundf(secondPeakAngle * 10); blackboxLogEvent(FLIGHT_LOG_EVENT_AUTOTUNE_TARGETS, (flightLogEventData_t*)&eventData); } diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c index e9c8d574ee..8e32ef6cbf 100644 --- a/src/main/sensors/battery.c +++ b/src/main/sensors/battery.c @@ -154,5 +154,5 @@ uint8_t calculateBatteryCapacityRemainingPercentage(void) { uint16_t batteryCapacity = batteryConfig->batteryCapacity; - return constrain((batteryCapacity - constrain(mAhDrawn, 0, 0xFFFF)) * 100.0 / batteryCapacity , 0, 100); + return constrain((batteryCapacity - constrain(mAhDrawn, 0, 0xFFFF)) * 100.0f / batteryCapacity , 0, 100); } diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c index b17c2b4174..d4478b6e9d 100644 --- a/src/main/telemetry/frsky.c +++ b/src/main/telemetry/frsky.c @@ -230,7 +230,7 @@ static void sendSatalliteSignalQualityAsTemperature2(void) if (telemetryConfig->frsky_unit == FRSKY_UNIT_METRICS) { serialize16(satellite); } else { - float tmp = (satellite - 32) / 1.8; + float tmp = (satellite - 32) / 1.8f; //Round the value tmp += (tmp < 0) ? -0.5f : 0.5f; serialize16(tmp);