Diff: main.cpp

Revision:

4:aa2cff91ff4f

Parent:

3:26a7b2c4bed1

Child:

5:045ef3068f21

--- a/main.cpp	Tue Jan 30 10:00:04 2018 +0000
+++ b/main.cpp	Tue Jan 30 10:29:58 2018 +0000
@@ -6,31 +6,28 @@
 #define Tilstand3 3.3
 #define Normaldrift 1.8<2.0
 
+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);
-DigitalIn _Sone2(p16);
-DigitalIn _Sone3(p17);
-DigitalIn _Sone4(p19);
+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;
 
 
 Ticker AlarmBlink; //10Hz blinking for alarmfunksjon på lys og telling
 int Tid = 0;
 volatile int sysclock = 0;
 
-volatile int Utganger1 = AlarmUtganger1;
-volatile int Utganger2 = AlarmUtganger2;
-volatile int Bryter = Servicebryter;
-volatile int Door1_1 = 0, Door1_2 = 0, Door2_1 = 0, Door2_2 = 0, Door3_1 = 0, Door3_2 = 0, Door4_1 = 0, Door4_2 = 0;
-volatile float Sone1 = _Sone1 * 3.3;
-volatile float Sone2 = _Sone2 * 3.3;
-volatile float Sone3 = _Sone3 * 3.3;
-volatile float Sone4 = _Sone4 * 3.3;
-volatile int ArrSone[4] = {Sone1, Sone2, Sone3, Sone4};
-volatile int DoorOne[4] = { Door1_1, Door2_1, Door3_1, Door4_1 };
-volatile int DoorTwo[4] = { Door1_2, Door2_2, Door3_2, Door4_2 };
+int Utganger1 = AlarmUtganger1;
+int Utganger2 = AlarmUtganger2;
+int Bryter = Servicebryter;
+int Door1_1 = 0, Door1_2 = 0, Door2_1 = 0, Door2_2 = 0, Door3_1 = 0, Door3_2 = 0, Door4_1 = 0, Door4_2 = 0;
+float ArrSone[4] = {Sone1, Sone2, Sone3, Sone4};
+int DoorOne[4] = { Door1_1, Door2_1, Door3_1, Door4_1 };
+int DoorTwo[4] = { Door1_2, Door2_2, Door3_2, Door4_2 };
 
 enum {_Feil, _Tilstand1, _Tilstand2, _Tilstand3, _NormalDrift} Tilstand; // Tilstand1 = Bryter1 i Sonen valgt, Tilstand2 = Bryter2 i sonen valgt, Tilstand3 = bryter 1 og 2 i sonen valgt, Normaldrift = alt er optimalt.
 int Tilstandssjekk();
@@ -47,6 +44,8 @@
             Utganger2 = 0;
         }
         Tilstandssjekk();
+        float volt = Sone1;
+        pc.printf("%f\n", volt);
         while(sysclock == 1);
         while(sysclock == 0);
         Tid++;
@@ -57,17 +56,7 @@
 
 int Tilstandssjekk()
 {
-    static float Sone1 = Sone1 * 3.3;
-    static float Sone2 = Sone2 * 3.3;
-    static float Sone3 = Sone3 * 3.3;
-    static float Sone4 = Sone4 * 3.3;
     int i = 0;
-    ArrSone[i];
-    DoorOne[i];
-    DoorTwo[i];
-    static int Utganger1;
-    static int Utganger2;
-
     for(i = 0; i < 3; i++) {
         if(ArrSone[i] == Tilstand1) {
             AlarmBlink_Start();