rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Clean up a few more compiler warnings

Browse Source 
Conflicts:

	flight/PiOS/Common/pios_ms5611.c
This commit is contained in:
James Cotton 2012-03-03 13:32:56 -06:00
parent 91a226fc12
commit 7961aba83c
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flight/Modules/ManualControl/manualcontrol.c
View File

@ -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;

1
flight/Modules/Sensors/sensors.c
View File

@ -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;

2
flight/PiOS/Common/pios_ms5611.c
View File

@ -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;