Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions firmware/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions firmware/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ defmt-bbq = { version = "0.1", optional = true }
mpu6050-dmp = "0.3"
bmi160 = "0.1"

# Sensor fusion
dcmimu = "0.2"

# Other crates
static_cell = "1"
nb = "1"
Expand Down
40 changes: 40 additions & 0 deletions firmware/src/imu/fusion/dcm.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
use dcmimu::DCMIMU;
use embassy_time::Instant;
use firmware_protocol::ImuType;

Check warning

Code scanning / clippy

unused import: `firmware_protocol::ImuType`

unused import: `firmware_protocol::ImuType`

use crate::imu::{FusedData, Fuser, Imu, Quat, UnfusedData};

Check warning

Code scanning / clippy

unused import: `Imu`

unused import: `Imu`

/// Extended Kalman filtering in direction cosine matrix formation
pub struct Dcm {
dcm: DCMIMU,
last: Instant,
}

impl Dcm {
pub fn new() -> Self {

Check warning

Code scanning / clippy

associated function `new` is never used

associated function `new` is never used
Self {
dcm: DCMIMU::new(),
last: Instant::now(),
}
}
}

impl Fuser for Dcm {
fn process(&mut self, unfused: &UnfusedData) -> FusedData {
let last = self.last;
self.last = Instant::now();
let elapsed = self.last - last;

let UnfusedData { accel, gyro } = unfused;

// TODO: Check that these euler angle convention matches
let (euler, _) = self.dcm.update(
(gyro.x, gyro.y, gyro.z),
(accel.x, accel.y, accel.z),
elapsed.as_micros() as f32 / 1_000_000.0,
);

let q = Quat::from_euler_angles(euler.roll, euler.pitch, euler.roll);
FusedData { q }
}
}
2 changes: 1 addition & 1 deletion firmware/src/imu/fusion/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
//! TODO: Add fusion
pub mod dcm;