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

Removed even more conflicts

Browse Source
This commit is contained in:
dario
2024-07-05 10:42:46 +02:00
parent a9b7fab6f5
commit 2055b8a3a2
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,8 @@
#ifndef STA_DRIVERS_BMI088_HPP #ifndef STA_DRIVERS_BMI088_HPP
#define STA_DRIVERS_BMI088_HPP #define STA_DRIVERS_BMI088_HPP
<<<<<<< HEAD
<<<<<<< HEAD
//#include <sta/devices/stm32/bus/spi.hpp>
//#include <sta/devices/stm32/bus/i2c.hpp>
#include <sta/bus/spi/device.hpp> #include <sta/bus/spi/device.hpp>
#include <sta/bus/i2c/device.hpp> #include <sta/bus/i2c/device.hpp>
=======
#include <sta/bus/spi/device.hpp>
>>>>>>> 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>