Capitalized Arduino.h. Fix issue 2 on breakout. Remove unused vars. Removed dup defines.

Author: Nathan Seidle

src/MAX30105.cpp

@@ -740,17 +740,15 @@ uint8_t MAX30105::readRegister8(uint8_t address, uint8_t reg) {
   _i2cPort->beginTransmission(address);
   _i2cPort->write(reg);
   _i2cPort->endTransmission(false);
-  _i2cPort->requestFrom(address, 1);   // Request 1 byte
 
-  int tries = 0;
-  while (!_i2cPort->available())
+  _i2cPort->requestFrom((uint8_t)address, (uint8_t)1); // Request 1 byte
+  if (_i2cPort->available())
   {
-    delay(1);
-    if (tries++ > 200) break;
+    return(_i2cPort->read());
   }
-  if (tries == 200) return (0); //Fail
 
-  return (_i2cPort->read());
+  return (0); //Fail
+
 }
 
 void MAX30105::writeRegister8(uint8_t address, uint8_t reg, uint8_t value) {

src/spo2_algorithm.cpp

@@ -57,7 +57,7 @@
 *******************************************************************************
 */
 
-#include "arduino.h"
+#include "Arduino.h"
 #include "spo2_algorithm.h"
 
 #if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega168__)
@@ -67,7 +67,7 @@ void maxim_heart_rate_and_oxygen_saturation(uint16_t *pun_ir_buffer, int32_t n_i
                 int32_t *pn_heart_rate, int8_t *pch_hr_valid)
 #else
 void maxim_heart_rate_and_oxygen_saturation(uint32_t *pun_ir_buffer, int32_t n_ir_buffer_length, uint32_t *pun_red_buffer, int32_t *pn_spo2, int8_t *pch_spo2_valid, 
-                int32_t *pn_heart_rate, int8_t *pch_hr_valid)
+                //int32_t *pn_heart_rate, int8_t *pch_hr_valid)
 #endif
 /**
 * \brief        Calculate the heart rate and SpO2 level
@@ -87,17 +87,18 @@ void maxim_heart_rate_and_oxygen_saturation(uint32_t *pun_ir_buffer, int32_t n_i
 * \retval       None
 */
 {
-  uint32_t un_ir_mean,un_only_once ;
+  uint32_t un_ir_mean;
   int32_t k, n_i_ratio_count;
-  int32_t i, s, m, n_exact_ir_valley_locs_count, n_middle_idx;
-  int32_t n_th1, n_npks, n_c_min;   
+  int32_t i, n_exact_ir_valley_locs_count, n_middle_idx;
+  int32_t n_th1, n_npks;   
   int32_t an_ir_valley_locs[15] ;
   int32_t n_peak_interval_sum;
 
   int32_t n_y_ac, n_x_ac;
   int32_t n_spo2_calc; 
   int32_t n_y_dc_max, n_x_dc_max; 
-  int32_t n_y_dc_max_idx, n_x_dc_max_idx; 
+  int32_t n_y_dc_max_idx = 0;
+  int32_t n_x_dc_max_idx = 0; 
   int32_t an_ratio[5], n_ratio_average; 
   int32_t n_nume, n_denom ;
 

src/spo2_algorithm.h

@@ -62,12 +62,12 @@
 #ifndef SPO2_ALGORITHM_H_
 #define SPO2_ALGORITHM_H_
 
-#include <arduino.h>
+#include <Arduino.h>
 
 #define FS 25    //sampling frequency
 #define BUFFER_SIZE (FS * 4) 
 #define MA4_SIZE 4 // DONOT CHANGE
-#define min(x,y) ((x) < (y) ? (x) : (y))
+//#define min(x,y) ((x) < (y) ? (x) : (y)) //Defined in Arduino.h
 
 //uch_spo2_table is approximated as  -45.060*ratioAverage* ratioAverage + 30.354 *ratioAverage + 94.845 ;
 const uint8_t uch_spo2_table[184]={ 95, 95, 95, 96, 96, 96, 97, 97, 97, 97, 97, 98, 98, 98, 98, 98, 99, 99, 99, 99,