Skip to content

Commit 225b496

Browse files
committed
Update mahony.c
1 parent 7c51919 commit 225b496

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

ports/esp32/cmodules/mahony/mahony.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ static volatile mp_float_t integralFBx = 0.0f, integralFBy = 0.0f, integralFBz
5959

6060
// ---------------------------------------------------------------------------------------------------
6161
// Function declarations
62-
STATIC mp_obj_t mahony_MahonyAHRSupdateIMU(size_t n_args, const mp_obj_t *args);
62+
static mp_obj_t mahony_MahonyAHRSupdateIMU(size_t n_args, const mp_obj_t *args);
6363

6464
// ---------------------------------------------------------------------------------------------------
6565
// Attitude and heading reference system (AHRS) algorithm update
6666
//
6767
// def MahonyAHRSupdate(gx : float, gy : float, gz : float, ax : float, ay : float, az : float, mx : float, my : float, mz : float, delta_t_us:int) -> None:
6868
//
69-
STATIC mp_obj_t mahony_MahonyAHRSupdate(size_t n_args, const mp_obj_t *args) {
69+
static mp_obj_t mahony_MahonyAHRSupdate(size_t n_args, const mp_obj_t *args) {
7070
mp_float_t gx = mp_obj_get_float(args[0]);
7171
mp_float_t gy = mp_obj_get_float(args[1]);
7272
mp_float_t gz = mp_obj_get_float(args[2]);
@@ -195,7 +195,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mahony_MahonyAHRSupdate_obj, 10, 10, mahony_
195195
//
196196
// def MahonyAHRSupdateIMU(gx : float, gy : float, gz : float, ax : float, ay : float, az : float, delta_t_us:int) -> None:
197197
//
198-
STATIC mp_obj_t mahony_MahonyAHRSupdateIMU(size_t n_args, const mp_obj_t *args) {
198+
static mp_obj_t mahony_MahonyAHRSupdateIMU(size_t n_args, const mp_obj_t *args) {
199199
mp_float_t gx = mp_obj_get_float(args[0]);
200200
mp_float_t gy = mp_obj_get_float(args[1]);
201201
mp_float_t gz = mp_obj_get_float(args[2]);
@@ -285,11 +285,11 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mahony_MahonyAHRSupdateIMU_obj, 7, 7, mahony
285285
// https://en.wikipedia.org/wiki/Conversion_between_quaternions_and_Euler_angles
286286
#define ROLL mp_float_t roll = atan2(q0 * q1 + q2 * q3, 0.5f - q1 * q1 - q2 * q2) * 57.295779513f; // degrees
287287
#define PITCH mp_float_t pitch = asin(2.0f * (q0 * q2 - q3 * q1)) * 57.295779513f; // degrees
288-
#define YAW mp_float_t yaw = atan2(q0 * q3 + q1 * q2, 0.5f - q2 * q2 - q3 * q3) * 57.295779513f; // degrees
288+
#define YAW mp_float_t yaw = atan2(q0 * q3 + q1 * q2, 0.5f - q2 * q2 - q3 * q3) * 57.295779513f; // degrees
289289
//
290290
// def angles()
291291
//
292-
STATIC mp_obj_t mahony_angles() {
292+
static mp_obj_t mahony_angles() {
293293
// roll(X), pitch(Y), yaw(Z)
294294
ROLL;
295295
PITCH;
@@ -305,25 +305,25 @@ STATIC mp_obj_t mahony_angles() {
305305
}
306306
MP_DEFINE_CONST_FUN_OBJ_0(mahony_angles_obj, mahony_angles);
307307

308-
STATIC mp_obj_t mahony_roll() {
308+
static mp_obj_t mahony_roll() {
309309
ROLL;
310310
return mp_obj_new_float(roll);
311311
}
312312
MP_DEFINE_CONST_FUN_OBJ_0(mahony_roll_obj, mahony_roll);
313313

314-
STATIC mp_obj_t mahony_pitch() {
314+
static mp_obj_t mahony_pitch() {
315315
PITCH;
316316
return mp_obj_new_float(pitch);
317317
}
318318
MP_DEFINE_CONST_FUN_OBJ_0(mahony_pitch_obj, mahony_pitch);
319319

320-
STATIC mp_obj_t mahony_yaw() {
320+
static mp_obj_t mahony_yaw() {
321321
YAW;
322322
return mp_obj_new_float(yaw);
323323
}
324324
MP_DEFINE_CONST_FUN_OBJ_0(mahony_yaw_obj, mahony_yaw);
325325

326-
STATIC mp_obj_t quaternion_to_angles(size_t n_args, const mp_obj_t *args) {
326+
static mp_obj_t quaternion_to_angles(size_t n_args, const mp_obj_t *args) {
327327
mp_arg_check_num(n_args, 0, 2, 2, false);
328328
mp_float_t q0 = mp_obj_get_float(args[0]);
329329
mp_float_t q1 = mp_obj_get_float(args[1]);
@@ -343,9 +343,9 @@ STATIC mp_obj_t quaternion_to_angles(size_t n_args, const mp_obj_t *args) {
343343
};
344344
return mp_obj_new_tuple(3, ret_val);
345345
}
346-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(quaternion_to_angles_obj, 4, 4, quaternion_to_angles);
346+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(quaternion_to_angles_obj, 4, 4, quaternion_to_angles);
347347

348-
STATIC mp_obj_t angles_to_quaternion(mp_obj_t _roll, mp_obj_t _pitch, mp_obj_t _yaw) {
348+
static mp_obj_t angles_to_quaternion(mp_obj_t _roll, mp_obj_t _pitch, mp_obj_t _yaw) {
349349
// roll(X), pitch(Y), yaw(Z)
350350
mp_float_t roll = mp_obj_get_float(_roll) / 57.295779513f;
351351
mp_float_t pitch = mp_obj_get_float(_pitch) / 57.295779513f;
@@ -373,13 +373,13 @@ STATIC mp_obj_t angles_to_quaternion(mp_obj_t _roll, mp_obj_t _pitch, mp_obj_t _
373373
};
374374
return mp_obj_new_tuple(4, ret_val);
375375
}
376-
STATIC MP_DEFINE_CONST_FUN_OBJ_3(angles_to_quaternion_obj, angles_to_quaternion);
376+
static MP_DEFINE_CONST_FUN_OBJ_3(angles_to_quaternion_obj, angles_to_quaternion);
377377

378378
// ---------------------------------------------------------------------------------------------------
379379
//
380380
// def get_twoKp() -> float:
381381
//
382-
STATIC mp_obj_t mahony_get_twoKp() {
382+
static mp_obj_t mahony_get_twoKp() {
383383
mp_float_t ret_val;
384384

385385
ret_val = twoKp;
@@ -391,7 +391,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(mahony_get_twoKp_obj, mahony_get_twoKp);
391391
//
392392
// def get_twoKi() -> float:
393393
//
394-
STATIC mp_obj_t mahony_get_twoKi() {
394+
static mp_obj_t mahony_get_twoKi() {
395395
mp_float_t ret_val;
396396

397397
ret_val = twoKi;
@@ -403,7 +403,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(mahony_get_twoKi_obj, mahony_get_twoKi);
403403
//
404404
// def set_twoKi(twoKi : float) -> None:
405405
//
406-
STATIC mp_obj_t mahony_set_twoKi(mp_obj_t twoKi_obj) {
406+
static mp_obj_t mahony_set_twoKi(mp_obj_t twoKi_obj) {
407407
mp_float_t _twoKi = mp_obj_get_float(twoKi_obj);
408408

409409
twoKi = _twoKi;
@@ -415,7 +415,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mahony_set_twoKi_obj, mahony_set_twoKi);
415415
//
416416
// def set_twoKp(twoKp : float) -> None:
417417
//
418-
STATIC mp_obj_t mahony_set_twoKp(mp_obj_t twoKp_obj) {
418+
static mp_obj_t mahony_set_twoKp(mp_obj_t twoKp_obj) {
419419
mp_float_t _twoKp = mp_obj_get_float(twoKp_obj);
420420

421421
twoKp = _twoKp;
@@ -424,7 +424,7 @@ STATIC mp_obj_t mahony_set_twoKp(mp_obj_t twoKp_obj) {
424424
}
425425
MP_DEFINE_CONST_FUN_OBJ_1(mahony_set_twoKp_obj, mahony_set_twoKp);
426426

427-
STATIC const mp_rom_map_elem_t mahony_module_globals_table[] = {
427+
static const mp_rom_map_elem_t mahony_module_globals_table[] = {
428428
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_mahony) },
429429
{ MP_ROM_QSTR(MP_QSTR_MahonyAHRSupdate), MP_ROM_PTR(&mahony_MahonyAHRSupdate_obj) },
430430
{ MP_ROM_QSTR(MP_QSTR_MahonyAHRSupdateIMU), MP_ROM_PTR(&mahony_MahonyAHRSupdateIMU_obj) },
@@ -440,7 +440,7 @@ STATIC const mp_rom_map_elem_t mahony_module_globals_table[] = {
440440
{ MP_ROM_QSTR(MP_QSTR_quaternion_to_angles), MP_ROM_PTR(&quaternion_to_angles_obj) },
441441
};
442442

443-
STATIC MP_DEFINE_CONST_DICT(mahony_module_globals, mahony_module_globals_table);
443+
static MP_DEFINE_CONST_DICT(mahony_module_globals, mahony_module_globals_table);
444444
const mp_obj_module_t mahony_user_cmodule = {
445445
.base = {&mp_type_module},
446446
.globals = (mp_obj_dict_t *)&mahony_module_globals,

0 commit comments

Comments
 (0)