Skip to content

Commit 2e79f5e

Browse files
tyethtyeth
committed
[chore] formatting
1 parent 73749fd commit 2e79f5e

15 files changed

+97
-108
lines changed

‎src/components/i2c/drivers/drvIsm330dhcx.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ bool drvIsm330dhcx::begin() {
5454
return true;
5555
}
5656

57-
bool drvIsm330dhcx::readAllEvents(sensors_event_t *accel,
58-
sensors_event_t *gyro,
57+
bool drvIsm330dhcx::readAllEvents(sensors_event_t *accel, sensors_event_t *gyro,
5958
sensors_event_t *temp) {
6059
if (!_imu) {
6160
return false;

‎src/components/i2c/drivers/drvIsm330dlc.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ bool drvIsm330dlc::begin() {
5454
return true;
5555
}
5656

57-
bool drvIsm330dlc::readAllEvents(sensors_event_t *accel,
58-
sensors_event_t *gyro,
59-
sensors_event_t *temp) {
57+
bool drvIsm330dlc::readAllEvents(sensors_event_t *accel, sensors_event_t *gyro,
58+
sensors_event_t *temp) {
6059
if (!_imu) {
6160
return false;
6261
}

‎src/components/i2c/drivers/drvLis2mdl.cpp‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88

99
#include <math.h>
1010

11-
namespace {
12-
constexpr uint8_t kLis2mdlDefaultAddr = 0x1E;
13-
}
11+
#define LIS2MDL_DEFAULT_ADDR 0x1E
1412

1513
/******************************************************************************/
16-
/*!
14+
/*!
1715
@brief Destructor for the LIS2MDL driver wrapper.
1816
*/
1917
/******************************************************************************/
@@ -25,7 +23,7 @@ drvLis2mdl::~drvLis2mdl() {
2523
}
2624

2725
/******************************************************************************/
28-
/*!
26+
/*!
2927
@brief Initializes the LIS2MDL sensor and begins I2C.
3028
@returns True if initialized successfully, False otherwise.
3129
*/
@@ -44,7 +42,7 @@ bool drvLis2mdl::begin() {
4442
}
4543

4644
const uint8_t addr =
47-
_address == 0 ? kLis2mdlDefaultAddr : static_cast<uint8_t>(_address);
45+
_address == 0 ? LIS2MDL_DEFAULT_ADDR : static_cast<uint8_t>(_address);
4846
if (!_mag->begin(addr, _i2c)) {
4947
WS_DEBUG_PRINTLN("[drvLis2mdl] Failed to initialise sensor");
5048
delete _mag;
@@ -61,7 +59,7 @@ bool drvLis2mdl::begin() {
6159
}
6260

6361
/******************************************************************************/
64-
/*!
62+
/*!
6563
@brief Reads the LIS2MDL's magnetometer event.
6664
@param event Pointer to the magnetometer event to populate.
6765
@returns True if the event was obtained successfully.
@@ -75,7 +73,7 @@ bool drvLis2mdl::readMagEvent(sensors_event_t *event) {
7573
}
7674

7775
/******************************************************************************/
78-
/*!
76+
/*!
7977
@brief Computes the vector magnitude of a magnetometer reading.
8078
@param event Magnetometer event to evaluate.
8179
@param magnitude Reference to store the computed magnitude (micro Tesla).
@@ -84,15 +82,14 @@ bool drvLis2mdl::readMagEvent(sensors_event_t *event) {
8482
/******************************************************************************/
8583
bool drvLis2mdl::computeMagnitude(const sensors_event_t &event,
8684
float &magnitude) {
87-
magnitude =
88-
sqrtf(event.magnetic.x * event.magnetic.x +
89-
event.magnetic.y * event.magnetic.y +
90-
event.magnetic.z * event.magnetic.z);
85+
magnitude = sqrtf(event.magnetic.x * event.magnetic.x +
86+
event.magnetic.y * event.magnetic.y +
87+
event.magnetic.z * event.magnetic.z);
9188
return true;
9289
}
9390

9491
/******************************************************************************/
95-
/*!
92+
/*!
9693
@brief Gets the LIS2MDL's raw sensor event (magnitude stored in data[0]).
9794
@param rawEvent Pointer to the sensor event.
9895
@returns True if the sensor event was obtained successfully.
@@ -111,7 +108,7 @@ bool drvLis2mdl::getEventRaw(sensors_event_t *rawEvent) {
111108
}
112109

113110
/******************************************************************************/
114-
/*!
111+
/*!
115112
@brief Gets the LIS2MDL's boolean sensor event.
116113
@param booleanEvent Pointer to the sensor event.
117114
@returns True once the placeholder value has been populated.
@@ -124,7 +121,7 @@ bool drvLis2mdl::getEventBoolean(sensors_event_t *booleanEvent) {
124121
}
125122

126123
/******************************************************************************/
127-
/*!
124+
/*!
128125
@brief Gets the LIS2MDL's magnetometer sensor event (x,y,z in microTesla).
129126
@param magEvent Pointer to the magnetometer sensor event.
130127
@returns True if the sensor event was obtained successfully.
@@ -135,7 +132,7 @@ bool drvLis2mdl::getEventMagneticField(sensors_event_t *magEvent) {
135132
}
136133

137134
/******************************************************************************/
138-
/*!
135+
/*!
139136
@brief Registers the driver's default magnetometer sensor type.
140137
*/
141138
/******************************************************************************/

‎src/components/i2c/drivers/drvLis2mdl.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <Adafruit_LIS2MDL.h>
1919

2020
/**************************************************************************/
21-
/*!
21+
/*!
2222
@brief Class that provides a driver interface for a LIS2MDL magnetometer.
2323
*/
2424
/**************************************************************************/
@@ -29,22 +29,22 @@ class drvLis2mdl : public drvBase {
2929
: drvBase(i2c, sensorAddress, mux_channel, driver_name) {}
3030

3131
/**************************************************************************/
32-
/*!
32+
/*!
3333
@brief Destructor for the LIS2MDL driver wrapper.
3434
*/
3535
/**************************************************************************/
3636
~drvLis2mdl();
3737

3838
/**************************************************************************/
39-
/*!
39+
/*!
4040
@brief Initializes the LIS2MDL sensor and begins I2C.
4141
@returns True if initialized successfully, False otherwise.
4242
*/
4343
/**************************************************************************/
4444
bool begin() override;
4545

4646
/**************************************************************************/
47-
/*!
47+
/*!
4848
@brief Gets a raw magnetometer magnitude event (micro Tesla).
4949
@param rawEvent Pointer to the destination sensor event.
5050
@returns True if the event was obtained successfully.
@@ -53,7 +53,7 @@ class drvLis2mdl : public drvBase {
5353
bool getEventRaw(sensors_event_t *rawEvent) override;
5454

5555
/**************************************************************************/
56-
/*!
56+
/*!
5757
@brief Placeholder boolean event implementation for compatibility.
5858
@param booleanEvent Pointer to the destination sensor event.
5959
@returns True once the placeholder event has been populated.
@@ -62,7 +62,7 @@ class drvLis2mdl : public drvBase {
6262
bool getEventBoolean(sensors_event_t *booleanEvent) override;
6363

6464
/**************************************************************************/
65-
/*!
65+
/*!
6666
@brief Retrieves the LIS2MDL's magnetometer vector event.
6767
@param magEvent Pointer to the destination sensor event.
6868
@returns True if the event was obtained successfully.
@@ -72,15 +72,15 @@ class drvLis2mdl : public drvBase {
7272

7373
protected:
7474
/**************************************************************************/
75-
/*!
75+
/*!
7676
@brief Registers the default virtual sensors exposed by the driver.
7777
*/
7878
/**************************************************************************/
7979
void ConfigureDefaultSensorTypes() override;
8080

8181
private:
8282
/**************************************************************************/
83-
/*!
83+
/*!
8484
@brief Reads a magnetometer event from the LIS2MDL helper.
8585
@param event Pointer to the destination sensor event.
8686
@returns True if the event was obtained successfully.
@@ -89,7 +89,7 @@ class drvLis2mdl : public drvBase {
8989
bool readMagEvent(sensors_event_t *event);
9090

9191
/**************************************************************************/
92-
/*!
92+
/*!
9393
@brief Computes the vector magnitude of a magnetometer reading.
9494
@param event Magnetometer event to evaluate.
9595
@param magnitude Reference to store the computed magnitude (micro Tesla).

‎src/components/i2c/drivers/drvLis3dh.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ bool drvLis3dh::getEventRaw(sensors_event_t *rawEvent) {
7171
// Calculate magnitude of the acceleration vector (m/s^2) and store in
7272
// event->data[0] to be consistent with other drivers that expose "raw"
7373
float mag = sqrtf(event.acceleration.x * event.acceleration.x +
74-
event.acceleration.y * event.acceleration.y +
75-
event.acceleration.z * event.acceleration.z);
74+
event.acceleration.y * event.acceleration.y +
75+
event.acceleration.z * event.acceleration.z);
7676
rawEvent->data[0] = mag;
7777
WS_DEBUG_PRINT("[drvLis3dh] Raw magnitude: ");
7878
WS_DEBUG_PRINTLN(mag);

‎src/components/i2c/drivers/drvLis3mdl.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <math.h>
1010

1111
/******************************************************************************/
12-
/*!
12+
/*!
1313
@brief Destructor for a LIS3MDL sensor.
1414
*/
1515
/******************************************************************************/
@@ -21,7 +21,7 @@ drvLis3mdl::~drvLis3mdl() {
2121
}
2222

2323
/******************************************************************************/
24-
/*!
24+
/*!
2525
@brief Initializes the LIS3MDL sensor and begins I2C.
2626
@returns True if initialized successfully, False otherwise.
2727
*/
@@ -51,7 +51,7 @@ bool drvLis3mdl::begin() {
5151
}
5252

5353
/******************************************************************************/
54-
/*!
54+
/*!
5555
@brief Reads the LIS3MDL's magnetometer event.
5656
@param event
5757
Pointer to the magnetometer event to populate.
@@ -65,7 +65,7 @@ bool drvLis3mdl::readMagEvent(sensors_event_t *event) {
6565
}
6666

6767
/******************************************************************************/
68-
/*!
68+
/*!
6969
@brief Computes the vector magnitude of a magnetometer reading.
7070
@param event
7171
Magnetometer event to evaluate.
@@ -76,15 +76,14 @@ bool drvLis3mdl::readMagEvent(sensors_event_t *event) {
7676
/******************************************************************************/
7777
bool drvLis3mdl::computeMagnitude(const sensors_event_t &event,
7878
float &magnitude) {
79-
magnitude =
80-
sqrtf(event.magnetic.x * event.magnetic.x +
81-
event.magnetic.y * event.magnetic.y +
82-
event.magnetic.z * event.magnetic.z);
79+
magnitude = sqrtf(event.magnetic.x * event.magnetic.x +
80+
event.magnetic.y * event.magnetic.y +
81+
event.magnetic.z * event.magnetic.z);
8382
return true;
8483
}
8584

8685
/******************************************************************************/
87-
/*!
86+
/*!
8887
@brief Gets the LIS3MDL's raw sensor event (magnitude stored in data[0]).
8988
@param rawEvent
9089
Pointer to the sensor event.
@@ -105,7 +104,7 @@ bool drvLis3mdl::getEventRaw(sensors_event_t *rawEvent) {
105104
}
106105

107106
/******************************************************************************/
108-
/*!
107+
/*!
109108
@brief Gets the LIS3MDL's boolean sensor event.
110109
@param booleanEvent
111110
Pointer to the sensor event.
@@ -121,7 +120,7 @@ bool drvLis3mdl::getEventBoolean(sensors_event_t *booleanEvent) {
121120
}
122121

123122
/******************************************************************************/
124-
/*!
123+
/*!
125124
@brief Gets the LIS3MDL's magnetometer sensor event (x,y,z in uTesla).
126125
@param magEvent
127126
Pointer to the magnetometer sensor event.

‎src/components/i2c/drivers/drvLis3mdl.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
#include "drvBase.h"
1717
#include <Adafruit_LIS3MDL.h>
1818

19-
2019
/**************************************************************************/
21-
/*!
20+
/*!
2221
@brief Class that provides a driver interface for a LIS3MDL magnetometer.
2322
*/
2423
/**************************************************************************/

‎src/components/i2c/drivers/drvLsm303agr.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@
88

99
#include <math.h>
1010

11-
namespace {
12-
constexpr uint8_t kLsm303agrAccelDefaultAddr = LSM303_ADDRESS_ACCEL;
13-
constexpr uint8_t kLsm303agrMagDefaultAddr = 0x1E; // LIS2MDL address
14-
}
11+
#define LSM303AGR_ACCEL_DEFAULT_ADDR LSM303_ADDRESS_ACCEL
12+
#define LSM303AGR_MAG_DEFAULT_ADDR 0x1E ///< LIS2MDL default address
1513

1614
/******************************************************************************/
17-
/*!
15+
/*!
1816
@brief Destructor for the LSM303AGR driver wrapper.
1917
*/
2018
/******************************************************************************/
2119
drvLsm303agr::~drvLsm303agr() { teardown(); }
2220

2321
/******************************************************************************/
24-
/*!
22+
/*!
2523
@brief Releases any allocated accelerometer or magnetometer instances.
2624
*/
2725
/******************************************************************************/
@@ -37,7 +35,7 @@ void drvLsm303agr::teardown() {
3735
}
3836

3937
/******************************************************************************/
40-
/*!
38+
/*!
4139
@brief Initializes the LSM303AGR accelerometer and LIS2MDL magnetometer.
4240
@returns True if initialization succeeded, False otherwise.
4341
*/
@@ -52,8 +50,10 @@ bool drvLsm303agr::begin() {
5250
return false;
5351
}
5452

53+
// TODO: if _address isn't default (or alt), shift mag by same offset.
54+
// to support adress translators. Alternatively compound components.
5555
const uint8_t accel_addr =
56-
_address == 0 ? kLsm303agrAccelDefaultAddr : (uint8_t)_address;
56+
_address == 0 ? LSM303AGR_ACCEL_DEFAULT_ADDR : (uint8_t)_address;
5757

5858
WS_DEBUG_PRINT("[drvLsm303agr] Initialising accel @ 0x");
5959
WS_DEBUG_PRINTHEX(accel_addr);
@@ -67,9 +67,9 @@ bool drvLsm303agr::begin() {
6767
_accel->setMode(LSM303_MODE_HIGH_RESOLUTION);
6868

6969
WS_DEBUG_PRINT("[drvLsm303agr] Initialising magnetometer @ 0x");
70-
WS_DEBUG_PRINTHEX(kLsm303agrMagDefaultAddr);
70+
WS_DEBUG_PRINTHEX(LSM303AGR_MAG_DEFAULT_ADDR);
7171
WS_DEBUG_PRINTLN("...");
72-
if (!_mag->begin(kLsm303agrMagDefaultAddr, _i2c)) {
72+
if (!_mag->begin(LSM303AGR_MAG_DEFAULT_ADDR, _i2c)) {
7373
WS_DEBUG_PRINTLN("[drvLsm303agr] Failed to initialise LIS2MDL");
7474
teardown();
7575
return false;
@@ -83,7 +83,7 @@ bool drvLsm303agr::begin() {
8383
}
8484

8585
/******************************************************************************/
86-
/*!
86+
/*!
8787
@brief Computes the magnitude of the accelerometer vector.
8888
@param magnitude Reference to store the computed m/s^2 value.
8989
@returns True if the accelerometer event was retrieved successfully.
@@ -104,7 +104,7 @@ bool drvLsm303agr::computeAccelMagnitude(float &magnitude) {
104104
}
105105

106106
/******************************************************************************/
107-
/*!
107+
/*!
108108
@brief Fills the raw event with the accelerometer magnitude in data[0].
109109
@param rawEvent Pointer to the destination sensor event.
110110
@returns True if the magnitude was computed successfully.
@@ -120,7 +120,7 @@ bool drvLsm303agr::getEventRaw(sensors_event_t *rawEvent) {
120120
}
121121

122122
/******************************************************************************/
123-
/*!
123+
/*!
124124
@brief Retrieves the 3-axis accelerometer event.
125125
@param accelEvent Pointer to the destination sensor event.
126126
@returns True if the event was populated successfully.
@@ -134,7 +134,7 @@ bool drvLsm303agr::getEventAccelerometer(sensors_event_t *accelEvent) {
134134
}
135135

136136
/******************************************************************************/
137-
/*!
137+
/*!
138138
@brief Retrieves the 3-axis magnetic field event.
139139
@param magEvent Pointer to the destination sensor event.
140140
@returns True if the event was populated successfully.
@@ -148,7 +148,7 @@ bool drvLsm303agr::getEventMagneticField(sensors_event_t *magEvent) {
148148
}
149149

150150
/******************************************************************************/
151-
/*!
151+
/*!
152152
@brief Registers the driver's default accelerometer and magnetometer types.
153153
*/
154154
/******************************************************************************/

0 commit comments

Comments
 (0)