Kartik Sastry / Mbed 2 deprecated 4180Final

Dependencies:   4DGL-uLCD-SE LSM9DS1_Library-KVS MBed_Adafruit-GPS-Library PinDetect X_NUCLEO_53L0A1 mbed-rtos mbed

Files at this revision

API Documentation at this revision

Comitter:
ksastry3
Date:
Thu Dec 14 07:21:52 2017 +0000
Parent:
0:8a797b9e2fe4
Commit message:
Final Version 12/14/2017 by Kartik V. Sastry

Changed in this revision

LSM9DS1_Library-KVS.lib Show diff for this revision Revisions of this file
MAX30102/MAX30102.cpp Show annotated file Show diff for this revision Revisions of this file
MAX30102/MAX30102.h Show annotated file Show diff for this revision Revisions of this file
TMP36.h Show annotated file Show diff for this revision Revisions of this file
algorithm/algorithm.cpp Show annotated file Show diff for this revision Revisions of this file
algorithm/algorithm.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/LSM9DS1_Library-KVS.lib	Wed Dec 06 02:21:17 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://os.mbed.com/users/ksastry3/code/LSM9DS1_Library-KVS/#24a1da642dc9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MAX30102/MAX30102.cpp	Thu Dec 14 07:21:52 2017 +0000
@@ -0,0 +1,220 @@
+/** \file max30102.cpp ******************************************************
+*
+* Project: MAXREFDES117#
+* Filename: max30102.cpp
+* Description: This module is an embedded controller driver for the MAX30102
+*
+*
+* --------------------------------------------------------------------
+*
+* This code follows the following naming conventions:
+*
+* char              ch_pmod_value
+* char (array)      s_pmod_s_string[16]
+* float             f_pmod_value
+* int32_t           n_pmod_value
+* int32_t (array)   an_pmod_value[16]
+* int16_t           w_pmod_value
+* int16_t (array)   aw_pmod_value[16]
+* uint16_t          uw_pmod_value
+* uint16_t (array)  auw_pmod_value[16]
+* uint8_t           uch_pmod_value
+* uint8_t (array)   auch_pmod_buffer[16]
+* uint32_t          un_pmod_value
+* int32_t *         pn_pmod_value
+*
+* ------------------------------------------------------------------------- */
+/*******************************************************************************
+* Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES
+* OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+*******************************************************************************
+*/
+#include "mbed.h"
+#include "MAX30102.h"
+
+//#ifdef TARGET_MAX32600MBED
+I2C i2c(p28, p27);
+// #else
+// I2C i2c(I2C_SDA, I2C_SCL);
+// #endif
+
+bool maxim_max30102_write_reg(uint8_t uch_addr, uint8_t uch_data)
+/**
+* \brief        Write a value to a MAX30102 register
+* \par          Details
+*               This function writes a value to a MAX30102 register
+*
+* \param[in]    uch_addr    - register address
+* \param[in]    uch_data    - register data
+*
+* \retval       true on success
+*/
+{
+  char ach_i2c_data[2];
+  ach_i2c_data[0]=uch_addr;
+  ach_i2c_data[1]=uch_data;
+
+  if(i2c.write(I2C_WRITE_ADDR, ach_i2c_data, 2, false)==0)
+    return true;
+  else
+    return false;
+}
+
+bool maxim_max30102_read_reg(uint8_t uch_addr, uint8_t *puch_data)
+/**
+* \brief        Read a MAX30102 register
+* \par          Details
+*               This function reads a MAX30102 register
+*
+* \param[in]    uch_addr    - register address
+* \param[out]   puch_data    - pointer that stores the register data
+*
+* \retval       true on success
+*/
+{
+  char ch_i2c_data;
+  ch_i2c_data=uch_addr;
+  if(i2c.write(I2C_WRITE_ADDR, &ch_i2c_data, 1, true)!=0)
+    return false;
+  if(i2c.read(I2C_READ_ADDR, &ch_i2c_data, 1, false)==0)
+  {
+    *puch_data=(uint8_t) ch_i2c_data;
+    return true;
+  }
+  else
+    return false;
+}
+
+bool maxim_max30102_init()
+/**
+* \brief        Initialize the MAX30102
+* \par          Details
+*               This function initializes the MAX30102
+*
+* \param        None
+*
+* \retval       true on success
+*/
+{
+  if(!maxim_max30102_write_reg(REG_INTR_ENABLE_1,0xc0)) // INTR setting
+    return false;
+  if(!maxim_max30102_write_reg(REG_INTR_ENABLE_2,0x00))
+    return false;
+  if(!maxim_max30102_write_reg(REG_FIFO_WR_PTR,0x00))  //FIFO_WR_PTR[4:0]
+    return false;
+  if(!maxim_max30102_write_reg(REG_OVF_COUNTER,0x00))  //OVF_COUNTER[4:0]
+    return false;
+  if(!maxim_max30102_write_reg(REG_FIFO_RD_PTR,0x00))  //FIFO_RD_PTR[4:0]
+    return false;
+  if(!maxim_max30102_write_reg(REG_FIFO_CONFIG,0x0f))  //sample avg = 1, fifo rollover=false, fifo almost full = 17
+    return false;
+  if(!maxim_max30102_write_reg(REG_MODE_CONFIG,0x03))   //0x02 for Red only, 0x03 for SpO2 mode 0x07 multimode LED
+    return false;
+  if(!maxim_max30102_write_reg(REG_SPO2_CONFIG,0x27))  // SPO2_ADC range = 4096nA, SPO2 sample rate (100 Hz), LED pulseWidth (400uS)
+    return false;
+
+  if(!maxim_max30102_write_reg(REG_LED1_PA,0x24))   //Choose value for ~ 7mA for LED1
+    return false;
+  if(!maxim_max30102_write_reg(REG_LED2_PA,0x24))   // Choose value for ~ 7mA for LED2
+    return false;
+  if(!maxim_max30102_write_reg(REG_PILOT_PA,0x7f))   // Choose value for ~ 25mA for Pilot LED
+    return false;
+  return true;
+}
+
+bool maxim_max30102_read_fifo(uint32_t *pun_red_led, uint32_t *pun_ir_led)
+/**
+* \brief        Read a set of samples from the MAX30102 FIFO register
+* \par          Details
+*               This function reads a set of samples from the MAX30102 FIFO register
+*
+* \param[out]   *pun_red_led   - pointer that stores the red LED reading data
+* \param[out]   *pun_ir_led    - pointer that stores the IR LED reading data
+*
+* \retval       true on success
+*/
+{
+  uint32_t un_temp;
+  unsigned char uch_temp;
+  *pun_red_led=0;
+  *pun_ir_led=0;
+  char ach_i2c_data[6];
+
+  //read and clear status register
+  maxim_max30102_read_reg(REG_INTR_STATUS_1, &uch_temp);
+  maxim_max30102_read_reg(REG_INTR_STATUS_2, &uch_temp);
+
+  ach_i2c_data[0]=REG_FIFO_DATA;
+  if(i2c.write(I2C_WRITE_ADDR, ach_i2c_data, 1, true)!=0)
+    return false;
+  if(i2c.read(I2C_READ_ADDR, ach_i2c_data, 6, false)!=0)
+  {
+    return false;
+  }
+  un_temp=(unsigned char) ach_i2c_data[0];
+  un_temp<<=16;
+  *pun_red_led+=un_temp;
+  un_temp=(unsigned char) ach_i2c_data[1];
+  un_temp<<=8;
+  *pun_red_led+=un_temp;
+  un_temp=(unsigned char) ach_i2c_data[2];
+  *pun_red_led+=un_temp;
+
+  un_temp=(unsigned char) ach_i2c_data[3];
+  un_temp<<=16;
+  *pun_ir_led+=un_temp;
+  un_temp=(unsigned char) ach_i2c_data[4];
+  un_temp<<=8;
+  *pun_ir_led+=un_temp;
+  un_temp=(unsigned char) ach_i2c_data[5];
+  *pun_ir_led+=un_temp;
+  *pun_red_led&=0x03FFFF;  //Mask MSB [23:18]
+  *pun_ir_led&=0x03FFFF;  //Mask MSB [23:18]
+
+
+  return true;
+}
+
+bool maxim_max30102_reset()
+/**
+* \brief        Reset the MAX30102
+* \par          Details
+*               This function resets the MAX30102
+*
+* \param        None
+*
+* \retval       true on success
+*/
+{
+    if(!maxim_max30102_write_reg(REG_MODE_CONFIG,0x40))
+        return false;
+    else
+        return true;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MAX30102/MAX30102.h	Thu Dec 14 07:21:52 2017 +0000
@@ -0,0 +1,97 @@
+/** \file max30102.h ******************************************************
+*
+* Project: MAXREFDES117#
+* Filename: max30102.h
+* Description: This module is an embedded controller driver header file for MAX30102
+*
+*
+* --------------------------------------------------------------------
+*
+* This code follows the following naming conventions:
+*
+* char              ch_pmod_value
+* char (array)      s_pmod_s_string[16]
+* float             f_pmod_value
+* int32_t           n_pmod_value
+* int32_t (array)   an_pmod_value[16]
+* int16_t           w_pmod_value
+* int16_t (array)   aw_pmod_value[16]
+* uint16_t          uw_pmod_value
+* uint16_t (array)  auw_pmod_value[16]
+* uint8_t           uch_pmod_value
+* uint8_t (array)   auch_pmod_buffer[16]
+* uint32_t          un_pmod_value
+* int32_t *         pn_pmod_value
+*
+* ------------------------------------------------------------------------- */
+/*******************************************************************************
+* Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES
+* OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+*******************************************************************************
+*/
+#ifndef MAX30102_H_
+#define MAX30102_H_
+
+#include "mbed.h"
+
+#define I2C_WRITE_ADDR 0xAE
+#define I2C_READ_ADDR 0xAF
+
+//register addresses
+#define REG_INTR_STATUS_1 0x00
+#define REG_INTR_STATUS_2 0x01
+#define REG_INTR_ENABLE_1 0x02
+#define REG_INTR_ENABLE_2 0x03
+#define REG_FIFO_WR_PTR 0x04
+#define REG_OVF_COUNTER 0x05
+#define REG_FIFO_RD_PTR 0x06
+#define REG_FIFO_DATA 0x07
+#define REG_FIFO_CONFIG 0x08
+#define REG_MODE_CONFIG 0x09
+#define REG_SPO2_CONFIG 0x0A
+#define REG_LED1_PA 0x0C
+#define REG_LED2_PA 0x0D
+#define REG_PILOT_PA 0x10
+#define REG_MULTI_LED_CTRL1 0x11
+#define REG_MULTI_LED_CTRL2 0x12
+#define REG_TEMP_INTR 0x1F
+#define REG_TEMP_FRAC 0x20
+#define REG_TEMP_CONFIG 0x21
+#define REG_PROX_INT_THRESH 0x30
+#define REG_REV_ID 0xFE
+#define REG_PART_ID 0xFF
+
+bool maxim_max30102_init();
+bool maxim_max30102_read_fifo(uint32_t *pun_red_led, uint32_t *pun_ir_led);
+bool maxim_max30102_write_reg(uint8_t uch_addr, uint8_t uch_data);
+bool maxim_max30102_read_reg(uint8_t uch_addr, uint8_t *puch_data);
+bool maxim_max30102_reset(void);
+
+#endif /* MAX30102_H_ */
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TMP36.h	Thu Dec 14 07:21:52 2017 +0000
@@ -0,0 +1,31 @@
+#include "mbed.h"
+
+//Setup a new class for TMP36 sensor
+class TMP36
+{
+public:
+    TMP36(PinName pin);
+    TMP36();
+    operator float ();
+    float read();
+private:
+//class sets up the AnalogIn pin
+    AnalogIn _pin;
+};
+
+TMP36::TMP36(PinName pin) : _pin(pin)
+{
+// _pin(pin) means pass pin to the AnalogIn constructor
+}
+
+float TMP36::read()
+{
+//convert sensor reading to temperature in degrees C
+    return ((_pin.read()*3.3)-0.500)*100.0;
+}
+//overload of float conversion (avoids needing to type .read() in equations)
+TMP36::operator float ()
+{
+//convert sensor reading to temperature in degrees C
+    return ((_pin.read()*3.3)-0.500)*100.0;
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/algorithm/algorithm.cpp	Thu Dec 14 07:21:52 2017 +0000
@@ -0,0 +1,363 @@
+/** \file algorithm.cpp ******************************************************
+*
+* Project: MAXREFDES117#
+* Filename: algorithm.cpp
+* Description: This module calculates the heart rate/SpO2 level
+*
+*
+* --------------------------------------------------------------------
+*
+* This code follows the following naming conventions:
+*
+* char              ch_pmod_value
+* char (array)      s_pmod_s_string[16]
+* float             f_pmod_value
+* int32_t           n_pmod_value
+* int32_t (array)   an_pmod_value[16]
+* int16_t           w_pmod_value
+* int16_t (array)   aw_pmod_value[16]
+* uint16_t          uw_pmod_value
+* uint16_t (array)  auw_pmod_value[16]
+* uint8_t           uch_pmod_value
+* uint8_t (array)   auch_pmod_buffer[16]
+* uint32_t          un_pmod_value
+* int32_t *         pn_pmod_value
+*
+* ------------------------------------------------------------------------- */
+/*******************************************************************************
+* Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES
+* OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+*******************************************************************************
+*/
+#include "algorithm.h"
+#include "mbed.h"
+
+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)
+/**
+* \brief        Calculate the heart rate and SpO2 level
+* \par          Details
+*               By detecting  peaks of PPG cycle and corresponding AC/DC of red/infra-red signal, the ratio for the SPO2 is computed.
+*               Since this algorithm is aiming for Arm M0/M3. formaula for SPO2 did not achieve the accuracy due to register overflow.
+*               Thus, accurate SPO2 is precalculated and save longo uch_spo2_table[] per each ratio.
+*
+* \param[in]    *pun_ir_buffer           - IR sensor data buffer
+* \param[in]    n_ir_buffer_length      - IR sensor data buffer length
+* \param[in]    *pun_red_buffer          - Red sensor data buffer
+* \param[out]    *pn_spo2                - Calculated SpO2 value
+* \param[out]    *pch_spo2_valid         - 1 if the calculated SpO2 value is valid
+* \param[out]    *pn_heart_rate          - Calculated heart rate value
+* \param[out]    *pch_hr_valid           - 1 if the calculated heart rate value is valid
+*
+* \retval       None
+*/
+{
+    uint32_t un_ir_mean ,un_only_once ;
+    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 an_ir_valley_locs[15] ;
+    int32_t an_exact_ir_valley_locs[15] ;
+    int32_t an_dx_peak_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 an_ratio[5],n_ratio_average; 
+    int32_t n_nume,  n_denom ;
+    // remove DC of ir signal    
+    un_ir_mean =0; 
+    for (k=0 ; k<n_ir_buffer_length ; k++ ) un_ir_mean += pun_ir_buffer[k] ;
+    un_ir_mean =un_ir_mean/n_ir_buffer_length ;
+    for (k=0 ; k<n_ir_buffer_length ; k++ )  an_x[k] =  pun_ir_buffer[k] - un_ir_mean ; 
+    
+    // 4 pt Moving Average
+    for(k=0; k< BUFFER_SIZE-MA4_SIZE; k++){
+        n_denom= ( an_x[k]+an_x[k+1]+ an_x[k+2]+ an_x[k+3]);
+        an_x[k]=  n_denom/(int32_t)4; 
+    }
+
+    // get difference of smoothed IR signal
+    
+    for( k=0; k<BUFFER_SIZE-MA4_SIZE-1;  k++)
+        an_dx[k]= (an_x[k+1]- an_x[k]);
+
+    // 2-pt Moving Average to an_dx
+    for(k=0; k< BUFFER_SIZE-MA4_SIZE-2; k++){
+        an_dx[k] =  ( an_dx[k]+an_dx[k+1])/2 ;
+    }
+    
+    // hamming window
+    // flip wave form so that we can detect valley with peak detector
+    for ( i=0 ; i<BUFFER_SIZE-HAMMING_SIZE-MA4_SIZE-2 ;i++){
+        s= 0;
+        for( k=i; k<i+ HAMMING_SIZE ;k++){
+            s -= an_dx[k] *auw_hamm[k-i] ; 
+                     }
+        an_dx[i]= s/ (int32_t)1146; // divide by sum of auw_hamm 
+    }
+
+ 
+    n_th1=0; // threshold calculation
+    for ( k=0 ; k<BUFFER_SIZE-HAMMING_SIZE ;k++){
+        n_th1 += ((an_dx[k]>0)? an_dx[k] : ((int32_t)0-an_dx[k])) ;
+    }
+    n_th1= n_th1/ ( BUFFER_SIZE-HAMMING_SIZE);
+    // peak location is acutally index for sharpest location of raw signal since we flipped the signal         
+    maxim_find_peaks( an_dx_peak_locs, &n_npks, an_dx, BUFFER_SIZE-HAMMING_SIZE, n_th1, 8, 5 );//peak_height, peak_distance, max_num_peaks 
+
+    n_peak_interval_sum =0;
+    if (n_npks>=2){
+        for (k=1; k<n_npks; k++)
+            n_peak_interval_sum += (an_dx_peak_locs[k]-an_dx_peak_locs[k -1]);
+        n_peak_interval_sum=n_peak_interval_sum/(n_npks-1);
+        *pn_heart_rate=(int32_t)(6000/n_peak_interval_sum);// beats per minutes
+        *pch_hr_valid  = 1;
+    }
+    else  {
+        *pn_heart_rate = -999;
+        *pch_hr_valid  = 0;
+    }
+            
+    for ( k=0 ; k<n_npks ;k++)
+        an_ir_valley_locs[k]=an_dx_peak_locs[k]+HAMMING_SIZE/2; 
+
+
+    // raw value : RED(=y) and IR(=X)
+    // we need to assess DC and AC value of ir and red PPG. 
+    for (k=0 ; k<n_ir_buffer_length ; k++ )  {
+        an_x[k] =  pun_ir_buffer[k] ; 
+        an_y[k] =  pun_red_buffer[k] ; 
+    }
+
+    // find precise min near an_ir_valley_locs
+    n_exact_ir_valley_locs_count =0; 
+    for(k=0 ; k<n_npks ;k++){
+        un_only_once =1;
+        m=an_ir_valley_locs[k];
+        n_c_min= 16777216;//2^24;
+        if (m+5 <  BUFFER_SIZE-HAMMING_SIZE  && m-5 >0){
+            for(i= m-5;i<m+5; i++)
+                if (an_x[i]<n_c_min){
+                    if (un_only_once >0){
+                       un_only_once =0;
+                   } 
+                   n_c_min= an_x[i] ;
+                   an_exact_ir_valley_locs[k]=i;
+                }
+            if (un_only_once ==0)
+                n_exact_ir_valley_locs_count ++ ;
+        }
+    }
+    if (n_exact_ir_valley_locs_count <2 ){
+       *pn_spo2 =  -999 ; // do not use SPO2 since signal ratio is out of range
+       *pch_spo2_valid  = 0; 
+       return;
+    }
+    // 4 pt MA
+    for(k=0; k< BUFFER_SIZE-MA4_SIZE; k++){
+        an_x[k]=( an_x[k]+an_x[k+1]+ an_x[k+2]+ an_x[k+3])/(int32_t)4;
+        an_y[k]=( an_y[k]+an_y[k+1]+ an_y[k+2]+ an_y[k+3])/(int32_t)4;
+    }
+
+    //using an_exact_ir_valley_locs , find ir-red DC andir-red AC for SPO2 calibration ratio
+    //finding AC/DC maximum of raw ir * red between two valley locations
+    n_ratio_average =0; 
+    n_i_ratio_count =0; 
+    
+    for(k=0; k< 5; k++) an_ratio[k]=0;
+    for (k=0; k< n_exact_ir_valley_locs_count; k++){
+        if (an_exact_ir_valley_locs[k] > BUFFER_SIZE ){             
+            *pn_spo2 =  -999 ; // do not use SPO2 since valley loc is out of range
+            *pch_spo2_valid  = 0; 
+            return;
+        }
+    }
+    // find max between two valley locations 
+    // and use ratio betwen AC compoent of Ir & Red and DC compoent of Ir & Red for SPO2 
+
+    for (k=0; k< n_exact_ir_valley_locs_count-1; k++){
+        n_y_dc_max= -16777216 ; 
+        n_x_dc_max= - 16777216; 
+        if (an_exact_ir_valley_locs[k+1]-an_exact_ir_valley_locs[k] >10){
+            for (i=an_exact_ir_valley_locs[k]; i< an_exact_ir_valley_locs[k+1]; i++){
+                if (an_x[i]> n_x_dc_max) {n_x_dc_max =an_x[i];n_x_dc_max_idx =i; }
+                if (an_y[i]> n_y_dc_max) {n_y_dc_max =an_y[i];n_y_dc_max_idx=i;}
+            }
+            n_y_ac= (an_y[an_exact_ir_valley_locs[k+1]] - an_y[an_exact_ir_valley_locs[k] ] )*(n_y_dc_max_idx -an_exact_ir_valley_locs[k]); //red
+            n_y_ac=  an_y[an_exact_ir_valley_locs[k]] + n_y_ac/ (an_exact_ir_valley_locs[k+1] - an_exact_ir_valley_locs[k])  ; 
+        
+        
+            n_y_ac=  an_y[n_y_dc_max_idx] - n_y_ac;    // subracting linear DC compoenents from raw 
+            n_x_ac= (an_x[an_exact_ir_valley_locs[k+1]] - an_x[an_exact_ir_valley_locs[k] ] )*(n_x_dc_max_idx -an_exact_ir_valley_locs[k]); // ir
+            n_x_ac=  an_x[an_exact_ir_valley_locs[k]] + n_x_ac/ (an_exact_ir_valley_locs[k+1] - an_exact_ir_valley_locs[k]); 
+            n_x_ac=  an_x[n_y_dc_max_idx] - n_x_ac;      // subracting linear DC compoenents from raw 
+            n_nume=( n_y_ac *n_x_dc_max)>>7 ; //prepare X100 to preserve floating value
+            n_denom= ( n_x_ac *n_y_dc_max)>>7;
+            if (n_denom>0  && n_i_ratio_count <5 &&  n_nume != 0)
+            {   
+                an_ratio[n_i_ratio_count]= (n_nume*100)/n_denom ; //formular is ( n_y_ac *n_x_dc_max) / ( n_x_ac *n_y_dc_max) ;
+                n_i_ratio_count++;
+            }
+        }
+    }
+
+    maxim_sort_ascend(an_ratio, n_i_ratio_count);
+    n_middle_idx= n_i_ratio_count/2;
+
+    if (n_middle_idx >1)
+        n_ratio_average =( an_ratio[n_middle_idx-1] +an_ratio[n_middle_idx])/2; // use median
+    else
+        n_ratio_average = an_ratio[n_middle_idx ];
+
+    if( n_ratio_average>2 && n_ratio_average <184){
+        n_spo2_calc= uch_spo2_table[n_ratio_average] ;
+        *pn_spo2 = n_spo2_calc ;
+        *pch_spo2_valid  = 1;//  float_SPO2 =  -45.060*n_ratio_average* n_ratio_average/10000 + 30.354 *n_ratio_average/100 + 94.845 ;  // for comparison with table
+    }
+    else{
+        *pn_spo2 =  -999 ; // do not use SPO2 since signal ratio is out of range
+        *pch_spo2_valid  = 0; 
+    }
+}
+
+
+void maxim_find_peaks(int32_t *pn_locs, int32_t *pn_npks, int32_t *pn_x, int32_t n_size, int32_t n_min_height, int32_t n_min_distance, int32_t n_max_num)
+/**
+* \brief        Find peaks
+* \par          Details
+*               Find at most MAX_NUM peaks above MIN_HEIGHT separated by at least MIN_DISTANCE
+*
+* \retval       None
+*/
+{
+    maxim_peaks_above_min_height( pn_locs, pn_npks, pn_x, n_size, n_min_height );
+    maxim_remove_close_peaks( pn_locs, pn_npks, pn_x, n_min_distance );
+    *pn_npks = min( *pn_npks, n_max_num );
+}
+
+void maxim_peaks_above_min_height(int32_t *pn_locs, int32_t *pn_npks, int32_t  *pn_x, int32_t n_size, int32_t n_min_height)
+/**
+* \brief        Find peaks above n_min_height
+* \par          Details
+*               Find all peaks above MIN_HEIGHT
+*
+* \retval       None
+*/
+{
+    int32_t i = 1, n_width;
+    *pn_npks = 0;
+    
+    while (i < n_size-1){
+        if (pn_x[i] > n_min_height && pn_x[i] > pn_x[i-1]){            // find left edge of potential peaks
+            n_width = 1;
+            while (i+n_width < n_size && pn_x[i] == pn_x[i+n_width])    // find flat peaks
+                n_width++;
+            if (pn_x[i] > pn_x[i+n_width] && (*pn_npks) < 15 ){                            // find right edge of peaks
+                pn_locs[(*pn_npks)++] = i;        
+                // for flat peaks, peak location is left edge
+                i += n_width+1;
+            }
+            else
+                i += n_width;
+        }
+        else
+            i++;
+    }
+}
+
+
+void maxim_remove_close_peaks(int32_t *pn_locs, int32_t *pn_npks, int32_t *pn_x, int32_t n_min_distance)
+/**
+* \brief        Remove peaks
+* \par          Details
+*               Remove peaks separated by less than MIN_DISTANCE
+*
+* \retval       None
+*/
+{
+    
+    int32_t i, j, n_old_npks, n_dist;
+    
+    /* Order peaks from large to small */
+    maxim_sort_indices_descend( pn_x, pn_locs, *pn_npks );
+
+    for ( i = -1; i < *pn_npks; i++ ){
+        n_old_npks = *pn_npks;
+        *pn_npks = i+1;
+        for ( j = i+1; j < n_old_npks; j++ ){
+            n_dist =  pn_locs[j] - ( i == -1 ? -1 : pn_locs[i] ); // lag-zero peak of autocorr is at index -1
+            if ( n_dist > n_min_distance || n_dist < -n_min_distance )
+                pn_locs[(*pn_npks)++] = pn_locs[j];
+        }
+    }
+
+    // Resort indices longo ascending order
+    maxim_sort_ascend( pn_locs, *pn_npks );
+}
+
+void maxim_sort_ascend(int32_t *pn_x,int32_t n_size) 
+/**
+* \brief        Sort array
+* \par          Details
+*               Sort array in ascending order (insertion sort algorithm)
+*
+* \retval       None
+*/
+{
+    int32_t i, j, n_temp;
+    for (i = 1; i < n_size; i++) {
+        n_temp = pn_x[i];
+        for (j = i; j > 0 && n_temp < pn_x[j-1]; j--)
+            pn_x[j] = pn_x[j-1];
+        pn_x[j] = n_temp;
+    }
+}
+
+void maxim_sort_indices_descend(int32_t *pn_x, int32_t *pn_indx, int32_t n_size)
+/**
+* \brief        Sort indices
+* \par          Details
+*               Sort indices according to descending order (insertion sort algorithm)
+*
+* \retval       None
+*/ 
+{
+    int32_t i, j, n_temp;
+    for (i = 1; i < n_size; i++) {
+        n_temp = pn_indx[i];
+        for (j = i; j > 0 && pn_x[n_temp] > pn_x[pn_indx[j-1]]; j--)
+            pn_indx[j] = pn_indx[j-1];
+        pn_indx[j] = n_temp;
+    }
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/algorithm/algorithm.h	Thu Dec 14 07:21:52 2017 +0000
@@ -0,0 +1,100 @@
+/** \file algorithm.h ******************************************************
+*
+* Project: MAXREFDES117#
+* Filename: algorithm.h
+* Description: This module is the heart rate/SpO2 calculation algorithm header file
+*
+* Revision History:
+*\n 1-18-2016 Rev 01.00 SK Initial release.
+*\n
+*
+* --------------------------------------------------------------------
+*
+* This code follows the following naming conventions:
+*
+*\n char              ch_pmod_value
+*\n char (array)      s_pmod_s_string[16]
+*\n float             f_pmod_value
+*\n int32_t           n_pmod_value
+*\n int32_t (array)   an_pmod_value[16]
+*\n int16_t           w_pmod_value
+*\n int16_t (array)   aw_pmod_value[16]
+*\n uint16_t          uw_pmod_value
+*\n uint16_t (array)  auw_pmod_value[16]
+*\n uint8_t           uch_pmod_value
+*\n uint8_t (array)   auch_pmod_buffer[16]
+*\n uint32_t          un_pmod_value
+*\n int32_t *         pn_pmod_value
+*
+* ------------------------------------------------------------------------- */
+/*******************************************************************************
+* Copyright (C) 2015 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES
+* OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+*******************************************************************************
+*/
+#ifndef ALGORITHM_H_
+#define ALGORITHM_H_
+
+#include "mbed.h"
+
+#define true 1
+#define false 0
+#define FS 100
+#define BUFFER_SIZE  (FS* 5) 
+#define HR_FIFO_SIZE 7
+#define MA4_SIZE  4 // DO NOT CHANGE
+#define HAMMING_SIZE  5// DO NOT CHANGE
+#define min(x,y) ((x) < (y) ? (x) : (y))
+
+const uint16_t auw_hamm[31]={ 41,    276,    512,    276,     41 }; //Hamm=  long16(512* hamming(5)');
+//uch_spo2_table is computed 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, 
+                            99, 99, 99, 99, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 
+                            100, 100, 100, 100, 99, 99, 99, 99, 99, 99, 99, 99, 98, 98, 98, 98, 98, 98, 97, 97, 
+                            97, 97, 96, 96, 96, 96, 95, 95, 95, 94, 94, 94, 93, 93, 93, 92, 92, 92, 91, 91, 
+                            90, 90, 89, 89, 89, 88, 88, 87, 87, 86, 86, 85, 85, 84, 84, 83, 82, 82, 81, 81, 
+                            80, 80, 79, 78, 78, 77, 76, 76, 75, 74, 74, 73, 72, 72, 71, 70, 69, 69, 68, 67, 
+                            66, 66, 65, 64, 63, 62, 62, 61, 60, 59, 58, 57, 56, 56, 55, 54, 53, 52, 51, 50, 
+                            49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 31, 30, 29, 
+                            28, 27, 26, 25, 23, 22, 21, 20, 19, 17, 16, 15, 14, 12, 11, 10, 9, 7, 6, 5, 
+                            3, 2, 1 } ;
+static  int32_t an_dx[ BUFFER_SIZE-MA4_SIZE]; // delta
+static  int32_t an_x[ BUFFER_SIZE]; //ir
+static  int32_t an_y[ BUFFER_SIZE]; //red
+
+
+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);
+void maxim_find_peaks( int32_t *pn_locs, int32_t *pn_npks,  int32_t *pn_x, int32_t n_size, int32_t n_min_height, int32_t n_min_distance, int32_t n_max_num );
+void maxim_peaks_above_min_height( int32_t *pn_locs, int32_t *pn_npks,  int32_t *pn_x, int32_t n_size, int32_t n_min_height );
+void maxim_remove_close_peaks( int32_t *pn_locs, int32_t *pn_npks,   int32_t  *pn_x, int32_t n_min_distance );
+void maxim_sort_ascend( int32_t *pn_x, int32_t n_size );
+void maxim_sort_indices_descend(  int32_t  *pn_x, int32_t *pn_indx, int32_t n_size);
+
+#endif /* ALGORITHM_H_ */
\ No newline at end of file
--- a/main.cpp	Wed Dec 06 02:21:17 2017 +0000
+++ b/main.cpp	Thu Dec 14 07:21:52 2017 +0000
@@ -1,90 +1,119 @@
 /* Code for ECE 4180-A Final Design Project  */
