Diff: main.cpp

Revision:

4:466d859bfb13

Parent:

3:344115c04cd0

--- a/main.cpp	Sun Mar 16 18:56:08 2014 +0000
+++ b/main.cpp	Mon Mar 17 18:40:46 2014 +0000
@@ -43,24 +43,25 @@
         if(server.read(buf)) {
             if(!dataFrame.Decode(buf))
                 printf("Frame CRC Error \n\r");
-            if(dataFrame.getIdDestinationMbed()==7) {
+            if((dataFrame.getIdDestinationMbed()==7) && (!dataFrame.CheckMyID(7))) {
                 printf("Voor mij\n\r");
                 PWMout=potentiometer.getPotentiometer();
                 PWMout.period(0.010);// set PWM period to 10 ms
                 tune.play(dataFrame.getTune());
-                display.setText("Temp: %d °C",dataFrame.getTemperature());
-                //display.setText("Temp: %d",dataFrame.getTemperature());
+                display.setText("Temp: %d C",dataFrame.getTemperature());
                 dataFrame.setIdDestinationMbed(IpDestination);
                 dataFrame.setTemperature(temp.getTemperature());
                 dataFrame.setPWMDutycycle(potentiometer.getPotentiometer());
                 dataFrame.setTune(dataFrame.getTune()+1);
                 dataFrame.AddID(7);
                 dataFrame.Encode(buf);
-            }
-            if(!dataFrame.CheckMyID(7)) {
                 server.connect(destIp);
                 server.send(buf);
             }
+          /*  if() {
+                server.connect(destIp);
+                server.send(buf);
+            }*/
         }
         if(BoolIpDestination) {
             if(IpDestination!=15)
@@ -68,7 +69,7 @@
             else
                 IpDestination=1;
             sprintf(destIp,"192.168.0.1%02i",IpDestination);
-            display.setText("IP: 192.168.0.1%02i",IpDestination);
+            display.setText("IP:192.168.0.1%02i",IpDestination);
             BoolIpDestination=0;
             wait(0.5);
         }
@@ -76,7 +77,8 @@
             dataFrame.setIdDestinationMbed(IpDestination);
             dataFrame.setTemperature(temp.getTemperature());
             dataFrame.setPWMDutycycle(potentiometer.getPotentiometer());
-            dataFrame.setTune(1);
+            tune.play(1);
+            dataFrame.setTune(2);
             dataFrame.AddID(7);
             //char testIDs[]= {0x08,0x09,0x0A};
             //dataFrame->setLengthIDs(3);