AA-308

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle

@@ -1,7 +1,7 @@
 //JC: use gradlew install and then comment out install and use gradlew bintray
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
+//apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'maven-publish'
 
 android {
@@ -51,6 +51,10 @@ android {
         preDexLibraries = false
         jumboMode = true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 }
 
 
@@ -97,11 +101,11 @@ publishing {
 }
 */
 dependencies {
-    compile 'com.google.guava:guava:20.0'
-    compile 'java3d:vecmath:1.3.1'
-    compile files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
-    compile files('libs/AndroidBluetoothLibrary.jar')
-    compile files('libs/androidplot-core-0.5.0-release.jar')
-    compile 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.google.guava:guava:20.0'
+    implementation 'java3d:vecmath:1.3.1'
+    implementation files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
+    implementation files('libs/AndroidBluetoothLibrary.jar')
+    api files('libs/androidplot-core-0.5.0-release.jar')
+    implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
 }

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java

@@ -1772,7 +1772,7 @@ protected void interpretDataPacketFormat(Object object,
 	@Override
 	public void createConfigBytesLayout() {
 		//TODO check this is ok
-		mConfigByteLayout = new ConfigByteLayoutShimmer3(getFirmwareIdentifier(), getFirmwareVersionMajor(), getFirmwareVersionMinor(), getFirmwareVersionInternal());
+		mConfigByteLayout = new ConfigByteLayoutShimmer3(getFirmwareIdentifier(), getFirmwareVersionMajor(), getFirmwareVersionMinor(), getFirmwareVersionInternal(), getHardwareVersion());
 	}
 
 	protected void finishOperation(BT_STATE currentOperation) {

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/manager/ShimmerBluetoothManagerAndroid.java

@@ -396,7 +396,7 @@ protected ShimmerDevice createNewShimmer3(ShimmerRadioInitializer shimmerRadioIn
         mMapOfBtConnectedShimmers.put(bluetoothAddress, shimmer);
         try {
             ShimmerVerObject sVO = shimmerRadioInitializer.readShimmerVerObject();
-            if (sVO.isShimmerGen3()) {
+            if (sVO.isShimmerGen3() || sVO.isShimmerGen3R()) {
                 return initializeShimmer3(serialPort, shimmer);
             } else if (sVO.isShimmerGen2()) {
                 return initializeShimmer2r(serialPort, shimmer);

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/Shimmer3BLEAndroid.java

@@ -457,7 +457,7 @@ protected void interpretDataPacketFormat(Object o, Configuration.COMMUNICATION_T
 
     @Override
     public void createConfigBytesLayout() {
-        mConfigByteLayout = new ConfigByteLayoutShimmer3(getFirmwareIdentifier(), getFirmwareVersionMajor(), getFirmwareVersionMinor(), getFirmwareVersionInternal());
+        mConfigByteLayout = new ConfigByteLayoutShimmer3(getFirmwareIdentifier(), getFirmwareVersionMajor(), getFirmwareVersionMinor(), getFirmwareVersionInternal(), getHardwareVersion());
     }
 
     @Override

ShimmerAndroidInstrumentDriver/bluetoothManagerExample/build.gradle

@@ -50,7 +50,7 @@ android {
 dependencies {
     implementation project(':ShimmerAndroidInstrumentDriver')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation ('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'

ShimmerAndroidInstrumentDriver/build.gradle

@@ -1,14 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.40'
     repositories {
         google()
         mavenCentral()
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        //classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:7.0.4' // Compatible with JDK 11
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         //classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0')
@@ -77,15 +78,15 @@ allprojects {
                 implementation 'java3d:vecmath:1.3.1'
                 implementation 'com.android.support:appcompat-v7:26.1.0'
                 implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
-                implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.10.18_alpha'){
+                implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanagerdev', version:'0.10.25_alpha'){
 
                     // excluding org.json which is provided by Android
                     exclude group: 'io.netty'
                     exclude group: 'com.google.protobuf'
                     exclude group: 'org.apache.commons.math'
                 }
 
-                implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.10.18_alpha'){
+                implementation (group: 'com.shimmerresearch', name: 'shimmerdriverdev', version:'0.10.25_alpha'){
 
                     // excluding org.json which is provided by Android
                     exclude group: 'io.netty'

ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/build.gradle

@@ -35,10 +35,10 @@ android {
 }
 
 dependencies {
-    compile project(':ShimmerAndroidInstrumentDriver')
-    compile 'org.apache.commons:commons-math:2.2'
-    compile 'org.apache.commons:commons-lang3:3.4'
-    provided files('../ShimmerAndroidInstrumentDriver/libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
-    provided files('../ShimmerAndroidInstrumentDriver/libs/androidplot-core-0.5.0-release.jar')
-    provided 'com.google.guava:guava:19.0'
+    implementation project(':ShimmerAndroidInstrumentDriver')
+    implementation 'org.apache.commons:commons-math:2.2'
+    implementation 'org.apache.commons:commons-lang3:3.4'
+    implementation files('../ShimmerAndroidInstrumentDriver/libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
+    implementation files('../ShimmerAndroidInstrumentDriver/libs/androidplot-core-0.5.0-release.jar')
+    implementation 'com.google.guava:guava:19.0'
 }

ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle

@@ -50,7 +50,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:support-v4:+'
     androidTestImplementation 'com.android.support:support-annotations:25.3.1'
-    compile(group: 'com.shimmerresearch', name: 'shimmerandroidinstrumentdriver', version: '3.0.85_beta', ext: 'aar')
+    implementation(group: 'com.shimmerresearch', name: 'shimmerandroidinstrumentdriver', version: '3.0.87_alpha', ext: 'aar')
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'

ShimmerAndroidInstrumentDriver/shimmerLegacyExample/build.gradle

@@ -48,7 +48,7 @@ android {
 dependencies {
     implementation project(':ShimmerAndroidInstrumentDriver')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'

ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle

@@ -48,7 +48,7 @@ android {
 dependencies {
     implementation project(':ShimmerAndroidInstrumentDriver')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'

ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java

@@ -684,6 +684,9 @@ else if(msg.what == Shimmer.MSG_IDENTIFIER_SYNC_PROGRESS){
             else if(msg.what == Shimmer.MSG_IDENTIFIER_NOTIFICATION_MESSAGE){
                 if(((CallbackObject)msg.obj).mIndicator == Shimmer.NOTIFICATION_SHIMMER_FULLY_INITIALIZED){
                     Toast.makeText(getApplicationContext(), "Device fully initialized: ", Toast.LENGTH_SHORT).show();
+                    String macAddress = ((CallbackObject)msg.obj).mBluetoothAddress;
+                    ShimmerDevice device = mService.getShimmer(macAddress);
+                    deviceConfigFragment.buildDeviceConfigList(device, MainActivity.this, mService.getBluetoothManager());
                 }
             }