Software hold - Team 1 - PRO2 2017 / Mbed 2 deprecated PRO2_samlet_kode

PRO2_Team 1_collected code

Dependencies:   mbed

Files at this revision

API Documentation at this revision

Revision 2:b80b6c14f7c3, committed 2017-05-19

Comitter:
Hammer4400
Date:
Fri May 19 19:16:27 2017 +0000
Parent:
1:135bd458e39e
Commit message:
+setting & logging;

Changed in this revision

SHTx.lib Show diff for this revision Revisions of this file
Settings.cpp Show annotated file Show diff for this revision Revisions of this file
Settings.h Show annotated file Show diff for this revision Revisions of this file
logging.cpp Show annotated file Show diff for this revision Revisions of this file
logging.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/SHTx.lib	Thu May 18 22:34:57 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/NegativeBlack/code/SHTx/#8465801be23f

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Settings.cpp	Fri May 19 19:16:27 2017 +0000
@@ -0,0 +1,45 @@
+//Author : Emil Hammer
+//Date : 19 May 2017
+//Version : 1.0
+//Copyright : Open for everyone
+//Description : Settings
+
+#include "mbed.h"
+
+DigitalOut myled(LED1);
+DigitalIn up(p5);
+DigitalIn down(p6);
+
+
+extern int timespan;
+int t;
+int i, set_temp;
+int temperature_low,temperature_high;
+
+int main()
+{
+    while(i<1) { //Open set_temp for user input.
+
+        if (up==1) {//recieve input from user
+            set_temp = (set_temp +1);
+        } // when "up" tricked set_temp raise 1
+        if (down==1) {
+            set_temp = (set_temp -1);
+        } // when "down" tricked set_temp raise 1
+        else if (timespan == 500);
+        {
+            /* if 500 ms passes without a user input
+             the program will break the loop*/
+            break;
+        }
+    }
+
+    int temperature_low = (set_temp-5);
+    int temperature_high = (set_temp+5);
+    /* Temperature that defines what uncomfortable */
+
+
+    i=2;
+    t=700; //force the program to pass hibernation.
+    return 0;
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Settings.h	Fri May 19 19:16:27 2017 +0000
@@ -0,0 +1,8 @@
+//Author : Emil Hammer
+//Date : 19 May 2017
+//Version : 1.0
+//Copyright : Open for everyone
+//Description : User input for temp.
+// Usage: Settings();
+
+void Settings();
\ No newline at end of file

--- a/logging.cpp	Thu May 18 22:34:57 2017 +0000
+++ b/logging.cpp	Fri May 19 19:16:27 2017 +0000
@@ -1,3 +1,9 @@
+//Author : Emil Hammer
+//Date : 19 May 2017
+//Version : 1.0
+//Copyright : Open for everyone
+//Description : Logging data
+
 #include "mbed.h"
 
 void logging ()

--- a/logging.h	Thu May 18 22:34:57 2017 +0000
+++ b/logging.h	Fri May 19 19:16:27 2017 +0000
@@ -1,3 +1,8 @@
-
+//Author : Emil Hammer
+//Date : 19 May 2017
+//Version : 1.0
+//Copyright : Open for everyone
+//Description : Logging data
+// Usage: logging();
 
 void logging ();
\ No newline at end of file

--- a/main.cpp	Thu May 18 22:34:57 2017 +0000
+++ b/main.cpp	Fri May 19 19:16:27 2017 +0000
@@ -46,9 +46,9 @@
     
     GetTemperatureAndHumidity();        //Data Collection
 
-    Comparevalues( );                    //Data Analysis
+    Comparevalues( );                   //Data Analysis
 
-    rgb_outp(status);                         //RGB_LED_output
+    rgb_outp(status);                   //RGB_LED_output
 
     return 0;
-}
+}
\ No newline at end of file