Skip to content

AA-274 Shimmer3 BLE support #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 27, 2023
Merged

AA-274 Shimmer3 BLE support #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c70f56
add Shimmer3 BLE support
MAzalya Nov 30, 2023
0393629
more updates and tidy up
MAzalya Nov 30, 2023
16a5e7d
more commits
MAzalya Nov 30, 2023
cba7151
add setpreferredPhy, requires update targetsdkversion
MAzalya Dec 20, 2023
9067d86
add Readme, minor update to example macAddress
MAzalya Dec 22, 2023
d542a9a
added os version check for permissions
MAzalya Dec 22, 2023
6cc751e
Update README.md
ShimmerEngineering Dec 22, 2023
a8eceb4
Update README.md
ShimmerEngineering Dec 22, 2023
3c499b2
accel print update
MAzalya Dec 26, 2023
e5c6801
Merge remote-tracking branch 'origin/AA-274' into AA-274
MAzalya Dec 26, 2023
2fc6f30
update readme to enable LN Accel
MAzalya Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ShimmerAndroidInstrumentDriver/.idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ apply plugin: 'maven-publish'
version = '3.0.72Beta'

android {
compileSdkVersion 25
compileSdkVersion 26

lintOptions {
abortOnError false
Expand All @@ -18,7 +18,7 @@ android {
// Enabling multidex support.
multiDexEnabled true
minSdkVersion 14
targetSdkVersion 14
targetSdkVersion 26
}

buildTypes {
Expand Down
11 changes: 11 additions & 0 deletions ...r/src/main/java/com/shimmerresearch/android/guiUtilities/ShimmerDialogConfigurations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.shimmerresearch.android.manager.ShimmerBluetoothManagerAndroid;
import com.shimmerresearch.android.shimmerService.ShimmerService;
import com.shimmerresearch.androidinstrumentdriver.R;
import com.shimmerresearch.androidradiodriver.Shimmer3BLEAndroid;
import com.shimmerresearch.bluetooth.ShimmerBluetooth;
import com.shimmerresearch.driver.Configuration;
import com.shimmerresearch.driver.ShimmerDevice;
Expand Down Expand Up @@ -224,6 +225,8 @@ public void onClick(DialogInterface dialog, int id) {

if (shimmerDeviceClone instanceof Shimmer) {
bluetoothManager.configureShimmer(shimmerDeviceClone);
}else if(shimmerDeviceClone instanceof Shimmer3BLEAndroid) {
bluetoothManager.configureShimmer(shimmerDeviceClone);
}
}
})
Expand Down Expand Up @@ -329,6 +332,8 @@ public void onClick(DialogInterface dialog, int which) {
((Shimmer)shimmerDevice).writeConfigBytes(shimmerDeviceClone.getShimmerConfigBytes());
} else if (shimmerDevice instanceof Shimmer4Android){
((Shimmer4Android)shimmerDevice).writeConfigBytes(shimmerDeviceClone.getShimmerConfigBytes());
}else if(shimmerDeviceClone instanceof Shimmer3BLEAndroid) {
((Shimmer3BLEAndroid)shimmerDevice).writeBytes(shimmerDeviceClone.getShimmerConfigBytes());
}
}
});
Expand Down Expand Up @@ -363,6 +368,8 @@ public void onClick(DialogInterface dialog, int which) {
((Shimmer)shimmerDevice).writeConfigBytes(shimmerDeviceClone.getShimmerConfigBytes());
} else if (shimmerDevice instanceof Shimmer4Android){
((Shimmer4Android)shimmerDevice).writeConfigBytes(shimmerDeviceClone.getShimmerConfigBytes());
}else if(shimmerDeviceClone instanceof Shimmer3BLEAndroid) {
((Shimmer3BLEAndroid)shimmerDevice).writeBytes(shimmerDeviceClone.getShimmerConfigBytes());
}
}
});
Expand Down Expand Up @@ -415,6 +422,8 @@ public void onClick(DialogInterface dialog, int which) {
//((Shimmer)shimmerDevice).configureShimmer(shimmerDeviceClone);
} else if (shimmerDevice instanceof Shimmer4Android){
bluetoothManager.configureShimmer(shimmerDeviceClone);
}else if(shimmerDevice instanceof Shimmer3BLEAndroid) {
bluetoothManager.configureShimmer(shimmerDeviceClone);
}
}
});
Expand Down Expand Up @@ -532,6 +541,8 @@ public void writeConfigToShimmer(ShimmerDevice clone, ShimmerBluetoothManagerAnd
bluetoothManager.configureShimmer(clone);
} else if (clone instanceof Shimmer4Android){
bluetoothManager.configureShimmer(clone);
} else if (clone instanceof Shimmer3BLEAndroid){
bluetoothManager.configureShimmer(clone);
}

}
Expand Down
108 changes: 108 additions & 0 deletions ...ver/src/main/java/com/shimmerresearch/android/manager/ShimmerBluetoothManagerAndroid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,22 @@
import android.app.ProgressDialog;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.le.BluetoothLeScanner;
import android.bluetooth.le.ScanCallback;
import android.bluetooth.le.ScanFilter;
import android.bluetooth.le.ScanResult;
import android.bluetooth.le.ScanSettings;
import android.content.Context;
import android.os.Handler;
import android.os.ParcelUuid;
import android.util.Log;
import android.widget.Toast;

import com.shimmerresearch.android.Shimmer;
import com.shimmerresearch.android.Shimmer4Android;
import com.shimmerresearch.android.VerisenseDeviceAndroid;
import com.shimmerresearch.androidradiodriver.AndroidBleRadioByteCommunication;
import com.shimmerresearch.androidradiodriver.Shimmer3BLEAndroid;
import com.shimmerresearch.androidradiodriver.ShimmerRadioInitializerAndroid;
import com.shimmerresearch.androidradiodriver.ShimmerSerialPortAndroid;
import com.shimmerresearch.bluetooth.ShimmerBluetooth;
Expand Down Expand Up @@ -62,6 +69,11 @@ public class ShimmerBluetoothManagerAndroid extends ShimmerBluetoothManager {
protected Handler mHandler;
private boolean AllowAutoPairing = true;

public enum BT_TYPE{
BT_CLASSIC,
BLE
}

public ShimmerBluetoothManagerAndroid(Context context, Handler handler) throws Exception {
super();
ShimmerRadioInitializer.useLegacyDelayBeforeBtRead(true);
Expand Down Expand Up @@ -167,11 +179,107 @@ public void run(){
thread.start();
}

public void connectShimmerThroughBTAddress(final String bluetoothAddress, BT_TYPE btType) {
if(btType.equals(BT_TYPE.BT_CLASSIC)){
connectShimmerThroughBTAddress(bluetoothAddress);
}else{
connectShimmer3BLEThroughBTAddress(bluetoothAddress,"",null);
}
}
@Override
public void connectShimmerThroughBTAddress(final String bluetoothAddress) {

//scanLeDevice(bluetoothAddress);
//doDiscovery();
connectShimmerThroughBTAddress(bluetoothAddress,"",null);
}

public void connectShimmer3BLEThroughBTAddress(final String bluetoothAddress, final String deviceName, Context context){
final Shimmer3BLEAndroid shimmer3BLE = new Shimmer3BLEAndroid(bluetoothAddress, mHandler);
shimmer3BLE.setMacIdFromUart(bluetoothAddress);
initializeNewShimmerCommon(shimmer3BLE);
Thread thread = new Thread(){
public void run(){
shimmer3BLE.connect(bluetoothAddress, "default");
}
};
thread.start();
}

//BT Classic Scan
private void doDiscovery() {

// If we're already discovering, stop it
if (mBluetoothAdapter.isDiscovering()) {
mBluetoothAdapter.cancelDiscovery();
}

// Request discover from BluetoothAdapter
mBluetoothAdapter.startDiscovery();
}

private BluetoothLeScanner bluetoothLeScanner;
private boolean scanning;
private Handler handler = new Handler();
// Stops scanning after 10 seconds.
private static final long SCAN_PERIOD = 10000;
List<BluetoothDevice> listScanBleDevice = new ArrayList<BluetoothDevice>();

//BLE Scan
private void scanLeDevice(String deviceMacAddress) {
getScannedBleDevices();
bluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
if (!scanning) {
// Stops scanning after a predefined scan period.
handler.postDelayed(new Runnable() {
@Override
public void run() {
scanning = false;
bluetoothLeScanner.stopScan(leScanCallback);
}
}, SCAN_PERIOD);

scanning = true;
scanForAllBleDevices();
//scanForSpecificBleDevices(deviceMacAddress);

} else {
scanning = false;
bluetoothLeScanner.stopScan(leScanCallback);
}
}
private void scanForAllBleDevices() {
bluetoothLeScanner.startScan(leScanCallback);
}
private void scanForSpecificBleDevices(String deviceMacAddress) {
List<ScanFilter> scanFilters = new ArrayList<>();
ScanFilter filter = new ScanFilter.Builder().setDeviceAddress(deviceMacAddress).build();
scanFilters.add(filter);
ScanSettings scanSettings = new ScanSettings.Builder().build();
bluetoothLeScanner.startScan(scanFilters, scanSettings, leScanCallback);
}

// Device scan callback.
private ScanCallback leScanCallback =
new ScanCallback() {
@Override
public void onScanResult(int callbackType, ScanResult result) {
super.onScanResult(callbackType, result);
BluetoothDevice bledevice = result.getDevice();
if(!listScanBleDevice.contains(result.getDevice())){
listScanBleDevice.add(result.getDevice());
}
}
};

private void getScannedBleDevices(){
for(BluetoothDevice dev : listScanBleDevice)
{
System.out.println(dev.getAddress());
}

}

private boolean isDevicePaired(String bluetoothAddress){
Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
for(BluetoothDevice device: pairedDevices){
Expand Down
8 changes: 7 additions & 1 deletion ...rc/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.shimmerresearch.androidradiodriver;

import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattService;
Expand Down Expand Up @@ -94,14 +95,19 @@ public void onMtuChanged(int mtu) {
} catch (InterruptedException e) {
e.printStackTrace();
}
gatt.requestConnectionPriority(BluetoothGatt.CONNECTION_PRIORITY_HIGH);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
gatt.requestConnectionPriority(BluetoothGatt.CONNECTION_PRIORITY_HIGH);
}

if (mByteCommunicationListener != null) {
mByteCommunicationListener.eventConnected();
}
mBleDevice = bleDevice;
startServiceS(bleDevice);
System.out.println(bleDevice.getMac() + " Connected");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
gatt.setPreferredPhy(BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_OPTION_NO_PREFERRED);
}
mTaskConnect.setResult("Connected");
}

Expand Down
Loading