Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resync with forks and cleanup #6

Merged
merged 4 commits into from
Oct 26, 2024
Merged

Resync with forks and cleanup #6

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4ff30e
Fix temperature board
NoahSprenger Oct 26, 2024
6c73f7e
Fix and sync with forks.
NoahSprenger Oct 26, 2024
37316ba
Fix test harness on common-arm lib.
NoahSprenger Oct 26, 2024
eaed1c4
Update Cargo.toml
NoahSprenger Oct 26, 2024
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
92 changes: 46 additions & 46 deletions Cargo.lock
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ members = ["boards/*", "examples/*", "crates/*"]
default-members = ["boards/*", "examples/*"]

[workspace.dependencies.stm32h7xx-hal]
version = "0.16.0"
git = "https://github.com/uorocketry/stm32h7xx-hal"
# We use 35 even though we have the 33.
features = ["defmt", "rt", "stm32h735", "can", "rtc"]

Expand Down Expand Up @@ -58,7 +58,8 @@ version = "0.2"
version = "0.4"

[workspace.dependencies.chrono]
version = "0.4.0"
#version = "0.4.0"
NoahSprenger marked this conversation as resolved.
Show resolved Hide resolved
git = "https://github.com/uorocketry/chrono"
default-features = false

[workspace.dependencies.heapless]
Expand Down
78 changes: 40 additions & 38 deletions boards/pressure/src/data_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,44 +114,46 @@ impl DataManager {
pub fn handle_data(&mut self, data: Message) {
match data.data {
messages::Data::Sensor(ref sensor) => match sensor.data {
messages::sensor::SensorData::EkfNavAcc(_) => {
self.ekf_nav_acc = Some(data);
}
messages::sensor::SensorData::GpsPosAcc(_) => {
self.gps_pos_acc = Some(data);
}
messages::sensor::SensorData::Air(_) => {
self.air = Some(data);
}
messages::sensor::SensorData::EkfNav1(_) => {
self.ekf_nav_1 = Some(data);
}
messages::sensor::SensorData::EkfNav2(_) => {
self.ekf_nav_2 = Some(data);
}
messages::sensor::SensorData::EkfQuat(_) => {
self.ekf_quat = Some(data);
}
messages::sensor::SensorData::GpsVel(_) => {
self.gps_vel = Some(data);
}
messages::sensor::SensorData::GpsVelAcc(_) => {
self.gps_vel_acc = Some(data);
}
messages::sensor::SensorData::Imu1(_) => {
self.imu_1 = Some(data);
}
messages::sensor::SensorData::Imu2(_) => {
self.imu_2 = Some(data);
}
messages::sensor::SensorData::UtcTime(_) => {
self.utc_time = Some(data);
}
messages::sensor::SensorData::GpsPos1(_) => {
self.gps_pos_1 = Some(data);
}
messages::sensor::SensorData::GpsPos2(_) => {
self.gps_pos_2 = Some(data);
messages::sensor::SensorData::SbgData(ref sbg_data) => match sbg_data{
messages::sensor::SbgData::EkfNavAcc(_) => {
self.ekf_nav_acc = Some(data);
}
messages::sensor::SbgData::GpsPosAcc(_) => {
self.gps_pos_acc = Some(data);
}
messages::sensor::SbgData::Air(_) => {
self.air = Some(data);
}
messages::sensor::SbgData::EkfNav1(_) => {
self.ekf_nav_1 = Some(data);
}
messages::sensor::SbgData::EkfNav2(_) => {
self.ekf_nav_2 = Some(data);
}
messages::sensor::SbgData::EkfQuat(_) => {
self.ekf_quat = Some(data);
}
messages::sensor::SbgData::GpsVel(_) => {
self.gps_vel = Some(data);
}
messages::sensor::SbgData::GpsVelAcc(_) => {
self.gps_vel_acc = Some(data);
}
messages::sensor::SbgData::Imu1(_) => {
self.imu_1 = Some(data);
}
messages::sensor::SbgData::Imu2(_) => {
self.imu_2 = Some(data);
}
messages::sensor::SbgData::UtcTime(_) => {
self.utc_time = Some(data);
}
messages::sensor::SbgData::GpsPos1(_) => {
self.gps_pos_1 = Some(data);
}
messages::sensor::SbgData::GpsPos2(_) => {
self.gps_pos_2 = Some(data);
}
}
messages::sensor::SensorData::RecoverySensing(_) => {
self.recovery_sensing = Some(data);
Expand Down
Loading
Loading