From 130e2ab85cade25c0884c4013197256ac4da2dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 6 Dec 2023 11:51:01 +0000
Subject: [PATCH] Xiaomi: Fix heart rate interval and sleep support

---
 .../service/devices/xiaomi/XiaomiSupport.java |  6 +--
 .../xiaomi/services/XiaomiHealthService.java  | 38 +++++++++++++++++--
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 151999abb..c7ffb8ec7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -417,14 +417,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onEnableHeartRateSleepSupport(final boolean enable) {
-        // TODO onEnableHeartRateSleepSupport
-        super.onEnableHeartRateSleepSupport(enable);
+        healthService.setHeartRateConfig();
     }
 
     @Override
     public void onSetHeartRateMeasurementInterval(final int seconds) {
-        // TODO
-        super.onSetHeartRateMeasurementInterval(seconds);
+        healthService.setHeartRateConfig();
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index a28d9c13b..ceb59c1fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -121,15 +121,28 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_CONFIG_SPO2_GET:
                 handleSpo2Config(cmd.getHealth().getSpo2());
                 return;
+            case CMD_CONFIG_SPO2_SET:
+                LOG.debug("Got spo2 set ack, status={}", cmd.getStatus());
+                return;
+            case CMD_CONFIG_HEART_RATE_SET:
+                LOG.debug("Got heart rate set ack, status={}", cmd.getStatus());
+                return;
+
             case CMD_CONFIG_HEART_RATE_GET:
                 handleHeartRateConfig(cmd.getHealth().getHeartRate());
                 return;
             case CMD_CONFIG_STANDING_REMINDER_GET:
                 handleStandingReminderConfig(cmd.getHealth().getStandingReminder());
                 return;
+            case CMD_CONFIG_STANDING_REMINDER_SET:
+                LOG.debug("Got standing reminder set ack, status={}", cmd.getStatus());
+                return;
             case CMD_CONFIG_STRESS_GET:
                 handleStressConfig(cmd.getHealth().getStress());
                 return;
+            case CMD_CONFIG_STRESS_SET:
+                LOG.debug("Got stress set ack, status={}", cmd.getStatus());
+                return;
             case CMD_WORKOUT_WATCH_STATUS:
                 handleWorkoutStatus(cmd.getHealth().getWorkoutStatusWatch());
                 return;
@@ -311,18 +324,35 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setHeartRateConfig() {
+    public void setHeartRateConfig() {
         final Prefs prefs = getDevicePrefs();
 
         final boolean sleepDetection = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION, false);
         final boolean sleepBreathingQuality = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING, false);
-        final int intervalMin = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0);
+        final int intervalSeconds = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0);
         final int alertHigh = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD, 0);
         final int alertLow = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD, 0);
 
+        int intervalMin;
+        if (intervalSeconds == -1) {
+            // Smart
+            intervalMin = 0;
+        } else {
+            intervalMin = intervalSeconds / 60;
+        }
+
+        LOG.debug(
+                "Set heart rate config: sleepDetection={}, sleepBreathingQuality={}, intervalSeconds={}, alertHigh={}, alertLow={}",
+                sleepDetection,
+                sleepBreathingQuality,
+                intervalSeconds,
+                alertHigh,
+                alertLow
+        );
+
         final XiaomiProto.HeartRate.Builder heartRate = XiaomiProto.HeartRate.newBuilder()
-                .setDisabled(intervalMin == 0)
-                .setInterval(Math.max(intervalMin, 0)) // smart will be -1 from pref
+                .setDisabled(intervalSeconds == 0)
+                .setInterval(intervalMin)
                 .setAdvancedMonitoring(XiaomiProto.AdvancedMonitoring.newBuilder()
                         .setEnabled(sleepDetection))
                 .setBreathingScore(sleepBreathingQuality ? 1 : 2)