Resolved merge conflict

This commit is contained in:
dario
2024-08-23 10:44:53 +02:00
3 changed files with 277 additions and 22 deletions

View File

@@ -94,9 +94,11 @@ namespace sta
bool busRead(Part part, uint8_t reg, uint8_t * buffer);
bool busWrite(Part part, uint8_t reg, uint8_t value);
void getRawRotation(uint16_t* x, uint16_t* y, uint16_t* z);
void getRawAcceleration(uint16_t* x, uint16_t* y, uint16_t* z);
void getRawRotation(int16_t* x, int16_t* y, int16_t* z);
void getRawAcceleration(int16_t* x, int16_t* y, int16_t* z);
float lsbToMps2(int16_t val);
float lsbToDPS(int16_t val);
void convertRawToActual(uint16_t* i, float* f, float f_range);
SPIDevice* gyro_device;