Colmi R0x: Add support for R12 and display preferences

2026-07-31 07:44:24 +02:00 · 2025-04-24 21:16:07 +02:00
parent f4ac744b3b
commit 43b30d36f6
9 changed files with 148 additions and 0 deletions
@@ -614,4 +614,9 @@ public class DeviceSettingsPreferenceConst {
    public static final String PREF_BATTERY_DISCHARGE_MANUAL = "battery_discharge_manual";
    public static final String PREF_BATTERY_MINIMUM_CHARGE = "battery_minimum_charge";
    public static final String PREF_BATTERY_ALLOW_PASS_THROUGH = "battery_allow_pass_through";
+
+    public static final String PREF_DISPLAY_ENABLED = "display_enabled";
+    public static final String PREF_DISPLAY_ENABLED_ALL_DAY = "display_all_day";
+    public static final String PREF_DISPLAY_ON_START = "display_on_start";
+    public static final String PREF_DISPLAY_ON_END = "display_on_end";
 }
@@ -898,6 +898,11 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
        addPreferenceHandlerFor(PREF_BATTERY_MINIMUM_CHARGE);
        addPreferenceHandlerFor(PREF_BATTERY_ALLOW_PASS_THROUGH);

+        addPreferenceHandlerFor(PREF_DISPLAY_ENABLED);
+        addPreferenceHandlerFor(PREF_DISPLAY_ENABLED_ALL_DAY);
+        addPreferenceHandlerFor(PREF_DISPLAY_ON_START);
+        addPreferenceHandlerFor(PREF_DISPLAY_ON_END);
+
        final Preference dischargeIntervalsSet = findPreference(PREF_BATTERY_DISCHARGE_INTERVALS_SET);
        if (dischargeIntervalsSet != null) {
            dischargeIntervalsSet.setOnPreferenceClickListener(preference -> {
@@ -178,6 +178,10 @@ public abstract class AbstractColmiR0xCoordinator extends AbstractBLEDeviceCoord
        return true;
    }

+    public boolean hasDisplay() {
+        return false;
+    }
+
    @Override
    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
        return new ColmiActivitySampleProvider(device, session);
@@ -238,6 +242,10 @@ public abstract class AbstractColmiR0xCoordinator extends AbstractBLEDeviceCoord
        if (supportsContinuousTemperature(device)) {
            health.add(R.xml.devicesettings_temperature_automatic_enable);
        }
+        if (hasDisplay()) {
+            final List<Integer> display = deviceSpecificSettings.addRootScreen(DeviceSpecificSettingsScreen.DISPLAY);
+            display.add(R.xml.devicesettings_colmi_r0x_display);
+        }
        return deviceSpecificSettings;
    }

@@ -29,6 +29,7 @@ public class ColmiR0xConstants {
    public static final byte CMD_SET_DATE_TIME = 0x01;
    public static final byte CMD_BATTERY = 0x03;
    public static final byte CMD_PHONE_NAME = 0x04;
+    public static final byte CMD_DISPLAY_PREF = 0x05;
    public static final byte CMD_POWER_OFF = 0x08;
    public static final byte CMD_PREFERENCES = 0x0a;
    public static final byte CMD_SYNC_HEART_RATE = 0x15;
@@ -0,0 +1,43 @@
+/*  Copyright (C) 2025 Arjan Schrijver
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.colmi;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+
+public class ColmiR12Coordinator extends AbstractColmiR0xCoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(ColmiR12Coordinator.class);
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^R12_.*");
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_colmi_r12;
+    }
+
+    @Override
+    public boolean hasDisplay() {
+        return true;
+    }
+}
@@ -29,6 +29,7 @@ package nodomain.freeyourgadget.gadgetbridge.model;

 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.UnknownDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.colmi.ColmiR12Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.garmin.bike.GarminEdge130PlusCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.fenix.GarminFenix7XProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivoactive.GarminVivoActiveHrCoordinator;
@@ -632,6 +633,7 @@ public enum DeviceType {
    COLMI_R06(ColmiR06Coordinator.class),
    COLMI_R09(ColmiR09Coordinator.class),
    COLMI_R10(ColmiR10Coordinator.class),
+    COLMI_R12(ColmiR12Coordinator.class),
    B_AND_W_P_SERIES(BandWPSeriesDeviceCoordinator.class),
    EARFUN_AIR_S(EarFunAirSCoordinator.class),
    EARFUN_AIR_PRO_4(EarFunAirPro4Coordinator.class),
@@ -33,6 +33,7 @@ import java.nio.ByteOrder;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -549,6 +550,39 @@ public class ColmiR0xDeviceSupport extends AbstractBTLEDeviceSupport {
                LOG.info("Temperature preference request sent: {}", StringUtils.bytesToHex(tempPrefsPacket));
                sendWrite("tempPreferenceRequest", tempPrefsPacket);
                break;
+            case DeviceSettingsPreferenceConst.PREF_DISPLAY_ENABLED:
+            case DeviceSettingsPreferenceConst.PREF_WEARLOCATION:
+            case DeviceSettingsPreferenceConst.PREF_SCREEN_BRIGHTNESS:
+            case DeviceSettingsPreferenceConst.PREF_DISPLAY_ENABLED_ALL_DAY:
+            case DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_START:
+            case DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_END:
+                final boolean displayEnabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DISPLAY_ENABLED, false);
+                final String wearLocation = prefs.getString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION, "left");
+                int brightness = prefs.getInt(DeviceSettingsPreferenceConst.PREF_SCREEN_BRIGHTNESS, 2);
+                if (brightness < 0 || brightness > 4) brightness = 2;
+                final boolean displayEnabledAllDay = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DISPLAY_ENABLED_ALL_DAY, false);
+                final String displayOnStart = prefs.getString(DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_START, "07:00");
+                final int displayOnStartHour = Integer.parseInt(displayOnStart.split(":")[0]);
+                final int displayOnStartMin = Integer.parseInt(displayOnStart.split(":")[1]);
+                final String displayOnEnd = prefs.getString(DeviceSettingsPreferenceConst.PREF_DISPLAY_ON_END, "22:00");
+                final int displayOnEndHour = Integer.parseInt(displayOnEnd.split(":")[0]);
+                final int displayOnEndMin = Integer.parseInt(displayOnEnd.split(":")[1]);
+                byte[] displayPrefsPacket = buildPacket(new byte[]{
+                    ColmiR0xConstants.CMD_DISPLAY_PREF,
+                    0x04,
+                    (byte) (displayEnabled ? 0x01 : 0x02),
+                    (byte) (Objects.equals(wearLocation, "left") ? 0x01 : 0x02),
+                    (byte) (brightness + 1),
+                    0x05,
+                    (byte) (displayEnabledAllDay ? 0x02 : 0x01),
+                    (byte) displayOnStartHour,
+                    (byte) displayOnStartMin,
+                    (byte) displayOnEndHour,
+                    (byte) displayOnEndMin
+                });
+                LOG.info("Display preferences request sent: {}", StringUtils.bytesToHex(displayPrefsPacket));
+                sendWrite("displayPreferencesRequest", displayPrefsPacket);
+                break;
        }
    }

@@ -1985,6 +1985,7 @@
    <string name="devicetype_colmi_r06">Colmi R06</string>
    <string name="devicetype_colmi_r09">Colmi R09</string>
    <string name="devicetype_colmi_r10">Colmi R10</string>
+    <string name="devicetype_colmi_r12">Colmi R12</string>
    <string name="devicetype_ultrahuma_ring_air">Ultrahuman Ring AIR</string>
    <string name="devicetype_bandw_pseries">Bowers and Wilkins P series</string>
    <string name="devicetype_earfun_air_s">EarFun Air S</string>
@@ -3904,4 +3905,8 @@
    <string name="maps_download_title">Download Maps</string>
    <string name="maps_download_summary">Click here to download map files. They should be saved to the folder selected in the preference below.</string>
    <string name="maps_track_color_title">Track color</string>
+    <string name="pref_display_enabled_title">Display enabled</string>
+    <string name="pref_display_enabled_summary">Enable the display on the ring</string>
+    <string name="pref_display_enabled_all_day_title">Enabled all day</string>
+    <string name="pref_display_enabled_all_day_summary">Enable the display the whole day. Disable to select specific times below</string>
 </resources>
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:icon="@drawable/ic_power_settings_new"
+        android:key="display_enabled"
+        android:layout="@layout/preference_checkbox"
+        android:title="@string/pref_display_enabled_title"
+        android:summary="@string/pref_display_enabled_summary" />
+    <ListPreference
+        android:dependency="display_enabled"
+        android:defaultValue="left"
+        android:icon="@drawable/ic_switch_left"
+        android:entries="@array/wearside"
+        android:entryValues="@array/wearside_values"
+        android:key="wearlocation"
+        android:title="@string/prefs_wearside"
+        android:summary="%s" />
+    <SeekBarPreference
+        android:dependency="display_enabled"
+        android:defaultValue="2"
+        android:icon="@drawable/ic_wb_sunny"
+        android:key="screen_brightness"
+        android:max="4"
+        android:title="@string/pref_screen_brightness" />
+    <SwitchPreferenceCompat
+        android:dependency="display_enabled"
+        android:disableDependentsState="true"
+        android:defaultValue="true"
+        android:icon="@drawable/ic_timer"
+        android:key="display_all_day"
+        android:layout="@layout/preference_checkbox"
+        android:title="@string/pref_display_enabled_all_day_title"
+        android:summary="@string/pref_display_enabled_all_day_summary" />
+    <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+        android:dependency="display_all_day"
+        android:defaultValue="07:00"
+        android:key="display_on_start"
+        android:title="@string/mi2_prefs_do_not_disturb_start" />
+    <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+        android:dependency="display_all_day"
+        android:defaultValue="22:00"
+        android:key="display_on_end"
+        android:title="@string/mi2_prefs_do_not_disturb_end" />
+</PreferenceScreen>