From 3c6ce1ffa6ee4d1a60567f45300fcf8832f9a0ff Mon Sep 17 00:00:00 2001
From: irriden <irriden@proton.me>
Date: Thu, 3 Aug 2023 23:55:08 +0000
Subject: [PATCH] sphinx-key: delete standalone heartbeat loop

just pulse the hearbeat everytime expected_sequence % 40 == 0
---
 sphinx-key/src/core/events.rs | 11 ++++++-----
 sphinx-key/src/main.rs        |  6 ------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/sphinx-key/src/core/events.rs b/sphinx-key/src/core/events.rs
index 0307dc9..6cb1055 100644
--- a/sphinx-key/src/core/events.rs
+++ b/sphinx-key/src/core/events.rs
@@ -34,7 +34,6 @@ pub enum Event {
     VlsMessage(Vec<u8>),
     LssMessage(Vec<u8>),
     Control(Vec<u8>),
-    HeartBeat,
 }
 
 pub const ROOT_STORE: &str = "/sdcard/store";
@@ -147,6 +146,12 @@ pub fn make_event_loop(
     let flash_db = ctrlr.persister();
     let mut expected_sequence = None;
     while let Ok(event) = rx.recv() {
+        if let Some(seq) = expected_sequence {
+            if seq % 40 == 0 {
+                log::info!("get heartbeat!");
+                let _ = root_handler.node().get_heartbeat();
+            }
+        }
         match event {
             Event::Connected => {
                 log::info!("GOT A Event::Connected msg!");
@@ -160,10 +165,6 @@ pub fn make_event_loop(
                 led_tx.send(Status::ConnectingToMqtt).unwrap();
                 log::info!("GOT A Event::Disconnected msg!");
             }
-            Event::HeartBeat => {
-                log::info!("Beating the heart!");
-                let _ = root_handler.node().get_heartbeat();
-            }
             Event::VlsMessage(msg_bytes) => {
                 led_tx.send(Status::Signing).unwrap();
                 let state1 = approver.control().get_state();
diff --git a/sphinx-key/src/main.rs b/sphinx-key/src/main.rs
index 1152222..ffc7879 100644
--- a/sphinx-key/src/main.rs
+++ b/sphinx-key/src/main.rs
@@ -193,12 +193,6 @@ fn make_and_launch_client(
     log::info!(">>>>>>>>>>> blocking forever...");
     log::info!("{:?}", config);
 
-    // heartbeat loop
-    thread::spawn(move || loop {
-        thread::sleep(Duration::from_secs(60));
-        let _ = tx.send(Event::HeartBeat);
-    });
-
     make_event_loop(
         mqtt_client,
         rx,