-/* Kartik Sastry, Robert Walsh, Krishna Peri */
+/* Kartik Sastry, Krishna Peri, Robert Walsh */
 /* mbed Based Fitness Wearable Prototype     */
 
+/**
+ * Acknowledgements:
+ *
+ * The core of the GPS and Heart Rate code used in this project was supplied
+ * as demonstration code by the manufacturer. The drivers written for the Heart
+ * Rate Monitor were altered by Kartik Sastry in order to allow the device
+ * to function with the mbed LPC1768 specifically.
+ *
+ * The uLCD, Temperature, Accelerometer, Control, and data processing are all
+ * our original work. The Temperature feature uses a class for the TMP36 written
+ * by Prof. James Hamblen, our ECE 4180 professor.
+ */
+
 /******************************************************************************/
-/*                   Devices Used and Pin Assignments                         */
+/*                 Devices Used, Wiring, Hardware Info                        */
 /******************************************************************************/
 /*
  - mbed LPC1768 Microcontroller
- - Adafruit VL53L0X Time of Flight Distance Sensor (LIDAR)
-    I2C p9, p10
-    DigitalOut p26
- - Heart Rate Sensor / Pulse Oximeter - Maxim MAXREFDES117#
-    I2C p9, p10
- - LSM9DS1 9 degrees-of-freedom Inertial Measurement Unit (IMU)
-    I2C p9, p10
+    5V, (2A) External Power Supply or 4.5 V, (3 AA Batteries) Power
+    Debugging and Additional Feedback over USB Virtual COM Port
+ - Heart Rate Sensor / Pulse Oximeter - Maxim Integrated MAXREFDES117# (HR)
+    I2C p27, p28
+    DigitalOut p20
+ - SparkFun Triple Axis Accelerometer Breakout - ADXL335 (IMU)
+    AnalogIn p15, p16, p17 (X, Y, Z axes respectively)
  - Adafruit Ultimate GPS Breakout V3 (GPS)
-    Serial 14, 15
+    Serial p13, p14
  - 4D Systems 4DGL-uLCD LCD Display (LCD)
-    Serial p27, p28, p30
+    Serial p9, p10
+    DigitalOut p8
  - Pushbutton (Wire one switch pole to p7, the other directly to ground. No need for external pullup resistor.)
     PinDetect p7
+ - Adafruit TMP36 Temperature Sensor
+    AnalogIn p19
 */
 
 /******************************************************************************/
 /*                          Libraries and Include Files                       */
 /******************************************************************************/
 #include "mbed.h"
