Diff: slave.cpp

Revision:

3:9c600fb19ed2

Parent:

2:067142778937

Child:

4:4848f847d2ce

--- a/slave.cpp	Tue Mar 13 12:15:05 2018 +0000
+++ b/slave.cpp	Wed Mar 14 14:39:08 2018 +0000
@@ -24,7 +24,11 @@
 float length[]={0,480,480,480,360,120,480,360,120,960,480,480,480,360,120,480,360,120};
 float delay[]={0,100,100,100,75,100,100,75,100,100,100,100,100,75,100,100,75,100};
 
-void startSlave(const char *ip){
+slave::slave(){
+    
+}
+
+void slave::startSlave(const char *ip){
         EthernetInterface eth;
         eth.init(ip, "255.255.255.0", "192.168.0.1");
         eth.connect();
@@ -50,7 +54,7 @@
             server.sendTo(client, getResponse(slaveBuffer,eth.getIPAddress()), 512);
         }
 }    
-char *getResponse(const char *buffer,const char *ip){
+char *slave::getResponse(const char *buffer,const char *ip){
     char *request = strtok((char*)buffer," ");//{buffer[0],buffer[1],buffer[2],'\0'};
     char *resource = strtok(NULL," ");
     slavepc.printf("\n\rresource =%s\n\r",resource);
@@ -82,10 +86,17 @@
             return tempbuffer;
         }
         else if(strcmp(resource,"/LED")==0){
-            putLED(strtok(NULL,'\0'));
+            char *color=strtok(NULL,'\0');
+            putLED(color);
             char tempbuffer[512];
-            sprintf(tempbuffer,"ACK 2.04 %14s",ip);
-            return tempbuffer;
+            //if(strcmp(color,"found")==0){
+                sprintf(tempbuffer,"ACK 2.04 %14s",ip);
+                return tempbuffer;
+            //}
+            /*else{
+                sprintf(tempbuffer,"ACK 4.00 %14s",ip);
+                return tempbuffer;
+            }*/
         }
         else if(strcmp(resource,"/LCD")==0){
             putLCD(strtok(NULL,'\0'));
@@ -106,35 +117,33 @@
     }
 }
 
-
-
-
-
-float getTemp(){
+float slave::getTemp(){
     return sensor.read();
 }
 
-float getPot(){
+float slave::getPot(){
     return p1.read();
 }
 
-void putLCD(char *str){
+void slave::putLCD(char *str){
+    slaveLCD.cls();
+    slaveLCD.locate(0,3);
     slaveLCD.printf("%s",str);
 }
 
-void putLED(char *color){
+void slave::putLED(char *color){
     r=mijnobject.getCOLOR(color).redValue;
     g=mijnobject.getCOLOR(color).greenValue;
     b=mijnobject.getCOLOR(color).blueValue;
 }
 
-void putLED(float red, float green, float blue){
+void slave::putLED(float red, float green, float blue){
     r= red;
     g= green;
     b= blue;
 }
 
-void putBuzzer(int start,int einde){
+void slave::putBuzzer(int start,int einde){
     for(start; start<einde+1;++start){
         spkr.period(1/freq[start]);
         spkr=0.5;