Skip to content

Commit d04acdd

Browse files
aeratertaaeraterta
committed
Updated i2c
1 parent 9275796 commit d04acdd

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎src/lsm303.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int8_t lsm303_set_power_mode(lsm303_dev *device,
9393
device->acc_power_mode = mode;
9494

9595
uint8_t data_buffer[] = {CTRL_REG1_A, val};
96-
return i2c_write_bytes(ACC_I2C_ADDRESS, data_buffer);
96+
return i2c_write_byte(ACC_I2C_ADDRESS, data_buffer);
9797
}
9898

9999
/**
@@ -127,7 +127,7 @@ int8_t lsm303_acc_enable_axes(lsm303_dev *device, lsm303_acc_axes_config axes) {
127127
device->acc_axes_config = axes;
128128

129129
uint8_t data_buffer[] = {CTRL_REG1_A, val};
130-
return i2c_write_bytes(ACC_I2C_ADDRESS, data_buffer);
130+
return i2c_write_byte(ACC_I2C_ADDRESS, data_buffer);
131131
}
132132

133133
/**
@@ -167,7 +167,7 @@ int8_t lsm303_acc_set_odr(lsm303_dev *device, enum lsm303_acc_odr odr) {
167167
device->acc_odr = odr;
168168

169169
uint8_t data_buffer[] = {CTRL_REG1_A, val};
170-
return i2c_write_bytes(ACC_I2C_ADDRESS, data_buffer);
170+
return i2c_write_byte(ACC_I2C_ADDRESS, data_buffer);
171171
}
172172

173173
/**
@@ -198,7 +198,7 @@ int8_t lsm303_acc_set_scale(lsm303_dev *device,
198198
device->acc_scale = scale;
199199

200200
uint8_t data_buffer[] = {CTRL_REG4_A, val};
201-
return i2c_write_bytes(ACC_I2C_ADDRESS, data_buffer);
201+
return i2c_write_byte(ACC_I2C_ADDRESS, data_buffer);
202202
}
203203

204204
/**
@@ -229,7 +229,7 @@ int8_t lsm303_acc_set_resolution(lsm303_dev *device,
229229
device->acc_resolution = resolution;
230230

231231
uint8_t data_buffer[] = {CTRL_REG4_A, val};
232-
return i2c_write_bytes(ACC_I2C_ADDRESS, data_buffer);
232+
return i2c_write_byte(ACC_I2C_ADDRESS, data_buffer);
233233
}
234234

235235
/**

‎src/utils

‎test/support/test_helper.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void set_expected_i2c_write_data(uint8_t *expected_data_param, size_t size) {
99
expected_data_size = size;
1010
}
1111

12-
signed char i2c_write_bytes_callback(uint8_t address, uint8_t *data_buffer,
12+
signed char i2c_write_byte_callback(uint8_t address, uint8_t *data_buffer,
1313
int cmock_num_calls) {
1414
// Validate the address
1515
TEST_ASSERT_EQUAL(ACC_I2C_ADDRESS, address);

‎test/support/test_helper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Declare the generalized callback function
1010
void set_expected_i2c_write_data(uint8_t *expected_data, size_t size);
11-
signed char i2c_write_bytes_callback(uint8_t address, uint8_t *data_buffer,
11+
signed char i2c_write_byte_callback(uint8_t address, uint8_t *data_buffer,
1212
int cmock_num_calls);
1313

1414
#endif // TEST_HELPERS_H

‎test/test_lsm303.c

+20-20
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,31 @@ void test_lsm303_setup(void) {
3939
LSM303_STATUS_SUCCESS);
4040
i2c_read_byte_IgnoreArg_read_data();
4141
i2c_read_byte_ReturnThruPtr_read_data(&power_mode_return);
42-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, power_buffer,
42+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, power_buffer,
4343
LSM303_STATUS_SUCCESS);
4444

4545
// AXES
4646
i2c_read_byte_ExpectAndReturn(ACC_I2C_ADDRESS, CTRL_REG1_A, NULL,
4747
LSM303_STATUS_SUCCESS);
4848
i2c_read_byte_IgnoreArg_read_data();
4949
i2c_read_byte_ReturnThruPtr_read_data(&enable_axes_return);
50-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, axes_buffer,
50+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, axes_buffer,
5151
LSM303_STATUS_SUCCESS);
5252

5353
// ODR
5454
i2c_read_byte_ExpectAndReturn(ACC_I2C_ADDRESS, CTRL_REG1_A, NULL,
5555
LSM303_STATUS_SUCCESS);
5656
i2c_read_byte_IgnoreArg_read_data();
5757
i2c_read_byte_ReturnThruPtr_read_data(&set_odr_return);
58-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, odr_buffer,
58+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, odr_buffer,
5959
LSM303_STATUS_SUCCESS);
6060

6161
// SCALE
6262
i2c_read_byte_ExpectAndReturn(ACC_I2C_ADDRESS, CTRL_REG4_A, NULL,
6363
LSM303_STATUS_SUCCESS);
6464
i2c_read_byte_IgnoreArg_read_data();
6565
i2c_read_byte_ReturnThruPtr_read_data(&set_scale_return);
66-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, scale_buffer,
66+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, scale_buffer,
6767
LSM303_STATUS_SUCCESS);
6868

6969
// RESOLUTION
@@ -72,7 +72,7 @@ void test_lsm303_setup(void) {
7272
i2c_read_byte_IgnoreArg_read_data();
7373
i2c_read_byte_ReturnThruPtr_read_data(&set_resolution_return);
7474
;
75-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, resolution_buffer,
75+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, resolution_buffer,
7676
LSM303_STATUS_SUCCESS);
7777

7878
TEST_ASSERT_EQUAL(LSM303_STATUS_SUCCESS, lsm303_setup(&dev, init_param));
@@ -95,9 +95,9 @@ void test_lsm303_set_power_mode(void) {
9595
i2c_read_byte_IgnoreArg_read_data();
9696
i2c_read_byte_ReturnThruPtr_read_data(&read_data_result);
9797

98-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
99-
i2c_write_bytes_IgnoreArg_data_buffer();
100-
i2c_write_bytes_StubWithCallback(i2c_write_bytes_callback);
98+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
99+
i2c_write_byte_IgnoreArg_data_buffer();
100+
i2c_write_byte_StubWithCallback(i2c_write_byte_callback);
101101

102102
TEST_ASSERT_EQUAL(LSM303_STATUS_SUCCESS,
103103
lsm303_set_power_mode(&dev, ACC_NORMAL));
@@ -115,9 +115,9 @@ void test_lsm303_acc_enable_axes(void) {
115115
i2c_read_byte_IgnoreArg_read_data();
116116
i2c_read_byte_ReturnThruPtr_read_data(&read_data_result);
117117

118-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
119-
i2c_write_bytes_IgnoreArg_data_buffer();
120-
i2c_write_bytes_StubWithCallback(i2c_write_bytes_callback);
118+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
119+
i2c_write_byte_IgnoreArg_data_buffer();
120+
i2c_write_byte_StubWithCallback(i2c_write_byte_callback);
121121

122122
TEST_ASSERT_EQUAL(LSM303_STATUS_SUCCESS,
123123
lsm303_acc_enable_axes(&dev, init_param.acc_axes_config));
@@ -135,9 +135,9 @@ void test_lsm303_acc_set_odr(void) {
135135
i2c_read_byte_IgnoreArg_read_data();
136136
i2c_read_byte_ReturnThruPtr_read_data(&read_data_result);
137137

138-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
139-
i2c_write_bytes_IgnoreArg_data_buffer();
140-
i2c_write_bytes_StubWithCallback(i2c_write_bytes_callback);
138+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
139+
i2c_write_byte_IgnoreArg_data_buffer();
140+
i2c_write_byte_StubWithCallback(i2c_write_byte_callback);
141141

142142
TEST_ASSERT_EQUAL(LSM303_STATUS_SUCCESS,
143143
lsm303_acc_set_odr(&dev, ACC_AXES_ENABLE_XYZ));
@@ -155,9 +155,9 @@ void test_lsm303_acc_set_scale(void) {
155155
i2c_read_byte_IgnoreArg_read_data();
156156
i2c_read_byte_ReturnThruPtr_read_data(&read_data_result);
157157

158-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
159-
i2c_write_bytes_IgnoreArg_data_buffer();
160-
i2c_write_bytes_StubWithCallback(i2c_write_bytes_callback);
158+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
159+
i2c_write_byte_IgnoreArg_data_buffer();
160+
i2c_write_byte_StubWithCallback(i2c_write_byte_callback);
161161

162162
TEST_ASSERT_EQUAL(LSM303_STATUS_SUCCESS,
163163
lsm303_acc_set_scale(&dev, ACC_SCALE_8G));
@@ -175,9 +175,9 @@ void test_lsm303_acc_set_resolution(void) {
175175
i2c_read_byte_IgnoreArg_read_data();
176176
i2c_read_byte_ReturnThruPtr_read_data(&read_data_result);
177177

178-
i2c_write_bytes_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
179-
i2c_write_bytes_IgnoreArg_data_buffer();
180-
i2c_write_bytes_StubWithCallback(i2c_write_bytes_callback);
178+
i2c_write_byte_ExpectAndReturn(ACC_I2C_ADDRESS, NULL, LSM303_STATUS_SUCCESS);
179+
i2c_write_byte_IgnoreArg_data_buffer();
180+
i2c_write_byte_StubWithCallback(i2c_write_byte_callback);
181181

182182
TEST_ASSERT_EQUAL(LSM303_STATUS_SUCCESS,
183183
lsm303_acc_set_resolution(&dev, ACC_RESOLUTION_HIGH));

0 commit comments

Comments
 (0)