Diff: pixart_heart_rate_demo.cpp

Revision:

2:b3716992c4cb

Parent:

1:51b46680bc75

Child:

3:e03a9fcf825c

--- a/pixart_heart_rate_demo.cpp	Mon Oct 30 06:11:23 2017 +0000
+++ b/pixart_heart_rate_demo.cpp	Mon Oct 30 06:14:41 2017 +0000
@@ -2,6 +2,9 @@
 
 #include "system_clock.h"
 
+#include "pixart_heart_rate.h"
+#include "pixart_pah8011.h"
+
 
 namespace pixart {
     
@@ -26,7 +29,7 @@
         system_clock_init();
         
         // interrupt
-        m_interrupt.rise(this, heart_rate_demo::pah8011_interrupt_handle);
+        m_interrupt.rise(this, &heart_rate_demo::pah8011_interrupt_handle);
         
         // heart_rate
         pixart::heart_rate heart_rate(heart_rate_demo::time_to_millisec);
@@ -53,9 +56,9 @@
         
         while(true)
         {
-            if (has_pah8011_interrupt)
+            if (m_has_pah8011_interrupt)
             {
-                has_pah8011_interrupt = false;
+                m_has_pah8011_interrupt = false;
             
                 if (!pah8011.task())
                 {
@@ -71,18 +74,20 @@
                 
                     for (uint32_t i = 0; i < result.num_per_ch; ++i)
                     {
+                        // set ppg sample
                         pixart::heart_rate::ppg_sample ppg_sample;
                         ppg_sample.ch1 = result.data[i * result.ch_num + 0];
                         ppg_sample.ch2 = result.data[i * result.ch_num + 1];
                         ppg_sample.is_touched = result.is_touched;
-                        ppg_sample.timestamp = pah8011_interrupt_timestamp;
+                        ppg_sample.timestamp = m_pah8011_interrupt_timestamp;
                         heart_rate.set_ppg_sample(ppg_sample);
                     
+                        // set accel sample (dummy)
                         pixart::heart_rate::accel_sample accel_sample;
                         accel_sample.x = 0.0f;
                         accel_sample.y = 0.0f;
                         accel_sample.z = 0.0f;
-                        accel_sample.timestamp = pah8011_interrupt_timestamp;
+                        accel_sample.timestamp = m_pah8011_interrupt_timestamp;
                         heart_rate.set_accel_sample(accel_sample);                
                     }