deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Correceted cc2420 function calls+modified makefile

Browse source
This commit is contained in:
Enric M. Calvo 2011-03-03 13:50:56 +01:00
parent 0c6fd04f44
commit 621aff1aeb
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/z1/sensys_scanner/Makefile
View file

@ -5,6 +5,9 @@ ifndef TARGET
TARGET=z1 TARGET=z1
endif endif
CONTIKI_SOURCEFILES += cc2420-arch.c sensors.c sht11.c
PROJECT_SOURCEFILES = i2cmaster.c tmp102.c adxl345.c battery-sensor.c sky-sensors.c #potentiometer-sensor.c
# Give a name to your project # Give a name to your project
CONTIKI = ../../../../contiki-2.x/ CONTIKI = ../../../../contiki-2.x/
CONTIKI_PROJECT = rssi-scanner CONTIKI_PROJECT = rssi-scanner
@ -24,3 +27,4 @@ viewrssi: ViewRSSI.class
# ContikiProjects: including the makefile # ContikiProjects: including the makefile
#include ../../../Makefile.projects #include ../../../Makefile.projects
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

4
examples/z1/sensys_scanner/rssi-scanner.c
View file

@ -59,8 +59,8 @@ set_frq(int c)
f = c + 352; // Start from 2400 MHz to 2485 MHz, f = c + 352; // Start from 2400 MHz to 2485 MHz,
//FASTSPI_SETREG(CC2420_FSCTRL, f); //FASTSPI_SETREG(CC2420_FSCTRL, f);
//FASTSPI_STROBE(CC2420_SRXON); //FASTSPI_STROBE(CC2420_SRXON);
setreg(CC2420_FSCTRL, f); CC2420_WRITE_REG(CC2420_FSCTRL, f);
strobe(CC2420_SRXON); CC2420_STROBE(CC2420_SRXON);
} }
static void static void