rename SpiManager class to IcmSpiManager

src/SpiManager.cpp → src/IcmSpiManager.cpp

@@ -1,7 +1,7 @@
 
-#include "SpiManager.h"
+#include "IcmSpiManager.h"
 
-SpiManager::SpiManager(SPI_HandleTypeDef *hspi)
+IcmSpiManager::IcmSpiManager(SPI_HandleTypeDef *hspi)
 {
 	_numDevices = 0;
 	_activeDevice = -1;
@@ -10,27 +10,27 @@ SpiManager::SpiManager(SPI_HandleTypeDef *hspi)
 }
 
 
-uint8_t SpiManager::addSlave(McuPin_typeDef *pin)
+uint8_t IcmSpiManager::addSlave(McuPin_typeDef *pin)
 {
 	_pinCS[_numDevices] = pin;
 	_numDevices++;
 	return _numDevices-1;
 }
 
-void SpiManager::cs_low(uint8_t index)
+void IcmSpiManager::cs_low(uint8_t index)
 {
 	_pinCS[index]->port->BRR = (uint32_t)_pinCS[index]->pin;
 }
 
 
-void SpiManager::cs_high(uint8_t index)
+void IcmSpiManager::cs_high(uint8_t index)
 {
 	_pinCS[index]->port->BSRR = _pinCS[index]->pin;
 }
 
 
 
-void SpiManager::select_user_bank(uint8_t sensorNum, userbank ub)
+void IcmSpiManager::select_user_bank(uint8_t sensorNum, userbank ub)
 {
 	// toto je v poriadku iba pri pouziti jedneho senzora
 	// treba osetrit situaciu, ked je viacero senzorov.
@@ -51,7 +51,7 @@ void SpiManager::select_user_bank(uint8_t sensorNum, userbank ub)
 	cs_high(sensorNum);
 }
 
