Skip to content

Commit 91d1ee0

Browse files
Fix typo
1 parent 9669cc4 commit 91d1ee0

File tree

9 files changed

+38
-38
lines changed

9 files changed

+38
-38
lines changed

components/mpu6050/include/mpu6050.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ typedef struct {
102102
typedef struct {
103103
float roll;
104104
float pitch;
105-
} complimentary_angle_t;
105+
} complementary_angle_t;
106106

107107
typedef void *mpu6050_handle_t;
108108

@@ -385,14 +385,14 @@ esp_err_t mpu6050_get_temp(mpu6050_handle_t sensor, mpu6050_temp_value_t *const
385385
* @param sensor object handle of mpu6050
386386
* @param acce_value accelerometer measurements
387387
* @param gyro_value gyroscope measurements
388-
* @param complimentary_angle complimentary angle
388+
* @param complementary_angle complementary angle
389389
*
390390
* @return
391391
* - ESP_OK Success
392392
* - ESP_FAIL Fail
393393
*/
394394
esp_err_t mpu6050_complimentory_filter(mpu6050_handle_t sensor, const mpu6050_acce_value_t *const acce_value,
395-
const mpu6050_gyro_value_t *const gyro_value, complimentary_angle_t *const complimentary_angle);
395+
const mpu6050_gyro_value_t *const gyro_value, complementary_angle_t *const complementary_angle);
396396

397397
#ifdef __cplusplus
398398
}

components/mpu6050/mpu6050.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ esp_err_t mpu6050_get_temp(mpu6050_handle_t sensor, mpu6050_temp_value_t *const
441441
}
442442

