Skip to content

DEV-61 add MacOS comport prefix for BT Shimmers #201

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
JongChern merged 1 commit into from
Feb 5, 2025
Merged

DEV-61 add MacOS comport prefix for BT Shimmers #201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .../src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public abstract class ShimmerBluetoothManager{
protected static final boolean USE_INFOMEM_CONFIG_METHOD = true;
public static final long SLEEP_BETWEEN_GROUP_ACTIONS_MS = 50;
public static final String COMPORT_PREFIX = "COM";
public static final String COMPORT_PREFIX_MAC = "/dev/";
protected int mSyncTrainingIntervalInSeconds = 15;
protected int msDelayBetweenSetCommands = 0;
protected BluetoothProgressReportAll mProgressReportAll;
Expand Down Expand Up @@ -502,7 +503,7 @@ public void removeShimmerDeviceBtConnected(String connectionHandle){
}

protected BluetoothDeviceDetails getBluetoothDeviceDetails(String connectionHandle){
if (!connectionHandle.contains(COMPORT_PREFIX)) {
if (!connectionHandle.contains(COMPORT_PREFIX) && !connectionHandle.contains(COMPORT_PREFIX_MAC)) {
return getBLEDeviceDetails(connectionHandle);
}
return mMapOfParsedBtComPorts.get(connectionHandle);
Expand Down Expand Up @@ -835,7 +836,7 @@ else if(deviceTypeDetected==DEVICE_TYPE.ARDUINO){
if (shimmerDevice!=null && !(shimmerDevice instanceof ShimmerShell)){
printMessage("Connecting to " + shimmerDevice.getClass().getSimpleName() + " with connection handle = " + (connectThroughComPort? comPort:bluetoothAddress));
if(connectThroughComPort){
if (!comPort.contains(COMPORT_PREFIX)) {
if (!comPort.contains(COMPORT_PREFIX) && !comPort.contains(COMPORT_PREFIX_MAC)) {
connectShimmer3BleGrpc(bluetoothDetails);
}else {
connectExistingShimmer(shimmerDevice, comPort, bluetoothAddress);
Expand Down