From: travisutk Date: Tue, 24 Jul 2012 03:12:57 +0000 (+0000) Subject: Apimote patch. I think this works. X-Git-Url: http://git.rot13.org//?p=goodfet;a=commitdiff_plain;h=f27155268cf6ef4f5281564ac972224860cdd598 Apimote patch. I think this works. git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1206 12e2690d-a6be-4b82-a7b7-67c4a43b65c8 --- diff --git a/firmware/apps/radios/ccspi.c b/firmware/apps/radios/ccspi.c index 6df0458..54b155c 100644 --- a/firmware/apps/radios/ccspi.c +++ b/firmware/apps/radios/ccspi.c @@ -50,12 +50,14 @@ void ccspisetup(){ DIRSS; DIRCE; - P4OUT|=BIT5; //activate CC2420 voltage regulator + //P4OUT|=BIT5; //activate CC2420 voltage regulator msdelay(100); //Reset the CC2420. - P4OUT&=~BIT6; - P4OUT|=BIT6; + /*P4OUT&=~BIT6; FIXME Does the new code work on Z1 and Telosb? + P4OUT|=BIT6;*/ + CLRCE; + SETCE; //Begin a new transaction. CLRSS; @@ -362,8 +364,8 @@ void ccspi_handle_fn( uint8_t const app, //TODO disable AUTOCRC here again to go back to promiscous mode //Turn off LED 2 (green) as signal - PLED2DIR |= PLED2PIN; - PLED2OUT |= PLED2PIN; + PLED2DIR |= PLED2PIN; + PLED2OUT |= PLED2PIN; } //TODO the firmware stops staying in this mode after a while, and stops jamming... need to find a fix. #else diff --git a/firmware/config.mk b/firmware/config.mk index a59ab27..76c118f 100644 --- a/firmware/config.mk +++ b/firmware/config.mk @@ -5,9 +5,9 @@ #Unset by default, but can be explicitly set later. config=undef -ifneq (,$(findstring $(board),apimote1)) +ifneq (,$(findstring $(board),apimote)) mcu ?= msp430f2618 -platform := apimote1 +platform := apimote config := monitor spi ccspi MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test CFLAGS += -Duseuart1 diff --git a/firmware/platforms/apimote.h b/firmware/platforms/apimote.h new file mode 100644 index 0000000..63a8a0a --- /dev/null +++ b/firmware/platforms/apimote.h @@ -0,0 +1,93 @@ +/*! \file apimote.h + \author Ryan Speers + \brief Port descriptions for the Apimote platform. +*/ + +#ifndef _GNU_ASSEMBLER_ +#include +#endif + +//LED on P5.5 (pin 49) (LED1 red) +#define PLEDOUT P5OUT +#define PLEDDIR P5DIR +#define PLEDPIN BIT5 +//LED on P5.6 (pin 50) (LED2 green) +#define PLED2OUT P5OUT +#define PLED2DIR P5DIR +#define PLED2PIN BIT6 +//LED on P5.7 (pin 51) (LED3 blue) +#define PLED3OUT P5OUT +#define PLED3DIR P5DIR +#define PLED3PIN BIT7 + +//mtx frx p34 +//mrx ftx p35 + +//SPI +//TelosB: 29/3.1=RF_SI, 30/3.2=RF_SO, 31/3.3=RF_SCLK +//ApiMote: 29/3.1=RF_SI, 30/3.2=RF_SO, 31/3.3=RF_SCLK +#define SPIOUT P3OUT +#define SPIDIR P3DIR +#define SPIIN P3IN +#define SPIREN P3REN + +/* For the radio to be used: + 2.7 (!RST) must be low + 2.0 (VREF_EN) must be high (cc2420-41 rf_vreg) + 3.0 (!CS) must be low for the transaction. +*/ + + + +#define INITPLATFORM \ + P2DIR |= BIT0+BIT7; \ + P2OUT &= ~BIT7; \ + P2OUT |= BIT0; \ + P3DIR |= BIT0; + + /* + P1DIR = 0xe0; \ + P1OUT = 0x00;\ + P2DIR = 0x7b;\ + P2OUT = 0x10;\ + P3DIR = 0xf1;\ + P3OUT = 0x00;\ + P4DIR = 0xfd;\ + P4OUT = 0xFd;\ + P5DIR = 0xff;\ + P5OUT = 0xff;\ + P6DIR = 0xff;\ + P6OUT = 0x00; + */ + + +//RF Control +//TelosB: Radio CS is 38/P4.2 (to CC2420 pin31) +//ApiMote: Radio CS is 28/P3.0 +#define SETSS P3OUT|=BIT0 +#define CLRSS P3OUT&=~BIT0 +#define DIRSS P3DIR|=BIT0 + +//CC2420 Chip Enable +//TelosB: Radio RESETn is 42/P4.6 (to CC2420 pin21) +//ApiMote: Radio RESETn is 27/P2.7 (to CC2420 pin21) +#define SETCE P2OUT|=BIT7 +#define CLRCE P2OUT&=~BIT7 +#define DIRCE P2DIR|=BIT7 + +//CC2420 signals +#define SFD (P2IN&BIT6) //TelosB 37/P4.1 -> ApiMote 26/P2.6 +#define FIFOP (P2IN&BIT4) //TelosB 12/P1.0 -> ApiMote 24/P2.4 (rf_pkt cc2420-29) +#define FIFO (P2IN&BIT3) //TelosB 15/P1.3 -> ApiMote 23/P2.3 (rf_gio0 cc2420-30) + +// network byte order converters +#define htons(x) ((((uint16_t)(x) & 0xFF00) >> 8) | \ + (((uint16_t)(x) & 0x00FF) << 8)) +#define htonl(x) ((((uint32_t)(x) & 0xFF000000) >> 24) | \ + (((uint32_t)(x) & 0x00FF0000) >> 8) | \ + (((uint32_t)(x) & 0x0000FF00) << 8) | \ + (((uint32_t)(x) & 0x000000FF) << 24)) + +#define ntohs htons +#define ntohl htonl + diff --git a/firmware/platforms/apimote1.h b/firmware/platforms/apimote1.h deleted file mode 100755 index 082947a..0000000 --- a/firmware/platforms/apimote1.h +++ /dev/null @@ -1,94 +0,0 @@ -/*! \file apimote.h - \author Ryan Speers - \brief Port descriptions for the GoodFET platform. -*/ - -/* #ifdef __MSPGCC__ */ -/* #include */ -/* #else */ -/* #include */ -/* #include */ -/* #include */ -/* #endif */ - -#ifndef _GNU_ASSEMBLER_ -#include -#endif - -//LED on P5.5 (pin 49) (LED1 red) -#define PLEDOUT P5OUT -#define PLEDDIR P5DIR -#define PLEDPIN BIT5 -//LED on P5.6 (pin 50) (LED2 green) -#define PLED2OUT P5OUT -#define PLED2DIR P5DIR -#define PLED2PIN BIT6 -//LED on P5.7 (pin 51) (LED3 blue) -#define PLED3OUT P5OUT -#define PLED3DIR P5DIR -#define PLED3PIN BIT7 - -//mtx frx p34 -//mrx ftx p35 - -//SPI -//TelosB: 29/3.1=RF_SI, 30/3.2=RF_SO, 31/3.3=RF_SCLK -//ApiMote: 29/3.1=RF_SI, 30/3.2=RF_SO, 31/3.3=RF_SCLK -#define SPIOUT P3OUT -#define SPIDIR P3DIR -#define SPIIN P3IN -#define SPIREN P3REN - -/* For the radio to be used: - 2.7 (!RST) must be low - 2.0 (VREF_EN) must be high (cc2420-41 rf_vreg) - 3.0 (!CS) must be low for the transaction. -*/ - - -/* TODO what to do here?. Hopefully nothing. -#define INITPLATFORM \ - P1DIR = 0xe0;\ - P1OUT = 0x00;\ - P2DIR = 0x7b;\ - P2OUT = 0x10;\ - P3DIR = 0xf1;\ - P3OUT = 0x00;\ - P4DIR = 0xfd;\ - P4OUT = 0xFd;\ - P5DIR = 0xff;\ - P5OUT = 0xff;\ - P6DIR = 0xff;\ - P6OUT = 0x00; -*/ - -//RF Control -//TelosB: Radio CS is 38/P4.2 (to CC2420 pin31) -//ApiMote: Radio CS is 28/P3.0 -#define SETSS P3OUT|=BIT0 -#define CLRSS P3OUT&=~BIT0 -#define DIRSS P3DIR|=BIT0 - -//CC2420 Chip Enable -//TelosB: Radio RESETn is 42/P4.6 (to CC2420 pin21) -//ApiMote: Radio RESETn is 27/P2.7 (to CC2420 pin21) -#define SETCE P2OUT|=BIT7 -#define CLRCE P2OUT&=~BIT7 -#define DIRCE P2DIR|=BIT7 - -//CC2420 signals -#define SFD (P2IN&BIT6) //TelosB 37/P4.1 -> ApiMote 26/P2.6 -#define FIFOP (P2IN&BIT4) //TelosB 12/P1.0 -> ApiMote 24/P2.4 (rf_pkt cc2420-29) -#define FIFO (P2IN&BIT3) //TelosB 15/P1.3 -> ApiMote 23/P2.3 (rf_gio0 cc2420-30) - -// network byte order converters -#define htons(x) ((((uint16_t)(x) & 0xFF00) >> 8) | \ - (((uint16_t)(x) & 0x00FF) << 8)) -#define htonl(x) ((((uint32_t)(x) & 0xFF000000) >> 24) | \ - (((uint32_t)(x) & 0x00FF0000) >> 8) | \ - (((uint32_t)(x) & 0x0000FF00) << 8) | \ - (((uint32_t)(x) & 0x000000FF) << 24)) - -#define ntohs htons -#define ntohl htonl -