MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-01-13 19:27:33 +01:00
Code Releases Wiki Activity

Fix error after merging master trunk, which have a different alarm handling, now.

Browse Source
This commit is contained in:
Sebastian Kranz 2019-02-20 14:55:07 +01:00
parent c05ae32ed3
commit 40ebb7487c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
View File

@ -64,6 +64,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
import nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction; import nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction; import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
import nodomain.freeyourgadget.gadgetbridge.util.AlarmUtils;
import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs; import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@ -272,16 +273,16 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
ZeTimeConstants.CMD_SEND, ZeTimeConstants.CMD_SEND,
(byte) 0xb, (byte) 0xb,
(byte) 0x0, (byte) 0x0,
(byte) alarm.getIndex(), // index (byte) alarm.getPosition(), // index
ZeTimeConstants.REMINDER_ALARM, ZeTimeConstants.REMINDER_ALARM,
(byte) 0x0, // year low byte (byte) 0x0, // year low byte
(byte) 0x0, // year high byte (byte) 0x0, // year high byte
(byte) 0x0, // month (byte) 0x0, // month
(byte) 0x0, // day (byte) 0x0, // day
(byte) alarm.getAlarmCal().get(Calendar.HOUR_OF_DAY), (byte) AlarmUtils.toCalendar(alarm).get(Calendar.HOUR_OF_DAY),
(byte) alarm.getAlarmCal().get(Calendar.MINUTE), (byte) AlarmUtils.toCalendar(alarm).get(Calendar.MINUTE),
(byte) alarm.getRepetitionMask(), (byte) alarm.getRepetition(),
(byte) (alarm.isEnabled() ? 1 : 0), (byte) (alarm.getEnabled() ? 1 : 0),
(byte) prefs.getInt(ZeTimeConstants.PREF_ALARM_SIGNALING, 11), // reminder signaling (byte) prefs.getInt(ZeTimeConstants.PREF_ALARM_SIGNALING, 11), // reminder signaling
ZeTimeConstants.CMD_END ZeTimeConstants.CMD_END
}; };