-#include "rtos.h"
+//#include "rtos.h"
 //#include "SDFileSystem.h"
 #include "uLCD_4DGL.h"
-#include "LSM9DS1.h"
+//#include "LSM9DS1.h"
 #include "MBed_Adafruit_GPS.h"
-#include "XNucleo53L0A1.h"
+// #include "XNucleo53L0A1.h"
 #include "math.h"
 #include <stdio.h>
 #include "PinDetect.h"
+#include "algorithm.h"
+#include "MAX30102.h"
+#include "TMP36.h"
 
 /******************************************************************************/
 /*                          I/O Object Declarations                           */
 /******************************************************************************/
-Serial pc(USBTX, USBRX);                // Interface to PC over virtual COM
-uLCD_4DGL uLCD(p28, p27, p30);          // LCD
-LSM9DS1 imu(p9, p10, 0xD6, 0x3C);       // IMU
-//Serial * gps_Serial;                  // GPS
-#define VL53L0_I2C_SDA   p9             // LIDAR
-#define VL53L0_I2C_SCL   p10            // I2C sensor pins for LIDAR
-DigitalOut shdn(p26);                   // This VL53L0X board test application performs a range measurement in polling mode
-                                        // Use 3.3(Vout) for Vin, p9 for SDA, p10 for SCL, P26 for shdn on mbed LPC1768
-PinDetect myPushbutton(p7);             // For Mode Selection Feature
+PinDetect myPushbutton(p7);                                                     // For Mode Selection Feature
+Serial pc(USBTX, USBRX);                                                        // Interface to PC over virtual COM
+uLCD_4DGL uLCD(p9, p10, p8);                                                    // uLCD
+AnalogIn Xval(p15);                                                             // IMU: Output of X-axis at analog p15
+AnalogIn Yval(p16);                                                             // IMU: Output of y-axis at analog p16
+AnalogIn Zval(p17);                                                             // IMU: Output of z-axis at analog p17
+TMP36 myTMP36(p19);                                                             // Analog in                                                          // GPS
+// #define VL53L0_I2C_SDA   p28                                                    // LIDAR
+// #define VL53L0_I2C_SCL   p27                                                    // I2C sensor pins for LIDAR
+// DigitalOut shdn(p26);                                                           // This VL53L0X board test application performs a range measurement in polling mode
+//                                                                                 // Use 3.3(Vout) for Vin, p9 for SDA, p10 for SCL, P26 for shdn on mbed LPC1768
 
 /******************************************************************************/
 /*                    Global Variables (Carefully Managed)                    */
 /******************************************************************************/
