Diff: bt32630.h

Revision:

17:65a8b29f6bac

Parent:

16:f6bfa6b66e96

Child:

18:1ad357c3df71

Child:

19:f230229cb6f3

--- a/bt32630.h	Wed Mar 11 00:54:39 2020 +0000
+++ b/bt32630.h	Wed Mar 18 17:48:18 2020 +0000
@@ -140,14 +140,16 @@
          //
          //pc.printf("%d\n",ppgRed16);
             
-        hrServicePtr->updateHeartRate(ecgsigned16); //send ECG sample
+        //hrServicePtr->updateHeartRate(ecgsigned16); //send ECG sample
         // TODO: call pan_tompkins()
         
         panTompkinsIter();
         //pc.printf("%f %f %f \n",movmean/1000, y/50,(movmean/1000)*(float)outputSignal[current]);
         int HR = (int)((FS*60)/rr1[7]);
-        pc.printf("%f %f %d\n", y/50,(movmean/1000)*(float)outputSignal[current],HR);
+        int avg_HR = (int)((FS*60)/rravg1);
+        pc.printf("%f %f %d %d\n", y/50,(movmean/1000)*outputSignal[current],HR,avg_HR);
         //pc.printf("%f f\n",y,y*(float)outputSignal[current]);
+        hrServicePtr->updateHeartRate(avg_HR);
         
     }