Revision 1:5e6b55099364, committed 2018-01-24

Comitter:

kicin2

Date:

Wed Jan 24 08:31:19 2018 +0000

Parent:

0:2574b54351ed

Commit message:

kicin2 vytah

Changed in this revision

diff -r 2574b54351ed -r 5e6b55099364 komunikacia.cpp
--- a/komunikacia.cpp	Wed Jan 24 07:55:50 2018 +0000
+++ b/komunikacia.cpp	Wed Jan 24 08:31:19 2018 +0000
@@ -101,8 +101,8 @@
     if(pc.getc() == 0xA0){//prijaty startovaci bajt
         adresaPrij = pc.getc();//prijata adresa prijmatela
         if(adresaPrij == 0x00){
-            adresaOdos = pc.getc();//prijata adresa odosielatela, adresa prijimatela nemoze byt ako moja
-            if(adresaOdos != 0x00){//teraz prijima paket
+            adresaOdos = pc.getc();//prijata adresa odosielatela
+            if(adresaOdos != 0x00){//adresa prijimatela nemoze byt ako moja,..teraz prijima paket
                 dlzkaPola = pc.getc();//prijata dlzka pola
                 unsigned char data[dlzkaPola];//zapise do pola
                 for(int i = 0;i<dlzkaPola;i++){

diff -r 2574b54351ed -r 5e6b55099364 main.cpp
--- a/main.cpp	Wed Jan 24 07:55:50 2018 +0000
+++ b/main.cpp	Wed Jan 24 08:31:19 2018 +0000
@@ -1,7 +1,7 @@
 /*!
  * \file main.cpp
  * \author Benedikt Kicin
- * subor main.cpp je hlavny subor aplikacie*/
+ * subor main.cpp je hlavny subor aplikacie, inicializacia, reset, spustenie*/
 
 #include "mbed.h"
 #include "komunikacia.h"

diff -r 2574b54351ed -r 5e6b55099364 riadenie.cpp
--- a/riadenie.cpp	Wed Jan 24 07:55:50 2018 +0000
+++ b/riadenie.cpp	Wed Jan 24 08:31:19 2018 +0000
@@ -22,7 +22,7 @@
         switch (adresaOdos) {
             case 0xb4: //vnutri vytahu
                         poschodie = 4;
-                        ledka = 0x24;
+                        ledka = 0x24; //stlacenie buttonu 0xb4 rozsvieti led 0x24
                         break;
             case 0xc4: //pred vytahom
                         poschodie = 4;

diff -r 2574b54351ed -r 5e6b55099364 vytah.cpp
--- a/vytah.cpp	Wed Jan 24 07:55:50 2018 +0000
+++ b/vytah.cpp	Wed Jan 24 08:31:19 2018 +0000
@@ -34,7 +34,7 @@
 */
 void stop()
 {
-    posliBajt(0xf1, 0x01); //motor, stop
+    posliBajt(0xf1, 0x01); //motor, stop... 0x02 motor pohyb... 0x03 pocitadlo motora
 }
 
 /**
@@ -76,13 +76,13 @@
 void chodNaPoschodie(unsigned char cisloPoschodia)
 {
     int pohyb; //rychlost pohybu
-    unsigned char poleR[5]; //inicializacia 5 poli
+    unsigned char poleR[5]; //inicializacia
 
     if(aktPoschodie != cisloPoschodia){ //zamknutie vytahu ked nie je na spravnom poschodi
 
     zamkni();
 
-      if(cisloPoschodia < aktPoschodie){ //ak je vytah na vyssom poschodi ako sme my
+      if(cisloPoschodia < aktPoschodie){ //ak je vytah na vyssom(alebo naopak) poschodi ako by mal byt
          pohyb = -100; //chod dole
         }
         else{ //inak
@@ -90,7 +90,7 @@
         }
 
         switch(pohyb){ //rychlost pohybu
-          case -100:                 //hodnoty rychlosti v bin tvare
+          case -100:                 //hodnoty v bin tvare
                     poleR[0] = 0x02; //0000 0010
                     poleR[1] = 0x9C; //1001 1100
                     poleR[2] = 0xFF; //1111 1111

diff -r 2574b54351ed -r 5e6b55099364 vytah.h
--- a/vytah.h	Wed Jan 24 07:55:50 2018 +0000
+++ b/vytah.h	Wed Jan 24 08:31:19 2018 +0000
@@ -21,8 +21,8 @@
     void zamkni();
     void odomkni();
     void stop();
+    void resetujSpravuWD();
     void posliSpravuWD();
-    void resetujSpravuWD();
     void vypniBrzdu();
     void zapniBrzdu();
     void chodNaPoschodie(unsigned char cisloPoschodia);