mirror of
https://git.intern.spaceteamaachen.de/ALPAKA/driver-bmi088.git
synced 2025-09-29 00:37:33 +00:00
Resolved conflicts
This commit is contained in:
@@ -2,9 +2,12 @@
|
||||
|
||||
#include <sta/debug/assert.hpp>
|
||||
|
||||
#include <sta/config.hpp>
|
||||
#ifndef STA_SPATZ_ENABLED
|
||||
|
||||
namespace sta
|
||||
{
|
||||
BMI088::BMI088(Device* gyro_device, Device* accel_device)
|
||||
BMI088::BMI088(SPIDevice* gyro_device, SPIDevice* accel_device)
|
||||
: gyro_device{gyro_device}, accel_device(accel_device)
|
||||
{
|
||||
STA_ASSERT(gyro_device != nullptr);
|
||||
@@ -143,7 +146,7 @@ namespace sta
|
||||
void BMI088::getAcceleration(float* x, float* y, float* z)
|
||||
{
|
||||
uint16_t i_x,i_y,i_z;
|
||||
getRawRotation(&i_x, &i_y, &i_z);
|
||||
getRawAcceleration(&i_x, &i_y, &i_z);
|
||||
convertRawToActual(&i_x, x, f_accel_range);
|
||||
convertRawToActual(&i_y, y, f_accel_range);
|
||||
convertRawToActual(&i_z, z, f_accel_range);
|
||||
@@ -204,3 +207,5 @@ namespace sta
|
||||
}
|
||||
}
|
||||
} // namespace sta
|
||||
|
||||
#endif // STA_SPATZ_ENABLED
|
||||
Reference in New Issue
Block a user