minor updates

Author: JongChern

ShimmerBluetoothManager/build.gradle

@@ -12,6 +12,8 @@ Rev0.2
 
 sourceCompatibility = 1.11
 targetCompatibility = 1.11
+//sourceCompatibility = '1.8'  // Ensure code is compiled with Java 8 when compiling ShimmerJavaClass for Matlab see ShimmerDriverPC (build.gradle)
+//targetCompatibility = '1.8'  // Ensure bytecode is compatible with Java 8 when compiling ShimmerJavaClass for Matlab see ShimmerDriverPC (build.gradle)
 
 repositories {
     mavenCentral()

ShimmerDriver/build.gradle

@@ -15,6 +15,8 @@ Rev0.2
 apply plugin: 'java-library'
 sourceCompatibility = 1.11
 targetCompatibility = 1.11
+//sourceCompatibility = '1.8'  // Ensure code is compiled with Java 8 when compiling ShimmerJavaClass for Matlab see ShimmerDriverPC (build.gradle)
+//targetCompatibility = '1.8'  // Ensure bytecode is compatible with Java 8 when compiling ShimmerJavaClass for Matlab see ShimmerDriverPC (build.gradle)
 
 repositories {
     mavenCentral()

ShimmerDriverPC/build.gradle

@@ -8,13 +8,17 @@
  */
 
 // Apply the java plugin to add support for Java
-apply plugin: 'java'
-apply plugin: 'java-library'
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
-
+plugins {
+    id 'java'
+    id 'java-library'
+    id 'eclipse'
+    id 'maven-publish'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'  // Apply the Shadow plugin
+}
 sourceCompatibility = 1.11
-
+targetCompatibility = 1.11
+//sourceCompatibility = '1.8'  // Ensure code is compiled with Java 8 when compiling ShimmerJavaClass for Matlab see ShimmerDriverPC (build.gradle)
+//targetCompatibility = '1.8'  // Ensure bytecode is compatible with Java 8 when compiling ShimmerJavaClass for Matlab see ShimmerDriverPC (build.gradle)
 /*
 Rev0.2
 - switch to using jfrog
@@ -96,3 +100,20 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     implementation 'com.parse.bolts:bolts-tasks:1.4.0'
 }
+
+// Shadow JAR task to create a runnable JAR with dependencies
+/*
+Change to using the following below for ShimmerDriverPC/ShimmerDriver/ShimmerBluetoothManager
+sourceCompatibility = '1.8'  // Ensure code is compiled with Java 8
+targetCompatibility = '1.8'  // Ensure bytecode is compatible with Java 8
+*/
+shadowJar {
+    archiveBaseName.set('ShimmerJavaClass')  // Use archiveBaseName instead of baseName
+    archiveClassifier.set('')  // Remove classifier so it’s named shimmerjavaclass.jar
+    
+    manifest {
+        attributes 'Main-Class': 'com.shimmerresearch.tools.matlab.ShimmerJavaClass'  // Specify the main class
+    }
+
+    mergeServiceFiles()  // Merges service files (if any)
+}

ShimmerDriverPC/src/main/java/com/shimmerresearch/tools/matlab/ShimmerJavaClass.java

@@ -25,6 +25,7 @@
 import com.shimmerresearch.exceptions.ShimmerException;
 import com.shimmerresearch.pcDriver.ShimmerPC;
 import com.shimmerresearch.tools.bluetooth.BasicShimmerBluetoothManagerPc;
+import com.shimmerresearch.algorithms.*;
 
 public class ShimmerJavaClass {
     private String comPort;
@@ -35,15 +36,20 @@ public class ShimmerJavaClass {
     private String[] signalNameArray;
     private String[] signalFormatArray;
     private String[] signalUnitArray;
+    
+    private boolean mDebug = false;
+    
 //    private int rowIndex = 0;
     Object[] currentData = null;
-    public static BasicShimmerBluetoothManagerPc mBluetoothManager = new BasicShimmerBluetoothManagerPc();
+    public static BasicShimmerBluetoothManagerPc mBluetoothManager = new BasicShimmerBluetoothManagerPc(false);
 
     public ShimmerJavaClass() {
         sdr.setWaitForData(mBluetoothManager.callBackObject);
         mBluetoothManager.addCallBack(sdr);
-        System.out.println("Callback Registered");
-        System.out.flush();
+        if (mDebug) {
+	        System.out.println("Callback Registered");
+	        System.out.flush();
+        }
     }
 
     public static void main(String[] args) {
@@ -155,8 +161,10 @@ private void sendData(Object[] data) {
 
     public void readData() { //Test receive data for all Object Cluster
     	Object[] data = receiveData();
-    	System.out.println("New Data : " + data[0] + "\tChannel Name  : " + data[1]
+    	if (mDebug) {
+    		System.out.println("New Data : " + data[0] + "\tChannel Name  : " + data[1]
     			+ "\tFormat : " + data[2] + "\tUnit : " + data[3]);
+    	}
     }
 
     public class SensorDataReceived extends BasicProcessWithCallBack {
@@ -180,8 +188,10 @@ protected void processMsgFromCallback(ShimmerMsg shimmerMSG) {
                     	comPort = callbackObject.mComPort;
                     }
                 	channelNames = retrieveSensorChannels();
-                	for(String channel : channelNames) {
-                		System.out.println(channel);
+                	if (mDebug) {
+	                	for(String channel : channelNames) {
+	                		System.out.println(channel);
+	                	}
                 	}
                 } else if (callbackObject.mState == BT_STATE.DISCONNECTED || callbackObject.mState == BT_STATE.CONNECTION_LOST) {
                     System.out.println("Device State Change: " + callbackObject.mState);