From c8c9772ac88bd3f3fe9ba09491dadd95d6b84dbd Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sun, 29 Sep 2024 21:27:46 +0200
Subject: [PATCH] Colmi R0x: Support REM sleep and awake samples

---
 .../devices/colmi/AbstractColmiR0xCoordinator.java     | 10 ++++++++++
 .../gadgetbridge/devices/colmi/ColmiR0xConstants.java  |  1 +
 .../colmi/samples/ColmiActivitySampleProvider.java     |  3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java
index d871b094e..fe1c90bac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/AbstractColmiR0xCoordinator.java
@@ -149,6 +149,16 @@ public abstract class AbstractColmiR0xCoordinator extends AbstractBLEDeviceCoord
         return true;
     }
 
+    @Override
+    public boolean supportsRemSleep() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsAwakeSleep() {
+        return true;
+    }
+
     @Override
     public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
         return new ColmiActivitySampleProvider(device, session);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/ColmiR0xConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/ColmiR0xConstants.java
index cb1cee038..1327d2b51 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/ColmiR0xConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/ColmiR0xConstants.java
@@ -59,5 +59,6 @@ public class ColmiR0xConstants {
 
     public static final byte SLEEP_TYPE_LIGHT = 0x02;
     public static final byte SLEEP_TYPE_DEEP = 0x03;
+    public static final byte SLEEP_TYPE_REM = 0x04;
     public static final byte SLEEP_TYPE_AWAKE = 0x05;
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/samples/ColmiActivitySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/samples/ColmiActivitySampleProvider.java
index dfb35d6d5..a027fa1e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/samples/ColmiActivitySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/samples/ColmiActivitySampleProvider.java
@@ -157,7 +157,6 @@ public class ColmiActivitySampleProvider extends AbstractSampleProvider<ColmiAct
 
         for (final ColmiSleepStageSample sleepStageSample : sleepStageSamples) {
             final ActivityKind sleepRawKind = sleepStageToActivityKind(sleepStageSample.getStage());
-            if (sleepRawKind == ActivityKind.AWAKE_SLEEP) continue;
             // round to the nearest minute, we don't need per-second granularity
             final int tsSeconds = (int) ((sleepStageSample.getTimestamp() / 1000) / 60) * 60;
             for (int i = tsSeconds; i < tsSeconds + sleepStageSample.getDuration() * 60; i += 60) {
@@ -181,6 +180,8 @@ public class ColmiActivitySampleProvider extends AbstractSampleProvider<ColmiAct
                 return ActivityKind.LIGHT_SLEEP;
             case ColmiR0xConstants.SLEEP_TYPE_DEEP:
                 return ActivityKind.DEEP_SLEEP;
+            case ColmiR0xConstants.SLEEP_TYPE_REM:
+                return ActivityKind.REM_SLEEP;
             case ColmiR0xConstants.SLEEP_TYPE_AWAKE:
                 return ActivityKind.AWAKE_SLEEP;
             default: