Diff: Frame.cpp

Revision:

3:344115c04cd0

Parent:

2:1243006bb879

Child:

4:466d859bfb13

--- a/Frame.cpp	Sun Mar 16 16:52:27 2014 +0000
+++ b/Frame.cpp	Sun Mar 16 18:56:08 2014 +0000
@@ -44,7 +44,6 @@
     if ( frame[0]==0xAA && frame[1]==0xBB && frame[length-2]==0xCC && frame[length-1]==0xDD) {
 
         IdDestinationMbed = (int) frame[3];
-        //temperature = (int) (0.026862*((frame[4]<<8) | frame[5])-25)  ;
         temperature = (int) ((frame[4]<<8) | frame[5])  ;
         pWMDutycycle = (int)frame[6];
         tune = (int) frame [7];
@@ -71,9 +70,9 @@
     encode[1]=0xBB;
     encode[2]= (char) length;
     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*2.55;
+    encode[4]= (char) (temperature>>8);
+    encode[5]= (char) temperature;
+    encode[6]= (char) pWMDutycycle;
     encode[7]= (char) tune;
 
     for (int i=0; i<lengthIDs; i++) {
@@ -167,13 +166,13 @@
 {
     return IdDestinationMbed;
 }
-void Frame::setTemperature(int temperature)
+void Frame::setTemperature(float temperature)
 {
-    this->temperature=temperature;
+    this->temperature=(int) (37.227*(temperature+25));
 }
 int Frame::getTemperature(void)
 {
-    return temperature;
+    return (int) (0.026862*temperature-25);
 }
 void Frame::setPWMDutycycle(int pWMDutycycle)
 {