Diff: WhackAMole.cpp

Revision:

2:4c79ab84c285

Parent:

1:d905afad53c0

Child:

3:3c0c008bacb3

diff -r d905afad53c0 -r 4c79ab84c285 WhackAMole.cpp
--- a/WhackAMole.cpp	Tue Oct 20 18:08:37 2015 +0000
+++ b/WhackAMole.cpp	Wed Oct 21 01:30:31 2015 +0000
@@ -81,7 +81,7 @@
 //***************** You can start coding here *****************//
 int main (void)
 {
-    uint8_t channel = 2;
+    uint8_t channel = 5;
     
     //Set the Channel. 0 is default, 15 is max
     mrf.SetChannel(channel);
@@ -103,19 +103,22 @@
         round_counter=0;
         score_counter=0;
         while(round_counter<10){
-            action = rand()%2;
+            action = rand()%3;
             if(action==0){
                 wait(1);
                 }
             else if (action==1){
                 timer.reset();
                 strcpy(txBuffer, "activate_1");
-                rf_send(txBuffer, strlen(txBuffer));
+                rf_send(txBuffer, strlen(txBuffer)+1);
+                pc.printf("Sent: %s\r\n", txBuffer);
                 while(true){
                     rxLen = rf_receive(rxBuffer, 128); 
-                    pc.printf("Received: %s\r\n", rxBuffer);    
-                    if(strcmp("finished_1", txBuffer)) {
-                        break;
+                    if (rxLen>0){  
+                        pc.printf("Received: %s\r\n", rxBuffer); 
+                        if(!strcmp("finished_1", rxBuffer)) { 
+                            break;
+                            }
                         }
                     }
                     score_counter+=timer.read_ms();
@@ -124,11 +127,15 @@
             else if (action==2){
                 timer.reset();
                 strcpy(txBuffer, "activate_2");
-                rf_send(txBuffer, strlen(txBuffer));
+                rf_send(txBuffer, strlen(txBuffer)+1);
+                pc.printf("Sent: %s\r\n", txBuffer);
                 while(true){
-                    rxLen = rf_receive(rxBuffer, 10);     
-                    if(strcmp("finished_2", txBuffer)) {
-                        break;
+                    rxLen = rf_receive(rxBuffer, 128); 
+                    if (rxLen>0){
+                        pc.printf("Received: %s\r\n", rxBuffer);    
+                        if(!strcmp("finished_2", rxBuffer)) {
+                            break;
+                            }
                         }
                     }
                     score_counter+=timer.read_ms();
@@ -137,11 +144,14 @@
             else if (action ==3){
                 timer.reset();
                 strcpy(txBuffer, "activate_3");
-                rf_send(txBuffer, strlen(txBuffer));
+                rf_send(txBuffer, strlen(txBuffer)+1);
                 while(true){
-                    rxLen = rf_receive(rxBuffer, 10);     
-                    if(strcmp("finished_3", txBuffer)) {
-                        break;
+                    rxLen = rf_receive(rxBuffer, 128); 
+                    if (rxLen>0){
+                        pc.printf("Received: %s\r\n", rxBuffer);    
+                        if(!strcmp("finished_3", rxBuffer)) {
+                            break;
+                            }
                         }
                     }
                     score_counter+=timer.read_ms();