Merge branch 'master' into DEV-135

JongChern · JongChern · commit ce9e34844df5 · 2025-09-22T15:11:23.000+08:00
diff --git a/ShimmerBluetoothManager/build.gradle b/ShimmerBluetoothManager/build.gradle
@@ -27,7 +27,7 @@ publishing {
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
             artifactId = 'shimmerbluetoothmanager' // Replace with the name of your package
-            version = '0.11.4_beta' // Replace with your package version
+            version = '0.11.5_beta' // Replace with your package version
 
             // Jar publication
             //(
diff --git a/ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java b/ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java
@@ -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;
 			}
 		}
diff --git a/ShimmerDriver/build.gradle b/ShimmerDriver/build.gradle
@@ -49,7 +49,7 @@ publishing {
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
             artifactId = 'shimmerdriver' // Replace with the name of your package
-            version = '0.11.4_beta' // Replace with your package version
+            version = '0.11.5_beta' // Replace with your package version
 
             // Jar publication
             //(
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/bluetooth/ShimmerBluetooth.java b/ShimmerDriver/src/main/java/com/shimmerresearch/bluetooth/ShimmerBluetooth.java
@@ -505,6 +505,7 @@ public int getNumCrcBytes() {
 	
 	public static final int MSG_IDENTIFIER_VERISENSE_ERASE_DATA_COMPLETED = 14;
 	public static final int MSG_IDENTIFIER_VERISENSE_WRITE_OPCONFIG_COMPLETED = 15;
+	public static final int MSG_IDENTIFIER_SYNC_COMPLETED = 16;
 
 	//	private boolean mVerboseMode = true;
 	//	private String mParentClassName = "ShimmerPC";
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/comms/radioProtocol/RadioListener.java b/ShimmerDriver/src/main/java/com/shimmerresearch/comms/radioProtocol/RadioListener.java
@@ -26,7 +26,7 @@ public interface RadioListener {
 	public void isNowStreamingCallback();
 	public void hasStopStreamingCallback();
 	public void isNowStreamLoggedDataCallback();
-	public void hasStopStreamLoggedDataCallback();
+	public void hasStopStreamLoggedDataCallback(String binPath);
 	public void initialiseStreamingCallback();
 	
 //	public void eventSyncStates(boolean isDocked, boolean isInitialised, boolean isSdLogging, boolean isSensing, boolean isStreaming, boolean haveAttemptedToRead);
diff --git 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{
@@ -2078,6 +2106,14 @@ public boolean isSupportedSdLogSync() {
 		return false;
 	}
 	
+	public boolean isHWAndFWSupportedBtBleControl() {
+		if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM
+				&& mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)
+						&& isShimmerGen3()){
+			return true;
+		}
+		return false;
+	}
 	
 	public boolean isLegacySdLog(){
 		if (getFirmwareIdentifier()==FW_ID.SDLOG && getFirmwareVersionMajor()==0 && getFirmwareVersionMinor()==5){
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDeviceCallbackAdapter.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDeviceCallbackAdapter.java
@@ -107,6 +107,11 @@ public void newSyncPayloadReceived(int payloadIndex, boolean crcError, double tr
 		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_SYNC_PROGRESS, callBackObject);
 	}
 	
+	public void readLoggedDataCompleted(String binFilePath) {
+		CallbackObject callBackObject = new CallbackObject(getMacId(), getComPort(), new SyncProgressDetails(binFilePath));
+		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_SYNC_COMPLETED, callBackObject);
+	}
+	
 	public void eraseDataCompleted() {
 		CallbackObject callBackObject = new CallbackObject(getMacId(), getComPort(), true);
 		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_VERISENSE_ERASE_DATA_COMPLETED, callBackObject);
@@ -121,7 +126,11 @@ public void hasStopStreaming() {
 		// Send a notification msg to the UI through a callback (use a msg identifier notification message)
 		CallbackObject callBackObject = new CallbackObject(ShimmerBluetooth.NOTIFICATION_SHIMMER_STOP_STREAMING, getMacId(), getComPort());
 		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_NOTIFICATION_MESSAGE, callBackObject);
-		mShimmerDevice.setBluetoothRadioState(BT_STATE.CONNECTED);
+		if (mShimmerDevice.isSDLogging()) {
+			mShimmerDevice.setBluetoothRadioState(BT_STATE.SDLOGGING);
+		} else {
+			mShimmerDevice.setBluetoothRadioState(BT_STATE.CONNECTED);
+		}
 	}
 	
 	public void startStreaming() {
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerObject.java
@@ -10831,6 +10831,14 @@ public static boolean isSupportedNewImuSensors(ShimmerVerObject svo, ExpansionBo
 			return false;
 		}
 	}
+	
+	public boolean isSupportedBtBleControl() {
+		//TODO check S3/S3R FW version in-which command was introduced?
+		BluetoothModuleVersionDetails bluetoothModuleVersionDetails = getBtFwVerDetails();
+		return (bluetoothModuleVersionDetails.isBtModuleVersionKnown()
+				&& !bluetoothModuleVersionDetails.isBtModuleVersionRn41()
+				&& !bluetoothModuleVersionDetails.isBtModuleVersionRn42());
+	}
 
 	@Override
 	public LinkedHashMap<String, ChannelDetails> getMapOfAllChannelsForStoringToDB(COMMUNICATION_TYPE commType, CHANNEL_TYPE channelType, boolean isKeyOJCName, boolean showDisabledChannels) {
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java
@@ -74,4 +74,29 @@ public String getBtModuleVersionReceived() {
 		return mBtModuleVersionReceived;
 	}
 
+	public boolean isBtModuleVersionKnown() {
+		return mBtModuleVersionParsed != BT_MODULE_VERSION.UNKNOWN && mBtModuleVersionParsed != BT_MODULE_VERSION.NOT_READ;
+	}
+	
+	public boolean isBtModuleVersionRn42() {
+		return mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V4_77 ||
+				mBtModuleVersionParsed == BT_MODULE_VERSION.RN42_VERSION_RESPONSE_V6_15;
+	}
+	
+	public boolean isBtModuleVersionRn41() {
+		return mBtModuleVersionParsed == BT_MODULE_VERSION.RN41_VERSION_RESPONSE_V4_77;
+	}
+
+	public boolean isBtModuleVersionRn4678() {
+		return mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_00_5
+				|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_11_0
+				|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_13_5
+				|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_22_0
+				|| mBtModuleVersionParsed == BT_MODULE_VERSION.RN4678_VERSION_RESPONSE_V1_23_0;
+	}
+	
+	public boolean isBtModuleVersionVelaIf820() {
+		return mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_12_12
+				|| mBtModuleVersionParsed == BT_MODULE_VERSION.VELA_IF820_V01_04_16_16;
+	}
 }
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer4sdk/Shimmer4sdk.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer4sdk/Shimmer4sdk.java
@@ -693,7 +693,7 @@ public void isNowStreamLoggedDataCallback() {
 				}
 
 				@Override
-				public void hasStopStreamLoggedDataCallback() {
+				public void hasStopStreamLoggedDataCallback(String binPath) {
 					// TODO Auto-generated method stub
 					
 				}
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerBattStatusDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerBattStatusDetails.java
@@ -75,7 +75,8 @@ public ShimmerBattStatusDetails(byte[] rxBuf) {
 		if(rxBuf.length >= 3) {
 			// Parse response string
             int battAdcValue = (((rxBuf[1]&0xFF) << 8) + (rxBuf[0]&0xFF));
-            int chargingStatus = rxBuf[2] & 0xC0;
+            // Parse as unsigned byte and let full byte through to handle UNKNOWN status
+            int chargingStatus = rxBuf[2] & 0xFF; 
             update(battAdcValue, chargingStatus);
 		}
 	}
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerDetails.java
@@ -146,7 +146,7 @@ public static final class HW_ID_SR_CODES {
         aMap.put(HW_ID_SR_CODES.EXP_BRD_BR_AMP, "Bridge Amplifier+");
         aMap.put(HW_ID_SR_CODES.SPAN, "Span");//not used
         aMap.put(HW_ID_SR_CODES.EXP_BRD_GSR, "GSR+");
-        aMap.put(HW_ID_SR_CODES.SHIMMER3, "Shimmer3");//not used
+        aMap.put(HW_ID_SR_CODES.SHIMMER3, "IMU");//not used
         aMap.put(HW_ID_SR_CODES.EXP_BRD_PROTO3_MINI, "PROTO3 Mini");
         aMap.put(HW_ID_SR_CODES.EXP_BRD_EXG, "ECG/EMG");
         aMap.put(HW_ID_SR_CODES.EXP_BRD_PROTO3_DELUXE, "PROTO3 Deluxe");
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/VerisenseDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/VerisenseDevice.java
@@ -1686,7 +1686,8 @@ public void isNowStreamLoggedDataCallback() {
 			}
 
 			@Override
-			public void hasStopStreamLoggedDataCallback() {
+			public void hasStopStreamLoggedDataCallback(String binFilePath) {
+				mDeviceCallbackAdapter.readLoggedDataCompleted(binFilePath);
 				// TODO Auto-generated method stub
 				setBluetoothRadioState(BT_STATE.CONNECTED);
 			}
@@ -1940,6 +1941,16 @@ public void readLoggedData() throws ShimmerException {
 		mapOfVerisenseProtocolByteCommunication.get(currentStreamingCommsRoute).readLoggedData();
 	}
 	
+	public void setRootPathForBinFile(String path) {
+		mapOfVerisenseProtocolByteCommunication.get(currentStreamingCommsRoute).setRootPathForBinFile(path);
+	}
+	
+	public void deleteData() throws Exception {
+		
+			mapOfVerisenseProtocolByteCommunication.get(currentStreamingCommsRoute).eraseDataTask().waitForCompletion();
+		
+	}
+	
 	/**
 	 * @return Null if sensor not supported by current hardware
 	 * @see SensorLIS2DW12
@@ -2187,15 +2198,15 @@ public void setPendingEventScheduleRwcSync(PendingEventSchedule pendingEventSche
 	}
 
 	/**
-	 * The number of minute�s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
+	 * The number of minute�s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
 	 * @return interval in minutes, if this value is set to either 0 or 65535 then the adaptive scheduler will never be turned on.
 	 */
 	public int getAdaptiveSchedulerInterval() {
 		return adaptiveSchedulerInterval;
 	}
 
 	/**
-	 * The number of minute�s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
+	 * The number of minute�s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
 	 * @param adaptiveSchedulerInterval interval in minutes, if this value is set to either 0 or 65535 then the adaptive scheduler will never be turned on.
 	 */
 	public void setAdaptiveSchedulerInterval(int adaptiveSchedulerInterval) {
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/communication/SyncProgressDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/communication/SyncProgressDetails.java
@@ -12,4 +12,7 @@ public SyncProgressDetails(int payloadIndex, boolean crcError, double transferRa
 		mTransferRateBytes = transferRateBytes;
 		mBinFilePath = binFilePath;
 	}
+	public SyncProgressDetails(String binFilePath) {
+		mBinFilePath = binFilePath;
+	}
 }
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/communication/VerisenseProtocolByteCommunication.java b/ShimmerDriver/src/main/java/com/shimmerresearch/verisense/communication/VerisenseProtocolByteCommunication.java
@@ -195,7 +195,7 @@ void handleResponse(VerisenseMessage verisenseMessage) {
 					resetFileNameOnStreamingLoggedDataFinish();
 					stateChange(VerisenseProtocolState.Connected);
 					for (RadioListener rl : mRadioListenerList) {
-						rl.hasStopStreamLoggedDataCallback();
+						rl.hasStopStreamLoggedDataCallback(getDataFilePath());
 					}
 				}
 				
diff --git a/ShimmerDriverPC/build.gradle b/ShimmerDriverPC/build.gradle
@@ -41,7 +41,7 @@ publishing {
 
             groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
             artifactId = 'shimmerdriverpc' // Replace with the name of your package
-            version = '0.11.4_beta' // Replace with your package version
+            version = '0.11.5_beta' // Replace with your package version
 
             // Jar publication
             //(
diff --git a/ShimmerDriverPC/src/main/java/com/shimmerresearch/driver/ble/BleRadioByteCommunication.java b/ShimmerDriverPC/src/main/java/com/shimmerresearch/driver/ble/BleRadioByteCommunication.java
@@ -188,7 +188,7 @@ public void connect() throws ShimmerException{
 		WriteDataToProcess("Connect");
 		mTaskConnect = new TaskCompletionSource<>();
 		try {
-			boolean result = mTaskConnect.getTask().waitForCompletion(2, TimeUnit.SECONDS);
+			boolean result = mTaskConnect.getTask().waitForCompletion(6, TimeUnit.SECONDS);
 			if (result) {
 				
 			} else {
diff --git a/ShimmerDriverPC/src/main/java/com/shimmerresearch/tools/bluetooth/BasicShimmerBluetoothManagerPc.java b/ShimmerDriverPC/src/main/java/com/shimmerresearch/tools/bluetooth/BasicShimmerBluetoothManagerPc.java
@@ -39,19 +39,27 @@ public class BasicShimmerBluetoothManagerPc extends ShimmerBluetoothManager {
 	List<String> shimmer3BleMacIdList = new ArrayList<String>();
 	List<VerisenseDevice> verisenseDeviceList = new ArrayList<VerisenseDevice>();
 	List<ShimmerGRPC> shimmer3BleDeviceList = new ArrayList<ShimmerGRPC>();
-	private boolean mInternalUse = true;
 	public static int mGRPCPort;
 	
 	public BasicShimmerBluetoothManagerPc() {
 		startGrpc();
 	}
 	
-	public BasicShimmerBluetoothManagerPc(boolean isInternalUse) {
-		if(isInternalUse) {
+	public BasicShimmerBluetoothManagerPc(boolean enableGRPC) {
+		if(enableGRPC) {
 			startGrpc();
 		}
 	}
 	
+	protected void startGrpc(String path) {
+		try {
+			GrpcBLERadioByteTools grpcTool = new GrpcBLERadioByteTools("ShimmerBLEGrpc.exe",path);
+			mGRPCPort = grpcTool.startServer();
+		}  catch(Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
 	private void startGrpc() {
 		try {
 			GrpcBLERadioByteTools grpcTool = new GrpcBLERadioByteTools();
diff --git a/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java b/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
@@ -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{
@@ -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, 135, 23);
 		chckbxWriteDataToFile.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
                 if(e.getStateChange() == ItemEvent.SELECTED) {
@@ -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(965, 181, 106, 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(1075, 181, 107, 31);
+		frame.getContentPane().add(btnStopSd);
 				
 		plotManager.setTitle("Plot");		
 	}
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ public ShimmerDevice getShimmerDeviceBtConnectedFromMac(String macAddress){`
`491`	`491`	`Iterator<ShimmerDevice> iterator = mMapOfBtConnectedShimmers.values().iterator();`
`492`	`492`	`while(iterator.hasNext()){`
`493`	`493`	`ShimmerDevice shimmerDevice = iterator.next();`
`494`		`- if(shimmerDevice.getMacId().equals(macAddress)){`
	`494`	`+ if(shimmerDevice.getMacId().toUpperCase().equals(macAddress.toUpperCase())){`
`495`	`495`	`return shimmerDevice;`
`496`	`496`	`}`
`497`	`497`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10831,6 +10831,14 @@ public static boolean isSupportedNewImuSensors(ShimmerVerObject svo, ExpansionBo`
`10831`	`10831`	`return false;`
`10832`	`10832`	`}`
`10833`	`10833`	`}`
	`10834`	`+`
	`10835`	`+ public boolean isSupportedBtBleControl() {`
	`10836`	`+ //TODO check S3/S3R FW version in-which command was introduced?`
	`10837`	`+ BluetoothModuleVersionDetails bluetoothModuleVersionDetails = getBtFwVerDetails();`
	`10838`	`+ return (bluetoothModuleVersionDetails.isBtModuleVersionKnown()`
	`10839`	`+ && !bluetoothModuleVersionDetails.isBtModuleVersionRn41()`
	`10840`	`+ && !bluetoothModuleVersionDetails.isBtModuleVersionRn42());`
	`10841`	`+ }`
`10834`	`10842`
`10835`	`10843`	`@Override`
`10836`	`10844`	`public LinkedHashMap<String, ChannelDetails> getMapOfAllChannelsForStoringToDB(COMMUNICATION_TYPE commType, CHANNEL_TYPE channelType, boolean isKeyOJCName, boolean showDisabledChannels) {`
Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,7 @@ public void isNowStreamLoggedDataCallback() {`
`693`	`693`	`}`
`694`	`694`
`695`	`695`	`@Override`
`696`		`- public void hasStopStreamLoggedDataCallback() {`
	`696`	`+ public void hasStopStreamLoggedDataCallback(String binPath) {`
`697`	`697`	`// TODO Auto-generated method stub`
`698`	`698`
`699`	`699`	`}`