From 7961aba83c48a42e78180a8334b376c9a41ff343 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sat, 3 Mar 2012 13:32:56 -0600 Subject: [PATCH] Clean up a few more compiler warnings Conflicts: flight/PiOS/Common/pios_ms5611.c --- flight/Modules/ManualControl/manualcontrol.c | 3 +-- flight/Modules/Sensors/sensors.c | 1 - flight/PiOS/Common/pios_ms5611.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/flight/Modules/ManualControl/manualcontrol.c b/flight/Modules/ManualControl/manualcontrol.c index 104dfc854..da18acd3e 100644 --- a/flight/Modules/ManualControl/manualcontrol.c +++ b/flight/Modules/ManualControl/manualcontrol.c @@ -615,8 +615,7 @@ static void altitudeHoldDesired(ManualControlCommandData * cmd) StabilizationSettingsGet(&stabSettings); thisSysTime = xTaskGetTickCount(); - if(thisSysTime > lastSysTime) // reuse dt in case of wraparound - dT = (thisSysTime - lastSysTime) / portTICK_RATE_MS / 1000.0f; + dT = (thisSysTime - lastSysTime) / portTICK_RATE_MS / 1000.0f; lastSysTime = thisSysTime; altitudeHoldDesired.Roll = cmd->Roll * stabSettings.RollMax; diff --git a/flight/Modules/Sensors/sensors.c b/flight/Modules/Sensors/sensors.c index c7823215b..ed7862407 100644 --- a/flight/Modules/Sensors/sensors.c +++ b/flight/Modules/Sensors/sensors.c @@ -147,7 +147,6 @@ int32_t mag_test; uint32_t sensor_dt_us; static void SensorsTask(void *parameters) { - uint8_t init = 0; portTickType lastSysTime; uint32_t accel_samples; uint32_t gyro_samples; diff --git a/flight/PiOS/Common/pios_ms5611.c b/flight/PiOS/Common/pios_ms5611.c index b6d08e9a7..61b621352 100644 --- a/flight/PiOS/Common/pios_ms5611.c +++ b/flight/PiOS/Common/pios_ms5611.c @@ -145,7 +145,7 @@ int32_t PIOS_MS5611_ReadADC(void) RawTemperature = (Data[0] << 16) | (Data[1] << 8) | Data[2]; deltaTemp = RawTemperature - (CalibData.C[4] << 8); - Temperature = ((2000l + deltaTemp * CalibData.C[5]) >> 23); + Temperature = 2000l + ((deltaTemp * CalibData.C[5]) >> 23); } else { int64_t Offset;