Skip to content

Commit 2d77973

Browse files
committed
Update lint
1 parent 21813e0 commit 2d77973

File tree

4 files changed

+94
-89
lines changed

4 files changed

+94
-89
lines changed

.gitignore

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ build/
22
.vscode/
33

44
# clang-format files
5-
clang-format.log
6-
7-
# ID Related files
8-
lsm303.code-workspace
5+
clang-format.log

lsm303.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
int8_t lsm303_setup(lsm303_dev *dev, lsm303_init_param lsm303_params) {
3838
int8_t ret = 0;
3939

40-
dev->acc_power_mode = lsm303_params.acc_power_mode;
41-
dev->acc_odr = lsm303_params.acc_odr;
40+
dev->acc_power_mode = lsm303_params.acc_power_mode;
41+
dev->acc_odr = lsm303_params.acc_odr;
4242
dev->acc_axes_config = lsm303_params.acc_axes_config;
43-
dev->acc_scale = lsm303_params.acc_scale;
44-
dev->acc_resolution = lsm303_params.acc_resolution;
43+
dev->acc_scale = lsm303_params.acc_scale;
44+
dev->acc_resolution = lsm303_params.acc_resolution;
4545
// dev->i2c0_dev = DEVICE_DT_GET(i2c0_master);
4646
dev->i2c0_dev = (struct device *)DEVICE_DT_GET(i2c0_master);
4747

@@ -122,10 +122,10 @@ int8_t lsm303_acc_enable_axes(lsm303_dev *device, lsm303_acc_axes_config axes) {
122122
}
123123

124124
val &= ~0x07;
125-
val = val | axes.acc_axes << ACC_AXES_MASK;
126-
axes.enable.z = (val & (1 << 2)) >> 2;
127-
axes.enable.y = (val & (1 << 1)) >> 1;
128-
axes.enable.x = (val & 1);
125+
val = val | axes.acc_axes << ACC_AXES_MASK;
126+
axes.enable.z = (val & (1 << 2)) >> 2;
127+
axes.enable.y = (val & (1 << 1)) >> 1;
128+
axes.enable.x = (val & 1);
129129
device->acc_axes_config = axes;
130130

131131
uint8_t data_buffer[] = {CTRL_REG1_A, val};
@@ -154,7 +154,7 @@ int8_t lsm303_acc_set_odr(lsm303_dev *device, enum lsm303_acc_odr odr) {
154154
}
155155

156156
val &= ~0xF0;
157-
val = val | odr << ACC_ODR_MASK;
157+
val = val | odr << ACC_ODR_MASK;
158158
device->acc_odr = odr;
159159

160160
uint8_t data_buffer[] = {CTRL_REG1_A, val};
@@ -184,7 +184,7 @@ int8_t lsm303_acc_set_scale(lsm303_dev *device,
184184
}
185185

186186
val &= ~0x30;
187-
val = val | scale << ACC_SCALE_MASK;
187+
val = val | scale << ACC_SCALE_MASK;
188188
device->acc_scale = scale;
189189

190190
uint8_t data_buffer[] = {CTRL_REG4_A, val};
@@ -214,7 +214,7 @@ int8_t lsm303_acc_set_resolution(lsm303_dev *device,
214214
}
215215

216216
val &= ~0x08;
217-
val = val | resolution << ACC_RESOLUTION_MASK;
217+
val = val | resolution << ACC_RESOLUTION_MASK;
218218
device->acc_resolution = resolution;
219219

220220
uint8_t data_buffer[] = {CTRL_REG4_A, val};

lsm303.code-workspace

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
}
6+
],
7+
"settings": {}
8+
}

lsm303.h

