Merge branch 'master' of github.com:kamaaina/cpp-projects

kamaaina · kamaaina · commit ce2d98166703 · 2014-07-30T19:11:45.000-06:00
diff --git a/bmp180/test.cpp b/bmp180/test.cpp
@@ -7,7 +7,7 @@ int main()
 {
    cout << "testing BMP180" << endl;
    BMP180 sensor = BMP180();
-   cout << "Temperature: " << sensor.readTemperature() << " m" << endl;
+   cout << "Temperature: " << sensor.readTemperature() << " C" << endl;
    cout << "Pressure: " << sensor.readPressure() << " Pa" << endl;
    cout << "Sea Level Pressure: " << sensor.readSeaLevelPressure() << " Pa" << endl;
    cout << "Altitude: " << sensor.readAltitude() << " m" << endl;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ int main()`
`7`	`7`	`{`
`8`	`8`	`cout << "testing BMP180" << endl;`
`9`	`9`	`BMP180 sensor = BMP180();`
`10`		`- cout << "Temperature: " << sensor.readTemperature() << " m" << endl;`
	`10`	`+ cout << "Temperature: " << sensor.readTemperature() << " C" << endl;`
`11`	`11`	`cout << "Pressure: " << sensor.readPressure() << " Pa" << endl;`
`12`	`12`	`cout << "Sea Level Pressure: " << sensor.readSeaLevelPressure() << " Pa" << endl;`
`13`	`13`	`cout << "Altitude: " << sensor.readAltitude() << " m" << endl;`