Simplify adapter lifecycle and introduce a lot of error propagation

[m17rt] / tools / m17rt-txpacket / src / main.rs

diff --git a/tools/m17rt-txpacket/src/main.rs b/tools/m17rt-txpacket/src/main.rs
index 916edf2f8773600678148457507d476dd670824b..37f86d953a96801deccb31da2b0614d40d1d57e4 100644 (file)
--- a/tools/m17rt-txpacket/src/main.rs
+++ b/tools/m17rt-txpacket/src/main.rs
@@ -12,7 +12,7 @@ fn main() {
     let soundmodem = Soundmodem::new(soundcard.input(), soundcard.output(), ptt);
     let app = M17App::new(soundmodem);
 
     let soundmodem = Soundmodem::new(soundcard.input(), soundcard.output(), ptt);
     let app = M17App::new(soundmodem);
 

-    app.start();
+    app.start().unwrap();

 
     println!("Transmitting packet...");
     let source = M17Address::from_callsign("VK7XT-1").unwrap();
 
     println!("Transmitting packet...");
     let source = M17Address::from_callsign("VK7XT-1").unwrap();


@@ -20,8 +20,9 @@ fn main() {
     let link_setup = LinkSetup::new_packet(&source, &destination);
     let payload = b"Hello, world!";
     app.tx()
     let link_setup = LinkSetup::new_packet(&source, &destination);
     let payload = b"Hello, world!";
     app.tx()

-        .transmit_packet(&link_setup, PacketType::Sms, payload);
+        .transmit_packet(&link_setup, PacketType::Sms, payload)
+        .unwrap();

 
     std::thread::sleep(std::time::Duration::from_secs(1));
 
     std::thread::sleep(std::time::Duration::from_secs(1));

-    app.close();
+    app.close().unwrap();

 }
 }