+74-74
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ typedef struct {
4646

4747
/*******************************STATUSES***************************************/
4848
typedef enum {
49-
LSM303_STATUS_SUCCESS = 0,
50-
LSM303_STATUS_API_ERR = -1,
49+
LSM303_STATUS_SUCCESS = 0,
50+
LSM303_STATUS_API_ERR = -1,
5151
LSM303_STATUS_INPUT_ERR = -2,
5252
LSM303_STATUS_ALLOC_ERR = -3,
5353
} LSM303_RETURN_STATUS;
@@ -63,115 +63,115 @@ typedef enum {
6363
/*********************************MASKS****************************************/
6464

6565
#define ACC_POWER_MODE_MASK 3
66-
#define ACC_AXES_MASK 0
67-
#define ACC_ODR_MASK 4
68-
#define ACC_SCALE_MASK 4
66+
#define ACC_AXES_MASK 0
67+
#define ACC_ODR_MASK 4
68+
#define ACC_SCALE_MASK 4
6969
#define ACC_RESOLUTION_MASK 3
7070

7171
/***********************ACCELEROMETER REGISTERS********************************/
7272

7373
typedef enum {
74-
CTRL_REG1_A = 0x20,
75-
CTRL_REG2_A = 0x21,
76-
CTRL_REG3_A = 0x22,
77-
CTRL_REG4_A = 0x23,
78-
CTRL_REG5_A = 0x24,
79-
CTRL_REG6_A = 0x25,
80-
REFERENCE_A = 0x26,
81-
STATUS_REG_A = 0x27,
82-
OUT_X_L_A = 0x28,
83-
OUT_X_H_A = 0x29,
84-
OUT_Y_L_A = 0x2A,
85-
OUT_Y_H_A = 0x2B,
86-
OUT_Z_L_A = 0x2C,
87-
OUT_Z_H_A = 0x2D,
74+
CTRL_REG1_A = 0x20,
75+
CTRL_REG2_A = 0x21,
76+
CTRL_REG3_A = 0x22,
77+
CTRL_REG4_A = 0x23,
78+
CTRL_REG5_A = 0x24,
79+
CTRL_REG6_A = 0x25,
80+
REFERENCE_A = 0x26,
81+
STATUS_REG_A = 0x27,
82+
OUT_X_L_A = 0x28,
83+
OUT_X_H_A = 0x29,
84+
OUT_Y_L_A = 0x2A,
85+
OUT_Y_H_A = 0x2B,
86+
OUT_Z_L_A = 0x2C,
87+
OUT_Z_H_A = 0x2D,
8888
FIFO_CTRL_REG_A = 0x2E,
89-
FIFO_SRC_REG_A = 0x2F,
90-
INT1_CFG_A = 0x30,
91-
INT1_SRC_A = 0x31,
92-
INT1_THS_A = 0x32,
89+
FIFO_SRC_REG_A = 0x2F,
90+
INT1_CFG_A = 0x30,
91+
INT1_SRC_A = 0x31,
92+
INT1_THS_A = 0x32,
9393
INT1_DURATION_A = 0x33,
94-
INT2_CFG_A = 0x34,
95-
INT2_SRC_A = 0x35,
96-
INT2_THS_A = 0x36,
94+
INT2_CFG_A = 0x34,
95+
INT2_SRC_A = 0x35,
96+
INT2_THS_A = 0x36,
9797
INT2_DURATION_A = 0x37,
98-
CLICK_CFG_A = 0x38,
99-
CLICK_SRC_A = 0x39,
100-
CLICK_THS_A = 0x3A,
101-
TIME_LIMIT_A = 0x3B,
102-
TIME_LATENCY_A = 0x3C,
103-
TIME_WINDOW_A = 0x3D
98+
CLICK_CFG_A = 0x38,
99+
CLICK_SRC_A = 0x39,
100+
CLICK_THS_A = 0x3A,
101+
TIME_LIMIT_A = 0x3B,
102+
TIME_LATENCY_A = 0x3C,
103+
TIME_WINDOW_A = 0x3D
104104
} LSM303DLHC_ACC_REG;
105105

106106
/***********************MAGNETOMETER REGISTERS*********************************/
107107
typedef enum {
108-
CRA_REG_M = 0x00,
109-
CRB_REG_M = 0x01,
110-
MR_REG_M = 0x02,
111-
OUT_X_H_M = 0x03,
112-
OUT_X_L_M = 0x04,
113-
OUT_Z_H_M = 0x05,
114-
OUT_Z_L_M = 0x06,
115-
OUT_Y_H_M = 0x07,
116-
OUT_Y_L_M = 0x08,
117-
SR_REG_M = 0x09,
118-
IRA_REG_M = 0x0A,
119-
IRB_REG_M = 0x0B,
120-
IRC_REG_M = 0x0C,
108+
CRA_REG_M = 0x00,
109+
CRB_REG_M = 0x01,
110+
MR_REG_M = 0x02,
111+
OUT_X_H_M = 0x03,
112+
OUT_X_L_M = 0x04,
113+
OUT_Z_H_M = 0x05,
114+
OUT_Z_L_M = 0x06,
115+
OUT_Y_H_M = 0x07,
116+
OUT_Y_L_M = 0x08,
117+
SR_REG_M = 0x09,
118+
IRA_REG_M = 0x0A,
119+
IRB_REG_M = 0x0B,
120+
IRC_REG_M = 0x0C,
121121
TEMP_OUT_H_M = 0x31,
122122
TEMP_OUT_L_M = 0x32
123123
} LSM303DLHC_MAG_REG;
124124

125125
/*****************************ACC DESCRIPTORS**********************************/
126126

127127
enum lsm303_acc_power_mode {
128-
ACC_NORMAL = 0x00,
129-
ACC_LOW_POWER = 0x01,
128+
ACC_NORMAL = 0x00,
129+
ACC_LOW_POWER = 0x01,
130130
ACC_POWER_DOWN = 0x02
131131
};
132132

133133
enum lsm303_acc_odr {
134-
ACC_ODR_1HZ = 0x01,
135-
ACC_ODR_10HZ = 0x02,
136-
ACC_ODR_25HZ = 0x03,
137-
ACC_ODR_50HZ = 0x04,
138-
ACC_ODR_100HZ = 0x05,
139-
ACC_ODR_200HZ = 0x06,
140-
ACC_ODR_400HZ = 0x07,
134+
ACC_ODR_1HZ = 0x01,
135+
ACC_ODR_10HZ = 0x02,
136+
ACC_ODR_25HZ = 0x03,
137+
ACC_ODR_50HZ = 0x04,
138+
ACC_ODR_100HZ = 0x05,
139+
ACC_ODR_200HZ = 0x06,
140+
ACC_ODR_400HZ = 0x07,
141141
ACC_ODR_1K620HZ = 0x08,
142142
ACC_ODR_1K344HZ = 0x09,
143143
ACC_ODR_5K376HZ = 0x09
144144
};
145145

146146
enum lsm303_acc_axes_enable {
147147
ACC_AXES_DISABLE_ALL = 0x00,
148-
ACC_AXES_ENABLE_X = 0x01,
149-
ACC_AXES_ENABLE_Y = 0x02,
150-
ACC_AXES_ENABLE_Z = 0x04,
151-
ACC_AXES_ENABLE_XY = 0x03,
152-
ACC_AXES_ENABLE_XZ = 0x05,
153-
ACC_AXES_ENABLE_YZ = 0x06,
154-
ACC_AXES_ENABLE_XYZ = 0x07
148+
ACC_AXES_ENABLE_X = 0x01,
149+
ACC_AXES_ENABLE_Y = 0x02,
150+
ACC_AXES_ENABLE_Z = 0x04,
151+
ACC_AXES_ENABLE_XY = 0x03,
152+
ACC_AXES_ENABLE_XZ = 0x05,
153+
ACC_AXES_ENABLE_YZ = 0x06,
154+
ACC_AXES_ENABLE_XYZ = 0x07
155155
};
156156

157157
enum lsm303_acc_full_scale {
158-
ACC_SCALE_2G = 0x00,
159-
ACC_SCALE_4G = 0x01,
160-
ACC_SCALE_8G = 0x02,
158+
ACC_SCALE_2G = 0x00,
159+
ACC_SCALE_4G = 0x01,
160+
ACC_SCALE_8G = 0x02,
161161
ACC_SCALE_16G = 0x03
162162
};
163163

164164
enum lsm303_acc_resolution {
165-
ACC_RESOLUTION_LOW = 0x00,
165+
ACC_RESOLUTION_LOW = 0x00,
166166
ACC_RESOLUTION_HIGH = 0x01
167167
};
168168

169169
/*****************************MAG DESCRIPTORS**********************************/
170170

171171
enum lsm303_mag_power_mode {
172172
MAG_CONTINUOUS_CONVERSION = 0x00,
173-
MAG_SINGLE_CONVERSION = 0x01,
174-
MAG_SLEEP_MODE = 0x02
173+
MAG_SINGLE_CONVERSION = 0x01,
174+
MAG_SLEEP_MODE = 0x02
175175
};
176176

177177
enum lsm303_mag_full_scale {
@@ -186,13 +186,13 @@ enum lsm303_mag_full_scale {
186186

187187
enum lsm303_mag_odr {
188188
MAG_ODR_0_75HZ = 0x00,
189-
MAG_ODR_1_5HZ = 0x01,
190-
MAG_ODR_3_0HZ = 0x02,
191-
MAG_ODR_7_5HZ = 0x03,
192-
MAG_ODR_15HZ = 0x04,
193-
MAG_ODR_30HZ = 0x05,
194-
MAG_ODR_75HZ = 0x06,
195-
MAG_ODR_220HZ = 0x07
189+
MAG_ODR_1_5HZ = 0x01,
190+
MAG_ODR_3_0HZ = 0x02,
191+
MAG_ODR_7_5HZ = 0x03,
192+
MAG_ODR_15HZ = 0x04,
193+
MAG_ODR_30HZ = 0x05,
194+
MAG_ODR_75HZ = 0x06,
195+
MAG_ODR_220HZ = 0x07
196196
};
197197

198198
typedef struct {

0 commit comments

Comments
 (0)