Skip to content

DEV-456 #243

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
MAzalya merged 1 commit into from
Sep 9, 2025
Merged

DEV-456 #243

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .../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 @@ -491,7 +491,7 @@ public ShimmerDevice getShimmerDeviceBtConnectedFromMac(String macAddress){
Iterator<ShimmerDevice> iterator = mMapOfBtConnectedShimmers.values().iterator();
while(iterator.hasNext()){
ShimmerDevice shimmerDevice = iterator.next();
if(shimmerDevice.getMacId().equals(macAddress)){
if(shimmerDevice.getMacId().toUpperCase().equals(macAddress.toUpperCase())){
return shimmerDevice;
}
}
Expand Down
51 changes: 49 additions & 2 deletions ...erPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,12 @@ public void actionPerformed(ActionEvent arg0) {
}

try {
ShimmerDevice device = btManager.getShimmerDeviceBtConnected(btComport);
ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
device = btManager.getShimmerDeviceBtConnected(btComport);
} else {
device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
}
if (device instanceof VerisenseDevice) {
((VerisenseDevice)device).startStreaming();
}else{
Expand Down Expand Up @@ -418,7 +423,7 @@ public void actionPerformed(ActionEvent e) {
frame.getContentPane().add(lblFilePath);

chckbxWriteDataToFile = new JCheckBox("Write Data to File");
chckbxWriteDataToFile.setBounds(829, 185, 242, 23);
chckbxWriteDataToFile.setBounds(829, 185, 116, 23);
chckbxWriteDataToFile.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
if(e.getStateChange() == ItemEvent.SELECTED) {
Expand All @@ -429,6 +434,46 @@ public void itemStateChanged(ItemEvent e) {
}
});
frame.getContentPane().add(chckbxWriteDataToFile);

JButton btnStartSDLogging = new JButton("START SD");
btnStartSDLogging.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
device = btManager.getShimmerDeviceBtConnected(btComport);
} else {
device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
}
if (device instanceof VerisenseDevice) {
((VerisenseDevice)device).startSDLogging();
}else{
((ShimmerBluetooth)device).startSDLogging();
}
}
});
btnStartSDLogging.setBounds(951, 181, 91, 31);
frame.getContentPane().add(btnStartSDLogging);

JButton btnStopSd = new JButton("STOP SD");
btnStopSd.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {

ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
device = btManager.getShimmerDeviceBtConnected(btComport);
} else {
device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
}
if (device instanceof VerisenseDevice) {
((VerisenseDevice)device).stopSDLogging();
}else{
((ShimmerBluetooth)device).stopSDLogging();
}

}
});
btnStopSd.setBounds(1043, 181, 82, 31);
frame.getContentPane().add(btnStopSd);

plotManager.setTitle("Plot");
}
Expand Down Expand Up @@ -514,6 +559,8 @@ protected void processMsgFromCallback(ShimmerMsg shimmerMSG) {
ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
device = btManager.getShimmerDeviceBtConnected(btComport);
} else {
device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
}

if (device instanceof VerisenseDevice) {
Expand Down
Loading