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

Changed filename of the CC2420 driver from simple-cc2420 to cc2420.

Browse source
This commit is contained in:
adamdunkels 2008-07-01 21:02:51 +00:00
parent 2569a8fc69
commit 1586d8f36f
16 changed files with 86 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/energest-demo/contiki-conf.h
View file

@ -1,5 +1,5 @@
/* -*- C -*- */
/* @(#)$Id: contiki-conf.h,v 1.2 2008/01/22 15:00:24 zhitao Exp $ */
/* @(#)$Id: contiki-conf.h,v 1.3 2008/07/01 21:02:51 adamdunkels Exp $ */
#ifndef CONTIKI_CONF_H
#define CONTIKI_CONF_H
@ -98,7 +98,6 @@ typedef unsigned long off_t;
#define CFS_RAM_CONF_SIZE 4096
#define CC2420_RADIO
/*
* SPI bus configuration for the TMote Sky.
*/

8
examples/energest-demo/contiki-sky-main.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)$Id: contiki-sky-main.c,v 1.5 2008/03/29 15:20:48 oliverschmidt Exp $
* @(#)$Id: contiki-sky-main.c,v 1.6 2008/07/01 21:02:51 adamdunkels Exp $
*/
#include <signal.h>
@ -43,7 +43,7 @@
#include "dev/leds.h"
#include "dev/light.h"
#include "dev/xmem.h"
#include "dev/simple-cc2420.h"
#include "dev/cc2420.h"
#include "dev/slip.h"
#include "dev/uart1.h"
@ -126,7 +126,7 @@ main(int argc, char **argv)
#endif /* WITH_UIP */
printf("Starting %s "
"($Id: contiki-sky-main.c,v 1.5 2008/03/29 15:20:48 oliverschmidt Exp $)\n", __FILE__);
"($Id: contiki-sky-main.c,v 1.6 2008/07/01 21:02:51 adamdunkels Exp $)\n", __FILE__);
ds2411_init();
sensors_light_init();
sht11_init();
@ -223,7 +223,7 @@ main(int argc, char **argv)
eint();
ENERGEST_OFF(ENERGEST_TYPE_LPM);
ENERGEST_ON(ENERGEST_TYPE_CPU);
}
}
}
}

4
examples/energest-demo/energest-demo.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: energest-demo.c,v 1.5 2008/04/16 10:49:50 zhitao Exp $
* $Id: energest-demo.c,v 1.6 2008/07/01 21:02:51 adamdunkels Exp $
*/
/**
@ -44,7 +44,7 @@
#include "net/mac/nullmac.h"
#include "dev/button-sensor.h"
#include "dev/simple-cc2420.h"
#include "dev/cc2420.h"
#include "dev/leds.h"
#include "node-id.h"

8
examples/sky/radio-test.c
View file

@ -26,14 +26,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: radio-test.c,v 1.2 2008/01/10 13:40:20 nifi Exp $
* $Id: radio-test.c,v 1.3 2008/07/01 21:02:51 adamdunkels Exp $
*
* -----------------------------------------------------------------
*
* Author : Adam Dunkels, Joakim Eriksson, Niclas Finne
* Created : 2006-03-07
* Updated : $Date: 2008/01/10 13:40:20 $
* $Revision: 1.2 $
* Updated : $Date: 2008/07/01 21:02:51 $
* $Revision: 1.3 $
*
* Simple application to indicate connectivity between two nodes:
*
@ -48,7 +48,7 @@
#include "net/rime.h"
#include "dev/leds.h"
#include "dev/button-sensor.h"
#include "dev/simple-cc2420.h"
#include "dev/cc2420.h"
#include <stdio.h>
#include <string.h>

7
examples/sky/sky-collect.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: sky-collect.c,v 1.4 2008/02/24 22:27:41 adamdunkels Exp $
* $Id: sky-collect.c,v 1.5 2008/07/01 21:02:51 adamdunkels Exp $
*/
/**
@ -46,9 +46,8 @@
#include "dev/button-sensor.h"
#include "dev/light.h"
#include "dev/cc2420.h"
#include "dev/sht11.h"
#include "dev/simple-cc2420.h"
#include "sys/timesynch.h"
#include <stdio.h>
#include <string.h>
#include "contiki-net.h"
@ -138,9 +137,7 @@ do_rssi(void)
simple_cc2420_on();
for(channel = 11; channel <= 26; ++channel) {
simple_cc2420_set_channel(channel);
// simple_cc2420_on();
rssi_samples[sample].channel[channel - 11] = simple_cc2420_rssi() + 53;
// simple_cc2420_off();
}
rime_mac->on();