Diff: HSP/Devices/MAX30001/MAX30001_helper.cpp

Revision:

1:9490836294ea

Parent:

0:e4a10ed6eb92

--- a/HSP/Devices/MAX30001/MAX30001_helper.cpp	Tue Oct 25 15:22:11 2016 +0000
+++ b/HSP/Devices/MAX30001/MAX30001_helper.cpp	Fri Apr 21 12:12:30 2017 -0500
@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  * Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
  *
@@ -49,16 +48,16 @@
 
 void MAX30001_Helper_Stop(void) {
   if (flags[(uint32_t)eStreaming_ECG] == 1) {
-    Peripherals::max30001()->max30001_Stop_ECG();
+    Peripherals::max30001()->Stop_ECG();
   }
   if (flags[(uint32_t)eStreaming_PACE] == 1) {
-    Peripherals::max30001()->max30001_Stop_PACE();
+    Peripherals::max30001()->Stop_PACE();
   }
   if (flags[(uint32_t)eStreaming_BIOZ] == 1) {
-    Peripherals::max30001()->max30001_Stop_BIOZ();
+    Peripherals::max30001()->Stop_BIOZ();
   }
   if (flags[(uint32_t)eStreaming_RtoR] == 1) {
-    Peripherals::max30001()->max30001_Stop_RtoR();
+    Peripherals::max30001()->Stop_RtoR();
   }
   MAX30001_Helper_ClearStreamingFlags();
 }
@@ -73,7 +72,7 @@
 
 void MAX30001_Helper_StartSync(void) {
   if (MAX30001_AnyStreamingSet() == 1) {
-    Peripherals::max30001()->max30001_synch();
+    Peripherals::max30001()->synch();
   }
 }
 
@@ -102,12 +101,12 @@
 }
 
 void MAX30001_Helper_SetupInterrupts() {
-	Peripherals::max30001()->max30001_INT_assignment(MAX30001::MAX30001_INT_B,    MAX30001::MAX30001_NO_INT,   MAX30001::MAX30001_NO_INT,  //  en_enint_loc,      en_eovf_loc,   en_fstint_loc,
-                                                         MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_NO_INT,  //  en_dcloffint_loc,  en_bint_loc,   en_bovf_loc,
-                                                         MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_NO_INT,  //  en_bover_loc,      en_bundr_loc,  en_bcgmon_loc,
-                                                         MAX30001::MAX30001_INT_B,    MAX30001::MAX30001_NO_INT,   MAX30001::MAX30001_NO_INT,  //  en_pint_loc,       en_povf_loc,   en_pedge_loc,
-                                                         MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_INT_B,    MAX30001::MAX30001_NO_INT,  //  en_lonint_loc,     en_rrint_loc,  en_samp_loc,
-                                                         MAX30001::MAX30001_INT_ODNR, MAX30001::MAX30001_INT_ODNR);                            //  intb_Type,         int2b_Type)
+	Peripherals::max30001()->INT_assignment(MAX30001::MAX30001_INT_B,    MAX30001::MAX30001_NO_INT,   MAX30001::MAX30001_NO_INT,  ///<  en_enint_loc,      en_eovf_loc,   en_fstint_loc,
+                                            MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_NO_INT,  ///<  en_dcloffint_loc,  en_bint_loc,   en_bovf_loc,
+                                            MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_NO_INT,  ///<  en_bover_loc,      en_bundr_loc,  en_bcgmon_loc,
+                                            MAX30001::MAX30001_INT_B,    MAX30001::MAX30001_NO_INT,   MAX30001::MAX30001_NO_INT,  ///<  en_pint_loc,       en_povf_loc,   en_pedge_loc,
+                                            MAX30001::MAX30001_INT_2B,   MAX30001::MAX30001_INT_B,    MAX30001::MAX30001_NO_INT,  ///<  en_lonint_loc,     en_rrint_loc,  en_samp_loc,
+                                            MAX30001::MAX30001_INT_ODNR, MAX30001::MAX30001_INT_ODNR);                            ///<  intb_Type,         int2b_Type)
 }
 
 
@@ -115,8 +114,8 @@
 static uint8_t serialNumber[6];
 uint8_t *MAX30001_Helper_getVersion(void) {
   // read the id
-  Peripherals::max30001()->max30001_reg_read(MAX30001::INFO, (uint32_t *)serialNumber);
+  Peripherals::max30001()->reg_read(MAX30001::INFO, (uint32_t *)serialNumber);
   // read id twice because it needs to be read twice
-  Peripherals::max30001()->max30001_reg_read(MAX30001::INFO, (uint32_t *)serialNumber);
+  Peripherals::max30001()->reg_read(MAX30001::INFO, (uint32_t *)serialNumber);
   return serialNumber;
 }