diff --git a/SensorLib/settings.gradle b/SensorLib/settings.gradle index 7d3bf12b..6b424f0e 100644 --- a/SensorLib/settings.gradle +++ b/SensorLib/settings.gradle @@ -1,4 +1,4 @@ -include ':sensorlibutils', ':sensorlib', ':sls-tek', ':sls-fitnessshirt', ':sls-shimmer', ':sls-smartwatch', ':sls-simblee', ':sls-smartband2', ':sls-bitalino', ':sls-portabiles' +include ':sensorlibutils', ':sensorlib', ':sls-tek', ':sls-fitnessshirt', ':sls-shimmer', ':sls-smartwatch', ':sls-simblee', ':sls-smartband2', ':sls-bitalino', ':sls-portabiles', ':sls-muse' if (!fileTree(dir: 'sls-empatica/libs', include: 'empalink*.aar').isEmpty()) { include ':sls-empatica' } diff --git a/SensorLib/sls-muse/src/main/java/de/fau/sensorlib/sensors/MuseSensor.java b/SensorLib/sls-muse/src/main/java/de/fau/sensorlib/sensors/MuseSensor.java index 12e8f342..f231a998 100644 --- a/SensorLib/sls-muse/src/main/java/de/fau/sensorlib/sensors/MuseSensor.java +++ b/SensorLib/sls-muse/src/main/java/de/fau/sensorlib/sensors/MuseSensor.java @@ -372,7 +372,8 @@ private void receiveMuseConnectionPacket(final MuseConnectionPacket packet, fina "\nfirmware version: " + museVersion.getFirmwareVersion() + "\nprotocol version: " + museVersion.getProtocolVersion()); - mFirmwareRevision = museVersion.getFirmwareVersion(); + mFirmwareRevisionString = museVersion.getFirmwareVersion(); + mFirmwareRevision = new FirmwareRevision(mFirmwareRevisionString); } diff --git a/SensorLib/sls-muse/src/main/jniLibs/arm64-v8a/libmuse_android.so b/SensorLib/sls-muse/src/main/jniLibs/arm64-v8a/libmuse_android.so deleted file mode 100755 index 78122945..00000000 Binary files a/SensorLib/sls-muse/src/main/jniLibs/arm64-v8a/libmuse_android.so and /dev/null differ diff --git a/SensorLib/sls-muse/src/main/jniLibs/armeabi/libmuse_android.so b/SensorLib/sls-muse/src/main/jniLibs/armeabi/libmuse_android.so deleted file mode 100755 index 78122945..00000000 Binary files a/SensorLib/sls-muse/src/main/jniLibs/armeabi/libmuse_android.so and /dev/null differ