Diff: main.cpp

Revision:

2:1243006bb879

Parent:

1:635e76c52151

Child:

3:344115c04cd0

--- a/main.cpp	Sun Mar 16 15:08:10 2014 +0000
+++ b/main.cpp	Sun Mar 16 16:52:27 2014 +0000
@@ -30,32 +30,33 @@
     buttonDestinationIpUp.rise(&DestinationIpUp);  // attach the address of the flip function to the rising edge
 
     char buf[256];
-    Frame* testFrame = new Frame();
+    Frame testFrame;
     Server server("192.168.0.107");
     server.printStatus();
-    Display* display=new Display();
-    display->setText("Seppe's MBED");
-    Tune* tune = new Tune();
+    Display display;
+    display.setText("Seppe's MBED");
+    Tune tune;
     Temperature temp;
-    Potentiometer* potentiometer = new Potentiometer();
+    Potentiometer potentiometer;
 
     while(1) {
         if(server.read(buf)) {
-            if(!testFrame->Decode(buf))
+            if(!testFrame.Decode(buf))
                 printf("Frame CRC Error \n\r");
-            if(testFrame->getIdDestinationMbed()==7) {
+            if(testFrame.getIdDestinationMbed()==7) {
                 printf("Voor mij\n\r");
-                PWMout=potentiometer->getPotentiometer()/100;
-                tune->play(testFrame->getTune());
-                display->setText("Temp: %d",testFrame->getTemperature());
-                testFrame->setIdDestinationMbed(IpDestination);
-                testFrame->setTemperature(temp.getTemperature());
-                testFrame->setPWMDutycycle(potentiometer->getPotentiometer());
-                testFrame->setTune(testFrame->getTune()+1);
-                testFrame->AddID(7);
-                testFrame->Encode(buf);
+                PWMout=potentiometer.getPotentiometer()/100;
+                tune.play(testFrame.getTune());
+                //display.setText("Temp: %d",(0.026862*(testFrame.getTemperature()-25)));
+                display.setText("Temp: %d",testFrame.getTemperature());
+                testFrame.setIdDestinationMbed(IpDestination);
+                testFrame.setTemperature(temp.getTemperature());
+                testFrame.setPWMDutycycle(potentiometer.getPotentiometer());
+                testFrame.setTune(testFrame.getTune()+1);
+                testFrame.AddID(7);
+                testFrame.Encode(buf);
             }
-            if(!testFrame->CheckMyID(7)) {
+            if(!testFrame.CheckMyID(7)) {
                 server.connect(destIp);
                 server.send(buf);
             }
@@ -66,20 +67,20 @@
             else
                 IpDestination=1;
             sprintf(destIp,"192.168.0.1%02i",IpDestination);
-            display->setText("192.168.0.1%02i",IpDestination);
+            display.setText("192.168.0.1%02i",IpDestination);
             BoolIpDestination=0;
             wait(0.5);
         }
         if(Send) {
-            testFrame->setIdDestinationMbed(IpDestination);
-            testFrame->setTemperature(temp.getTemperature());
-            testFrame->setPWMDutycycle(potentiometer->getPotentiometer());
-            testFrame->setTune(1);
-            testFrame->AddID(7);
+            testFrame.setIdDestinationMbed(IpDestination);
+            testFrame.setTemperature(temp.getTemperature());
+            testFrame.setPWMDutycycle(potentiometer.getPotentiometer());
+            testFrame.setTune(1);
+            testFrame.AddID(7);
             //char testIDs[]= {0x08,0x09,0x0A};
             //testFrame->setLengthIDs(3);
             //testFrame->setIDs(testIDs);
-            testFrame->Encode(buf);
+            testFrame.Encode(buf);
 
             server.connect(destIp);
             server.send(buf);
@@ -87,4 +88,4 @@
             wait(0.5);
         }
     }
-}
+}
\ No newline at end of file