diff options
Diffstat (limited to 'src/org/codeaurora/bluetooth/a4wp/A4wpService.java')
| -rw-r--r-- | src/org/codeaurora/bluetooth/a4wp/A4wpService.java | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java index 7e9b7bb..240d487 100644 --- a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java +++ b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java @@ -76,17 +76,17 @@ public class A4wpService extends Service private BluetoothAdapter mBluetoothAdapter = null; private BluetoothGattServer mBluetoothGattServer = null; private BluetoothDevice mDevice = null; - - private static final UUID A4WP_SERVICE_UUID = UUID.fromString("6455fffe-a146-11e2-9e96-0800200c9a67"); + private static final UUID A4WP_SERVICE_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200cfffe"); //PRU writes private static final UUID A4WP_PRU_CTRL_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200c9a67"); - private static final UUID A4WP_PTU_STATIC_UUID = UUID.fromString("6455e671-a146-11e2-9e96-0800200c9a67"); + private static final UUID A4WP_PTU_STATIC_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200c9a68"); //PRU reads - private static final UUID A4WP_PRU_ALERT_UUID = UUID.fromString("6455e672-a146-11e2-9e96-0800200c9a67"); - private static final UUID A4WP_PRU_STATIC_UUID = UUID.fromString("6455e673-a146-11e2-9e96-0800200c9a67"); - private static final UUID A4WP_PRU_DYNAMIC_UUID = UUID.fromString("6455e674-a146-11e2-9e96-0800200c9a67"); + private static final UUID A4WP_PRU_ALERT_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200c9a69"); + private static final UUID A4WP_PRU_STATIC_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200c9a70"); + private static final UUID A4WP_PRU_DYNAMIC_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200c9a71"); - private static final UUID A4WP_PRU_ALERT_DESC_UUID = UUID.fromString("6455e672-a146-11e2-9e96-0800200c9a67"); + private static final UUID A4WP_PRU_ALERT_DESC_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200c9a69"); + //CHECK: Using the Alert UUID for now private static final Object mLock = new Object(); private int mState = BluetoothProfile.STATE_DISCONNECTED; @@ -126,7 +126,7 @@ public class A4wpService extends Service private AdvertiseData mAdvertisementData; private BluetoothLeAdvertiser mAdvertiser; private AdvertiseCallback mAdvertiseCallback = new myAdvertiseCallback(1); - ParcelUuid uuid1 = ParcelUuid.fromString("6455fffe-a146-11e2-9e96-0800200c9a67"); + ParcelUuid uuid1 = ParcelUuid.fromString("6455e670-a146-11e2-9e96-0800200cfffe"); private WbcManager.WbcEventListener mWbcCallback = new WbcManager.WbcEventListener() { @@ -680,13 +680,13 @@ public class A4wpService extends Service mIndex = index; } - @Override - public void onStartSuccess(AdvertiseSettings settingsInEffect) { + //@Override + public void onSuccess(AdvertiseSettings settingsInEffect) { Log.d(LOGTAG, "advertise success " + mIndex); } - @Override - public void onStartFailure(int errorCode) { + //@Override + public void onFailure(int errorCode) { Log.d(LOGTAG, "advetise failure " + mIndex); } } @@ -694,30 +694,20 @@ public class A4wpService extends Service private void StartAdvertising() { - /* serviceData represnts service data for Wipower that needs - to be part of advertising, - 0x28 i& 0x00 represents the primary based handle - 0xFF and 0x60 represents: - ADV Flags are set to: CAT3 PRU 21, Reboot bit and OVP indicator - */ byte[] serviceData = new byte[] { - 0x28, 0x00, (byte)0xff, 0x60 }; + (byte)0xfe, (byte)0xff, 0x28, 0x00, (byte)0xff, 0x60 }; mAdvertiser = mBluetoothAdapter.getBluetoothLeAdvertiser(); mAdvertisementData = new AdvertiseData.Builder() - .addServiceData(uuid1, serviceData).build(); + .setServiceData(uuid1, serviceData).build(); mAdvertiseSettings = new AdvertiseSettings.Builder() - .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_POWER) + .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_WIPOWER_LATENCY) .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_ULTRA_LOW) - .setConnectable(true) - .setTimeout(WIPOWER_ADV_TIMEOUT).build(); + .setConnectable(true).build(); Log.d(LOGTAG, " Calling mAdvertiser.startAdvertising"); - if(mAdvertiser != null) - mAdvertiser.startAdvertising(mAdvertiseSettings, mAdvertisementData, mAdvertiseCallback); - else - Log.d(LOGTAG, " mAdvertiser is null"); + mAdvertiser.startAdvertising(mAdvertiseSettings, mAdvertisementData, mAdvertiseCallback); } private void stopAdvertising() @@ -841,7 +831,7 @@ public class A4wpService extends Service Log.d(LOGTAG, "onStart Command called!!"); //mWipowerBoot is used to hold power enable command till the service is been registered completely - if (mWipowerBoot == true && mWipowerManager != null) { + if (mWipowerBoot == true) { if (mChargeComplete == true) { mWipowerManager.enablePowerApply(true, true, true); } else { |