-// Globals for IMU
-float new_x = 0, new_y = 0, new_z = 0;
-bool start = 0;
-int count = 0;
+// // Globals For LIDAR
+// static XNucleo53L0A1 *board = NULL;
+// int status;
+// uint32_t distance;
 
 // Globals For GPS
-// Declare
-Serial gps_Serial(p13,p14);                 // Serial object for use w/ GPS
-Adafruit_GPS myGPS(&gps_Serial);            // Object of Adafruit's GPS class
-Timer refresh_Timer;                        // Sets up a timer for use in loop; how often do we print GPS info?
-const int refresh_Time = 2000;              // refresh time in ms
-char c;                                     // when read via Adafruit_GPS::read(), the class returns single character stored here
+Serial * gps_Serial;
 
-// Globals For LIDAR
-static XNucleo53L0A1 *board=NULL;
-int status;
-uint32_t distance;
-
-/******************************************************************************/
-/*                              Necessary Mutex Locks                         */
-/******************************************************************************/
-Mutex mySerialMutex;            // On PC com port
-Mutex myLCDMutex;               // On uLCD
+// Globals for Heart Rate Sensor
+#define MAX_BRIGHTNESS 255
+uint32_t aun_ir_buffer[500]; //IR LED sensor data
+int32_t n_ir_buffer_length;    //data length
+uint32_t aun_red_buffer[500];    //Red LED sensor data
+int32_t n_sp02; //SPO2 value
+int8_t ch_spo2_valid;   //indicator to show if the SP02 calculation is valid
+int32_t n_heart_rate;   //heart rate value
+int8_t  ch_hr_valid;    //indicator to show if the heart rate calculation is valid
+uint8_t uch_dummy;
+// Serial pc(USBTX, USBRX);    //initializes the serial port
+// #ifdef TARGET_KL25Z
+// PwmOut led(PTB18);  //initializes the pwm output that connects to the on board LED
+// DigitalIn myINT(PTD1);  //pin PTD1 connects to the interrupt output pin of the MAX30102
+// #endif
+// #ifdef TARGET_K64F
+// DigitalIn myINT(PTD1);  //pin PTD1 connects to the interrupt output pin of the MAX30102
+// #endif
+// #ifdef TARGET_MAX32600MBED
+PwmOut led(LED1);    // initializes the pwm output that connects to the on board LED
+DigitalIn myINT(p20);  // pin p20 connects to the interrupt output pin of the MAX30102
+// #endif
 
 /******************************************************************************/
 /*                    Device Selection / Thread Control                       */
 /******************************************************************************/
