Diff: Module.cpp

Revision:

1:fa51edf89e71

Parent:

0:6ee88b4152dc

Child:

2:7f7eb0cc78a4

--- a/Module.cpp	Wed Apr 23 11:10:26 2014 +0000
+++ b/Module.cpp	Thu Apr 24 10:39:09 2014 +0000
@@ -23,7 +23,7 @@
     this->version[1] = 0;
     
     this->enableData= false;
-    this->packageSize = 20;
+    this->packageSize = 100;
     this->sampleNumber = 0;
     this->sampleRate = 250; //default waarde - let op, digitale filters moeten herberekend worden bij het veranderen van de sampleRate
     this->dataPacket = NULL;
@@ -55,57 +55,76 @@
 
 void Module::meting_thread()
 {
-    if(this->dataPacket->addMeasurement(this->daq->measure()))
+    if(enableData)
     {
-        this->sampleNumber++;
-    }
-    else
-    {
-        //printf("false \n");
-        this->sendPacket(this->dataPacket);
-        this->creatDataPacket();
+        Measurement *m = this->daq->measure();
+        if(this->dataPacket->addMeasurement(m))
+        {
+            this->sampleNumber++;
+        }
+        else
+        {
+            //printf("false \n");
+            this->sendPacket(this->dataPacket);
+            this->creatDataPacket();
+        
+            this->dataPacket->addMeasurement(m); //hier niet meer controleren of het lukt?
+            this->sampleNumber++;
+        }
+        delete m;
     }
 }
 
 //PACKET WORKER
 void Module::packetWorker(Packet *p)
 {
+    pl.putc(p->getID()[0]);
+    pl.putc(p->getID()[1]);
+    pl.putc(p->getCMD());
     switch(p->getCMD())
     {
         //S2C packets
-        case PACKET_ACK : this->sendPacket(p); break;
-        case PACKET_NACK : this->sendPacket(p); break;
-        case PACKET_ERROR : this->sendPacket(p); break;
-        case PACKET_ALIVE : this->sendPacket(p); break;
-        case PACKET_DATA : this->sendPacket(p); break;
-        case PACKET_GET_IP_REPLY : this->sendPacket(p); break;
+        case PACKET_ACK : this->sendPacket(p); pl.printf("ACK"); break;
+        case PACKET_NACK : this->sendPacket(p); pl.printf("NACK"); break;
+        case PACKET_ERROR : this->sendPacket(p); pl.printf("ERROR"); break;
+        case PACKET_ALIVE : this->sendPacket(p); pl.printf("ALIVE"); break;
+        case PACKET_DATA : this->sendPacket(p); pl.printf("DATA"); break;
+        case PACKET_GET_IP_REPLY : this->sendPacket(p); pl.printf("IP_REPLY"); break;
         
         //C2S packets
         case PACKET_INIT :
             this->HandleInit(p);
+            printf("PACKET_INIT");
             break;
         case PACKET_ENABLE_DATA :
             this->HandleEnableData(p);
+            printf("ENABLE_DATA");
             break;
         case PACKET_CHANGE_IP :
             this->HandleChangeIP(p);
+            printf("CHANGE_IP");
             break;
         case PACKET_REMOVE_IP :
             this->removeIP();
+            printf("REMOVE_IP");
             break;
         case PACKET_GET_IP :
             this->IpReply();
+            printf("GET_IP");
             break;
         case PACKET_VERSION :
             this->VersionReply();
+            printf("VERSION");
             break;
         //case PACKET_VERSION_REPLY : --> zelf versturen!
         //    break;
         case PACKET_SET_PACKAGE_SIZE :
             HandleSetPackageSize(p);
+            printf("SET_PACKAGE_SIZE");
             break;
         case PACKET_GET_SETTINGS :
             this->SettingsReply();
+            printf("GET_SETTINGS");
             break;
         //case PACKET_GET_SETTINGS_REPLY : --> moet verstuurd worden!
         //    break;
@@ -115,21 +134,26 @@
             this->ID[1] = cmdData[1];
             delete cmdData;
             this->Acknowledge();
+            printf("SET_ID");
             break;
         case PACKET_TEST_MODE :
             this->uart->send(p); //uitsturen via beide interfaces
             //this->wifi->send(p);
+            printf("TEST_MODE");
             break;
         case PACKET_LED_TEST_MODE :
             uint8_t *ledData = p->getCMD_DATA();
             uint8_t ledInfo = ledData[0];
             this->LedTest(ledInfo);
             delete ledData;
+            printf("LED_TEST_MODE");
             break;
         default:
             /// packet dat ik binnen krijg !!!!!
+            printf("huh??");
             break;
     }
+    printf("gedaan");
     delete p;    
 }