1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

OP-1658 - various fixes

Conflicts:
	flight/pios/common/pios_mpu9250.c
This commit is contained in:
Alessio Morale 2014-12-27 18:49:08 +01:00
parent 621c1e8679
commit fc125540b7
3 changed files with 4 additions and 3 deletions

View File

@ -264,7 +264,7 @@ static void SensorsTask(__attribute__((unused)) void *parameters)
}
} else {
if (PIOS_SENSORS_Poll(sensor)) {
PIOS_SENSOR_Fetch(sensor, (void *)&source_data, MAX_SENSORS_PER_INSTANCE);
PIOS_SENSOR_Fetch(sensor, (void *)source_data, MAX_SENSORS_PER_INSTANCE);
accumulateSamples(&sensor_context, source_data);
processSamples(&sensor_context, sensor);
clearContext(&sensor_context);

View File

@ -634,8 +634,8 @@ void PIOS_MPU6000_driver_Reset(__attribute__((unused)) uintptr_t context)
void PIOS_MPU6000_driver_get_scale(float *scales, uint8_t size, __attribute__((unused)) uintptr_t contet)
{
PIOS_Assert(size >= 2);
scales[0] = PIOS_MPU6000_GetScale();
scales[1] = PIOS_MPU6000_GetAccelScale();
scales[0] = PIOS_MPU6000_GetAccelScale();
scales[1] = PIOS_MPU6000_GetScale();
}
QueueHandle_t PIOS_MPU6000_driver_get_queue(__attribute__((unused)) uintptr_t context)

View File

@ -39,6 +39,7 @@ PIOS_SENSORS_Instance *PIOS_SENSORS_Register(const PIOS_SENSORS_Driver *driver,
instance->driver = driver;
instance->type = type;
instance->context = context;
instance->next = NULL;
LL_APPEND(sensor_list, instance);
return instance;
}