MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-15 05:07:54 +01:00
Code Releases Wiki Activity

improvements

Browse Source
This commit is contained in:
Sophanimus 2019-04-05 22:11:00 +02:00 committed by Andreas Shimokawa
parent c7a6dc4b01
commit e86bc80016
1 changed files with 119 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/bfh16/BFH16DeviceSupport.java
View File

@ -33,7 +33,7 @@
Set sitting reminder () () (X) () Set sitting reminder () () (X) ()
Trigger a photo () () (X) () Trigger a photo () () (X) ()
Switch automated heartbeat detection () () (X) () Switch automated heartbeat detection (X) () (X) ()
Switch display illumination () () (X) () Switch display illumination () () (X) ()
Switch vibration () () (X) () Switch vibration () () (X) ()
Switch notifications () () (X) () Switch notifications () () (X) ()
@ -131,6 +131,7 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
//onXYZ //onXYZ
//______________________________________________________________________________________________ //______________________________________________________________________________________________
//TODO check TODOs in method
@Override @Override
public boolean onCharacteristicChanged(BluetoothGatt gatt, public boolean onCharacteristicChanged(BluetoothGatt gatt,
BluetoothGattCharacteristic characteristic) { BluetoothGattCharacteristic characteristic) {
@ -214,8 +215,35 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
} }
//working
@Override
public void onSetTime() {
try {
TransactionBuilder builder = performInitialized("SetTime");
syncDateAndTime(builder);
builder.queue(getQueue());
} catch(IOException e) {
LOG.warn(e.getMessage());
}
}
//TODO: not checked yet + needs rework //working
@Override
public void onFindDevice(boolean start) {
try {
TransactionBuilder builder = performInitialized("FindDevice");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_VIBRATE, 0, start ? 1 : 0
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
GB.toast(getContext(), "Your device will vibrate 3 times!", Toast.LENGTH_LONG, GB.INFO);
}
//TODO: checked + rework
@Override @Override
public void onNotification(NotificationSpec notificationSpec) { public void onNotification(NotificationSpec notificationSpec) {
String notificationTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title); String notificationTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
@ -246,18 +274,7 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
@Override //TODO: check
public void onSetTime() {
try {
TransactionBuilder builder = performInitialized("SetTime");
syncDateAndTime(builder);
builder.queue(getQueue());
} catch(IOException e) {
LOG.warn(e.getMessage());
}
}
//TODO: not checked yet
@Override @Override
public void onSetCallState(CallSpec callSpec) { public void onSetCallState(CallSpec callSpec) {
switch (callSpec.command) { switch (callSpec.command) {
@ -267,6 +284,69 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
} }
//TODO: check
@Override
public void onEnableRealtimeSteps(boolean enable) {
onEnableRealtimeHeartRateMeasurement(enable);
}
//TODO: check
@Override
public void onReset(int flags) {
try {
TransactionBuilder builder = performInitialized("Reboot");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_ACTION_REBOOT_DEVICE, 0, 0
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
//TODO: check
@Override
public void onHeartRateTest() {
try {
TransactionBuilder builder = performInitialized("HeartRateTest");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_MEASURE_HEART, 0, 1
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
//TODO: check
@Override
public void onEnableRealtimeHeartRateMeasurement(boolean enable) {
// TODO: test
try {
TransactionBuilder builder = performInitialized("RealTimeHeartMeasurement");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_MEASURE_HEART, 0, enable ? 1 : 0
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
//TODO: check
@Override
public void onSetConstantVibration(int integer) {
try {
TransactionBuilder builder = performInitialized("Vibrate");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_VIBRATE, 0, 1
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
@Override @Override
public void onSetCannedMessages(CannedMessagesSpec cannedMessagesSpec) { public void onSetCannedMessages(CannedMessagesSpec cannedMessagesSpec) {
@ -282,11 +362,6 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
@Override
public void onEnableRealtimeSteps(boolean enable) {
onEnableRealtimeHeartRateMeasurement(enable);
}
@Override @Override
public void onInstallApp(Uri uri) { public void onInstallApp(Uri uri) {
@ -322,74 +397,6 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
@Override
public void onReset(int flags) {
try {
TransactionBuilder builder = performInitialized("Reboot");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_ACTION_REBOOT_DEVICE, 0, 0
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
@Override
public void onHeartRateTest() {
try {
TransactionBuilder builder = performInitialized("HeartRateTest");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_MEASURE_HEART, 0, 1
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
@Override
public void onEnableRealtimeHeartRateMeasurement(boolean enable) {
// TODO: test
try {
TransactionBuilder builder = performInitialized("RealTimeHeartMeasurement");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_MEASURE_HEART, 0, enable ? 1 : 0
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
//working
@Override
public void onFindDevice(boolean start) {
try {
TransactionBuilder builder = performInitialized("FindDevice");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_VIBRATE, 0, start ? 1 : 0
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
GB.toast(getContext(), "Your device will vibrate 3 times!", Toast.LENGTH_LONG, GB.INFO);
}
@Override
public void onSetConstantVibration(int integer) {
try {
TransactionBuilder builder = performInitialized("Vibrate");
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_VIBRATE, 0, 1
));
builder.queue(getQueue());
} catch(Exception e) {
LOG.warn(e.getMessage());
}
}
@Override @Override
public void onScreenshotReq() { public void onScreenshotReq() {
@ -425,6 +432,11 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
@Override
public void onSendWeather(WeatherSpec weatherSpec) {
}
@Override @Override
public void onTestNewFunction() { public void onTestNewFunction() {
@ -445,10 +457,7 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
@Override
public void onSendWeather(WeatherSpec weatherSpec) {
}
@ -495,27 +504,6 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
//working
private void syncDateAndTime(TransactionBuilder builder) {
Calendar cal = Calendar.getInstance();
String strYear = String.valueOf(cal.get(Calendar.YEAR));
byte year1 = (byte)Integer.parseInt(strYear.substring(0, 2));
byte year2 = (byte)Integer.parseInt(strYear.substring(2, 4));
byte month = (byte)cal.get(Calendar.MONTH);
byte day = (byte)cal.get(Calendar.DAY_OF_MONTH);
byte hour = (byte)cal.get(Calendar.HOUR_OF_DAY);
byte minute = (byte)cal.get(Calendar.MINUTE);
byte second = (byte)cal.get(Calendar.SECOND);
byte weekDay = (byte)cal.get(Calendar.DAY_OF_WEEK);
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_SET_DATE_AND_TIME,
(year1 << 24) | (year2 << 16) | (month << 8) | day,
(hour << 24) | (minute << 16) | (second << 8) | weekDay
));
}
//TODO: check //TODO: check
private void syncSettings(TransactionBuilder builder) { private void syncSettings(TransactionBuilder builder) {
syncDateAndTime(builder); syncDateAndTime(builder);
@ -559,6 +547,26 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
} }
//working
private void syncDateAndTime(TransactionBuilder builder) {
Calendar cal = Calendar.getInstance();
String strYear = String.valueOf(cal.get(Calendar.YEAR));
byte year1 = (byte)Integer.parseInt(strYear.substring(0, 2));
byte year2 = (byte)Integer.parseInt(strYear.substring(2, 4));
byte month = (byte)cal.get(Calendar.MONTH);
byte day = (byte)cal.get(Calendar.DAY_OF_MONTH);
byte hour = (byte)cal.get(Calendar.HOUR_OF_DAY);
byte minute = (byte)cal.get(Calendar.MINUTE);
byte second = (byte)cal.get(Calendar.SECOND);
byte weekDay = (byte)cal.get(Calendar.DAY_OF_WEEK);
builder.write(ctrlCharacteristic, commandWithChecksum(
BFH16Constants.CMD_SET_DATE_AND_TIME,
(year1 << 24) | (year2 << 16) | (month << 8) | day,
(hour << 24) | (minute << 16) | (second << 8) | weekDay
));
}
//working //working
private byte[] commandWithChecksum(byte cmd, int argSlot1, int argSlot2) private byte[] commandWithChecksum(byte cmd, int argSlot1, int argSlot2)
{ {
@ -579,7 +587,6 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
return bytesToWrite; return bytesToWrite;
} }
/** /**
* Checksum is calculated by the sum of bytes 0 to 8 and send as byte 9 * Checksum is calculated by the sum of bytes 0 to 8 and send as byte 9
*/ */
@ -612,7 +619,6 @@ public class BFH16DeviceSupport extends AbstractBTLEDeviceSupport {
return bytesToWrite; return bytesToWrite;
} }
private byte[] stringToUTF8Bytes(String src, int byteCount) { private byte[] stringToUTF8Bytes(String src, int byteCount) {
try { try {
if (src == null) if (src == null)