Merge branch 'master' of https://github.com/jloosli/Adafruit-Raspberry-Pi-Python-Code

Author: jloosli

Adafruit_MPL115A2/Adafruit_MPL115A2.py

@@ -114,7 +114,7 @@ def readCalibrationData(self):
     self._mpl115a2_b1 /= 8192.0
     self._mpl115a2_b2 /= 16384.0
     self._mpl115a2_c12 /= 4194304.0
-    self._mpl115a2_c12 /= 10**9
+    #self._mpl115a2_c12 /= 10**9
 
     if (self.debug):
       self.showCalibrationData()
@@ -149,7 +149,7 @@ def getPT(self):
     pressureComp = self._mpl115a2_a0 + (self._mpl115a2_b1 + self._mpl115a2_c12 * temp) * pressure + self._mpl115a2_b2 * temp
     P = ((65.0 / 1023) * pressureComp) + 50.0
     T = ((temp - 498.0) / -5.35 + 25.0)
-    return P,T
+    return P,T, temp
 
 
   def readRawPressure(self):

Adafruit_MPL115A2/test.py

@@ -16,13 +16,15 @@
 # bmp = BMP085(0x77, 2)  # HIRES Mode
 # bmp = BMP085(0x77, 3)  # ULTRAHIRES Mode
 
-temp, pressure = mpl.getPT()
+temp, pressure, temp2 = mpl.getPT()
 
 # temp = mpl.readTemperature()
 # pressure = mpl.readPressure()
 # altitude = mpl.readAltitude()
 
 print "Temperature: %.2f C" % temp
 print "Temperature: %.2f F" % (temp * 9 / 5 + 32)
+print "Temperature: %.2f C" % temp2
+print "Temperature: %.2f F" % (temp2 * 9 / 5 + 32)
 print "Pressure:    %.2f hPa" % (pressure / 100.0)
 #print "Altitude:    %.2f" % altitude