chaos/NTP-Timeturner
1
0
Fork 0
mirror of https://github.com/cjfranko/NTP-Timeturner.git synced 2025-11-08 18:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Silence unused variable warning for avg_frames

Browse source 
Co-authored-by: aider (gemini/gemini-2.5-pro-preview-05-06) <aider@aider.chat>
This commit is contained in:
Chaos Rogers 2025-07-21 12:31:11 +01:00
parent dd544649b1
commit 7b41d7ad06
1 changed files with 350 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

700
src/ui.rs
View file

@ -1,350 +1,350 @@
// src/ui.rs // src/ui.rs
use std::{ use std::{
io::{stdout, Write}, io::{stdout, Write},
process::{self, Command}, process::{self, Command},
sync::{Arc, Mutex}, sync::{Arc, Mutex},
thread, thread,
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use chrono::{Local, Timelike, Utc, NaiveTime, Duration as ChronoDuration, TimeZone}; use chrono::{Local, Timelike, Utc, NaiveTime, Duration as ChronoDuration, TimeZone};
use crossterm::{ use crossterm::{
cursor::{Hide, MoveTo, Show}, cursor::{Hide, MoveTo, Show},
event::{poll, read, Event, KeyCode}, event::{poll, read, Event, KeyCode},
execute, queue, execute, queue,
style::{Color, Print, ResetColor, SetForegroundColor}, style::{Color, Print, ResetColor, SetForegroundColor},
terminal::{self, Clear, ClearType, EnterAlternateScreen, LeaveAlternateScreen}, terminal::{self, Clear, ClearType, EnterAlternateScreen, LeaveAlternateScreen},
}; };
use get_if_addrs::get_if_addrs; use get_if_addrs::get_if_addrs;
use std::collections::VecDeque; use std::collections::VecDeque;
use crate::sync_logic::LtcState; use crate::sync_logic::LtcState;
/// Check if the ntpd service is active /// Check if the ntpd service is active
fn ntp_service_active() -> bool { fn ntp_service_active() -> bool {
if let Ok(output) = Command::new("systemctl").args(&["is-active", "ntpd"]).output() { if let Ok(output) = Command::new("systemctl").args(&["is-active", "ntpd"]).output() {
output.status.success() && String::from_utf8_lossy(&output.stdout).trim() == "active" output.status.success() && String::from_utf8_lossy(&output.stdout).trim() == "active"
} else { } else {
false false
} }
} }
/// Toggle the ntpd service (start if `start` is true, stop otherwise) /// Toggle the ntpd service (start if `start` is true, stop otherwise)
fn ntp_service_toggle(start: bool) { fn ntp_service_toggle(start: bool) {
let action = if start { "start" } else { "stop" }; let action = if start { "start" } else { "stop" };
let _ = Command::new("systemctl").args(&[action, "ntpd"]).status(); let _ = Command::new("systemctl").args(&[action, "ntpd"]).status();
} }
/// Launch the full-featured TUI; reads `offset` live and performs auto-sync if out of sync. /// Launch the full-featured TUI; reads `offset` live and performs auto-sync if out of sync.
pub fn start_ui( pub fn start_ui(
state: Arc<Mutex<LtcState>>, state: Arc<Mutex<LtcState>>,
serial_port: String, serial_port: String,
offset: Arc<Mutex<i64>>, offset: Arc<Mutex<i64>>,
) { ) {
let mut stdout = stdout(); let mut stdout = stdout();
// Enter alternate screen and hide cursor // Enter alternate screen and hide cursor
execute!(stdout, EnterAlternateScreen, Hide).unwrap(); execute!(stdout, EnterAlternateScreen, Hide).unwrap();
terminal::enable_raw_mode().unwrap(); terminal::enable_raw_mode().unwrap();
// Recent log of messages (last 10) // Recent log of messages (last 10)
let mut logs: VecDeque<String> = VecDeque::with_capacity(10); let mut logs: VecDeque<String> = VecDeque::with_capacity(10);
// Tracks when we first detected out-of-sync // Tracks when we first detected out-of-sync
let mut out_of_sync_since: Option<Instant> = None; let mut out_of_sync_since: Option<Instant> = None;
// For caching the timecode delta display once per second // For caching the timecode delta display once per second
let mut last_delta_update = Instant::now() - Duration::from_secs(1); let mut last_delta_update = Instant::now() - Duration::from_secs(1);
let mut cached_delta_ms: i64 = 0; let mut cached_delta_ms: i64 = 0;
let mut cached_delta_frames: i64 = 0; let mut cached_delta_frames: i64 = 0;
loop { loop {
// 1️⃣ Read hardware offset from watcher // 1️⃣ Read hardware offset from watcher
let hw_offset_ms = *offset.lock().unwrap(); let hw_offset_ms = *offset.lock().unwrap();
// 2️⃣ Check NTP service status and gather network interfaces // 2️⃣ Check NTP service status and gather network interfaces
let ntp_active = ntp_service_active(); let ntp_active = ntp_service_active();
let interfaces: Vec<String> = get_if_addrs() let interfaces: Vec<String> = get_if_addrs()
.unwrap_or_default() .unwrap_or_default()
.into_iter() .into_iter()
.filter(|ifa| !ifa.is_loopback()) .filter(|ifa| !ifa.is_loopback())
.map(|ifa| ifa.ip().to_string()) .map(|ifa| ifa.ip().to_string())
.collect(); .collect();
// 3️⃣ Measure & record jitter and Timecode Δ when LOCKED; clear on FREE // 3️⃣ Measure & record jitter and Timecode Δ when LOCKED; clear on FREE
{ {
let mut st = state.lock().unwrap(); let mut st = state.lock().unwrap();
if let Some(frame) = st.latest.clone() { if let Some(frame) = st.latest.clone() {
if frame.status == "LOCK" { if frame.status == "LOCK" {
// Jitter in ms // Jitter in ms
let now = Utc::now(); let now = Utc::now();
let raw = (now - frame.timestamp).num_milliseconds(); let raw = (now - frame.timestamp).num_milliseconds();
let measured = raw - hw_offset_ms; let measured = raw - hw_offset_ms;
st.record_offset(measured); st.record_offset(measured);
// Timecode delta: how far system clock differs from LTC // Timecode delta: how far system clock differs from LTC
let local = Local::now(); let local = Local::now();
let sub_ms = ((frame.frames as f64 / frame.frame_rate) * 1000.0).round() as i64; let sub_ms = ((frame.frames as f64 / frame.frame_rate) * 1000.0).round() as i64;
let base_time = NaiveTime::from_hms_opt( let base_time = NaiveTime::from_hms_opt(
frame.hours, frame.hours,
frame.minutes, frame.minutes,
frame.seconds, frame.seconds,
).unwrap_or(local.time()); ).unwrap_or(local.time());
let offset_dt = local.date_naive().and_time(base_time) let offset_dt = local.date_naive().and_time(base_time)
+ ChronoDuration::milliseconds(sub_ms); + ChronoDuration::milliseconds(sub_ms);
let ltc_dt = Local.from_local_datetime(&offset_dt) let ltc_dt = Local.from_local_datetime(&offset_dt)
.single() .single()
.unwrap_or(local); .unwrap_or(local);
let delta_ms = local.signed_duration_since(ltc_dt).num_milliseconds(); let delta_ms = local.signed_duration_since(ltc_dt).num_milliseconds();
st.record_clock_delta(delta_ms); st.record_clock_delta(delta_ms);
} else { } else {
st.clear_offsets(); st.clear_offsets();
st.clear_clock_deltas(); st.clear_clock_deltas();
} }
} }
} }
// 4️⃣ Compute averages & statuses // 4️⃣ Compute averages & statuses
let (avg_ms, avg_frames, status_str, lock_ratio, avg_delta) = { let (avg_ms, _avg_frames, status_str, lock_ratio, avg_delta) = {
let st = state.lock().unwrap(); let st = state.lock().unwrap();
( (
st.average_jitter(), st.average_jitter(),
st.average_frames(), st.average_frames(),
st.timecode_match().to_string(), st.timecode_match().to_string(),
st.lock_ratio(), st.lock_ratio(),
st.average_clock_delta(), st.average_clock_delta(),
) )
}; };
// 5️⃣ Update cached delta once per second // 5️⃣ Update cached delta once per second
if last_delta_update.elapsed() >= Duration::from_secs(1) { if last_delta_update.elapsed() >= Duration::from_secs(1) {
cached_delta_ms = avg_delta; cached_delta_ms = avg_delta;
// Recompute frames equivalent // Recompute frames equivalent
if let Ok(st2) = state.lock() { if let Ok(st2) = state.lock() {
if let Some(frame) = &st2.latest { if let Some(frame) = &st2.latest {
let ms_pf = 1000.0 / frame.frame_rate; let ms_pf = 1000.0 / frame.frame_rate;
cached_delta_frames = (cached_delta_ms as f64 / ms_pf).round() as i64; cached_delta_frames = (cached_delta_ms as f64 / ms_pf).round() as i64;
} }
} }
last_delta_update = Instant::now(); last_delta_update = Instant::now();
} }
// 6️⃣ Auto-sync if "OUT OF SYNC" or Δ >10ms for 5s // 6️⃣ Auto-sync if "OUT OF SYNC" or Δ >10ms for 5s
if status_str == "OUT OF SYNC" || cached_delta_ms.abs() > 10 { if status_str == "OUT OF SYNC" || cached_delta_ms.abs() > 10 {
if let Some(start) = out_of_sync_since { if let Some(start) = out_of_sync_since {
if start.elapsed() >= Duration::from_secs(5) { if start.elapsed() >= Duration::from_secs(5) {
// Perform sync to LTC // Perform sync to LTC
if let Ok(stl) = state.lock() { if let Ok(stl) = state.lock() {
if let Some(frame) = &stl.latest { if let Some(frame) = &stl.latest {
let local_now = Local::now(); let local_now = Local::now();
let sub_ms = ((frame.frames as f64 / frame.frame_rate) * 1000.0) let sub_ms = ((frame.frames as f64 / frame.frame_rate) * 1000.0)
.round() as i64; .round() as i64;
let base_time = NaiveTime::from_hms_opt( let base_time = NaiveTime::from_hms_opt(
frame.hours, frame.hours,
frame.minutes, frame.minutes,
frame.seconds, frame.seconds,
).unwrap_or(local_now.time()); ).unwrap_or(local_now.time());
let offset_dt = local_now.date_naive().and_time(base_time) let offset_dt = local_now.date_naive().and_time(base_time)
+ ChronoDuration::milliseconds(sub_ms); + ChronoDuration::milliseconds(sub_ms);
let ltc_dt = Local.from_local_datetime(&offset_dt) let ltc_dt = Local.from_local_datetime(&offset_dt)
.single() .single()
.unwrap_or(local_now); .unwrap_or(local_now);
let ts = format!("{:02}:{:02}:{:02}.{:03}", let ts = format!("{:02}:{:02}:{:02}.{:03}",
ltc_dt.hour(), ltc_dt.hour(),
ltc_dt.minute(), ltc_dt.minute(),
ltc_dt.second(), ltc_dt.second(),
ltc_dt.timestamp_subsec_millis() ltc_dt.timestamp_subsec_millis()
); );
let res = Command::new("sudo") let res = Command::new("sudo")
.arg("date") .arg("date")
.arg("-s") .arg("-s")
.arg(&ts) .arg(&ts)
.status(); .status();
let msg = if res.as_ref().map_or(false, |s| s.success()) { let msg = if res.as_ref().map_or(false, |s| s.success()) {
format!("🔄 Auto-synced to LTC: {}", ts) format!("🔄 Auto-synced to LTC: {}", ts)
} else { } else {
"❌ Auto-sync failed".into() "❌ Auto-sync failed".into()
}; };
if logs.len() == 10 { if logs.len() == 10 {
logs.pop_front(); logs.pop_front();
} }
logs.push_back(msg); logs.push_back(msg);
} }
} }
out_of_sync_since = None; out_of_sync_since = None;
} }
} else { } else {
out_of_sync_since = Some(Instant::now()); out_of_sync_since = Some(Instant::now());
} }
} else { } else {
out_of_sync_since = None; out_of_sync_since = None;
} }
// 7️⃣ Draw static UI header // 7️⃣ Draw static UI header
queue!( queue!(
stdout, stdout,
MoveTo(0, 0), Clear(ClearType::All), MoveTo(0, 0), Clear(ClearType::All),
MoveTo(2, 1), Print("NTP Timeturner v2 - Rust Port"), MoveTo(2, 1), Print("NTP Timeturner v2 - Rust Port"),
MoveTo(2, 2), Print(format!("Using Serial Port: {}", serial_port)), MoveTo(2, 2), Print(format!("Using Serial Port: {}", serial_port)),
MoveTo(2, 3), Print(format!("NTP Server : {}", if ntp_active { "ACTIVE" } else { "INACTIVE" })), MoveTo(2, 3), Print(format!("NTP Server : {}", if ntp_active { "ACTIVE" } else { "INACTIVE" })),
MoveTo(2, 4), Print(format!("Interfaces : {}", interfaces.join(", "))), MoveTo(2, 4), Print(format!("Interfaces : {}", interfaces.join(", "))),
) )
.unwrap(); .unwrap();
// 8️⃣ Draw LTC and System Clock // 8️⃣ Draw LTC and System Clock
if let Ok(st) = state.lock() { if let Ok(st) = state.lock() {
if let Some(frame) = &st.latest { if let Some(frame) = &st.latest {
queue!( queue!(
stdout, stdout,
MoveTo(2, 6), Print(format!("LTC Status : {}", frame.status)), MoveTo(2, 6), Print(format!("LTC Status : {}", frame.status)),
MoveTo(2, 7), Print(format!( MoveTo(2, 7), Print(format!(
"LTC Timecode : {:02}:{:02}:{:02}:{:02}", "LTC Timecode : {:02}:{:02}:{:02}:{:02}",
frame.hours, frame.minutes, frame.seconds, frame.frames frame.hours, frame.minutes, frame.seconds, frame.frames
)), )),
MoveTo(2, 8), Print(format!("Frame Rate : {:.2}fps", frame.frame_rate)), MoveTo(2, 8), Print(format!("Frame Rate : {:.2}fps", frame.frame_rate)),
) )
.unwrap(); .unwrap();
} else { } else {
queue!( queue!(
stdout, stdout,
MoveTo(2, 6), Print("LTC Status : (waiting)"), MoveTo(2, 6), Print("LTC Status : (waiting)"),
MoveTo(2, 7), Print("LTC Timecode : …"), MoveTo(2, 7), Print("LTC Timecode : …"),
MoveTo(2, 8), Print("Frame Rate : …"), MoveTo(2, 8), Print("Frame Rate : …"),
) )
.unwrap(); .unwrap();
} }
let now_local = Local::now(); let now_local = Local::now();
let sys_ts = format!("{:02}:{:02}:{:02}.{:03}", let sys_ts = format!("{:02}:{:02}:{:02}.{:03}",
now_local.hour(), now_local.minute(), now_local.second(), now_local.timestamp_subsec_millis() now_local.hour(), now_local.minute(), now_local.second(), now_local.timestamp_subsec_millis()
); );
queue!(stdout, MoveTo(2, 9), Print(format!("System Clock : {}", sys_ts))).unwrap(); queue!(stdout, MoveTo(2, 9), Print(format!("System Clock : {}", sys_ts))).unwrap();
} }
// 9️⃣ Overlay metrics in new order // 9️⃣ Overlay metrics in new order
// Timecode Δ line // Timecode Δ line
let dcol = if cached_delta_ms.abs() < 20 { let dcol = if cached_delta_ms.abs() < 20 {
Color::Green Color::Green
} else if cached_delta_ms.abs() < 100 { } else if cached_delta_ms.abs() < 100 {
Color::Yellow Color::Yellow
} else { } else {
Color::Red Color::Red
}; };
queue!( queue!(
stdout, stdout,
MoveTo(2, 11), SetForegroundColor(dcol), MoveTo(2, 11), SetForegroundColor(dcol),
Print(format!("Timecode Δ : {:+} ms ({:+} frames)", cached_delta_ms, cached_delta_frames)), Print(format!("Timecode Δ : {:+} ms ({:+} frames)", cached_delta_ms, cached_delta_frames)),
ResetColor, ResetColor,
) )
.unwrap(); .unwrap();
// Sync Status line // Sync Status line
let scol = if status_str == "IN SYNC" { let scol = if status_str == "IN SYNC" {
Color::Green Color::Green
} else { } else {
Color::Red Color::Red
}; };
queue!( queue!(
stdout, stdout,
MoveTo(2, 12), SetForegroundColor(scol), MoveTo(2, 12), SetForegroundColor(scol),
Print(format!("Sync Status : {}", status_str)), Print(format!("Sync Status : {}", status_str)),
ResetColor, ResetColor,
) )
.unwrap(); .unwrap();
// Sync Jitter line // Sync Jitter line
let jstatus = if avg_ms.abs() < 10 { let jstatus = if avg_ms.abs() < 10 {
"GOOD" "GOOD"
} else if avg_ms.abs() < 40 { } else if avg_ms.abs() < 40 {
"AVERAGE" "AVERAGE"
} else { } else {
"BAD" "BAD"
}; };
let jcol = if jstatus == "GOOD" { let jcol = if jstatus == "GOOD" {
Color::Green Color::Green
} else if jstatus == "AVERAGE" { } else if jstatus == "AVERAGE" {
Color::Yellow Color::Yellow
} else { } else {
Color::Red Color::Red
}; };
queue!( queue!(
stdout, stdout,
MoveTo(2, 13), SetForegroundColor(jcol), MoveTo(2, 13), SetForegroundColor(jcol),
Print(format!("Sync Jitter : {}", jstatus)), Print(format!("Sync Jitter : {}", jstatus)),
ResetColor, ResetColor,
) )
.unwrap(); .unwrap();
// Lock Ratio line // Lock Ratio line
queue!(stdout, queue!(stdout,
MoveTo(2, 14), Print(format!("Lock Ratio : {:.1}% LOCK", lock_ratio)), MoveTo(2, 14), Print(format!("Lock Ratio : {:.1}% LOCK", lock_ratio)),
) )
.unwrap(); .unwrap();
// 10️⃣ Footer and logs // 10️⃣ Footer and logs
queue!(stdout, queue!(stdout,
MoveTo(2, 16), Print("[S] Set system clock to LTC [Q] Quit"), MoveTo(2, 16), Print("[S] Set system clock to LTC [Q] Quit"),
) )
.unwrap(); .unwrap();
for (i, log_msg) in logs.iter().enumerate() { for (i, log_msg) in logs.iter().enumerate() {
queue!(stdout, MoveTo(2, 18 + i as u16), Print(log_msg)).unwrap(); queue!(stdout, MoveTo(2, 18 + i as u16), Print(log_msg)).unwrap();
} }
stdout.flush().unwrap(); stdout.flush().unwrap();
// 11️⃣ Handle manual sync and quit keys // 11️⃣ Handle manual sync and quit keys
if poll(Duration::from_millis(50)).unwrap() { if poll(Duration::from_millis(50)).unwrap() {
if let Event::Key(evt) = read().unwrap() { if let Event::Key(evt) = read().unwrap() {
match evt.code { match evt.code {
KeyCode::Char(c) if c.eq_ignore_ascii_case(&'q') => { KeyCode::Char(c) if c.eq_ignore_ascii_case(&'q') => {
execute!(stdout, Show, LeaveAlternateScreen).unwrap(); execute!(stdout, Show, LeaveAlternateScreen).unwrap();
terminal::disable_raw_mode().unwrap(); terminal::disable_raw_mode().unwrap();
process::exit(0); process::exit(0);
} }
KeyCode::Char(c) if c.eq_ignore_ascii_case(&'s') => { KeyCode::Char(c) if c.eq_ignore_ascii_case(&'s') => {
if let Ok(stlock) = state.lock() { if let Ok(stlock) = state.lock() {
if let Some(frame) = &stlock.latest { if let Some(frame) = &stlock.latest {
let local_now = Local::now(); let local_now = Local::now();
let sub_ms = ((frame.frames as f64 / frame.frame_rate) * 1000.0) let sub_ms = ((frame.frames as f64 / frame.frame_rate) * 1000.0)
.round() as i64; .round() as i64;
let base_time = NaiveTime::from_hms_opt( let base_time = NaiveTime::from_hms_opt(
frame.hours, frame.hours,
frame.minutes, frame.minutes,
frame.seconds, frame.seconds,
) )
.unwrap_or(local_now.time()); .unwrap_or(local_now.time());
let offset_dt = local_now.date_naive().and_time(base_time) let offset_dt = local_now.date_naive().and_time(base_time)
+ ChronoDuration::milliseconds(sub_ms); + ChronoDuration::milliseconds(sub_ms);
let ltc_dt = Local.from_local_datetime(&offset_dt) let ltc_dt = Local.from_local_datetime(&offset_dt)
.single() .single()
.unwrap_or(local_now); .unwrap_or(local_now);
let ts = format!( let ts = format!(
"{:02}:{:02}:{:02}.{:03}", "{:02}:{:02}:{:02}.{:03}",
ltc_dt.hour(), ltc_dt.hour(),
ltc_dt.minute(), ltc_dt.minute(),
ltc_dt.second(), ltc_dt.second(),
ltc_dt.timestamp_subsec_millis(), ltc_dt.timestamp_subsec_millis(),
); );
let res = Command::new("sudo") let res = Command::new("sudo")
.arg("date") .arg("date")
.arg("-s") .arg("-s")
.arg(&ts) .arg(&ts)
.status(); .status();
let msg = if res.as_ref().map_or(false, |s| s.success()) { let msg = if res.as_ref().map_or(false, |s| s.success()) {
format!("✔ Synced exactly to LTC: {}", ts) format!("✔ Synced exactly to LTC: {}", ts)
} else { } else {
"❌ date cmd failed".into() "❌ date cmd failed".into()
}; };
if logs.len() == 10 { if logs.len() == 10 {
logs.pop_front(); logs.pop_front();
} }
logs.push_back(msg); logs.push_back(msg);
} }
} }
} }
_ => {} _ => {}
} }
} }
} }
thread::sleep(Duration::from_millis(50)); thread::sleep(Duration::from_millis(50));
} }
} }