-enum DATA_ACQ_MODE {MODE_IMU_SELECT, MODE_GPS_SELECT, MODE_LIDAR_SELECT};       // by default mapped to {0, 1, 2}
+// Add MODE_LIDAR_SELECT if we can get LIDAR to work
+enum DATA_ACQ_MODE {MODE_IMU_SELECT, MODE_GPS_SELECT, MODE_TEMP_SELECT, MODE_HR_SELECT};
 volatile int myMode = MODE_IMU_SELECT;                                          // To be changed by pushbutton presses
 
 // Short ISR - serviced when interrupt given by myPushbutton hit
 void changeMode_ISR(void) {
-    myMode = (myMode + 1) % 3;        // mod 3 makes it periodic (0,1,2,0,1,2)
+    myMode = (myMode + 1) % 4;                                                  // mod 4 makes it periodic (0,1,2,3,0)
 }
 
 /******************************************************************************/
@@ -92,63 +121,345 @@
 /******************************************************************************/
 void IMU_THREAD();
 void GPS_THREAD();
-void LIDAR_THREAD();
-void LCD_THREAD();
+void TEMP_THREAD();
+void HR_THREAD();
+// void LIDAR_THREAD();
 
 /******************************************************************************/
-/*               Main Thread: Initialization and Heart Rate                   */
+/*                      Main Thread: Initialization                           */
 /******************************************************************************/
+
 int main() {
 
-    // Set up IMU
-    uLCD.baudrate(300000);
-    imu.begin();
-    if (!imu.begin()) {
-        pc.printf("(IMU) Failed to communicate with LSM9DS1.\n");
-    }
-    imu.calibrate();
-    imu.readAccel();
+    // // Set up LIDAR
+    // pc.printf("\rSetting Up LIDAR...\n");
+    // DevI2C *device_i2c = new DevI2C(VL53L0_I2C_SDA, VL53L0_I2C_SCL);            // LIDAR Objects:
+    // board = XNucleo53L0A1::instance(device_i2c, A2, D8, D2);                    // creates the 53L0A1 expansion board singleton obj
+    // shdn = 0;                                                                   // must reset sensor for an mbed reset to work
+    // wait(0.1);
+    // shdn = 1;
+    // wait(0.1);
+
+    // status = board->init_board();                                               // init the 53L0A1 board with default values
+    // while (status) {
+    //     pc.printf("\r(LIDAR) Failed to init board! \r\n");
+    //     status = board->init_board();
+    // }
+    // pc.printf("\rSet Up LIDAR.\n");
 
-    // Set up GPS
-    myGPS.begin(9600);                                                  // sets baud rate for GPS communication; note this may be changed via Adafruit_GPS::sendCommand(char *)
-                                                                        // a list of GPS commands is available at http://www.adafruit.com/datasheets/PMTK_A08.pdf
-    myGPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA);                     // these commands are defined in MBed_Adafruit_GPS.h; a link is provided there for command creation
-    myGPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ);
-    myGPS.sendCommand(PGCMD_ANTENNA);
-    pc.printf("(GPS) Connection established at 9600 baud...\n");
-    Thread::wait(1*1000);
-    refresh_Timer.start();                                              // starts the clock on the timer
+    // Set up uLCD
+    pc.printf("\rSetting Up uLCD...\n");
+    uLCD.baudrate(31250);
+    pc.printf("\rSet Up uLCD.\n");
+    uLCD.printf("Welcome!");
 
