updated to latests libs from RF24

Sketches/lightswitch.c

@@ -16,6 +16,7 @@
 #include "nRF24L01.h"
 #include "RF24.h"
 #include "printf.h"
+
 int relay = 8;
 
 //
@@ -33,6 +34,35 @@ RF24 radio(9,10);
 // Radio pipe addresses for the 2 nodes to communicate.
 const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
 
+
+char * convertNumberIntoArray(unsigned short number, unsigned short length) {
+
+    char * arr = (char *) malloc(length * sizeof(char)), * curr = arr;
+    do {
+        *curr++ = number % 10;
+      number /= 10;
+    } while (number != 0);
+    return arr;
+}
+
+unsigned short getId(char * rawMessage, unsigned short length){
+    unsigned short i = 0;
+    unsigned short id = 0;
+    for( i=1; i< length; i++){
+        id += rawMessage[i]*pow( 10, i-1 );
+    }
+    return id;
+}
+
+unsigned short getMessage( char * rawMessage){
+    unsigned short message = rawMessage[0];
+    return (unsigned short)message;
+}
+unsigned short getLength( unsigned int rudeMessage){
+    unsigned short length = (unsigned short)(log10((float)rudeMessage)) + 1;
+    return length;
+}
+
 void setup(void)
 {
   //
@@ -43,57 +73,97 @@ void setup(void)
   pinMode(relay, OUTPUT);
   digitalWrite(relay, HIGH);
   printf_begin();
-  printf("\nLight Switch Arduino\n\r");
+  printf("\nRemote Switch Arduino\n\r");
 
   //
   // Setup and configure rf radio
   //
 
   radio.begin();
+//  radio.setAutoAck(1);                    // Ensure autoACK is enabled
   radio.setRetries(15,15);
 
-  radio.openWritingPipe(pipes[0]);
-  radio.openReadingPipe(1,pipes[1]);
+  radio.openWritingPipe(pipes[1]);
+  radio.openReadingPipe(1,pipes[0]);
   radio.startListening();
   radio.printDetails();
 }
 
+int getState(unsigned short pin){
+  boolean state = digitalRead(pin);
+  return state == true ? 0 : 1;
+}
+
+void doAction(unsigned short id, unsigned short action){
+
+
+    if( action == 0 ){
+        digitalWrite(id, HIGH);
+    }else{
+        digitalWrite(id, LOW);
+    }
+
+
+
+}
+void sendCallback(unsigned short callback){
+   // First, stop listening so we can talk
+      radio.stopListening();
+
+      // Send the final one back.
+      radio.write( &callback, sizeof(unsigned short) );
+      printf("Sent response.\n\r");
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+}
+
+void performAction(unsigned short rawMessage){
+  unsigned short action, id, length, callback;
+  char * castedMessage;
+
+  length = getLength(rawMessage);
+  castedMessage = convertNumberIntoArray(rawMessage, length);
+  action = getMessage(castedMessage);
+  id = getId(castedMessage, length);
+
+  if (action == 0 || action ==1){
+      callback = action;
+      doAction(id, action);
+  }else if(action == 2){
+      callback = getState(id);
+  }
+  sendCallback(callback);
+
+
+
+}
 void loop(void)
 {
 
     // if there is data ready
     if ( radio.available() )
     {
       // Dump the payloads until we've gotten everything
-      unsigned long message;
-      bool done = false;
-      while (!done)
+      unsigned short message;
+      bool done;
+//      char * new;
+      unsigned short rawMessage; 
+      done = false;
+      while ( radio.available() )
       {
         // Fetch the payload, and see if this was the last one.
-        done = radio.read( &message, sizeof(unsigned long) );
+        radio.read( &rawMessage, sizeof(unsigned long) );
 
         // Spew it
-        printf("Got message %lu...",message);
-        if (message == 1){
-          digitalWrite(relay, LOW);
-        }else{
-          digitalWrite(relay, HIGH);
-        }
-
-	// Delay just a little bit to let the other unit
-	// make the transition to receiver
-	delay(20);
-      }
+        printf("Got message %d...",rawMessage); 
 
-      // First, stop listening so we can talk
-      radio.stopListening();
+        performAction(rawMessage);
 
-      // Send the final one back.
-      radio.write( &message, sizeof(unsigned long) );
-      printf("Sent response.\n\r");
+        delay(20);
+      }
 
-      // Now, resume listening so we catch the next packets.
-      radio.startListening();
+
     }
 
 }