From a7c10bed42c44e66ce6320c035cd873d9166ee9a Mon Sep 17 00:00:00 2001 From: Daniel Dakhno Date: Wed, 20 Nov 2019 00:56:09 +0100 Subject: [PATCH] added alarm settings --- .../devices/qhybrid/QHybridCoordinator.java | 8 +++-- .../devices/qhybrid/QHybridSupport.java | 15 ++++++++ .../devices/qhybrid/adapter/WatchAdapter.java | 5 +++ .../adapter/fossil/FossilWatchAdapter.java | 34 +++++++++++++++++++ .../adapter/misfit/MisfitWatchAdapter.java | 10 ++++++ .../fossil/alarm/AlarmsSetRequest.java | 19 +++++++++++ 6 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java index 23e25cd4e..ab4538fce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java @@ -92,12 +92,16 @@ public class QHybridCoordinator extends AbstractDeviceCoordinator { } public boolean supportsAlarmConfiguration() { - return false; + GBDevice connectedDevice = GBApplication.app().getDeviceManager().getSelectedDevice(); + if(connectedDevice == null || connectedDevice.getType() != DeviceType.FOSSILQHYBRID){ + return false; + } + return true; } @Override public int getAlarmSlotCount() { - return 0; + return this.supportsAlarmConfiguration() ? 5 : 0; } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java index c5f5a7c3b..a96009718 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.PrintWriter; import java.io.StringWriter; +import java.util.ArrayList; import java.util.HashMap; import java.util.UUID; @@ -32,11 +33,15 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBException; import nodomain.freeyourgadget.gadgetbridge.R; +import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo; import nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.NotificationConfiguration; import nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.PackageConfigHelper; +import nodomain.freeyourgadget.gadgetbridge.entities.DaoMaster; +import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; import nodomain.freeyourgadget.gadgetbridge.externalevents.NotificationListener; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.model.Alarm; import nodomain.freeyourgadget.gadgetbridge.model.BatteryState; import nodomain.freeyourgadget.gadgetbridge.model.GenericItem; import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec; @@ -221,6 +226,16 @@ public class QHybridSupport extends QHybridBaseSupport { GBApplication.getContext().registerReceiver(globalCommandReceiver, globalFilter); } + @Override + public void onSetAlarms(ArrayList alarms) { + super.onSetAlarms(alarms); + if(this.watchAdapter == null){ + GB.toast("watch not connected", Toast.LENGTH_LONG, GB.ERROR); + return; + } + this.watchAdapter.onSetAlarms(alarms); + } + private void loadTimeOffset() { timeOffset = getContext().getSharedPreferences(getContext().getPackageName(), Context.MODE_PRIVATE).getInt("QHYBRID_TIME_OFFSET", 0); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java index 1c34058ee..2e7205a1d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java @@ -4,7 +4,10 @@ import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCharacteristic; import android.content.Context; +import java.util.ArrayList; + import nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.NotificationConfiguration; +import nodomain.freeyourgadget.gadgetbridge.model.Alarm; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit.PlayNotificationRequest; @@ -47,6 +50,8 @@ public abstract class WatchAdapter { public abstract void onFetchActivityData(); + public abstract void onSetAlarms(ArrayList alarms); + public abstract boolean onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic); public void onMtuChanged(BluetoothGatt gatt, int mtu, int status){}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java index b83fa24be..ae73a2fab 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java @@ -20,6 +20,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBException; import nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.NotificationConfiguration; import nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.PackageConfigHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.model.Alarm; import nodomain.freeyourgadget.gadgetbridge.model.GenericItem; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport; @@ -31,6 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fos import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.RequestMtuRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.SetDeviceStateRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm.AlarmsGetRequest; +import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm.AlarmsSetRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.button.ButtonConfigurationGetRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.configuration.ConfigurationGetRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.configuration.ConfigurationPutRequest; @@ -309,6 +311,38 @@ public class FossilWatchAdapter extends WatchAdapter { // queueWrite(new ConfigurationGetRequest(this)); } + @Override + public void onSetAlarms(ArrayList alarms) { + // throw new RuntimeException("noope"); + ArrayList activeAlarms = new ArrayList<>(); + for (Alarm alarm : alarms){ + if(!alarm.getEnabled()) continue; + if(alarm.getRepetition() == 0){ + activeAlarms.add(new nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm.Alarm( + (byte) alarm.getMinute(), + (byte) alarm.getHour(), + false + )); + continue; + } + int repitition = alarm.getRepetition(); + repitition = (repitition << 1) | ((repitition >> 6) & 1); + activeAlarms.add(new nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm.Alarm( + (byte) alarm.getMinute(), + (byte) alarm.getHour(), + (byte) repitition + )); + } + queueWrite(new AlarmsSetRequest(activeAlarms.toArray(new nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm.Alarm[0]), this){ + @Override + public void onFilePut(boolean success) { + super.onFilePut(success); + if(success) GB.toast("successfully set alarms", Toast.LENGTH_SHORT, GB.INFO); + else GB.toast("error setting alarms", Toast.LENGTH_SHORT, GB.INFO); + } + }); + } + @Override public boolean onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) { switch (characteristic.getUuid().toString()) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java index 2ccae55ac..807fae0bb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java @@ -5,6 +5,7 @@ import android.bluetooth.BluetoothGattCharacteristic; import android.content.Intent; import android.util.Log; import android.util.SparseArray; +import android.widget.Toast; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -15,6 +16,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Date; import java.util.GregorianCalendar; import java.util.NoSuchElementException; @@ -25,6 +27,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInf import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager; import nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.NotificationConfiguration; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.model.Alarm; import nodomain.freeyourgadget.gadgetbridge.model.BatteryState; import nodomain.freeyourgadget.gadgetbridge.model.GenericItem; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; @@ -55,6 +58,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.mis import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit.SetVibrationStrengthRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit.UploadFileRequest; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit.VibrateRequest; +import nodomain.freeyourgadget.gadgetbridge.util.GB; import static nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport.ITEM_ACTIVITY_POINT; import static nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport.ITEM_STEP_COUNT; @@ -446,6 +450,12 @@ public class MisfitWatchAdapter extends WatchAdapter { queueWrite(new ActivityPointGetRequest()); } + @Override + public void onSetAlarms(ArrayList alarms) { + GB.toast("alarms not supported with this firmware", Toast.LENGTH_LONG, GB.ERROR); + return; + } + @Override public void overwriteButtons() { uploadFileRequest = new UploadFileRequest((short) 0x0800, new byte[]{ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java new file mode 100644 index 000000000..552a9085e --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java @@ -0,0 +1,19 @@ +package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm; + +import java.nio.ByteBuffer; + +import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter; +import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file.FilePutRequest; + +public class AlarmsSetRequest extends FilePutRequest { + public AlarmsSetRequest(Alarm[] alarms, FossilWatchAdapter adapter) { + super((short) 0x0A00, createFileFromAlarms(alarms), adapter); + } + + static byte[] createFileFromAlarms(Alarm[] alarms){ + ByteBuffer buffer = ByteBuffer.allocate(alarms.length * 3); + for(Alarm alarm : alarms) buffer.put(alarm.getData()); + + return buffer.array(); + } +}