Diff: main.cpp

Revision:

4:dee1ebc51d2e

Parent:

3:d473fb175cec

Child:

5:8c5c19be2126

--- a/main.cpp	Wed Dec 06 10:53:16 2017 +0000
+++ b/main.cpp	Mon Dec 11 15:13:35 2017 +0000
@@ -4,7 +4,7 @@
 #define ARRAY_SIZE(array) sizeof(array)/sizeof(*array)
 
 Serial term(USBTX, USBRX);
-DigitalOut led1(LED1);
+DigitalOut led1(LED2);
 
 
 
@@ -62,13 +62,22 @@
     }
 }
 
-int *prerusVysielanie()
+void prerusVysielanie()
 {
    
     
     prijmi = 1;
     for(int i = 0; i < 4; i++) {
         adresa[i] = term.getc();
+        if(adresa[i] == W_1_BUTTON){smerDole();}
+        else if(adresa[i]== W_2_BUTTON)
+        {
+            
+            smerHore();
+            
+            if(adresa[i] == 0xE2){stop();}
+        }
+        
     }
     
    
@@ -77,53 +86,21 @@
     }else{        
         for(int i = 0; i < adresa[3]; i++){
             sprava[i]=term.getc();  
-            //return sprava[i];
+            
         }
         adresa[4]=term.getc();
+        
         if(adresa[4] == getCrc(adresa[1], adresa[2],adresa[3],sprava)){
-          return sprava;
+         
         }
+        
     }
-    return sprava;
-    
-   // riadeniePohybu();
-    
+  
    
 }
 
 
-int dajPoschodie()
-{
-    int poschodie;
-    switch(adresa[2]){
-        case SWITCH_P:{
-            poschodie = SWITCH_P;
-           cisloPochodia_dislpej = 0;
-            break;
-        }
-        case SWITCH_1:{
-            poschodie = SWITCH_1;
-           cisloPochodia_dislpej = 1;
-            break;
-        }
-        case SWITCH_2:{
-            poschodie = SWITCH_2;
-           cisloPochodia_dislpej = 2;
-            break;
-        }
-        case SWITCH_3:{
-            poschodie = SWITCH_3;
-           cisloPochodia_dislpej = 3;
-            break;
-        }
-        case SWITCH_4:{
-            poschodie = SWITCH_4;
-           cisloPochodia_dislpej = 4;
-            break;
-        }
-    }  
-    return poschodie;  
-}
+
 
 
 int main() {
@@ -131,16 +108,13 @@
     term.baud(57600);
    
 
-      led1 = 0;
-      wait(2);
-      led1 = 1;
-      while(true){
       
-    int aDataIn[] = {*prerusVysielanie()};
-     int dataSize1 = ARRAY_SIZE(aDataIn);
-    posliSpravu(0xD0,0xAA,dataSize1,aDataIn);
-    wait(1);
-     }
+    //int aDataIn[] = {*prerusVysielanie()};
+    // int dataSize1 = ARRAY_SIZE(aDataIn);
+   // posliSpravu(0xD0,0xAA,dataSize1,aDataIn);
+   
+   
+    prerusVysielanie();
      
      
     
@@ -148,15 +122,6 @@
 }
 
 
-void tlac_vytah()
-{
-    if (prijmi == 1)
-    {
-        
-        }
-    }
-
-
 void stop()
 {
     int aDataIn[] = {0x1};