MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
Conflicts:
	libraries/LiquidCrystal/LCD.cpp
	libraries/LiquidCrystal/LCD.h
	libraries/MySensors/MySensor.cpp
	libraries/MySensors/examples/MysensorMicro/MysensorMicro.ino
This commit is contained in:
Henrik Ekblad
2015-06-11 22:26:33 +02:00
parent 51d22c6936 b482a8eb7a
commit 10e48594d8
40 changed files with 8168 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/examples/PressureSensor/PressureSensor.ino
+1 -1
View File
@@ -73,7 +73,7 @@ void setup() {
}
void loop() {
float pressure = bmp.readSealevelPressure(205)/100; // 205 meters above sealevel
float pressure = bmp.readSealevelPressure(205)/100.0; // 205 meters above sealevel
float temperature = bmp.readTemperature();
if (!metric) {