Diff: model.cpp

Revision:

8:96c852630824

Parent:

7:9521d6ae3747

Child:

9:97b26dcd1035

diff -r 9521d6ae3747 -r 96c852630824 model.cpp
--- a/model.cpp	Sun Dec 11 00:52:39 2016 +0000
+++ b/model.cpp	Sun Dec 11 16:28:43 2016 +0000
@@ -1,9 +1,9 @@
 #include "model.h"
-Model::Model(Serial *pci):cmd(new Commands)
+
+Model::Model(Serial *pci,Timer _tm):cmd(new Commands)
 {
     pc=pci;
     pc->baud(57600);
-    init();
     char data[1];
     data[0]=0x43;
 //        for(int i =0;i<2;i++){
@@ -11,6 +11,41 @@
 //          data[0]=0x44;
 //        for(int i =0;i<15;i++){
 //        sendPacket(0xa0,0xd0,0x00,data,1);}
+    cmd->MotorDown[0]=0x2;
+    cmd->MotorDown[1]=0xff;
+    cmd->MotorDown[2]=0xff;
+    cmd->MotorDown[3]=0xff;
+    cmd->MotorDown[4]=0xfb;
+    cmd->MotorUp[0]=0x2;
+    cmd->MotorUp[1]=0x00;
+    cmd->MotorUp[2]=0x00;
+    cmd->MotorUp[3]=0x00;
+    cmd->MotorUp[4]=0x14;
+    cmd->MotorStop[0]=0x1;
+    cmd->LedOn[0]=0x01;
+    cmd->LedOff[0]=0x00;
+    cmd->ArrowDown[0]=0x02;
+    cmd->ArrowUp[0]=0x01;
+    mapPoschodie.insert(pair<string, bool>("p1",false));
+    mapPoschodie.insert(pair<string, bool>("p2",false));
+    mapPoschodie.insert(pair<string, bool>("p3",false));
+    mapPoschodie.insert(pair<string, bool>("p4",false));
+    mapPoschodie.insert(pair<string, bool>("p0",false));
+    poschodie=4;
+    direction=0;
+    p4=1;
+    p3=1;
+    p2=1;
+    p1=1;
+    p0=1;
+}
+void Model::setDataForResend(char targetAdd,char sourceAdd,int dataLength,char *data )
+{
+
+}
+Serial* Model::getSerial(void)
+{
+    return pc;
 }
 char Model::crcCalc(char targetAddr, char senderAddr, char *data,int DataSize)
 {
@@ -44,8 +79,9 @@
         sendPacket(0xa0,0x14,0x00,cmd->LedOn,1);
         sendPacket(0xa0,0x24,0x00,cmd->LedOn,1);
         if(direction==0) { //chod nahor
-            if(poschodie<4){
-                upMotor();}
+            if(poschodie<4) {
+                upMotor();
+            }
         }
     }
     if( mapPoschodie.find("p3")->second==true&&p3==true) {
@@ -216,7 +252,6 @@
         default:
             break;
 
-
     }
 
 }