Diff: main.cpp

Revision:

5:fb64c72bb867

Parent:

4:7865b145ff3c

Child:

6:96c0402be8c5

--- a/main.cpp	Tue Aug 22 21:54:03 2017 +0000
+++ b/main.cpp	Mon Aug 28 21:00:41 2017 +0000
@@ -1,3 +1,37 @@
+/*******************************************************************************
+ * Copyright (C) 2017 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 "max32630fthr.h"
 #include "MAX30205.h"
@@ -36,7 +70,7 @@
             if ( ( temp_sensor_sampleTimer.read() > 1.0f ) && !temp_conversion_flag && ( rc == 0 ) ) {
                 
                 temp_cfg.bits.one_shot = 1;
-                rc = temp_sensor->writeConfiguration(temp_cfg);     // Send one-shot cmd to begin conversion  
+                rc = temp_sensor.writeConfiguration(temp_cfg);     // Send one-shot cmd to begin conversion  
                 temp_conversion_flag = 1;                           // Raise flag indicating a conversion has begun
                 
             } 
@@ -45,8 +79,8 @@
             if ( ( temp_sensor_sampleTimer.read() > 1.05f ) && temp_conversion_flag && ( rc == 0 ) ){
                 
                 temp_conversion_flag = 0;                                   // Lower flag when conversion has completed
-                rc = temp_sensor->readTemperature(rawTemperatureRead);      // Read the temperature data
-                temperature = temp_sensor->toCelsius(rawTemperatureRead);   // Convert temp data to Celsius
+                rc = temp_sensor.readTemperature(rawTemperatureRead);      // Read the temperature data
+                temperature = temp_sensor.toCelsius(rawTemperatureRead);   // Convert temp data to Celsius
                 temp_sensor_sampleTimer.reset();                            // Reset timer 
                 
                 pc.printf("Temperature is %2.3f deg. C \r\n", temperature);