From 9c8ffa4b75989bc049a30216ca88166d821745d7 Mon Sep 17 00:00:00 2001
From: Sachymetsu <sachymetsu@tutamail.com>
Date: Tue, 14 Jul 2026 08:47:30 +0200
Subject: [PATCH] Fix time sync code

---
 src/ble.rs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/ble.rs b/src/ble.rs
index 2136bb4..c89a84f 100644
--- a/src/ble.rs
+++ b/src/ble.rs
@@ -1,7 +1,7 @@
 use cyw43::bluetooth::BtDriver;
 use embassy_executor::Spawner;
 use embassy_time::{Duration, WithTimeout};
-use jiff::{SignedDuration, Timestamp};
+use jiff::SignedDuration;
 use sachy_fmt::{error, info, unwrap};
 use static_cell::StaticCell;
 use trouble_host::{
@@ -99,19 +99,16 @@ pub async fn run(spawner: Spawner, controller: ExternalController<BtDriver<'stat
                     .ok();
 
                 if let Ok(read) = channel.receive(stack, &mut payload).await {
-                    let (now1, now2) = payload[..read].split_at(8);
-                    let now1 = unwrap!(Timestamp::from_millisecond(i64::from_le_bytes(
-                        now1.try_into().unwrap()
-                    )));
-                    let now2 = unwrap!(Timestamp::from_millisecond(i64::from_le_bytes(
-                        now2.try_into().unwrap()
-                    )));
-
                     TIMER.signal(TimerMessage::Now);
                     let now3 = NOW.wait().await;
 
-                    let offset =
-                        ((now1 - now0).get_milliseconds() + (now2 - now3).get_milliseconds()) / 2;
+                    let (now1, now2) = payload[..read].split_at(8);
+                    let now1 = i64::from_le_bytes(unwrap!(now1.try_into()));
+                    let now2 = i64::from_le_bytes(unwrap!(now2.try_into()));
+
+                    let off1 = now1.saturating_sub(now0.as_millisecond());
+                    let off2 = now2.saturating_sub(now3.as_millisecond());
+                    let offset = off1.saturating_add(off2) / 2;
 
                     let time = now0 + SignedDuration::from_millis(offset);
 
-- 
2.51.2