X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fradios%2Fnrf.c;h=6f65e0bfb09ce6698dca503474054d4e71b4722a;hb=12bb2a05d2b9a940f4bcdd7478d3c9d45cc8f50a;hp=f65d2e537e2a97a76995a677b8e923083133ff5a;hpb=8bba67a8aeb9e40bb81ba2749710b9fef660d689;p=goodfet

diff --git a/firmware/apps/radios/nrf.c b/firmware/apps/radios/nrf.c
index f65d2e5..6f65e0b 100644
--- a/firmware/apps/radios/nrf.c
+++ b/firmware/apps/radios/nrf.c
@@ -19,19 +19,17 @@
 //BIT0 should be SS, but in point of fact it is IRQ.
 //BIT4 is actually SS, BIT5 is CE.
 #define SS BIT4
+#define CE BIT5;
 
-//This could be more accurate.
-//Does it ever need to be?
-#define NRFSPEED 0
-#define NRFDELAY(x)
-//delay(x)
+#define RADIOACTIVE  P5OUT|=CE
+#define RADIOPASSIVE P5OUT&=~CE
 
 
 //! Set up the pins for NRF mode.
 void nrfsetup(){
   P5OUT|=SS;
   P5DIR&=~MISO;
-  P5DIR|=MOSI+SCK+SS;
+  P5DIR|=MOSI+SCK+SS+CE;
   
   
   //Begin a new transaction.
@@ -73,6 +71,7 @@ u8 nrf_regwrite(u8 reg, const u8 *buf, int len){
     nrftrans8(*buf++);
   
   P5OUT|=SS;
+  return reg;//status
 }
 //! Reads a register
 u8 nrf_regread(u8 reg, u8 *buf, int len){
@@ -83,6 +82,7 @@ u8 nrf_regread(u8 reg, u8 *buf, int len){
     *buf++=nrftrans8(0);
   
   P5OUT|=SS;
+  return reg;//status
 }
 
 //! Handles a Nordic RF command.
@@ -91,10 +91,12 @@ void nrfhandle(unsigned char app,
 	       unsigned long len){
   unsigned long i;
   
+  RADIOPASSIVE;
+  
   //Raise !SS to end transaction, just in case we forgot.
   P5OUT|=SS;
   nrfsetup();
-    
+  
   switch(verb){
     //PEEK and POKE might come later.
   case READ:  
@@ -123,11 +125,39 @@ void nrfhandle(unsigned char app,
     P5OUT|=SS;  //Raise !SS to end transaction.
     txdata(app,verb,len);
     break;
-    
   case SETUP:
     nrfsetup();
     txdata(app,verb,0);
     break;
+  case NRF_RX:
+    RADIOPASSIVE;
+    
+    //Get the packet.
+    P5OUT&=~SS;
+    nrftrans8(NRF_R_RX_PAYLOAD);
+    for(i=0;i<32;i++)
+      cmddata[i]=nrftrans8(0xde);
+    P5OUT|=SS;
+    //no break
+    txdata(app,verb,32);
+    break;
+  case NRF_RX_FLUSH:
+    //Flush the buffer.
+    P5OUT&=~SS;
+    nrftrans8(NRF_FLUSH_RX);
+    P5OUT|=SS;
+    
+    //Return the packet.
+    txdata(app,verb,32);
+    break;
+  case NRF_TX:
+  case NRF_TX_FLUSH:
+  default:
+    debugstr("Not yet supported.");
+    txdata(app,verb,0);
+    break;
   }
   
+  P5OUT|=SS;//End session
+  RADIOACTIVE;
 }