From 6b2460e1c1c4cd8574560625a979ed275997186c Mon Sep 17 00:00:00 2001
From: JongChern <jongchern@gmail.com>
Date: Fri, 22 Aug 2025 15:53:18 +0800
Subject: [PATCH 1/2] Update ShimmerDevice.java

---
 .../shimmerresearch/driver/ShimmerDevice.java | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
index 9e1265b19..56c184fc2 100644
--- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
+++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
@@ -207,8 +207,36 @@ public abstract class ShimmerDevice extends BasicProcessWithCallBack implements
 	public transient CommsProtocolRadio mCommsProtocolRadio = null;
 	public BT_STATE mBluetoothRadioState = BT_STATE.DISCONNECTED;
 	public DOCK_STATE mDockState = DOCK_STATE.UNDOCKED;
-	
+	public BTRADIO_STATE mRadioState = BTRADIO_STATE.UNKNOWN; 
 	private boolean mUpdateOnlyWhenStateChanges=false;
+	public static int EXP_BOARD_MEMORY_LOCATION_FOR_BTRADIO_STATE = 2018;
+	public enum BTRADIO_STATE{
+
+		BT_CLASSIC_BLE_ENABLED("BT Classic and BLE Enabled"),
+		BT_CLASSIC_ENABLED("BT Classic Enabled"),
+		BLE_ENABLED("BLE Enabled"),
+		NONE_ENABLED("None Enabled"),
+		UNKNOWN("Unknown");
+//		RECORDING("Recording");
+		
+	    private final String text;
+
+	    /**
+	     * @param text
+	     */
+	    private BTRADIO_STATE(final String text) {
+	        this.text = text;
+	    }
+
+	    /* (non-Javadoc)
+	     * @see java.lang.Enum#toString()
+	     */
+	    @Override
+	    public String toString() {
+	        return text;
+	    }
+	
+	}
 	
 	//TODO:
 	public enum DOCK_STATE{

From ead283076c0835b77a015a4571de4ef68d445530 Mon Sep 17 00:00:00 2001
From: Mas Azalya <masazalya@shimmersensing.com>
Date: Mon, 25 Aug 2025 13:17:01 +0800
Subject: [PATCH 2/2] update shimmer3 HW check

---
 .../main/java/com/shimmerresearch/driver/ShimmerDevice.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
index 56c184fc2..dfdceacb8 100644
--- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
+++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
@@ -2106,9 +2106,10 @@ public boolean isSupportedSdLogSync() {
 		return false;
 	}
 	
-	public boolean isFWSupportedBtBleControl() {
+	public boolean isHWAndFWSupportedBtBleControl() {
 		if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM
-				&& mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)){
+				&& mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)
+						&& isShimmerGen3()){
 			return true;
 		}
 		return false;