Skip to content

DEV-448 Disconnection from BLE Server not being communicated to UI #246

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
dmariapan-shimmer merged 4 commits into from
Sep 30, 2025
Merged

DEV-448 Disconnection from BLE Server not being communicated to UI #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e230611
DEV-448 WIP implementing check for whether BLE gRPC server is running
jyong15 Sep 18, 2025
5804f97
DEV-448 fix IOThread not stopping
jyong15 Sep 29, 2025
bb3143e
DEV-448 fix typo
jyong15 Sep 29, 2025
2348316
DEV-448 fix checks for running BLE Server
jyong15 Sep 29, 2025
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
37 changes: 34 additions & 3 deletions ShimmerDriver/src/main/java/com/shimmerresearch/grpc/GrpcBLERadioByteTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;

import javax.swing.JFrame;

Expand Down Expand Up @@ -82,9 +83,40 @@ public boolean isExeRunning(String exeName) {
return false;
}
}

public boolean isExeRunningMacOS(String exeName) {
try {
Process process = Runtime.getRuntime().exec(new String[]{"pgrep", "-x", exeName});
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
boolean found = reader.readLine() != null;

if (!process.waitFor(5, TimeUnit.SECONDS)) { // Wait up to 5 seconds
process.destroy(); // Terminate the process if it doesn't exit
System.err.println("pgrep process timed out.");
return false; // Consider it not found or an error
}

return found;
} catch (IOException e) {
System.err.println("Error executing pgrep command: " + e.getMessage());
e.printStackTrace();
return false;
} catch (InterruptedException e) {
System.err.println("Thread interrupted while waiting for pgrep process: " + e.getMessage());
Thread.currentThread().interrupt(); // Restore the interrupted status
return false;
}
}

public boolean isServerRunning() {
if(UtilShimmer.isOsMac()) {
return isExeRunningMacOS(mExeNameMac);
} else {
return isExeRunning(mExeNameWindows);
}
}

public int startServer() throws Exception {


int port = getFreePort();

System.out.println(port + " is free");
Expand Down Expand Up @@ -117,7 +149,6 @@ public int startServer() throws Exception {
processThread.start();
return port;
// You can continue with other tasks here

}

public void stopServer() {
Expand Down
46 changes: 23 additions & 23 deletions ShimmerDriverPC/src/main/java/com/shimmerresearch/pcDriver/ShimmerGRPC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,29 +539,29 @@ public void disconnect() throws ShimmerException {
setBluetoothRadioState(BT_STATE.DISCONNECTED);
}

private void closeConnection(){
try {
if (mIOThread != null) {
mIOThread.stop = true;
// Closing serial port before before thread is finished stopping throws an error so waiting here
while(mIOThread != null && mIOThread.isAlive());

mIOThread = null;
if(mUseProcessingThread){
mPThread.stop = true;
mPThread = null;
}
}
mIsStreaming = false;
mIsInitialised = false;

setBluetoothRadioState(BT_STATE.DISCONNECTED);
} catch (Exception ex) {
consolePrintException(ex.getMessage(), ex.getStackTrace());
setBluetoothRadioState(BT_STATE.DISCONNECTED);
}
private void closeConnection() {
try {
if (mIOThread != null) {
mIOThread.stop = true;
mIOThread.interrupt();
mIOThread.join(); // Wait until the thread terminates
mIOThread = null;
if (mUseProcessingThread) {
mPThread.stop = true;
mPThread.interrupt();
mPThread.join();
mPThread = null;
}
}
mIsStreaming = false;
mIsInitialised = false;

setBluetoothRadioState(BT_STATE.DISCONNECTED);
} catch (Exception ex) {
consolePrintException(ex.getMessage(), ex.getStackTrace());
setBluetoothRadioState(BT_STATE.DISCONNECTED);
}
}

//Need to override here because ShimmerDevice class uses a different map
Expand Down
9 changes: 7 additions & 2 deletions ...rPC/src/main/java/com/shimmerresearch/tools/bluetooth/BasicShimmerBluetoothManagerPc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class BasicShimmerBluetoothManagerPc extends ShimmerBluetoothManager {
List<VerisenseDevice> verisenseDeviceList = new ArrayList<VerisenseDevice>();
List<ShimmerGRPC> shimmer3BleDeviceList = new ArrayList<ShimmerGRPC>();
public static int mGRPCPort;
private GrpcBLERadioByteTools grpcTool;

public BasicShimmerBluetoothManagerPc() {
startGrpc();
Expand All @@ -54,7 +55,7 @@ public BasicShimmerBluetoothManagerPc(boolean enableGRPC) {

protected void startGrpc(String path) {
try {
GrpcBLERadioByteTools grpcTool = new GrpcBLERadioByteTools("ShimmerBLEGrpc.exe",path);
grpcTool = new GrpcBLERadioByteTools("ShimmerBLEGrpc.exe",path);
mGRPCPort = grpcTool.startServer();
} catch(Exception e) {
e.printStackTrace();
Expand All @@ -63,12 +64,16 @@ protected void startGrpc(String path) {

protected void startGrpc() {
try {
GrpcBLERadioByteTools grpcTool = new GrpcBLERadioByteTools();
grpcTool = new GrpcBLERadioByteTools();
mGRPCPort = grpcTool.startServer();
} catch(Exception e) {
e.printStackTrace();
}
}

public boolean isGrpcServerRunning() {
return grpcTool.isServerRunning();
}

public void setPathToVeriBLEApp(String path) {
mPathToVeriBLEApp = path;
Expand Down