-    // Set up LIDAR
-    DevI2C *device_i2c = new DevI2C(VL53L0_I2C_SDA, VL53L0_I2C_SCL);    // LIDAR Objects:
-    board = XNucleo53L0A1::instance(device_i2c, A2, D8, D2);            // creates the 53L0A1 expansion board singleton obj
-    shdn = 0;                                                           // must reset sensor for an mbed reset to work
-    Thread::wait(0.1*1000);
-    shdn = 1;
-    Thread::wait(0.1*1000);
-
-    status = board->init_board();                                       // init the 53L0A1 board with default values
-    while (status) {
-        pc.printf("(LIDAR) Failed to init board! \r\n");
-        status = board->init_board();
-    }
+    // // Set up GPS
+    // pc.printf("\rSetting Up GPS...\n");
+    // myGPS.begin(9600);                                                          // sets baud rate for GPS communication; note this may be changed via Adafruit_GPS::sendCommand(char *)
+    //                                                                             // a list of GPS commands is available at http://www.adafruit.com/datasheets/PMTK_A08.pdf
+    // myGPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA);                             // these commands are defined in MBed_Adafruit_GPS.h; a link is provided there for command creation
+    // myGPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ);
+    // myGPS.sendCommand(PGCMD_ANTENNA);
+    // pc.printf("\r(GPS) Connection established at 9600 baud...\n");
+    // wait(1);
+    // refresh_Timer.start();                                                      // starts the clock on the timer
+    // pc.printf("\rSet Up GPS.\n");
 
     // Set up Mode Selecting Pushbutton (Debounced, Interrupt Based)