-void SpiManager::takeBus(uint8_t index)
+void IcmSpiManager::takeBus(uint8_t index)
 {
 	while(_activeDevice >= 0){
 		; // wait
@@ -59,12 +59,12 @@ void SpiManager::takeBus(uint8_t index)
 	_activeDevice = index;
 }
 
-void SpiManager::releaseBus()
+void IcmSpiManager::releaseBus()
 {
 	_activeDevice = -1;
 }
 
-uint8_t* SpiManager::read_multiple_reg(uint8_t sensorNum, userbank ub, uint8_t reg, uint8_t len)
+uint8_t* IcmSpiManager::read_multiple_reg(uint8_t sensorNum, userbank ub, uint8_t reg, uint8_t len)
 {
 	uint8_t read_reg = READ | reg;
 	this->select_user_bank(sensorNum, ub);
@@ -79,7 +79,7 @@ uint8_t* SpiManager::read_multiple_reg(uint8_t sensorNum, userbank ub, uint8_t r
 
 
 
-uint8_t SpiManager::read_single_reg(uint8_t sensorNum, userbank ub, uint8_t reg)
+uint8_t IcmSpiManager::read_single_reg(uint8_t sensorNum, userbank ub, uint8_t reg)
 {
 	uint8_t read_reg = READ | reg;
 	uint8_t reg_val;
@@ -94,7 +94,7 @@ uint8_t SpiManager::read_single_reg(uint8_t sensorNum, userbank ub, uint8_t reg)
 }
 
 
-void SpiManager::write_single_reg(uint8_t sensorNum, userbank ub, uint8_t reg, uint8_t val)
+void IcmSpiManager::write_single_reg(uint8_t sensorNum, userbank ub, uint8_t reg, uint8_t val)
 {
 	uint8_t write_reg[2];
 	write_reg[0] = WRITE | reg;
@@ -108,7 +108,7 @@ void SpiManager::write_single_reg(uint8_t sensorNum, userbank ub, uint8_t reg, u
 }
 
 
-void SpiManager::write_multiple_reg(uint8_t sensorNum, userbank ub, uint8_t reg, uint8_t* val, uint8_t len)
+void IcmSpiManager::write_multiple_reg(uint8_t sensorNum, userbank ub, uint8_t reg, uint8_t* val, uint8_t len)
 {
 	uint8_t write_reg = WRITE | reg;
 	select_user_bank(sensorNum, ub);
@@ -120,7 +120,7 @@ void SpiManager::write_multiple_reg(uint8_t sensorNum, userbank ub, uint8_t reg,
 }
 
 
-uint8_t SpiManager::read_single_external_reg(uint8_t sensorNum, uint8_t reg)
+uint8_t IcmSpiManager::read_single_external_reg(uint8_t sensorNum, uint8_t reg)
 {
 
 	this->write_single_reg(sensorNum, ub_3, B3_I2C_SLV0_ADDR, READ | MAG_SLAVE_ADDR);
@@ -131,7 +131,7 @@ uint8_t SpiManager::read_single_external_reg(uint8_t sensorNum, uint8_t reg)
 	return this->read_single_reg(sensorNum, ub_0, B0_EXT_SLV_SENS_DATA_00);
 }
 
-void SpiManager::write_single_external_reg(uint8_t sensorNum, uint8_t reg, uint8_t val)
+void IcmSpiManager::write_single_external_reg(uint8_t sensorNum, uint8_t reg, uint8_t val)
 {
 	this->write_single_reg(sensorNum, ub_3, B3_I2C_SLV0_ADDR, WRITE | MAG_SLAVE_ADDR);
 	this->write_single_reg(sensorNum, ub_3, B3_I2C_SLV0_REG, reg);
@@ -139,7 +139,7 @@ void SpiManager::write_single_external_reg(uint8_t sensorNum, uint8_t reg, uint8
 	this->write_single_reg(sensorNum, ub_3, B3_I2C_SLV0_CTRL, 0x81);
 }
 
-uint8_t* SpiManager::read_multiple_external_reg(uint8_t sensorNum, uint8_t reg, uint8_t len)
+uint8_t* IcmSpiManager::read_multiple_external_reg(uint8_t sensorNum, uint8_t reg, uint8_t len)
 {
 	this->write_single_reg(sensorNum, ub_3, B3_I2C_SLV0_ADDR, READ | MAG_SLAVE_ADDR);
 	this->write_single_reg(sensorNum, ub_3, B3_I2C_SLV0_REG, reg);

src/SpiManager.h → src/IcmSpiManager.h

@@ -193,7 +193,7 @@ typedef enum
 
 
 
-class SpiManager{
+class IcmSpiManager{
 
 private:
 	uint8_t _numDevices;
@@ -212,7 +212,7 @@ private:
 
 
 public:
-    SpiManager(SPI_HandleTypeDef* hspi);
+    IcmSpiManager(SPI_HandleTypeDef* hspi);
     uint8_t addSlave(McuPin_typeDef *pin);
 
     uint8_t* read_multiple_reg(uint8_t index, userbank ub, uint8_t reg, uint8_t len);

src/icm20948.cpp

@@ -30,7 +30,7 @@ uint16_t ACCEL_SampleRate_Table[15] = {
 };
 
 
-Icm20948::Icm20948(SpiManager *spi, icm20948_Config *config){
+Icm20948::Icm20948(IcmSpiManager *spi, icm20948_Config *config){
 
 	_activeDevice = spi->addSlave(config->pinCS);
 	_spi = spi;
@@ -315,7 +315,7 @@ uint8_t Icm20948::GetIndex(void)
  * 3) Sensor Mag
  * ---------------------------------------------- */
 
-Sensor::Sensor(SpiManager *spi, int8_t activeDevice){
+Sensor::Sensor(IcmSpiManager *spi, int8_t activeDevice){
 	_spi = spi;
 	_activeDevice = activeDevice;
 	_scaleFactor = 1.0f;
@@ -339,15 +339,15 @@ bool Sensor::_read_without_scale_factor(axisesI* data)
 	return this->Read(data);
 }
 
-SensorGyro::SensorGyro(SpiManager *spi, int8_t activeDevice):Sensor(spi, activeDevice){
+SensorGyro::SensorGyro(IcmSpiManager *spi, int8_t activeDevice):Sensor(spi, activeDevice){
 
 }
 
-SensorAccel::SensorAccel(SpiManager *spi, int8_t activeDevice):Sensor(spi, activeDevice){
+SensorAccel::SensorAccel(IcmSpiManager *spi, int8_t activeDevice):Sensor(spi, activeDevice){
 
 }
 
-SensorMag::SensorMag(SpiManager *spi, int8_t activeDevice):Sensor(spi, activeDevice){
+SensorMag::SensorMag(IcmSpiManager *spi, int8_t activeDevice):Sensor(spi, activeDevice){
 
 }
 

src/icm20948.h

@@ -12,7 +12,7 @@
 #ifndef __ICM20948_H__
 #define	__ICM20948_H__
 
-#include "SpiManager.h"
+#include "IcmSpiManager.h"
 #include "icm_datatypes.h"
 #include <stdbool.h>
 
@@ -20,7 +20,7 @@
 class Sensor{
 protected:
 	int8_t _activeDevice;
-	SpiManager *_spi;
+	IcmSpiManager *_spi;
 public:
 	float _scaleFactor;
 	axisesI data;
@@ -28,7 +28,7 @@ public:
 	int16_t offset_y;
 	int16_t offset_z;
 
-	Sensor(SpiManager *spi, int8_t _activeDevice);
+	Sensor(IcmSpiManager *spi, int8_t _activeDevice);
 	void SetScaleFactor(float sf);
 	void SetRange();
 	void SetLowPassFilter();
@@ -51,7 +51,7 @@ public:
 
 class SensorAccel : public Sensor {
 public:
-	SensorAccel(SpiManager *spi, int8_t _activeDevice);
+	SensorAccel(IcmSpiManager *spi, int8_t _activeDevice);
 	axisesI *GetData(void);
 	bool Read(axisesI *);
 	bool ReadUnit(axisesF*);
@@ -72,7 +72,7 @@ public:
 
 class SensorGyro: public Sensor {
 public:
-	SensorGyro(SpiManager *spi, int8_t _activeDevice);
+	SensorGyro(IcmSpiManager *spi, int8_t _activeDevice);
 	axisesI *GetData(void);
 	bool Read(axisesI *);
 	bool ReadUnit(axisesF*);
@@ -91,7 +91,7 @@ public:
 
 class SensorMag: public Sensor {
 public:
-	SensorMag(SpiManager *spi, int8_t _activeDevice);
+	SensorMag(IcmSpiManager *spi, int8_t _activeDevice);
 	axisesI *GetData(void);
 	bool Read(axisesI *);
 	bool ReadUnit(axisesF*);
@@ -102,7 +102,7 @@ class Icm20948{
 private:
 	uint8_t _numDevices;
 	int8_t _activeDevice;
-	SpiManager *_spi;
+	IcmSpiManager *_spi;
 	McuPin_typeDef *_pinINT;
 	bool _ak09916_enable;
 	bool _sensor_ready;
@@ -126,7 +126,7 @@ public:
 	SensorGyro *gyroSensor;
 	SensorMag *magSensor;
 
-    Icm20948(SpiManager *spi, icm20948_Config *config);
+    Icm20948(IcmSpiManager *spi, icm20948_Config *config);
     void SetInterruptSource(interrupt_source_enum int_source);
     void Calibrate(icm20948_Config *config);
     void Read(void);