Diff: main.cpp

Revision:

40:117b324843ee

Parent:

39:6cc9a40bc8a6

--- a/main.cpp	Tue May 14 08:05:58 2019 +0000
+++ b/main.cpp	Tue May 14 20:30:07 2019 +0000
@@ -16,6 +16,9 @@
 /* Status Spleisser definieren*/
 int StatusSpleisser = ST_SOLO;
 
+extern int StatusDUO;
+extern int StatusSOLO;
+
 
 /*Buttons initialisieren*/
 
@@ -46,7 +49,9 @@
 
 /*Input initalisieren für Status Spleisser*/
 DigitalIn InputKontrollmodul(COM_SIGNAL);
+int val_InputKontrollmodul = 0;
 
+DigitalIn CutSignal(CUT_SIGNAL);
 /* Motor Control Expansion Board. */
 XNucleoIHM02A1 *x_nucleo_ihm02a1_1;
 XNucleoIHM02A12 *x_nucleo_ihm02a1_2;
@@ -224,23 +229,35 @@
 
     /* -------------------- ---- STATE_MACHINE ------------------------------ */
     while(1) {
+        val_InputKontrollmodul=InputKontrollmodul;
+      //  printf("%i",val_InputKontrollmodul);
+        
+       //val_InputKontrollmodul = InputKontrollmodul.read();
         switch (StatusSpleisser) {
             case ST_SOLO:
-                if(InputKontrollmodul == 0) {
+                if(InputKontrollmodul == 0) 
+                {
                     EntrySOLO();
-                } else {
+                } 
+                else if(InputKontrollmodul == 1)
+                {
+                    StatusDUO =DUO_DEFAULT;
                     StatusSpleisser = ST_DUO;
                 }
                 break;
             case ST_DUO:
                 if(InputKontrollmodul == 1) {
+                    
                     EntryDUO();
-                } else {
+                } 
+                else if (InputKontrollmodul == 0)
+                {
+                    StatusSOLO =SOLO_DEFAULT;
                     StatusSpleisser = ST_SOLO;
                 }
-                break;
-
+                break;     
         }
+       
     }
     /* ------------------------------ END ----------------------------------- */