projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Autotuner is ready for action\!
[goodfet]
/
firmware
/
apps
/
radios
/
nrf.c
diff --git
a/firmware/apps/radios/nrf.c
b/firmware/apps/radios/nrf.c
index
d105af5
..
ca70113
100644
(file)
--- a/
firmware/apps/radios/nrf.c
+++ b/
firmware/apps/radios/nrf.c
@@
-15,27
+15,25
@@
#include "nrf.h"
#include "spi.h"
#include "nrf.h"
#include "spi.h"
-//This could be more accurate.
-//Does it ever need to be?
-#define NRFSPEED 0
-#define NRFDELAY(x)
-//delay(x)
+#define RADIOACTIVE SETCE
+#define RADIOPASSIVE CLRCE
//! Set up the pins for NRF mode.
void nrfsetup(){
//! Set up the pins for NRF mode.
void nrfsetup(){
- P5OUT|=SS;
- P5DIR|=MOSI+SCK+SS;
+ SETSS;
P5DIR&=~MISO;
P5DIR&=~MISO;
+ P5DIR|=MOSI+SCK;
+ DIRSS;
+ DIRCE;
//Begin a new transaction.
//Begin a new transaction.
-
P5OUT&=~
SS;
-
P5OUT|=
SS;
+
CLR
SS;
+
SET
SS;
}
}
-
//! Read and write an NRF byte.
//! Read and write an NRF byte.
-u
nsigned char nrftrans8(unsigned char
byte){
+u
8 nrftrans8(u8
byte){
register unsigned int bit;
//This function came from the NRF Wikipedia article.
//Minor alterations.
register unsigned int bit;
//This function came from the NRF Wikipedia article.
//Minor alterations.
@@
-59,47
+57,102
@@
unsigned char nrftrans8(unsigned char byte){
}
}
+//! Writes a register
+u8 nrf_regwrite(u8 reg, const u8 *buf, int len){
+ CLRSS;
+
+ reg=nrftrans8(reg);
+ while(len--)
+ nrftrans8(*buf++);
+
+ SETSS;
+ return reg;//status
+}
+//! Reads a register
+u8 nrf_regread(u8 reg, u8 *buf, int len){
+ CLRSS;
+
+ reg=nrftrans8(reg);
+ while(len--)
+ *buf++=nrftrans8(0);
+
+ SETSS;
+ return reg;//status
+}
+
//! Handles a Nordic RF command.
void nrfhandle(unsigned char app,
unsigned char verb,
unsigned long len){
unsigned long i;
//! Handles a Nordic RF command.
void nrfhandle(unsigned char app,
unsigned char verb,
unsigned long len){
unsigned long i;
+ //Drop CE to passify radio.
+ RADIOPASSIVE;
//Raise !SS to end transaction, just in case we forgot.
//Raise !SS to end transaction, just in case we forgot.
-
P5OUT|=
SS;
+
SET
SS;
nrfsetup();
nrfsetup();
- debugstr("NRF Handler");
-
switch(verb){
//PEEK and POKE might come later.
switch(verb){
//PEEK and POKE might come later.
- case READ:
+ case READ:
case WRITE:
case WRITE:
-
P5OUT&=~
SS; //Drop !SS to begin transaction.
+
CLR
SS; //Drop !SS to begin transaction.
for(i=0;i<len;i++)
cmddata[i]=nrftrans8(cmddata[i]);
for(i=0;i<len;i++)
cmddata[i]=nrftrans8(cmddata[i]);
-
P5OUT|=
SS; //Raise !SS to end transaction.
+
SET
SS; //Raise !SS to end transaction.
txdata(app,verb,len);
break;
case PEEK://Grab NRF Register
txdata(app,verb,len);
break;
case PEEK://Grab NRF Register
-
P5OUT&=~
SS; //Drop !SS to begin transaction.
- nrftrans8(
0|(0x1F & cmddata[0])
); //000A AAAA
+
CLR
SS; //Drop !SS to begin transaction.
+ nrftrans8(
NRF_R_REGISTER | cmddata[0]
); //000A AAAA
for(i=1;i<len;i++)
cmddata[i]=nrftrans8(cmddata[i]);
for(i=1;i<len;i++)
cmddata[i]=nrftrans8(cmddata[i]);
-
P5OUT|=
SS; //Raise !SS to end transaction.
- txdata(app,verb,
0
);
+
SET
SS; //Raise !SS to end transaction.
+ txdata(app,verb,
len
);
break;
case POKE://Poke NRF Register
break;
case POKE://Poke NRF Register
-
- txdata(app,verb,0);
+ CLRSS; //Drop !SS to begin transaction.
+ nrftrans8(NRF_W_REGISTER | cmddata[0]); //001A AAAA
+ for(i=1;i<len;i++)
+ cmddata[i]=nrftrans8(cmddata[i]);
+ SETSS; //Raise !SS to end transaction.
+ txdata(app,verb,len);
break;
break;
-
case SETUP:
nrfsetup();
txdata(app,verb,0);
break;
case SETUP:
nrfsetup();
txdata(app,verb,0);
break;
+ case NRF_RX:
+ RADIOPASSIVE;
+ //Get the packet.
+ CLRSS;
+ nrftrans8(NRF_R_RX_PAYLOAD);
+ for(i=0;i<32;i++)
+ cmddata[i]=nrftrans8(0xde);
+ SETSS;
+ //no break
+ txdata(app,verb,32);
+ break;
+ case NRF_RX_FLUSH:
+ //Flush the buffer.
+ CLRSS;
+ nrftrans8(NRF_FLUSH_RX);
+ SETSS;
+
+ //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;
}
}
+
+ SETSS;//End session
+ RADIOACTIVE;
}
}