Skip to content

Commit ff67ec4

Browse files
committed
updates and more fixes
1 parent dc054f1 commit ff67ec4

2 files changed

Lines changed: 26 additions & 2 deletions

File tree

ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,17 @@ public ShimmerDevice getShimmerDeviceBtConnected(String connectionHandle){
494494
return shimmerDevice;
495495
}
496496

497+
public boolean checkIfAlgoEnabledonAnyConnectedDevice(String algoName) {
498+
for (String comPort:mMapOfBtConnectedShimmers.keySet()) {
499+
ShimmerDevice device = getShimmerDeviceBtConnected(comPort);
500+
boolean algoenabled = device.isAlgorithmEnabled(algoName);
501+
if(algoenabled) {
502+
return true;
503+
}
504+
}
505+
return false;
506+
}
507+
497508
public ShimmerDevice getShimmerDeviceBtConnectedFromMac(String macAddress){
498509
Iterator<ShimmerDevice> iterator = mMapOfBtConnectedShimmers.values().iterator();
499510
while(iterator.hasNext()){

ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.Map.Entry;
3030
import java.util.Random;
3131
import java.util.TimeZone;
32+
import java.util.regex.Pattern;
3233

3334
import org.apache.commons.lang3.ArrayUtils;
3435

@@ -938,7 +939,19 @@ public int compare(Entry<Double, Double> o1,
938939
}
939940
return new ArrayList<Double>(sortedMap.keySet());
940941
}
941-
942+
// Regex breakdown:
943+
// ^ : Start of string
944+
// [0-9a-fA-F]{2} : Two hex characters
945+
// ( (:[0-9a-fA-F]{2}){5} | ([0-9a-fA-F]{2}){5} ) : Either 5 groups preceded by colons OR 5 groups with nothing
946+
// $ : End of string
947+
private static final String MAC_REGEX = "^([0-9a-fA-F]{2})((:[0-9a-fA-F]{2}){5}|([0-9a-fA-F]{2}){5})$";
948+
private static final Pattern MAC_PATTERN = Pattern.compile(MAC_REGEX);
949+
950+
public static boolean isValidMacAddress(String mac) {
951+
if (mac == null) return false;
952+
return MAC_PATTERN.matcher(mac).matches();
953+
}
954+
942955
public static boolean isValidMac(String mac) {
943956
if(mac==null){
944957
return false;
@@ -954,7 +967,7 @@ public static boolean isValidMac(String mac) {
954967

955968
return true;
956969
}
957-
970+
958971
public static String getDayString(int dayIndex) {
959972
switch (dayIndex) {
960973
case Calendar.SUNDAY:

0 commit comments

Comments
 (0)