From 059263d7eaa8c9594ff5a2a64540f5c19a798091 Mon Sep 17 00:00:00 2001
From: Vladan Popovic <vladanovic@gmail.com>
Date: Sun, 5 Mar 2023 00:01:37 +0100
Subject: [PATCH] pass mqtt host/port in loop

---
 src/main.rs  | 4 ++--
 src/modem.rs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 6b6f78e..e770785 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,7 +36,7 @@ fn main() -> anyhow::Result<()> {
     //let accel_sender = gps_sender.clone();
 
     //let _ = gps::main(gps_tx, gps_rx, gps_uart, gps_sender)?;
-    threads.push(thread::spawn(move || gps::main(gps_tx, gps_rx, gps_uart, gps_sender)));
+    threads.push(thread::spawn(move || gps::main(gps_tx, gps_rx, gps_uart, gps_sender.clone())));
     thread::sleep(Duration::from_millis(1000));
     //threads.push(thread::spawn(move || accel::main(accel_sender)));
 
@@ -83,7 +83,7 @@ fn main() -> anyhow::Result<()> {
         let _ = mdm.echo(false).unwrap_or(());
         println!("resetting modem ... ");
         println!("======================= MODEM =======================");
-        let _ = mdm.start_sending(mqtt_username, mqtt_password).unwrap_or(());
+        let _ = mdm.mqtt_send_position_loop("51.158.66.64", 7887, mqtt_username, mqtt_password).unwrap_or(());
         let _ = mdm.tcp_close_connection().unwrap_or(());
         thread::sleep(Duration::from_millis(1500));
     }
diff --git a/src/modem.rs b/src/modem.rs
index 41d95ec..953fc1d 100644
--- a/src/modem.rs
+++ b/src/modem.rs
@@ -518,7 +518,7 @@ impl<UART: serial::Uart, PWK: OutputPin, RST: OutputPin, PW: OutputPin> Modem<UA
         Ok(())
     }
 
-    pub fn start_sending(&mut self, mqtt_username: &str, mqtt_password: &str) -> anyhow::Result<()> {
+    pub fn mqtt_send_position_loop(&mut self, host: &str, port: u16, username: &str, password: &str) -> anyhow::Result<()> {
         if !self.is_gprs_attached()? {
             let _ = self.gprs_attach_ap(crate::config::MTS)?;
             let _ = self.try_connect_gprs()?;
@@ -531,14 +531,14 @@ impl<UART: serial::Uart, PWK: OutputPin, RST: OutputPin, PW: OutputPin> Modem<UA
         let _ = self.send("AT+CIPRXGET=1", "OK");
 
         for _ in 0..5 {
-            if let Ok(_) = self.tcp_connect("51.158.66.64", 7887) {
+            if let Ok(_) = self.tcp_connect(host, port) {
                 break
             }
         }
 
         let device_id = "c36a72df-5bd6-4f9b-995d-059433bc3267";
-        println!("connecting to MQTT with ({}:{})", mqtt_username, mqtt_password);
-        let _ = self.mqtt_connect(device_id, mqtt_username, mqtt_password)?;
+        println!("connecting to MQTT with ({}:{})", username, password);
+        let _ = self.mqtt_connect(device_id, username, password)?;
 
         println!("entering queue receive loop ...");
         let mut err_count = 0;