X-Git-Url: https://code.octet-stream.net/m17rt/blobdiff_plain/608ca7e33ab51d812607ddcc3429bfa9aa3c34b0..16aaa4ac98d3719986e49623483c7f17306a4f95:/tools/m17rt-mod/src/main.rs diff --git a/tools/m17rt-mod/src/main.rs b/tools/m17rt-mod/src/main.rs index 3bd6727..104d83e 100644 --- a/tools/m17rt-mod/src/main.rs +++ b/tools/m17rt-mod/src/main.rs @@ -2,17 +2,22 @@ use m17app::app::M17App; use m17app::link_setup::M17Address; use m17app::serial::{PttPin, SerialPtt}; use m17app::soundcard::Soundcard; -use m17app::soundmodem::Soundmodem; +use m17app::soundmodem::{NullErrorHandler, Soundmodem}; use m17codec2::WavePlayer; use std::path::PathBuf; pub fn mod_test() { let soundcard = Soundcard::new("plughw:CARD=Device,DEV=0").unwrap(); soundcard.set_tx_inverted(true); - let ptt = SerialPtt::new("/dev/ttyUSB0", PttPin::Rts); - let soundmodem = Soundmodem::new(soundcard.input(), soundcard.output(), ptt); + let ptt = SerialPtt::new("/dev/ttyUSB0", PttPin::Rts).unwrap(); + let soundmodem = Soundmodem::new( + soundcard.input(), + soundcard.output(), + ptt, + NullErrorHandler::new(), + ); let app = M17App::new(soundmodem); - app.start(); + app.start().unwrap(); std::thread::sleep(std::time::Duration::from_secs(1)); println!("Beginning playback..."); WavePlayer::play( @@ -24,10 +29,12 @@ pub fn mod_test() { ); println!("Playback complete."); std::thread::sleep(std::time::Duration::from_secs(1)); - app.close(); + app.close().unwrap(); } fn main() { - env_logger::init(); + env_logger::builder() + .format_timestamp(Some(env_logger::TimestampPrecision::Millis)) + .init(); mod_test(); }