443443
esp_err_t mpu6050_complimentory_filter(mpu6050_handle_t sensor, const mpu6050_acce_value_t *const acce_value,
444-
const mpu6050_gyro_value_t *const gyro_value, complimentary_angle_t *const complimentary_angle)
444+
const mpu6050_gyro_value_t *const gyro_value, complementary_angle_t *const complementary_angle)
445445
{
446446
float acce_angle[2];
447447
float gyro_angle[2];
@@ -452,8 +452,8 @@ esp_err_t mpu6050_complimentory_filter(mpu6050_handle_t sensor, const mpu6050_ac
452452
if (sens->counter == 1) {
453453
acce_angle[0] = (atan2(acce_value->acce_y, acce_value->acce_z) * RAD_TO_DEG);
454454
acce_angle[1] = (atan2(acce_value->acce_x, acce_value->acce_z) * RAD_TO_DEG);
455-
complimentary_angle->roll = acce_angle[0];
456-
complimentary_angle->pitch = acce_angle[1];
455+
complementary_angle->roll = acce_angle[0];
456+
complementary_angle->pitch = acce_angle[1];
457457
gettimeofday(sens->timer, NULL);
458458
return ESP_OK;
459459
}
@@ -472,8 +472,8 @@ esp_err_t mpu6050_complimentory_filter(mpu6050_handle_t sensor, const mpu6050_ac
472472
gyro_angle[0] = gyro_rate[0] * sens->dt;
473473
gyro_angle[1] = gyro_rate[1] * sens->dt;
474474

475-
complimentary_angle->roll = (ALPHA * (complimentary_angle->roll + gyro_angle[0])) + ((1 - ALPHA) * acce_angle[0]);
476-
complimentary_angle->pitch = (ALPHA * (complimentary_angle->pitch + gyro_angle[1])) + ((1 - ALPHA) * acce_angle[1]);
475+
complementary_angle->roll = (ALPHA * (complementary_angle->roll + gyro_angle[0])) + ((1 - ALPHA) * acce_angle[0]);
476+
complementary_angle->pitch = (ALPHA * (complementary_angle->pitch + gyro_angle[1])) + ((1 - ALPHA) * acce_angle[1]);
477477

478478
return ESP_OK;
479479
}

components/mpu6886/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ C driver for MPU-6886 6-axis gyroscope and accelerometer based on I2C communicat
88
- 3-axis accelerometer data (raw 16-bit or floating-point g values)
99
- 3-axis gyroscope data (raw 16-bit or floating-point dps values)
1010
- Internal temperature sensor
11-
- Complimentary filter for roll and pitch angle estimation
11+
- complementary filter for roll and pitch angle estimation
1212

1313
### Configuration
1414
- Accelerometer full-scale range: ±2g, ±4g, ±8g, ±16g
@@ -237,7 +237,7 @@ mpu6886_set_gyro_low_power(sensor, true, MPU6886_GYRO_AVG_32);
237237
| `mpu6886_get_raw_acce` / `mpu6886_get_acce` | Read accelerometer data |
238238
| `mpu6886_get_raw_gyro` / `mpu6886_get_gyro` | Read gyroscope data |
239239
| `mpu6886_get_temp` | Read temperature |
240-
| `mpu6886_complimentary_filter` | Compute roll/pitch angles |
240+
| `mpu6886_complementary_filter` | Compute roll/pitch angles |
241241
242242
## See Also
243243
* [MPU-6886 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/MPU-6886-000193%2Bv1.1_GHIC_en.pdf)

components/mpu6886/include/mpu6886.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ typedef struct {
181181
typedef struct {
182182
float roll;
183183
float pitch;
184-
} mpu6886_complimentary_angle_t;
184+
} mpu6886_complementary_angle_t;
185185

186186
typedef void *mpu6886_handle_t;
187187

@@ -733,19 +733,19 @@ esp_err_t mpu6886_get_gyro(mpu6886_handle_t sensor, mpu6886_gyro_value_t *const
733733
esp_err_t mpu6886_get_temp(mpu6886_handle_t sensor, mpu6886_temp_value_t *const temp_value);
734734

735735
/**
736-
* @brief Use complimentary filter to calculate roll and pitch
736+
* @brief Use complementary filter to calculate roll and pitch
737737
*
738738
* @param sensor object handle of mpu6886
739739
* @param acce_value accelerometer measurements
740740
* @param gyro_value gyroscope measurements
741-
* @param complimentary_angle complimentary angle
741+
* @param complementary_angle complementary angle
742742
*
743743
* @return
744744
* - ESP_OK Success
745745
* - ESP_FAIL Fail
746746
*/
747-
esp_err_t mpu6886_complimentary_filter(mpu6886_handle_t sensor, const mpu6886_acce_value_t *const acce_value,
748-
const mpu6886_gyro_value_t *const gyro_value, mpu6886_complimentary_angle_t *const complimentary_angle);
747+
esp_err_t mpu6886_complementary_filter(mpu6886_handle_t sensor, const mpu6886_acce_value_t *const acce_value,
748+
const mpu6886_gyro_value_t *const gyro_value, mpu6886_complementary_angle_t *const complementary_angle);
749749

750750
#ifdef __cplusplus
751751
}

components/mpu6886/mpu6886.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -891,8 +891,8 @@ esp_err_t mpu6886_get_temp(mpu6886_handle_t sensor, mpu6886_temp_value_t *const
891891
return ret;
892892
}
893893

894-
esp_err_t mpu6886_complimentary_filter(mpu6886_handle_t sensor, const mpu6886_acce_value_t *const acce_value,
895-
const mpu6886_gyro_value_t *const gyro_value, mpu6886_complimentary_angle_t *const complimentary_angle)
894+
esp_err_t mpu6886_complementary_filter(mpu6886_handle_t sensor, const mpu6886_acce_value_t *const acce_value,
895+
const mpu6886_gyro_value_t *const gyro_value, mpu6886_complementary_angle_t *const complementary_angle)
896896
{
897897
float acce_angle[2];
898898
float gyro_angle[2];
@@ -903,8 +903,8 @@ esp_err_t mpu6886_complimentary_filter(mpu6886_handle_t sensor, const mpu6886_ac
903903
if (sens->counter == 1) {
904904
acce_angle[0] = (atan2(acce_value->acce_y, acce_value->acce_z) * RAD_TO_DEG);
905905
acce_angle[1] = (atan2(acce_value->acce_x, acce_value->acce_z) * RAD_TO_DEG);
906-
complimentary_angle->roll = acce_angle[0];
907-
complimentary_angle->pitch = acce_angle[1];
906+
complementary_angle->roll = acce_angle[0];
907+
complementary_angle->pitch = acce_angle[1];
908908
gettimeofday(sens->timer, NULL);
909909
return ESP_OK;
910910
}
@@ -923,8 +923,8 @@ esp_err_t mpu6886_complimentary_filter(mpu6886_handle_t sensor, const mpu6886_ac
923923
gyro_angle[0] = gyro_rate[0] * sens->dt;
924924
gyro_angle[1] = gyro_rate[1] * sens->dt;
925925

926-
complimentary_angle->roll = (ALPHA * (complimentary_angle->roll + gyro_angle[0])) + ((1 - ALPHA) * acce_angle[0]);
927-
complimentary_angle->pitch = (ALPHA * (complimentary_angle->pitch + gyro_angle[1])) + ((1 - ALPHA) * acce_angle[1]);
926+
complementary_angle->roll = (ALPHA * (complementary_angle->roll + gyro_angle[0])) + ((1 - ALPHA) * acce_angle[0]);
927+
complementary_angle->pitch = (ALPHA * (complementary_angle->pitch + gyro_angle[1])) + ((1 - ALPHA) * acce_angle[1]);
928928

929929
return ESP_OK;
930930
}

components/sensors/icm42670/icm42670.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ typedef struct {
5454
i2c_master_dev_handle_t i2c_handle;
5555
bool initialized_filter;
5656
uint64_t previous_measurement_us;
57-
complimentary_angle_t previous_measurement;
57+
complementary_angle_t previous_measurement;
5858
} icm42670_dev_t;
5959

6060
/*******************************************************************************
@@ -381,7 +381,7 @@ static esp_err_t icm42670_read(icm42670_handle_t sensor, const uint8_t reg_start
381381
}
382382

383383
esp_err_t icm42670_complimentory_filter(icm42670_handle_t sensor, const icm42670_value_t *const acce_value,
384-
const icm42670_value_t *const gyro_value, complimentary_angle_t *const complimentary_angle)
384+
const icm42670_value_t *const gyro_value, complementary_angle_t *const complementary_angle)
385385
{
386386
icm42670_dev_t *sens = (icm42670_dev_t *) sensor;
387387
float measurement_delta;
@@ -410,13 +410,13 @@ esp_err_t icm42670_complimentory_filter(icm42670_handle_t sensor, const icm42670
410410
gyro_roll_angle = gyro_value->x * measurement_delta;
411411
gyro_pitch_angle = gyro_value->y * measurement_delta;
412412

413-
complimentary_angle->roll = (ALPHA * (sens->previous_measurement.roll + gyro_roll_angle)) + ((
413+
complementary_angle->roll = (ALPHA * (sens->previous_measurement.roll + gyro_roll_angle)) + ((
414414
1 - ALPHA) * acc_roll_angle);
415-
complimentary_angle->pitch = (ALPHA * (sens->previous_measurement.pitch + gyro_pitch_angle)) + ((
415+
complementary_angle->pitch = (ALPHA * (sens->previous_measurement.pitch + gyro_pitch_angle)) + ((
416416
1 - ALPHA) * acc_pitch_angle);
417417

418-
sens->previous_measurement.roll = complimentary_angle->roll;
419-
sens->previous_measurement.pitch = complimentary_angle->pitch;
418+
sens->previous_measurement.roll = complementary_angle->roll;
419+
sens->previous_measurement.pitch = complementary_angle->pitch;
420420

421421
return ESP_OK;
422422
}

components/sensors/icm42670/include/icm42670.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ typedef struct {
117117
typedef struct {
118118
float roll;
119119
float pitch;
120-
} complimentary_angle_t;
120+
} complementary_angle_t;
121121

122122
typedef void *icm42670_handle_t;
123123

@@ -292,14 +292,14 @@ esp_err_t icm42670_get_temp_value(icm42670_handle_t sensor, float *value);
292292
*
293293
* @param acce_value accelerometer measurements
294294
* @param gyro_value gyroscope measurements
295-
* @param complimentary_angle complimentary angle
295+
* @param complementary_angle complementary angle
296296
*
297297
* @return
298298
* - ESP_OK Success
299299
* - ESP_FAIL Fail
300300
*/
301301
esp_err_t icm42670_complimentory_filter(icm42670_handle_t sensor, const icm42670_value_t *acce_value,
302-
const icm42670_value_t *gyro_value, complimentary_angle_t *complimentary_angle);
302+
const icm42670_value_t *gyro_value, complementary_angle_t *complementary_angle);
303303

304304
/**
305305
* @brief Read a register

examples/display_rotation/main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static void app_imu_read(void)
249249
icm42670_get_temp_value(imu, &val);
250250
ESP_LOGI(TAG, "TEMP val: %.2f", val);
251251

252-
complimentary_angle_t angle;
252+
complementary_angle_t angle;
253253
icm42670_complimentory_filter(imu, &acce_val, &gyro_val, &angle);
254254
ESP_LOGI(TAG, "Angle roll: %.2f pitch: %.2f ", angle.roll, angle.pitch);
255255

examples/display_sensors/main/main.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static uint8_t g_page_num = 0;
4444

4545
static mpu6050_acce_value_t acce;
4646
static mpu6050_gyro_value_t gyro;
47-
static complimentary_angle_t complimentary_angle;
47+
static complementary_angle_t complementary_angle;
4848

4949
static void display_show_signs(void)
5050
{
@@ -132,12 +132,12 @@ static void display_show_gyro_data(void)
132132
bsp_display_unlock();
133133
}
134134

135-
static void display_show_complimentary_angle(void)
135+
static void display_show_complementary_angle(void)
136136
{
137-
ESP_LOGI(TAG, "roll:%.2f, pitch:%.2f", complimentary_angle.roll, complimentary_angle.pitch);
137+
ESP_LOGI(TAG, "roll:%.2f, pitch:%.2f", complementary_angle.roll, complementary_angle.pitch);
138138

139139
bsp_display_lock(0);
140-
lv_label_set_text_fmt(main_label, "Roll: %.2f\nPitch: %.2f", complimentary_angle.roll, complimentary_angle.pitch);
140+
lv_label_set_text_fmt(main_label, "Roll: %.2f\nPitch: %.2f", complementary_angle.roll, complementary_angle.pitch);
141141
lv_obj_set_style_text_align(main_label, LV_TEXT_ALIGN_LEFT, 0);
142142
bsp_display_unlock();
143143
}
@@ -197,7 +197,7 @@ static void display_show_task(void *pvParameters)
197197
display_show_gyro_data();
198198
break;
199199
case 3:
200-
display_show_complimentary_angle();
200+
display_show_complementary_angle();
201201
break;
202202
case 4:
203203
display_show_barometer_data();
@@ -215,7 +215,7 @@ static void mpu6050_read(void *pvParameters)
215215
{
216216
mpu6050_get_acce(mpu6050_dev, &acce);
217217
mpu6050_get_gyro(mpu6050_dev, &gyro);
218-
mpu6050_complimentory_filter(mpu6050_dev, &acce, &gyro, &complimentary_angle);
218+
mpu6050_complimentory_filter(mpu6050_dev, &acce, &gyro, &complementary_angle);
219219
}
220220

221221
static void btn_handler(void *button_handle, void *usr_data)
@@ -277,7 +277,7 @@ void app_main(void)
277277
q_page_num = xQueueCreate(10, sizeof(uint8_t));
278278
xTaskCreate(display_show_task, "display_show_task", 2048 * 2, NULL, 5, NULL);
279279

280-
// In order to get accurate calculation of complimentary angle we need fast reading (5ms)
280+
// In order to get accurate calculation of complementary angle we need fast reading (5ms)
281281
// FreeRTOS resolution is 10ms, so esp_timer is used
282282
const esp_timer_create_args_t cal_timer_config = {
283283
.callback = mpu6050_read,

0 commit comments

Comments
 (0)