Diff: main.cpp

Revision:

14:3b6adb5000f1

Parent:

13:2724d2e747f1

--- a/main.cpp	Tue Oct 22 07:49:24 2019 +0000
+++ b/main.cpp	Tue Oct 22 08:34:25 2019 +0000
@@ -15,7 +15,7 @@
 */
 
 // PC serial connection
-HIDScope        scope( 5 );
+HIDScope        scope( 3 );
 MODSERIAL pc(USBTX, USBRX);
 
 // LED
@@ -40,19 +40,21 @@
 double emg1_rest_stdev;
 vector<double> emg1_cal;
 
+/*
 double emg2;
 double emg2_MVC;
 double emg2_MVC_stdev;
 double emg2_rest;
 double emg2_rest_stdev;
-vector<double> emg2_cal;
+//vector<double> emg2_cal;
 
 double emg3;
 double emg3_MVC;
 double emg3_MVC_stdev;
 double emg3_rest;
 double emg3_rest_stdev;
-vector<double> emg3_cal;
+//vector<double> emg3_cal;
+*/
 
 // Initialize tickers and timeouts
 Ticker tickSample;
@@ -63,7 +65,7 @@
 /*
 ------ GLOBAL VARIABLES ------
 */
-const int Fs = 500; // Sampling frequency (s)
+const int Fs = 10; // Sampling frequency (s)
 const double Tcal = 10.0f; // Calibration duration (s)
 int trim_cal = 1; // Trim transient behaviour of calibration (s)
 
@@ -162,22 +164,22 @@
 {
     // Read EMG inputs
     emg1 = emg1_in.read();
-    emg2 = emg2_in.read();
-    emg3 = emg3_in.read();
+    // emg2 = emg2_in.read();
+    // emg3 = emg3_in.read();
 
     // Output raw EMG input
-    scope.set(0, emg1 );
+    // scope.set(0, emg1 );
     
     double emg1_n = bqc_notch.step( emg1 ); // Filter notch
-    scope.set(1, emg1_n);
+    //scope.set(1, emg1_n);
     double emg1_hp = bqc_high.step( emg1_n ); // Filter highpass
-    scope.set(2, emg1_n);
+    // scope.set(1, emg1_hp);
     double emg1_rectify = fabs( emg1_hp ); // Rectify
-    scope.set(3, emg1_n);
+    // scope.set(2, emg1_rectify);
     double emg1_env = bqc_low.step( emg1_rectify ); // Filter lowpass (completes envelope)
 
     // Output EMG after filters
-    scope.set(4, emg1_env );
+    //scope.set(2, emg1_env );
     scope.send();
 
     emg1_cal.push_back(emg1_env);