Programmeringsgruppe 1 / Mbed OS Alarmsystem_rev_innlevering

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of Alarmsystem_log_funksjon_funker_ikke by Programmeringsgruppe 1

Diff: main.cpp

Revision:
5:045ef3068f21
Parent:
4:aa2cff91ff4f
Child:
6:a3b97bf7902b
Child:
7:25e0260ee887
--- a/main.cpp	Tue Jan 30 10:29:58 2018 +0000
+++ b/main.cpp	Tue Jan 30 10:41:49 2018 +0000
@@ -5,16 +5,16 @@
 #define Tilstand2 2.1<2.3
 #define Tilstand3 3.3
 #define Normaldrift 1.8<2.0
-
+DigitalOut myled2(LED2);
 Serial pc(USBTX, USBRX);
 DigitalOut Driftslys(LED1);
 BusOut AlarmUtganger1(p21, p22, p23, p24);
 BusOut AlarmUtganger2(p25, p26, p27, p28);
 DigitalIn Servicebryter(p20);
-DigitalIn _Sone1(p15); float Sone1 =  _Sone1 * 3.3;
-DigitalIn _Sone2(p16); float Sone2 =  _Sone2 * 3.3;
-DigitalIn _Sone3(p17); float Sone3 =  _Sone3 * 3.3;
-DigitalIn _Sone4(p19); float Sone4 =  _Sone4 * 3.3;
+AnalogIn _Sone1(p15); float Sone1 =  _Sone1 * 3.3;
+AnalogIn _Sone2(p16); float Sone2 =  _Sone2 * 3.3;
+AnalogIn _Sone3(p17); float Sone3 =  _Sone3 * 3.3;
+AnalogIn _Sone4(p19); float Sone4 =  _Sone4 * 3.3;
 
 
 Ticker AlarmBlink; //10Hz blinking for alarmfunksjon på lys og telling
@@ -46,8 +46,9 @@
         Tilstandssjekk();
         float volt = Sone1;
         pc.printf("%f\n", volt);
-        while(sysclock == 1);
-        while(sysclock == 0);
+        wait(1.0);
+        //while(sysclock == 1);
+        //while(sysclock == 0);
         Tid++;
 
 
@@ -77,6 +78,7 @@
         if(Normaldrift == ArrSone[i]) {
             Driftslys = 1;
             DoorOne[i] = AlarmUtganger1 - DoorOne[i];
+            myled2 = 1;
         }
         if(i < 0 ) {
             DoorOne[i] = AlarmUtganger1 + DoorOne[i];
@@ -86,7 +88,7 @@
             DoorOne[i] = AlarmUtganger2 + DoorTwo[i];
         }
     }
-    return ArrSone[i], DoorOne[i], DoorTwo[i];
+    return 0;
 }
 
 void AlarmBlink_Start(void)