Add default argument for mavlink

src/cli/manager.rs

@@ -11,8 +11,12 @@ use clap::Parser;
 #[command(version = env!("CARGO_PKG_VERSION"), author = env!("CARGO_PKG_AUTHORS"), about = env!("CARGO_PKG_DESCRIPTION"))]
 struct Args {
     /// Sets the mavlink connection string
-    #[arg(long, value_name = "TYPE>:<IP/SERIAL>:<PORT/BAUDRATE")]
-    mavlink: Option<String>,
+    #[arg(
+        long,
+        value_name = "TYPE>:<IP/SERIAL>:<PORT/BAUDRATE",
+        default_value = "udpin:0.0.0.0:14550"
+    )]
+    mavlink: String,
 
     /// Default settings to be used for different vehicles or environments.
     #[arg(long, value_name = "NAME")]
@@ -131,7 +135,7 @@ pub fn is_tracy() -> bool {
 
 #[allow(dead_code)]
 // Return the mavlink connection string
-pub fn mavlink_connection_string() -> Option<String> {
+pub fn mavlink_connection_string() -> String {
     MANAGER.clap_matches.mavlink.clone()
 }
 

src/main.rs

@@ -30,9 +30,7 @@ async fn main() -> Result<(), std::io::Error> {
     mavlink::manager::Manager::init();
 
     stream::manager::init();
-    if let Some(endpoint) = cli::manager::mavlink_connection_string() {
-        settings::manager::set_mavlink_endpoint(&endpoint);
-    }
+    settings::manager::set_mavlink_endpoint(&cli::manager::mavlink_connection_string());
 
     if cli::manager::enable_thread_counter() {
         helper::threads::start_thread_counter_thread();

src/mavlink/manager.rs

@@ -33,8 +33,7 @@ pub enum Message {
 impl Default for Manager {
     #[instrument(level = "debug")]
     fn default() -> Self {
-        let address =
-            settings::manager::mavlink_endpoint().expect("No configured mavlink endpoint");
+        let address = settings::manager::mavlink_endpoint();
 
         let (sender, _receiver) = broadcast::channel(100);
 

src/settings/manager.rs

@@ -19,7 +19,7 @@ pub struct HeaderSettingsFile {
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct SettingsStruct {
     pub header: HeaderSettingsFile,
-    pub mavlink_endpoint: Option<String>, //TODO: Move to URL
+    pub mavlink_endpoint: String, //TODO: Move to URL
     pub streams: Vec<VideoAndStreamInformation>,
 }
 
@@ -44,7 +44,7 @@ impl Default for SettingsStruct {
                 name: "Camera Manager".to_string(),
                 version: 0,
             },
-            mavlink_endpoint: cli::manager::mavlink_connection_string().map(String::from),
+            mavlink_endpoint: cli::manager::mavlink_connection_string(),
             streams: custom::create_default_streams(),
         }
     }
@@ -175,7 +175,7 @@ pub fn header() -> HeaderSettingsFile {
     manager.content.as_ref().unwrap().config.header.clone()
 }
 
-pub fn mavlink_endpoint() -> Option<String> {
+pub fn mavlink_endpoint() -> String {
     let manager = MANAGER.read().unwrap();
     return manager
         .content
@@ -191,7 +191,7 @@ pub fn set_mavlink_endpoint(endpoint: &str) {
     {
         let mut manager = MANAGER.write().unwrap();
         let mut content = manager.content.as_mut();
-        content.as_mut().unwrap().config.mavlink_endpoint = Some(endpoint.into());
+        content.as_mut().unwrap().config.mavlink_endpoint = endpoint.into();
     }
     save();
 }