Feature/mfi hardware

.gitignore

@@ -34,13 +34,7 @@ captures/
 
 # IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
+.idea/
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.

app/build.gradle

@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "com.backyardbrains"
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 89
-        versionName '1.8.3.1'
+        targetSdkVersion 30
+        versionCode 90
+        versionName '1.8.3.5'
 
         externalNativeBuild {
             cmake {
@@ -45,7 +46,7 @@ android {
         debug {
             debuggable true
             minifyEnabled false
-            ext.enableCrashlytics = false
+//            ext.enableCrashlytics = false
         }
     }
 
@@ -111,6 +112,11 @@ dependencies {
     implementation "androidx.room:room-runtime:$roomVersion"
     annotationProcessor "androidx.room:room-compiler:$roomVersion"
 
+    implementation platform('com.google.firebase:firebase-bom:28.0.0')
+    implementation 'com.google.firebase:firebase-crashlytics'
+    implementation 'com.google.firebase:firebase-analytics'
+    implementation 'com.google.firebase:firebase-core'
+
     // material design
     implementation "com.google.android.material:material:$materialDesignVersion"
 
@@ -147,15 +153,6 @@ dependencies {
 
     // signal filtering
     implementation "org.apache.commons:commons-math3:$commonsMathVersion"
-
-    // firebase & crashlytics
-    implementation "com.google.firebase:firebase-core:$firebaseVersion"
-    implementation("com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion") {
-        transitive = true
-    }
-
     // benchmark
     implementation "com.github.T-Spoon:Benchit:$benchitVersion"
-}
-
-apply plugin: 'com.google.gms.google-services'
+}

app/src/main/cpp/byb/SampleStreamProcessor.cpp

@@ -111,7 +111,13 @@ namespace backyardbrains {
                                 msb = msb & REMOVER;
                                 msb = msb << 7u;
                                 lsb = lsb & REMOVER;
-                                sample = (short) (((msb | lsb) - 512) * 30);
+                                sample = (short) (((msb | lsb)
+                                                   -
+                                                   backyardbrains::utils::SampleStreamUtils::getResolution(
+                                                           hardwareType))
+                                                  *
+                                                  backyardbrains::utils::SampleStreamUtils::getResolutionMultiplier(
+                                                          hardwareType));
 
                                 // calculate average sample
                                 average = 0.0001 * sample + 0.9999 * average;
@@ -196,10 +202,19 @@ namespace backyardbrains {
 //            inDataPrevLength = length;
 
             bool avoidFilteringOfChannels = stopFilteringAfterChannelIndex >= 0;
+
             for (int i = 0; i < channelCount; i++) {
                 // apply additional filtering if necessary
-                if (avoidFilteringOfChannels && i <= stopFilteringAfterChannelIndex)
+                //TODO: Check is stopFilteringAfterChannelIndex variable properly updated after insert extension board
+                if (avoidFilteringOfChannels && i <= stopFilteringAfterChannelIndex) {
+
+                    applyFilters(i, channels[i], sampleCounters[i]);
+                }
+                else if (!avoidFilteringOfChannels)
+                {
                     applyFilters(i, channels[i], sampleCounters[i]);
+
+                }
                 outSamples[i] = new short[sampleCounters[i]];
                 std::copy(channels[i], channels[i] + sampleCounters[i], outSamples[i]);
                 outSampleCounts[i] = sampleCounters[i];
@@ -217,8 +232,8 @@ namespace backyardbrains {
             __android_log_print(ANDROID_LOG_DEBUG, TAG, "ESCAPE SEQUENCE MESSAGE %s AT %d", message.c_str(),
                                 sampleIndex);
             if (backyardbrains::utils::SampleStreamUtils::isHardwareTypeMsg(message)) {
-                listener->onSpikerBoxHardwareTypeDetected(
-                        backyardbrains::utils::SampleStreamUtils::getHardwareType(message));
+                hardwareType = backyardbrains::utils::SampleStreamUtils::getHardwareType(message);
+                listener->onSpikerBoxHardwareTypeDetected(hardwareType);
             } else if (backyardbrains::utils::SampleStreamUtils::isSampleRateAndNumOfChannelsMsg(message)) {
                 const int sampleRate = backyardbrains::utils::SampleStreamUtils::getMaxSampleRate(message);
                 const int channelCount = backyardbrains::utils::SampleStreamUtils::getChannelCount(message);
@@ -235,6 +250,8 @@ namespace backyardbrains {
         }
 
         void SampleStreamProcessor::updateProcessingParameters(int expansionBoardType) {
+            __android_log_print(ANDROID_LOG_DEBUG, typeid(*this).name(),"expansionBoardType %d", expansionBoardType);
+
             switch (expansionBoardType) {
                 default:
                 case backyardbrains::utils::SampleStreamUtils::NONE_BOARD_DETACHED:

app/src/main/cpp/byb/SampleStreamUtils.cpp

@@ -9,7 +9,8 @@ namespace backyardbrains {
     namespace utils {
 
         const std::string SampleStreamUtils::HARDWARE_TYPE_PREFIX = "HWT:";
-        const std::string SampleStreamUtils::HARDWARE_TYPE_PLANT = SampleStreamUtils::HARDWARE_TYPE_PREFIX + "PLANTSS;";
+        const std::string SampleStreamUtils::HARDWARE_TYPE_PLANT =
+                SampleStreamUtils::HARDWARE_TYPE_PREFIX + "PLANTSS;";
         const std::string SampleStreamUtils::HARDWARE_TYPE_MUSCLE =
                 SampleStreamUtils::HARDWARE_TYPE_PREFIX + "MUSCLESS;";
         const std::string SampleStreamUtils::HARDWARE_TYPE_HEART_AND_BRAIN_6CH =
@@ -20,6 +21,8 @@ namespace backyardbrains {
                 SampleStreamUtils::HARDWARE_TYPE_PREFIX + "NEURONSB;";
         const std::string SampleStreamUtils::HARDWARE_TYPE_MUSCLE_PRO =
                 SampleStreamUtils::HARDWARE_TYPE_PREFIX + "MUSCLESB;";
+        const std::string SampleStreamUtils::HARDWARE_TYPE_HUMANS =
+                SampleStreamUtils::HARDWARE_TYPE_PREFIX + "HUMANSB;";
         const std::string SampleStreamUtils::SAMPLE_RATE_PREFIX = "MSF:";
         const std::string SampleStreamUtils::NUM_OF_CHANNELS_PREFIX = "MNC:";
         const std::string SampleStreamUtils::EVENT_PREFIX = "EVNT:";
@@ -30,12 +33,20 @@ namespace backyardbrains {
         }
 
         int SampleStreamUtils::getHardwareType(std::string message) {
-            if (std::strcmp(HARDWARE_TYPE_PLANT.c_str(), message.c_str()) == 0) return PLANT_HARDWARE;
-            if (std::strcmp(HARDWARE_TYPE_MUSCLE.c_str(), message.c_str()) == 0) return MUSCLE_HARDWARE;
-            if (std::strcmp(HARDWARE_TYPE_HEART_AND_BRAIN_6CH.c_str(), message.c_str()) == 0) return HEART_HARDWARE;
-            if (std::strcmp(HARDWARE_TYPE_HEART_AND_BRAIN.c_str(), message.c_str()) == 0) return HEART_HARDWARE;
-            if (message.find(HARDWARE_TYPE_NEURON_PRO) != std::string::npos) return NEURON_PRO_HARDWARE;
-            if (message.find(HARDWARE_TYPE_MUSCLE_PRO) != std::string::npos) return MUSCLE_PRO_HARDWARE;
+            if (std::strcmp(HARDWARE_TYPE_PLANT.c_str(), message.c_str()) == 0)
+                return PLANT_HARDWARE;
+            if (std::strcmp(HARDWARE_TYPE_MUSCLE.c_str(), message.c_str()) == 0)
+                return MUSCLE_HARDWARE;
+            if (std::strcmp(HARDWARE_TYPE_HEART_AND_BRAIN_6CH.c_str(), message.c_str()) == 0)
+                return HEART_HARDWARE;
+            if (std::strcmp(HARDWARE_TYPE_HEART_AND_BRAIN.c_str(), message.c_str()) == 0)
+                return HEART_HARDWARE;
+            if (std::strcmp(HARDWARE_TYPE_HUMANS.c_str(), message.c_str()) == 0)
+                return HUMANS_HARDWARE;
+            if (message.find(HARDWARE_TYPE_NEURON_PRO) != std::string::npos)
+                return NEURON_PRO_HARDWARE;
+            if (message.find(HARDWARE_TYPE_MUSCLE_PRO) != std::string::npos)
+                return MUSCLE_PRO_HARDWARE;
             return UNKNOWN_HARDWARE;
         }
 
@@ -72,7 +83,8 @@ namespace backyardbrains {
         }
 
         bool SampleStreamUtils::isExpansionBoardTypeMsg(std::string message) {
-            return message.compare(0, EXPANSION_BOARD_TYPE_PREFIX.length(), EXPANSION_BOARD_TYPE_PREFIX) == 0;
+            return message.compare(0, EXPANSION_BOARD_TYPE_PREFIX.length(),
+                                   EXPANSION_BOARD_TYPE_PREFIX) == 0;
         }
 
         int SampleStreamUtils::getExpansionBoardType(std::string message) {
@@ -82,5 +94,19 @@ namespace backyardbrains {
             message = message.replace(found, message.length() - found, "");
             return std::stoi(message);
         }
+
+        int SampleStreamUtils::getResolution(int hardwareType) {
+            if (hardwareType == HUMANS_HARDWARE) {
+                return 8192; //(2^14)/2
+            }
+            return 512; //(2^10)/2
+        }
+
+        int SampleStreamUtils::getResolutionMultiplier(int hardwareType) {
+            if (hardwareType == HUMANS_HARDWARE) {
+                return 1;
+            }
+            return 30;
+        }
     }
 }

app/src/main/cpp/byb/includes/SampleStreamProcessor.h

@@ -115,6 +115,8 @@ namespace backyardbrains {
             byte msb;
             // Average signal which we use to avoid signal offset
             double average;
+
+            int hardwareType = -1;
         };
     }
 }

app/src/main/cpp/byb/includes/SampleStreamUtils.h

@@ -87,6 +87,10 @@ namespace backyardbrains {
              */
             static int getExpansionBoardType(std::string message);
 
+            static int getResolution(int hardwareType);
+
+            static int getResolutionMultiplier(int hardwareType);
+
         private:
             // Hardware type SpikerBox reply message prefix.
             static const std::string HARDWARE_TYPE_PREFIX;
@@ -102,6 +106,8 @@ namespace backyardbrains {
             static const std::string HARDWARE_TYPE_NEURON_PRO;
             // Muscle PRO SpikerBox reply message for hardware type inquiry.
             static const std::string HARDWARE_TYPE_MUSCLE_PRO;
+            // Humans SpikerBox reply message for hardware type inquiry.
+            static const std::string HARDWARE_TYPE_HUMANS;
             // Sample rate SpikerBox reply message prefix
             static const std::string SAMPLE_RATE_PREFIX;
             // Number of channels SpikerBox reply message prefix
@@ -123,9 +129,11 @@ namespace backyardbrains {
             static const int MUSCLE_PRO_HARDWARE = 3;
             // SpikerBox Neuron PRO hardware type.
             static const int NEURON_PRO_HARDWARE = 4;
+            // SpikerBox Humans hardware type.
+            static const int HUMANS_HARDWARE = 5;
 
             // Sample rate used throughout the app.
-            static const int SAMPLE_RATE = 10000;
+            static const int SAMPLE_RATE = 10000;  //TODo sad je fizno proveri dal se negde cacka
         };
     }
 }

app/src/main/java/com/backyardbrains/BybApplication.java

@@ -20,22 +20,12 @@
 package com.backyardbrains;
 
 import android.app.Application;
-import com.crashlytics.android.Crashlytics;
-import com.crashlytics.android.core.CrashlyticsCore;
-import io.fabric.sdk.android.Fabric;
 import org.greenrobot.eventbus.EventBus;
 
 public class BybApplication extends Application {
 
     @Override public void onCreate() {
         super.onCreate();
-
-        // Set up Crashlytics, disabled for debug builds
-        Crashlytics crashlyticsKit =
-            new Crashlytics.Builder().core(new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()).build();
-        // Initialize Fabric with the debug-disabled crashlytics.
-        Fabric.with(this, crashlyticsKit);
-
         // initialize event bus
         EventBus.builder()
             .logNoSubscriberMessages(false)