Diff: main.cpp

Revision:

3:0759c60f116b

Parent:

2:4fba73b78e1c

Child:

4:6d85c470d101

--- a/main.cpp	Tue May 09 20:55:08 2017 +0000
+++ b/main.cpp	Tue May 09 21:05:08 2017 +0000
@@ -1,9 +1,12 @@
 /**
- * Copyright (c) 2010 Roy van Dam <roy@negative-black.org>
+ * Program for reading temperature and humidity from SHT15
+ * Modified to fit to EDE Pro2 Team 1 project.
+ * Author Olga Høyer
+ * Original Copyright (c) 2010 Roy van Dam <roy@negative-black.org>
 **/
 
-#include "mbed.h"
-#include "SHTx/sht15.hpp"
+#include "mbed.h"                       //NOTE. Compiler gives an error:
+#include "SHTx/sht15.hpp"               //"CMSIS Target not recognised"
 
 //GLOBAL VARIABLES:
 float temperature, humidity;
@@ -35,10 +38,10 @@
 
     // Temperature in celcius
     sensor.setScale(false);
-    Temperature=sensor.getTemperature();        //don't know if it works
+    temperature=sensor.getTemperature();        //don't know if it works
 
     // Relative Humidity
-    Humdity=sensor.getHumidity();               //don't know if it works
+    humidity=sensor.getHumidity();               //don't know if it works
 
     wait(5);
     return ();