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

double check upload of tested version

Browse source
This commit is contained in:
Chris Frankland-Wright 2025-07-19 12:29:10 +01:00 • committed by GitHub
parent bd2111d77a
commit a47a0e6bd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 555 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

162
src/main.rs
View file

@ -1,81 +1,81 @@
// src/main.rs
mod config;
mod sync_logic;
mod serial_input;
mod ui;
use crate::config::watch_config;
use crate::sync_logic::LtcState;
use crate::serial_input::start_serial_thread;
use crate::ui::start_ui;
use std::{
fs,
path::Path,
sync::{Arc, Mutex, mpsc},
thread,
};
/// Embed the default config.json at compile time.
const DEFAULT_CONFIG: &str = include_str!("../config.json");
/// If no `config.json` exists alongside the binary, write out the default.
fn ensure_config() {
let p = Path::new("config.json");
if !p.exists() {
fs::write(p, DEFAULT_CONFIG)
.expect("Failed to write default config.json");
eprintln!("⚙️ Emitted default config.json");
}
}
fn main() {
// 🔄 Ensure there's always a config.json present
ensure_config();
// 1️⃣ Start watching config.json for changes
let hw_offset = watch_config("config.json");
println!("🔧 Watching config.json (hardware_offset_ms)...");
// 2️⃣ Channel for raw LTC frames
let (tx, rx) = mpsc::channel();
println!("✅ Channel created");
// 3️⃣ Shared state for UI and serial reader
let ltc_state = Arc::new(Mutex::new(LtcState::new()));
println!("✅ State initialised");
// 4️⃣ Spawn the serial reader thread (no offset here)
{
let tx_clone = tx.clone();
let state_clone = ltc_state.clone();
thread::spawn(move || {
println!("🚀 Serial thread launched");
start_serial_thread(
"/dev/ttyACM0",
115200,
tx_clone,
state_clone,
0, // ignored in serial path
);
});
}
// 5️⃣ Spawn the UI renderer thread, passing the live offset Arc
{
let ui_state = ltc_state.clone();
let offset_clone = hw_offset.clone();
let port = "/dev/ttyACM0".to_string();
thread::spawn(move || {
println!("🖥️ UI thread launched");
start_ui(ui_state, port, offset_clone);
});
}
// 6️⃣ Keep main thread alive
println!("📡 Main thread entering loop...");
for _frame in rx {
// no-op
}
}
// src/main.rs
mod config;
mod sync_logic;
mod serial_input;
mod ui;
use crate::config::watch_config;
use crate::sync_logic::LtcState;
use crate::serial_input::start_serial_thread;
use crate::ui::start_ui;
use std::{
fs,
path::Path,
sync::{Arc, Mutex, mpsc},
thread,
};
/// Embed the default config.json at compile time.
const DEFAULT_CONFIG: &str = include_str!("../config.json");
/// If no `config.json` exists alongside the binary, write out the default.
fn ensure_config() {
let p = Path::new("config.json");
if !p.exists() {
fs::write(p, DEFAULT_CONFIG)
.expect("Failed to write default config.json");
eprintln!("⚙️ Emitted default config.json");
}
}
fn main() {
// 🔄 Ensure there's always a config.json present
ensure_config();
// 1️⃣ Start watching config.json for changes
let hw_offset = watch_config("config.json");
println!("🔧 Watching config.json (hardware_offset_ms)...");
// 2️⃣ Channel for raw LTC frames
let (tx, rx) = mpsc::channel();
println!("✅ Channel created");
// 3️⃣ Shared state for UI and serial reader
let ltc_state = Arc::new(Mutex::new(LtcState::new()));
println!("✅ State initialised");
// 4️⃣ Spawn the serial reader thread (no offset here)
{
let tx_clone = tx.clone();
let state_clone = ltc_state.clone();
thread::spawn(move || {
println!("🚀 Serial thread launched");
start_serial_thread(
"/dev/ttyACM0",
115200,
tx_clone,
state_clone,
0, // ignored in serial path
);
});
}
// 5️⃣ Spawn the UI renderer thread, passing the live offset Arc
{
let ui_state = ltc_state.clone();
let offset_clone = hw_offset.clone();
let port = "/dev/ttyACM0".to_string();
thread::spawn(move || {
println!("🖥️ UI thread launched");
start_ui(ui_state, port, offset_clone);
});
}
// 6️⃣ Keep main thread alive
println!("📡 Main thread entering loop...");
for _frame in rx {
// no-op
}
}