Revision 2:1243006bb879, committed 2014-03-16

Comitter:

seppeduwe

Date:

Sun Mar 16 16:52:27 2014 +0000

Parent:

1:635e76c52151

Child:

3:344115c04cd0

Commit message:

Einde opendeurdag

Changed in this revision

--- a/Frame.cpp	Sun Mar 16 15:08:10 2014 +0000
+++ b/Frame.cpp	Sun Mar 16 16:52:27 2014 +0000
@@ -73,7 +73,7 @@
     encode[3]= (char) IdDestinationMbed;
     encode[4]= (char) (((int)(37.227*temperature+930.68))>>8);
     encode[5]= (int) (37.227*temperature+930.68);
-    encode[6]= (char) pWMDutycycle;
+    encode[6]= (char) pWMDutycycle*2.55;
     encode[7]= (char) tune;
 
     for (int i=0; i<lengthIDs; i++) {

--- a/Server.h	Sun Mar 16 15:08:10 2014 +0000
+++ b/Server.h	Sun Mar 16 16:52:27 2014 +0000
@@ -2,20 +2,21 @@
 #ifndef Server_H
 #define Server_H
 
-class  Server {
-    private:
-        EthernetInterface* eth;
-        TCPSocketConnection* socket;
-        TCPSocketServer* server;
-    public:
-        Server(char* sourceAddress);
-        void send(char* data);
-        int read(char* buffer);
-        void printStatus(void);
-        int connect(char* destinationAddress);
-        int close(void);
-        void resetSocket(void);
-        ~Server(); 
+class  Server
+{
+private:
+    EthernetInterface* eth;
+    TCPSocketConnection* socket;
+    TCPSocketServer* server;
+public:
+    Server(char* sourceAddress);
+    void send(char* data);
+    int read(char* buffer);
+    void printStatus(void);
+    int connect(char* destinationAddress);
+    int close(void);
+    void resetSocket(void);
+    ~Server();
 };
 
 #endif
\ No newline at end of file

--- 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