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

Merge branch 'andyboeh-device_casio_improve'

Browse Source
This commit is contained in:
Andreas Shimokawa 2019-01-29 08:39:41 +01:00
commit cf62b0bb45
5 changed files with 209 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900Constants.java
View File

@ -29,6 +29,10 @@ public final class CasioGB6900Constants {
public static final UUID CCC_DESCRIPTOR_UUID = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
// Immediate Alert
public static final UUID IMMEDIATE_ALERT_SERVICE_UUID = UUID.fromString("00001802-0000-1000-8000-00805f9b34fb");
// Alert
public static final UUID ALERT_SERVICE_UUID = UUID.fromString("26eb0000-b012-49a8-b1f8-394fb2032b0f");
@ -74,6 +78,7 @@ public final class CasioGB6900Constants {
public static final UUID TX_POWER_LEVEL_CHARACTERISTIC_UUID = UUID.fromString("00002a07-0000-1000-8000-00805f9b34fb");
// Settings
public static final UUID CASIO_SETTING_FOR_BLE_CHARACTERISTIC_UUID = UUID.fromString("26eb000f-b012-49a8-b1f8-394fb2032b0f");
public static final UUID CASIO_SETTING_FOR_ALM_CHARACTERISTIC_UUID = UUID.fromString("26eb0013-b012-49a8-b1f8-394fb2032b0f");
// Notification Types
@ -83,5 +88,9 @@ public final class CasioGB6900Constants {
public static final byte SNS_NOTIFICATION_ID = 13;
public static final byte SMS_NOTIFICATION_ID = 5;
public enum Model {
MODEL_CASIO_GENERIC,
MODEL_CASIO_6900B,
MODEL_CASIO_5600B
}
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900DeviceCoordinator.java
View File

@ -118,7 +118,7 @@ public class CasioGB6900DeviceCoordinator extends AbstractDeviceCoordinator {
@Override
public int getAlarmSlotCount() {
return 0; // 4 regular and one snooze but not yet implemented
return 5; // 4 regular and one snooze
}
@Override

54
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTServer.java
View File

@ -101,6 +101,40 @@ class CasioGATTServer extends BluetoothGattServerCallback {
LOG.warn("error sending response");
}
}
private GBDeviceEventMusicControl.Event parse3Button(int button) {
GBDeviceEventMusicControl.Event event;
switch(button) {
case 3:
event = GBDeviceEventMusicControl.Event.NEXT;
break;
case 2:
event = GBDeviceEventMusicControl.Event.PREVIOUS;
break;
case 1:
event = GBDeviceEventMusicControl.Event.PLAYPAUSE;
break;
default:
LOG.warn("Unhandled button received: " + button);
event = GBDeviceEventMusicControl.Event.UNKNOWN;
}
return event;
}
private GBDeviceEventMusicControl.Event parse2Button(int button) {
GBDeviceEventMusicControl.Event event;
switch(button) {
case 2:
event = GBDeviceEventMusicControl.Event.PLAYPAUSE;
break;
case 1:
event = GBDeviceEventMusicControl.Event.NEXT;
break;
default:
LOG.warn("Unhandled button received: " + button);
event = GBDeviceEventMusicControl.Event.UNKNOWN;
}
return event;
}
@Override
public void onCharacteristicWriteRequest(BluetoothDevice device, int requestId, BluetoothGattCharacteristic characteristic,
@ -119,21 +153,23 @@ class CasioGATTServer extends BluetoothGattServerCallback {
if((value[0] & 0x03) == 0) {
int button = value[1] & 0x0f;
LOG.info("Button pressed: " + button);
switch(button) {
case 3:
musicCmd.event = GBDeviceEventMusicControl.Event.NEXT;
switch(mDeviceSupport.getModel())
{
case MODEL_CASIO_5600B:
musicCmd.event = parse2Button(button);
break;
case 2:
musicCmd.event = GBDeviceEventMusicControl.Event.PREVIOUS;
case MODEL_CASIO_6900B:
musicCmd.event = parse3Button(button);
break;
case 1:
musicCmd.event = GBDeviceEventMusicControl.Event.PLAYPAUSE;
case MODEL_CASIO_GENERIC:
musicCmd.event = parse3Button(button);
break;
default:
LOG.warn("Unhandled button received: " + button);
LOG.warn("Unhandled device");
return;
}
mDeviceSupport.evaluateGBDeviceEvent(musicCmd);
mDeviceSupport.evaluateGBDeviceEvent(musicCmd);
}
else {
LOG.info("received from device: " + value.toString());
@ -145,7 +181,7 @@ class CasioGATTServer extends BluetoothGattServerCallback {
LOG.info("Connection state change for device: " + device.getAddress() + " status = " + status + " newState = " + newState);
if (newState == BluetoothGattServer.STATE_DISCONNECTED) {
LOG.info("CASIO GATT server noticed disconnect.");
}
if (newState == BluetoothGattServer.STATE_CONNECTED) {
GBDevice.State devState = mDeviceSupport.getDevice().getState();

153
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGB6900DeviceSupport.java
View File

@ -60,6 +60,10 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
private MusicSpec mBufferMusicSpec = null;
private MusicStateSpec mBufferMusicStateSpec = null;
private BluetoothGatt mBtGatt = null;
private CasioGB6900Constants.Model mModel = CasioGB6900Constants.Model.MODEL_CASIO_GENERIC;
private byte[] mBleSettings = null;
private static final int mCasioSleepTime = 80;
public CasioGB6900DeviceSupport() {
super(LOG);
@ -74,6 +78,7 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
addSupportedService(CasioGB6900Constants.MORE_ALERT_SERVICE_UUID);
addSupportedService(CasioGB6900Constants.TX_POWER_SERVICE_UUID);
addSupportedService(CasioGB6900Constants.LINK_LOSS_SERVICE);
addSupportedService(CasioGB6900Constants.IMMEDIATE_ALERT_SERVICE_UUID);
mThread = new CasioGATTThread(getContext(), this);
}
@ -116,6 +121,16 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
LOG.info("Initializing");
String name = gbDevice.getName();
if(name.contains("5600B")) {
mModel = CasioGB6900Constants.Model.MODEL_CASIO_5600B;
} else if(name.contains("6900B")) {
mModel = CasioGB6900Constants.Model.MODEL_CASIO_6900B;
} else {
mModel = CasioGB6900Constants.Model.MODEL_CASIO_GENERIC;
}
gbDevice.setState(GBDevice.State.INITIALIZING);
gbDevice.sendDeviceUpdateIntent(getContext());
@ -132,6 +147,10 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
return builder;
}
CasioGB6900Constants.Model getModel() {
return mModel;
}
// FIXME: Replace hardcoded values by configuration
private void configureWatch(TransactionBuilder builder) {
if (mBtGatt == null)
@ -142,13 +161,13 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
BluetoothGattService llService = mBtGatt.getService(CasioGB6900Constants.LINK_LOSS_SERVICE);
BluetoothGattCharacteristic charact = llService.getCharacteristic(CasioGB6900Constants.ALERT_LEVEL_CHARACTERISTIC_UUID);
builder.write(charact, value);
builder.wait(mCasioSleepTime);
}
private void addCharacteristics() {
mCasioCharacteristics.clear();
mCasioCharacteristics.add(getCharacteristic(CasioGB6900Constants.CASIO_A_NOT_COM_SET_NOT));
mCasioCharacteristics.add(getCharacteristic(CasioGB6900Constants.CASIO_A_NOT_W_REQ_NOT));
mCasioCharacteristics.add(getCharacteristic(CasioGB6900Constants.FUNCTION_SWITCH_CHARACTERISTIC));
mCasioCharacteristics.add(getCharacteristic(CasioGB6900Constants.ALERT_LEVEL_CHARACTERISTIC_UUID));
mCasioCharacteristics.add(getCharacteristic(CasioGB6900Constants.RINGER_CONTROL_POINT));
}
@ -156,6 +175,7 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
public boolean enableNotifications(TransactionBuilder builder, boolean enable) {
for(BluetoothGattCharacteristic charact : mCasioCharacteristics) {
builder.notify(charact, enable);
builder.wait(mCasioSleepTime);
}
return true;
}
@ -231,6 +251,39 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
}
}
private void readBleSettings() {
try {
TransactionBuilder builder = performInitialized("readBleSettings");
builder.read(getCharacteristic(CasioGB6900Constants.CASIO_SETTING_FOR_BLE_CHARACTERISTIC_UUID));
builder.queue(getQueue());
} catch(IOException e) {
LOG.error("Error reading BLE settings: " + e.getMessage());
}
}
private void configureBleSettings() {
// These values seem to improve connection stability _on my phone_
// Maybe they should be configurable?
int slaveLatency = 2;
int connInterval = 300;
mBleSettings[5] = (byte)(connInterval & 0xff);
mBleSettings[6] = (byte)((connInterval >> 8) & 0xff);
mBleSettings[7] = (byte)(slaveLatency & 0xff);
mBleSettings[8] = (byte)((slaveLatency >> 8) & 0xff);
mBleSettings[9] = 0; // Setting for Disconnect!?
}
private void writeBleSettings() {
try {
TransactionBuilder builder = performInitialized("writeBleSettings");
builder.write(getCharacteristic(CasioGB6900Constants.CASIO_SETTING_FOR_BLE_CHARACTERISTIC_UUID), mBleSettings);
builder.queue(getQueue());
} catch(IOException e) {
LOG.error("Error writing BLE settings: " + e.getMessage());
}
}
private boolean handleInitResponse(byte data) {
boolean handled = false;
switch(data)
@ -239,10 +292,11 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
LOG.info("Initialization done, setting state to INITIALIZED");
if(mHandlerThread == null) {
mHandlerThread = new CasioHandlerThread(getDevice(), getContext(), this);
mHandlerThread.start();
}
mHandlerThread.start();
gbDevice.setState(GBDevice.State.INITIALIZED);
gbDevice.sendDeviceUpdateIntent(getContext());
readBleSettings();
handled = true;
break;
default:
@ -337,6 +391,63 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
}
LOG.info(str);
}
else if(characteristicUUID.equals(CasioGB6900Constants.CASIO_SETTING_FOR_BLE_CHARACTERISTIC_UUID)) {
mBleSettings = data;
String str = "Read Casio Setting for BLE: ";
for(int i=0; i<data.length; i++) {
str += String.format("0x%1x ", data[i]);
}
/* Definition of parameters - for future reference */
// data[0]; // BLE alert for call, mail and other
// data[1]; // BLE alert for Calendar
// data[2]; // BLE alert for SNS
// data[3]; // BLE alert for vibration and alarm
// data[4]; // BLE alert for animation
// data[5]; // Connection Interval
// data[6]; // Connection Interval
// data[7]; // Slave Latency
// data[8]; // Slave Latency
// Alert definitions:
// 0 = Off
// 1 = Sound
// 2 = Vibration
// 3 = Sound and Vibration
//int callAlert = (data[0] >> 6) & 0x03;
//LOG.info("Call Alert: " + callAlert);
//int mailAlert = (data[0] >> 2) & 0x03;
//LOG.info("Mail Alert: " + mailAlert);
//int snsAlert = (data[2] >> 4) & 0x03;
//LOG.info("SNS Alert: " + snsAlert);
//int calAlert = (data[1] >> 6) & 0x03;
//LOG.info("Calendart Alert: " + calAlert);
//int otherAlert = (data[0] & 0x03);
//LOG.info("Other Alert: " + otherAlert);
//int vibrationValue = (data[3] & 0x0f);
//LOG.info("Vibration Value: " + vibrationValue);
//int alarmValue = (data[3] >> 4) & 0x0f;
// Vibration pattern; A = 0, B = 1, C = 2
//LOG.info("Alarm Value: " + alarmValue);
//int animationValue = data[4] & 0x40;
// Length of Alarm, only 2, 5 and 10 possible
//LOG.info("Animation Value: " + animationValue);
// 0 = on
// 64 = off
//int useDisableMtuReqBit = data[4] & 0x08;
// 8 = on
// 0 = off!?
//LOG.info("useDisableMtuReqBit: " + useDisableMtuReqBit);
//int slaveLatency = ((data[7] & 0xff) | ((data[8] & 0xff) << 8));
//int connInterval = ((data[5] & 0xff) | ((data[6] & 0xff) << 8));
//LOG.info("Slave Latency: " + slaveLatency);
//LOG.info("Connection Interval: " + connInterval);
//LOG.info(str);
configureBleSettings();
writeBleSettings();
}
else {
return super.onCharacteristicRead(gatt, characteristic, status);
}
@ -445,7 +556,30 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
@Override
public void onSetAlarms(ArrayList<? extends Alarm> alarms) {
int alarmOffset = 4;
byte[] data = new byte[20];
for(int i=0; i<alarms.size(); i++)
{
Alarm alm = alarms.get(i);
if(alm.getEnabled()) {
data[i * alarmOffset] = 0x40;
} else {
data[i * alarmOffset] = 0;
}
if(alm.getRepetition(Alarm.ALARM_ONCE)) {
data[i * alarmOffset] |= 0x20;
}
data[i * alarmOffset + 1] = 0;
data[i * alarmOffset + 2] = (byte)alm.getHour();
data[i * alarmOffset + 3] = (byte)alm.getMinute();
}
try {
TransactionBuilder builder = performInitialized("setAlarm");
builder.write(getCharacteristic(CasioGB6900Constants.CASIO_SETTING_FOR_ALM_CHARACTERISTIC_UUID), data);
builder.queue(getQueue());
} catch(IOException e) {
LOG.error("Error setting alarm: " + e.getMessage());
}
}
@Override
@ -583,7 +717,18 @@ public class CasioGB6900DeviceSupport extends AbstractBTLEDeviceSupport {
@Override
public void onFindDevice(boolean start) {
if(start) {
showNotification(CasioGB6900Constants.SNS_NOTIFICATION_ID, "You found it!", "");
try {
TransactionBuilder builder = performInitialized("findDevice");
byte value[] = new byte[]{GattCharacteristic.HIGH_ALERT};
BluetoothGattService service = mBtGatt.getService(CasioGB6900Constants.IMMEDIATE_ALERT_SERVICE_UUID);
BluetoothGattCharacteristic charact = service.getCharacteristic(CasioGB6900Constants.ALERT_LEVEL_CHARACTERISTIC_UUID);
builder.write(charact, value);
LOG.info("onFindDevice sent");
builder.queue(getQueue());
} catch (IOException e) {
LOG.warn("showNotification failed: " + e.getMessage());
}
}
}

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioHandlerThread.java
View File

@ -75,8 +75,11 @@ public class CasioHandlerThread extends GBDeviceIoThread {
break;
}
if (gbDevice.getState() == GBDevice.State.NOT_CONNECTED) {
GBDevice.State state = gbDevice.getState();
if (state == GBDevice.State.NOT_CONNECTED || state == GBDevice.State.WAITING_FOR_RECONNECT) {
LOG.debug("Closing handler thread, state not connected or waiting for reconnect.");
quit();
continue;
}
Calendar now = GregorianCalendar.getInstance();