-    myPushbutton.mode(PullUp);                                          // Use internal pullups for pushbutton
-    Thread::wait(.01*1000);                                             // Delay for initial pullup to take effect
-    myPushbutton.attach_deasserted(&changeMode_ISR);                    // Setup Interrupt Service Routines. PullUp implies 1->0 change means hit
-    myPushbutton.setSampleFrequency();                                  // Start sampling pushbutton inputs using interruptsUsing default 50 Hz (20 ms period)
+    pc.printf("\rSetting Up Mode Changing PB...\n");
+    myPushbutton.mode(PullUp);                                                  // Use internal pullups for pushbutton
+    wait(.01);                                                                  // Delay for initial pullup to take effect
+    myPushbutton.attach_deasserted(&changeMode_ISR);                            // Setup Interrupt Service Routines. PullUp implies 1->0 change means hit
+    myPushbutton.setSampleFrequency();                                          // Start sampling pushbutton inputs using interruptsUsing default 50 Hz (20 ms period)
+    pc.printf("\rSet Up Mode Changing PB.\n");
+
+/******************************************************************************/
+/*                          Main Thread: Devices                              */
+/******************************************************************************/
+
+    while(true) {
+        pc.printf("Entered Main Loop\n");
+
+        // Print Current Mode on Top
+        uLCD.text_width(1); // normal size text
+        uLCD.text_height(1);
+        uLCD.background_color(BLACK);
+        uLCD.color(GREEN);
+        uLCD.locate(0, 0);
+        uLCD.printf("  ");
+        uLCD.locate(0, 0);
+        uLCD.printf("Mode: %d", myMode);
+        pc.printf("\rMode: %d", myMode);
+
+        // Depending on Mode:
+        switch (myMode) {
+            case MODE_IMU_SELECT:
+                // Print Current Mode on Top
+                uLCD.text_width(1); // normal size text
+                uLCD.text_height(1);
+                uLCD.background_color(BLACK);
+                uLCD.color(GREEN);
+                uLCD.locate(0, 0);
+                uLCD.printf("  ");
+                uLCD.locate(0, 0);
+                uLCD.printf("Mode: %d", myMode);
+                pc.printf("\rMode: %d", myMode);
+
+                // Create a RED Outline of the screen
+                uLCD.background_color(RED);
+                uLCD.cls();
+                uLCD.filled_rectangle(4, 4, 124, 124, BLACK);
+                while (myMode == MODE_IMU_SELECT) {
+                    IMU_THREAD();
+                }
+                break;
+
+            case MODE_GPS_SELECT:
+                // Print Current Mode on Top
+                uLCD.text_width(1); // normal size text
+                uLCD.text_height(1);
+                uLCD.background_color(BLACK);
+                uLCD.color(GREEN);
+                uLCD.locate(0, 0);
+                uLCD.printf("  ");
+                uLCD.locate(0, 0);
+                uLCD.printf("Mode: %d", myMode);
+                pc.printf("\rMode: %d", myMode);
+
+                // Create a BLUE Outline of the screen
+                uLCD.background_color(BLUE);
+                uLCD.cls();
+                uLCD.filled_rectangle(4, 4, 124, 124, BLACK);
+                while (myMode == MODE_GPS_SELECT) {
+                    GPS_THREAD();
+                }
+                break;
+
+            case MODE_TEMP_SELECT:
+                // Print Current Mode on Top
+                uLCD.text_width(1); // normal size text
+                uLCD.text_height(1);
+                uLCD.background_color(BLACK);
+                uLCD.color(GREEN);
+                uLCD.locate(0, 0);
+                uLCD.printf("  ");
+                uLCD.locate(0, 0);
+                uLCD.printf("Mode: %d", myMode);
+                pc.printf("\rMode: %d", myMode);
+
+                // Create a GREEN Outline of the screen
+                uLCD.background_color(GREEN);
+                uLCD.cls();
+                uLCD.filled_rectangle(4, 4, 124, 124, BLACK);
+                while (myMode == MODE_TEMP_SELECT) {
+                    TEMP_THREAD();
+                }
+                break;
+            case MODE_HR_SELECT:
+                // Print Current Mode on Top
+                uLCD.text_width(1); // normal size text
+                uLCD.text_height(1);
+                uLCD.background_color(BLACK);
+                uLCD.color(GREEN);
+                uLCD.locate(0, 0);
+                uLCD.printf("  ");
+                uLCD.locate(0, 0);
+                uLCD.printf("Mode: %d", myMode);
+                pc.printf("\rMode: %d", myMode);
+
+                // Create a WHITE Outline of the screen
+                uLCD.background_color(WHITE);
+                uLCD.cls();
+                uLCD.filled_rectangle(4, 4, 124, 124, BLACK);
+                // Graphics Boilerplate
+                uLCD.text_width(2); // 2X size text
+                uLCD.text_height(2);
+                uLCD.color(WHITE);
+                uLCD.locate(0,0);
+                uLCD.printf("HEARTRATE");
+                while (myMode == MODE_HR_SELECT) {
+                    HR_THREAD();
+                }
+                break;
+            // case MODE_LIDAR_SELECT:
+            //     // Print Current Mode on Top
+            //     uLCD.text_width(1); // normal size text
+            //     uLCD.text_height(1);
+            //     uLCD.background_color(BLACK);
+            //     uLCD.color(GREEN);
+            //     uLCD.locate(0, 0);
+            //     uLCD.printf("  ");
+            //     uLCD.locate(0, 0);
+            //     uLCD.printf("Mode: %d", myMode);
+            //     pc.printf("\rMode: %d", myMode);
 
-    // Launch Threads
-    Thread IMU_THREAD(IMU_THREAD);
-    Thread GPS_THREAD(GPS_THREAD);
-    Thread LIDAR_THREAD(LIDAR_THREAD);
-    Thread LCD_THREAD(LCD_THREAD);
+            //     // Create a LGREY Outline of the screen
+            //     uLCD.background_color(LGREY);
+            //     uLCD.cls();
+            //     uLCD.filled_rectangle(4, 4, 124, 124, BLACK);
+            //     // Graphics Boilerplate
+            //     uLCD.text_width(2); // 2X size text
+            //     uLCD.text_height(2);
+            //     uLCD.color(LGREY);
+            //     uLCD.locate(0,0);
+            //     uLCD.printf("PUSH-UPS");
+            //     while (myMode == MODE_LIDAR_SELECT) {
+            //         LIDAR_THREAD();
+            //     }
+            //     break;
+            default:
+                // Print Current Mode on Top
+                uLCD.text_width(1); // normal size text
+                uLCD.text_height(1);
+                uLCD.background_color(BLACK);
+                uLCD.color(GREEN);
+                uLCD.locate(0, 0);
+                uLCD.printf("  ");
+                uLCD.locate(0, 0);
+                uLCD.printf("Mode: %d", myMode);
+                pc.printf("\rMode: %d", myMode);
+                uLCD.cls();
+                uLCD.printf("INVALID MODE.");
+
+        }
+    }
+} // END OF MAIN!!!!
+
+
+/******************************************************************************/
+/*                    Thread 1: Heart Rate Monitoring                         */
+/******************************************************************************/
+void HR_THREAD() {
+    uint32_t un_min, un_max, un_prev_data;  //variables to calculate the on-board LED brightness that reflects the heartbeats
+    int i;
+    int32_t n_brightness;
+    float f_temp;
+    int32_t myOldHeartRate;
+
+    maxim_max30102_reset(); //resets the MAX30102
+
+    // // initialize serial communication at 115200 bits per second:
+    // pc.baud(9600);
+    // pc.format(8,SerialBase::None,1);
+    // wait(1);
+
+    //read and clear status register
+    maxim_max30102_read_reg(0,&uch_dummy);
+
+    // //wait until the user presses a key
+    // while(pc.readable()==0)
+    // {
+    //     pc.printf("\x1B[2J");  //clear terminal program screen
+    //     pc.printf("Press any key to start conversion\n\r");
+    //     wait(1);
+    // }
+    // uch_dummy=getchar();
+
+    maxim_max30102_init();  //initializes the MAX30102
+    // pc.printf("\rInitialization Complete - HR\n");
+
+    n_brightness=0;
+    un_min=0x3FFFF;
+    un_max=0;
+
+    n_ir_buffer_length=500; //buffer length of 100 stores 5 seconds of samples running at 100sps
+
+    //read the first 500 samples, and determine the signal range
+    for(i=0;i<n_ir_buffer_length;i++)
+    {
+        while(myINT.read()==1);   //wait until the interrupt pin asserts
+
+        maxim_max30102_read_fifo((aun_red_buffer+i), (aun_ir_buffer+i));  //read from MAX30102 FIFO
 
-    // Main Thread
-    while(true) {
-        // <DO THINGS!>
-        Thread::wait(5000);
+        if(un_min>aun_red_buffer[i])
+            un_min=aun_red_buffer[i];    //update signal min
+        if(un_max<aun_red_buffer[i])
+            un_max=aun_red_buffer[i];    //update signal max
+        // pc.printf("red=");
+        // pc.printf("%i", aun_red_buffer[i]);
+        // pc.printf(", ir=");
+        // pc.printf("%i\n\r", aun_ir_buffer[i]);
+    }
+    un_prev_data=aun_red_buffer[i];
+
+
+    //calculate heart rate and SpO2 after first 500 samples (first 5 seconds of samples)
+    maxim_heart_rate_and_oxygen_saturation(aun_ir_buffer, n_ir_buffer_length, aun_red_buffer, &n_sp02, &ch_spo2_valid, &n_heart_rate, &ch_hr_valid);
+
+    //Continuously taking samples from MAX30102.  Heart rate and SpO2 are calculated every 1 second
+    while (myMode == MODE_HR_SELECT) {
+        i=0;
+        un_min=0x3FFFF;
+        un_max=0;
+
+        //dumping the first 100 sets of samples in the memory and shift the last 400 sets of samples to the top
+        for(i=100;i<500;i++)
+        {
+            aun_red_buffer[i-100]=aun_red_buffer[i];
+            aun_ir_buffer[i-100]=aun_ir_buffer[i];
+
+            //update the signal min and max
+            if(un_min>aun_red_buffer[i])
+            un_min=aun_red_buffer[i];
+            if(un_max<aun_red_buffer[i])
+            un_max=aun_red_buffer[i];
+        }
+
+        //take 100 sets of samples before calculating the heart rate.
+        for(i=400;i<500;i++)
+        {
+            un_prev_data=aun_red_buffer[i-1];
+            while(myINT.read()==1);
+            maxim_max30102_read_fifo((aun_red_buffer+i), (aun_ir_buffer+i));
+
+            if(aun_red_buffer[i]>un_prev_data)
+            {
+                f_temp=aun_red_buffer[i]-un_prev_data;
+                f_temp/=(un_max-un_min);
+                f_temp*=MAX_BRIGHTNESS;
+                n_brightness-=(int)f_temp;
+                if(n_brightness<0)
+                    n_brightness=0;
+            }
+            else
+            {
+                f_temp=un_prev_data-aun_red_buffer[i];
+                f_temp/=(un_max-un_min);
+                f_temp*=MAX_BRIGHTNESS;
+                n_brightness+=(int)f_temp;
+                if(n_brightness>MAX_BRIGHTNESS)
+                    n_brightness=MAX_BRIGHTNESS;
+            }
+            //#if defined(TARGET_KL25Z) || defined(TARGET_MAX32600MBED)
+            led.write(1-(float)n_brightness/256);
+            //#endif
+            //send samples and calculation result to terminal program through UART
+            // pc.printf("red=");
+            // pc.printf("%i", aun_red_buffer[i]);
+            // pc.printf(", ir=");
+            // pc.printf("%i", aun_ir_buffer[i]);
+            // pc.printf(", HR=%i, ", n_heart_rate);
+            // pc.printf("HRvalid=%i, ", ch_hr_valid);
+            if (ch_hr_valid == 1) {
+                myOldHeartRate = n_heart_rate;
+                if ((myOldHeartRate >= 50) && (myOldHeartRate <= 200)) {
+                    // Print Out on LCD
+                    uLCD.text_width(2); // normal size text
+                    uLCD.text_height(2);
+                    uLCD.locate(1,3);
+                    uLCD.printf("HR:\n\n  %i", myOldHeartRate);
+                } else {
+                    uLCD.text_width(2); // normal size text
+                    uLCD.text_height(2);
+                    uLCD.locate(1,3);
+                    uLCD.printf("HR:\n\n   --");
+                }
+
+            }
+            // pc.printf("SpO2=%i, ", n_sp02);
+            // pc.printf("SPO2Valid=%i\n\r", ch_spo2_valid);
+        }
+        maxim_heart_rate_and_oxygen_saturation(aun_ir_buffer, n_ir_buffer_length, aun_red_buffer, &n_sp02, &ch_spo2_valid, &n_heart_rate, &ch_hr_valid);
     }
 }
 
@@ -156,26 +467,45 @@
 /*                       Thread 2: IMU Measurement                            */
 /******************************************************************************/
 void IMU_THREAD() {
-    // Change Axis..............................................................................................................
+    float x,y,z;                                                                    // Raw data
+    float xG, yG, zG;                                                       // IN G
+    bool start = 0;
+    int count = 0;
+
     while (myMode == MODE_IMU_SELECT) {
-        imu.readAccel();
-        new_x = imu.calcAccel(imu.ax);
-        new_y = imu.calcAccel(imu.ay);
-        new_z = imu.calcAccel(imu.az);
-        mySerialMutex.lock();
-            pc.printf("z: %f\r\n", new_z);
-        mySerialMutex.unlock();
-        if (new_z > 1.25){
+        // Graphics Boilerplate
+        uLCD.text_width(3); // 3X size text
+        uLCD.text_height(3);
+        uLCD.color(RED);
+        uLCD.locate(0,0);
+        uLCD.printf("IMU");
+
+        // Get Values
+        x = Xval.read();           // Reads X-axis value between 0 and 1
+        y = Yval.read();           // Reads Y-axis value
+        z = Zval.read();           // Reads Z-axis value
+
+        xG = (x * 6.6) - 3.3;       // Scaling into G's
+        yG = (y * 6.6) - 3.3;
+        zG = (z * 6.6) - 3.3;
+
+        pc.printf("\r%f, %f, %f\n", xG, yG, zG);
+
+        if (zG > 0.7){
             start = 1;
         }
-        if (start == 1 & new_z < .90){
-            count += 1;
+
+        if (start==1 & zG < 0.5) {
+            count+=1;
             start = 0;
         }
-        mySerialMutex.lock();
-            pc.printf("count: %d\r\n", count);
-        mySerialMutex.unlock();
-        Thread::wait(.1*1000);
+
+        // Print Out on LCD
+        uLCD.text_width(2); // normal size text
+        uLCD.text_height(2);
+        uLCD.locate(1,3);
+        uLCD.printf("Squats:\n\n  %d", count);
+        wait(.25);
     }
 }
 
@@ -183,59 +513,114 @@
 /*                          Thread 3: GPS Measurement                         */
 /******************************************************************************/
 void GPS_THREAD() {
-    // pc.baud(9600);                                           // sets virtual COM serial communication to high rate; this is to allow more time to be spent on GPS retrieval
+    // Graphics Boilerplate
+    uLCD.text_width(3); // 3X size text
+    uLCD.text_height(3);
+    uLCD.color(BLUE);
+    uLCD.locate(0,0);
+    uLCD.printf("GPS");
+    uLCD.text_width(1); // normal size text
+    uLCD.text_height(1);
+    uLCD.locate(1,3);
+    uLCD.printf("GPS Data:\n");
+
+    pc.baud(9600); //sets virtual COM serial communication to high rate; this is to allow more time to be spent on GPS retrieval
+
+    gps_Serial = new Serial(p13,p14); //serial object for use w/ GPS
+    Adafruit_GPS myGPS(gps_Serial); //object of Adafruit's GPS class
+    char c; //when read via Adafruit_GPS::read(), the class returns single character stored here
+    Timer refresh_Timer; //sets up a timer for use in loop; how often do we print GPS info?
+    const int refresh_Time = 2000; //refresh time in ms
+
+    myGPS.begin(9600);  //sets baud rate for GPS communication; note this may be changed via Adafruit_GPS::sendCommand(char *)
+                        //a list of GPS commands is available at http://www.adafruit.com/datasheets/PMTK_A08.pdf
+
+    myGPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA); //these commands are defined in MBed_Adafruit_GPS.h; a link is provided there for command creation
+    myGPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ);
+    myGPS.sendCommand(PGCMD_ANTENNA);
+
+    pc.printf("Connection established at 9600 baud...\n");
+
+    wait(1);
+
+    refresh_Timer.start();  //starts the clock on the timer
 
     while (myMode == MODE_GPS_SELECT) {
-        c = myGPS.read();                                       // queries the GPS
+        c = myGPS.read();   //queries the GPS
 
-        // if (c) { pc.printf("%c", c); }                       // this line will echo the GPS data if not paused
+        //if (c) { pc.printf("%c", c); } //this line will echo the GPS data if not paused
 
-        // check if we recieved a new message from GPS, if so, attempt to parse it,
+        //check if we recieved a new message from GPS, if so, attempt to parse it,
         if ( myGPS.newNMEAreceived() ) {
             if ( !myGPS.parse(myGPS.lastNMEA()) ) {
                 continue;
             }
         }
 
-        // check if enough time has passed to warrant printing GPS info to screen
-        // note if refresh_Time is too low or pc.baud is too low, GPS data may be lost during printing
+        //check if enough time has passed to warrant printing GPS info to screen
+        //note if refresh_Time is too low or pc.baud is too low, GPS data may be lost during printing
         if (refresh_Timer.read_ms() >= refresh_Time) {
             refresh_Timer.reset();
-            mySerialMutex.lock();
-                pc.printf("Time: %d:%d:%d.%u\n\r", myGPS.hour, myGPS.minute, myGPS.seconds, myGPS.milliseconds);
-                pc.printf("Date: %d/%d/20%d\n\r", myGPS.day, myGPS.month, myGPS.year);
-                pc.printf("Fix: %d\n\r", (int) myGPS.fix);
-                pc.printf("Quality: %d\n\r", (int) myGPS.fixquality);
-                if (myGPS.fix) {
-                    pc.printf("Location: %5.2f%c, %5.2f%c\n\r", myGPS.latitude, myGPS.lat, myGPS.longitude, myGPS.lon);
-                    pc.printf("Speed: %5.2f knots\n\r", myGPS.speed);
-                    // pc.printf("Angle: %5.2f\n", myGPS.angle);
-                    // pc.printf("Altitude: %5.2f\n", myGPS.altitude);
-                    pc.printf("Satellites: %d\n\r", myGPS.satellites);
-                }
-            mySerialMutex.unlock();
+            uLCD.locate(1, 4);
+            pc.printf("\rGPS SAYS:\n\r");
+            pc.printf("\rTime: %d:%d:%d.%u\n\r", myGPS.hour, myGPS.minute, myGPS.seconds, myGPS.milliseconds);
+            uLCD.printf("\rTime: %d:%d:%d.%u\n\r", myGPS.hour, myGPS.minute, myGPS.seconds, myGPS.milliseconds);
+            pc.printf("\rDate: %d/%d/20%d\n\r", myGPS.day, myGPS.month, myGPS.year);
+            uLCD.printf("\rDate: %d/%d/20%d\n\r", myGPS.day, myGPS.month, myGPS.year);
+            pc.printf("\rFix: %d\n\r", (int) myGPS.fix);
+            uLCD.printf("\rFix: %d\n\r", (int) myGPS.fix);
+            pc.printf("\rQuality: %d\n\r", (int) myGPS.fixquality);
+            if (myGPS.fix) {
+                pc.printf("\rLocation: %5.2f%c, %5.2f%c\n\r", myGPS.latitude, myGPS.lat, myGPS.longitude, myGPS.lon);
+                pc.printf("\rLocation: %5.2f%c, %5.2f%c\n\r", myGPS.latitude, myGPS.lat, myGPS.longitude, myGPS.lon);
+                pc.printf("\rSpeed: %5.2f knots\n\r", myGPS.speed);
+                uLCD.printf("\rSpeed: %5.2f mph\n\r", myGPS.speed * 1.15078);           // CONVERT
+                pc.printf("\rAngle: %5.2f\n", myGPS.angle);
+                pc.printf("\rAltitude: %5.2f\n", myGPS.altitude);
+                uLCD.printf("\rAltitude: %5.2f\n", myGPS.altitude);
+                pc.printf("\rSatellites: %d\n\r", myGPS.satellites);
+            }
         }
     }
 }
 
+// /******************************************************************************/
+// /*                       Thread 4: LIDAR Measurements                         */
+// /******************************************************************************/
+// void LIDAR_THREAD() {
+//     // loop taking and printing distance
+//     while (myMode == MODE_LIDAR_SELECT) {
+//         status = board->sensor_centre->get_distance(&distance);
+//         if (status == VL53L0X_ERROR_NONE) {
+//                 pc.printf("\rLIDAR SAYS:\n\r");
+//                 pc.printf("\rD=%ld mm\r\n", distance);
+//         }
+//     }
+// }
+
 /******************************************************************************/
-/*                       Thread 4: LIDAR Measurements                         */
+/*                   Thread 5: Temperature Measurements                       */
 /******************************************************************************/
-void LIDAR_THREAD() {
-    // loop taking and printing distance
-    while (myMode == MODE_LIDAR_SELECT) {
-        status = board->sensor_centre->get_distance(&distance);
-        if (status == VL53L0X_ERROR_NONE) {
-            mySerialMutex.lock();
-                pc.printf("D=%ld mm\r\n", distance);
-            mySerialMutex.unlock();
-        }
+void TEMP_THREAD() {
+
+    float myCurrentTemp;
+
+    while (myMode == MODE_TEMP_SELECT) {
+        // Graphics Boilerplate
+        uLCD.text_width(3); // 3X size text
+        uLCD.text_height(3);
+        uLCD.color(GREEN);
+        uLCD.locate(0,0);
+        uLCD.printf("TEMP");
+
+        // Get Temperature
+        myCurrentTemp = myTMP36.read();         // Floating Value
+
+        // Print Out on LCD
+        uLCD.text_width(2); // normal size text
+        uLCD.text_height(2);
+        uLCD.locate(1,3);
+        uLCD.printf("Temp:\n\n %0.1f C", myCurrentTemp);
+        wait(1);
     }
 }
-
-/******************************************************************************/
-/*                          Thread 5: LCD Display                             */
-/******************************************************************************/
-void LCD_THREAD() {
-
-}
\ No newline at end of file