test

Dependents:   FM_integration_copy

Fork of MPL3115A2 by Michael Lange

Files at this revision

API Documentation at this revision

Comitter:
pyonta2017
Date:
Wed Sep 06 15:12:42 2017 +0000
Parent:
3:7c7c1ea6fc33
Commit message:
?

Changed in this revision

Altitude.h Show annotated file Show diff for this revision Revisions of this file
Temperature.h Show annotated file Show diff for this revision Revisions of this file
diff -r 7c7c1ea6fc33 -r a9ee44b59212 Altitude.h
--- a/Altitude.h	Wed Apr 02 12:59:44 2014 +0000
+++ b/Altitude.h	Wed Sep 06 15:12:42 2017 +0000
@@ -32,7 +32,7 @@
     enum unitsType { METERS, FEET };
 
     Altitude();
-    Altitude(float a, unitsType units = FEET);
+    Altitude(float a, unitsType units = METERS);
     Altitude(const char* compressed);
     Altitude(const char msb, const char csb, const char lsb);
 
@@ -42,15 +42,15 @@
     operator float(void) { return _altitude; }
 
     //! Returns the altitude in the units you specifiy, defaulting to FEET if none specified.
-    float altitude(unitsType units = FEET);
+    float altitude(unitsType units = METERS);
     //! Call to decompress the sensor data after an I2C read.
     void setAltitude();
     void setAltitude(const char* compressed);
     void setAltitude(const char msb, const char csb, const char lsb);
-    void setAltitude(float a, unitsType units = FEET);
+    void setAltitude(float a, unitsType units = METERS);
 
     //! Returns the altitude as a string in the units specified, defaulting to FEET if none specified.
-    const char* print(unitsType units = FEET);
+    const char* print(unitsType units = METERS);
     
     //! Converts meters to feet.
     static float MetersToFeet(float meters) { return meters * 3.28084; }
diff -r 7c7c1ea6fc33 -r a9ee44b59212 Temperature.h
--- a/Temperature.h	Wed Apr 02 12:59:44 2014 +0000
+++ b/Temperature.h	Wed Sep 06 15:12:42 2017 +0000
@@ -28,7 +28,7 @@
     enum unitsType { CELSIUS, FAHRENHEIT, KELVIN };
 
     Temperature();
-    Temperature(float a, unitsType units = FAHRENHEIT);
+    Temperature(float a, unitsType units = CELSIUS);
     Temperature(const char* compressed);
     Temperature(const char msb, const char lsb);
 
@@ -37,15 +37,15 @@
     //! Same as calling temperature with FAHRENHEIT as the parameter.
     operator float(void) { return _temperature; }
 
-    float temperature(unitsType units = FAHRENHEIT);
+    float temperature(unitsType units = CELSIUS);
     //! Call to decompress the sensor data after an I2C read.
     void setTemperature();
     void setTemperature(const char* compressed);
     void setTemperature(const char msb, const char lsb);
-    void setTemperature(float a, unitsType units = FAHRENHEIT);
+    void setTemperature(float a, unitsType units = CELSIUS);
 
     //! Returns the temperature as a string in the units specified, defaulting to FAHRENHEIT if none specified.
-    const char* print(unitsType units = FAHRENHEIT);
+    const char* print(unitsType units = CELSIUS);
     
 private:
     float _temperature;