sebastian
/
cheapsdo2.0
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Switched protocol to u64 for frequencies
/ audit (push) Successful in 20s Details
/ build-firmware (push) Successful in 44s Details
/ build-linux (push) Successful in 2m59s Details
/ build-windows (push) Successful in 1m43s Details
/ build-appimage (push) Successful in 3m36s Details

This commit is contained in:
Sebastian 2024-01-21 16:50:38 +01:00
parent d90ac1ec00
commit be45b12b5a
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/src/main.rs
View File

@ -337,8 +337,8 @@ mod app {
defmt::info!("short_avg:\t{} mHz", short_avg);
cx.shared.device_status.lock(|device_status| {
device_status.measured_frequency = (freq as f64) / 1_000_000_000.0;
device_status.average_frequency = (short_avg as f64) / 1_000_000_000.0;
device_status.measured_frequency = freq;
device_status.average_frequency = short_avg;
device_status.pwm = cur_pwm as u16;
});

18
hostsoftware/src/main.rs
View File

@ -76,8 +76,14 @@ impl eframe::App for CheapsdoControl {
match data {
Ok(SerialPortData::DeviceState(status_msg)) => {
self.device_state = status_msg.clone();
self.average_points.push([self.average_points.len() as f64, status_msg.average_frequency]);
self.pwm_points.push([self.pwm_points.len() as f64, status_msg.pwm as f64]);
self.average_points.push([
self.average_points.len() as f64,
status_msg.average_frequency as f64 / 1_000_000_000.0
]);
self.pwm_points.push([
self.pwm_points.len() as f64,
status_msg.pwm as f64
]);
},
Err(_) => break,
};
@ -143,7 +149,9 @@ impl eframe::App for CheapsdoControl {
ui.label(
egui::RichText::new(format!(
"Measured: {}",
formatters::frequency(self.device_state.measured_frequency)
formatters::frequency(
self.device_state.measured_frequency as f64 / 1_000_000_000.0
)
))
.family(egui::FontFamily::Monospace)
.size(20.0),
@ -154,7 +162,9 @@ impl eframe::App for CheapsdoControl {
ui.label(
egui::RichText::new(format!(
"Average: {}",
formatters::frequency(self.device_state.average_frequency)
formatters::frequency(
self.device_state.average_frequency as f64 / 1_000_000_000.0
)
))
.family(egui::FontFamily::Monospace)
.size(20.0),

8
protocol/src/lib.rs
View File

@ -15,16 +15,16 @@ pub enum HostMessage {
#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
pub struct StatusMessage {
pub measured_frequency: f64,
pub average_frequency: f64,
pub measured_frequency: u64,
pub average_frequency: u64,
pub pwm: u16,
}
impl Default for StatusMessage {
fn default() -> Self {
Self {
measured_frequency: 0.0f64,
average_frequency: 0.0f64,
measured_frequency: 0u64,
average_frequency: 0u64,
pwm: 0u16,
}
}