Reverted some CCSPI performance patches. This might slow down the Z1.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1237 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/client/goodfet.ccspi b/client/goodfet.ccspi
index f8d10bd..b40d123 100755 (executable)
--- a/client/goodfet.ccspi
+++ b/client/goodfet.ccspi
@@ -203,7 +203,7 @@ if(sys.argv[1]=="sniff" or sys.argv[1]=="sniffdissect"):
                                             client.RF_getfreq()/10**6);
     #Now we're ready to get packets.
     while 1:
-        client.setup(); #Really oughtn't be necessary, but can't hurt.
+        #client.setup(); #Really oughtn't be necessary, but can't hurt.
         client.CC_RFST_RX();
         
         packet=None;

diff --git a/firmware/apps/radios/ccspi.c b/firmware/apps/radios/ccspi.c
index 6d72a69..7c72ddd 100644 (file)
--- a/firmware/apps/radios/ccspi.c
+++ b/firmware/apps/radios/ccspi.c
@@ -228,7 +228,7 @@ void ccspi_handle_fn( uint8_t const app,
       CLRSS;
       ccspitrans8(CCSPI_RXFIFO | 0x40);
       //ccspitrans8(0x3F|0x40);
-      cmddata[0]=0xff; //to be replaced with length
+      cmddata[0]=0x20; //to be replaced with length
       
       
       /* This reads too far on some CC2420 revisions, but on others it
@@ -238,8 +238,8 @@ void ccspi_handle_fn( uint8_t const app,
         A software fix is to reset the CC2420 between packets.  This
         works, but a better solution is desired.
       */
-      //for(i=0;i<cmddata[0]+1;i++)
-      for(i=0;FIFO && i<0x80;i++)
+      for(i=0;i<cmddata[0]+1;i++)
+      //for(i=0;FIFO && i<0x80;i++)
         cmddata[i]=ccspitrans8(0x00);
       SETSS;
 

diff --git a/firmware/config.mk b/firmware/config.mk
index 14f93af..e7b256d 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -13,7 +13,7 @@ MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
 CFLAGS += -Duseuart1 -Dapimote
 endif
 
-ifneq (,$(findstring $(board),goodthopter01))
+ifneq (,$(findstring $(board),goodthopter01 goodthopter10))
 mcu ?= msp430f2274
 platform := goodfet
 config := monitor spi