ALPAKA/driver-bmi088
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/driver-bmi088.git synced 2025-09-29 00:37:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolved merge conflict

Browse Source
This commit is contained in:
dario
2024-07-05 10:37:43 +02:00
parent de5ed7904a 86456b898b
commit a9b7fab6f5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sta/drivers/bmi088.hpp
View File

@@ -1,6 +1,7 @@
#ifndef STA_DRIVERS_BMI088_HPP #ifndef STA_DRIVERS_BMI088_HPP
#define STA_DRIVERS_BMI088_HPP #define STA_DRIVERS_BMI088_HPP
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
//#include <sta/devices/stm32/bus/spi.hpp> //#include <sta/devices/stm32/bus/spi.hpp>
//#include <sta/devices/stm32/bus/i2c.hpp> //#include <sta/devices/stm32/bus/i2c.hpp>
@@ -9,6 +10,9 @@
======= =======
#include <sta/bus/spi/device.hpp> #include <sta/bus/spi/device.hpp>
>>>>>>> 2e8b075 (Added mock driver; renamed enums and fixed a bug) >>>>>>> 2e8b075 (Added mock driver; renamed enums and fixed a bug)
=======
#include <sta/bus/spi/device.hpp>
>>>>>>> 86456b898b23d4c97f2314301d4924bb93e7a2d2
#include <sta/drivers/bmi088_defs.hpp> #include <sta/drivers/bmi088_defs.hpp>
@@ -23,6 +27,7 @@ namespace sta
SUSPEND = 0x80, SUSPEND = 0x80,
DEEP_SUSPEND = 0x20 DEEP_SUSPEND = 0x20
}; };
enum GyroRange enum GyroRange
{ {
_2000 = 0x00, _2000 = 0x00,
@@ -31,6 +36,7 @@ namespace sta
_250 = 0x03, _250 = 0x03,
_125 = 0x04 _125 = 0x04
}; };
enum GyroBandwidth enum GyroBandwidth
{ {
_2000_532 = 0x00, _2000_532 = 0x00,