Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

This commit is contained in:
Adam Dunkels 2011-08-31 20:57:31 +02:00
commit 69d262af5b
12 changed files with 617 additions and 235 deletions

View file

@ -105,6 +105,7 @@ CC = avr-gcc
LD = avr-gcc LD = avr-gcc
AS = avr-as AS = avr-as
AR = avr-ar AR = avr-ar
ELF_SIZE = avr-size -C --mcu=$(MCU)
OBJCOPY = avr-objcopy OBJCOPY = avr-objcopy
STRIP = avr-strip STRIP = avr-strip
CFLAGSNO = -Wall -mmcu=$(MCU) -gdwarf-2 -fno-strict-aliasing \ CFLAGSNO = -Wall -mmcu=$(MCU) -gdwarf-2 -fno-strict-aliasing \

View file

@ -980,16 +980,18 @@ rf230_transmit(unsigned short payload_len)
RELEASE_LOCK(); RELEASE_LOCK();
if (tx_result==1) { //success, data pending from adressee if (tx_result==1) { //success, data pending from adressee
tx_result=0; //Just show success? tx_result = RADIO_TX_OK; //Just show success?
} else if (tx_result==3) { //CSMA channel access failure } else if (tx_result==3) { //CSMA channel access failure
DEBUGFLOW('m'); DEBUGFLOW('m');
RIMESTATS_ADD(contentiondrop); RIMESTATS_ADD(contentiondrop);
PRINTF("rf230_transmit: Transmission never started\n"); PRINTF("rf230_transmit: Transmission never started\n");
tx_result = RADIO_TX_COLLISION;
} else if (tx_result==5) { //Expected ACK, none received } else if (tx_result==5) { //Expected ACK, none received
DEBUGFLOW('n'); DEBUGFLOW('n');
// tx_result=0; tx_result = RADIO_TX_NOACK;
} else if (tx_result==7) { //Invalid (Can't happen since waited for idle above?) } else if (tx_result==7) { //Invalid (Can't happen since waited for idle above?)
DEBUGFLOW('o'); DEBUGFLOW('o');
tx_result = RADIO_TX_ERR;
} }
return tx_result; return tx_result;

View file

@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: httpd-simple.h,v 1.1 2010/05/09 12:52:05 nifi Exp $
*/ */
/** /**
@ -43,8 +42,10 @@
#include "contiki-net.h" #include "contiki-net.h"
/* The current internal border router webserver ignores the requested file name */
/* and needs no per-connection output buffer, so save some RAM */
#ifndef WEBSERVER_CONF_CFS_PATHLEN #ifndef WEBSERVER_CONF_CFS_PATHLEN
#define HTTPD_PATHLEN 80 #define HTTPD_PATHLEN 2
#else /* WEBSERVER_CONF_CFS_CONNS */ #else /* WEBSERVER_CONF_CFS_CONNS */
#define HTTPD_PATHLEN WEBSERVER_CONF_CFS_PATHLEN #define HTTPD_PATHLEN WEBSERVER_CONF_CFS_PATHLEN
#endif /* WEBSERVER_CONF_CFS_CONNS */ #endif /* WEBSERVER_CONF_CFS_CONNS */
@ -56,8 +57,8 @@ struct httpd_state {
struct timer timer; struct timer timer;
struct psock sin, sout; struct psock sin, sout;
struct pt outputpt; struct pt outputpt;
char inputbuf[HTTPD_PATHLEN + 30]; char inputbuf[HTTPD_PATHLEN + 24];
char outputbuf[UIP_TCP_MSS]; /*char outputbuf[UIP_TCP_MSS]; */
char filename[HTTPD_PATHLEN]; char filename[HTTPD_PATHLEN];
httpd_simple_script_t script; httpd_simple_script_t script;
char state; char state;

View file

@ -25,8 +25,12 @@ endif
#copy output to e.g. webserver-nano.sky, raven-webserver.avr-raven #copy output to e.g. webserver-nano.sky, raven-webserver.avr-raven
$(WITH_WEBSERVER) : $(CONTIKI_PROJECT) $(WITH_WEBSERVER) : $(CONTIKI_PROJECT)
cp $(CONTIKI_PROJECT).$(TARGET) $(WITH_WEBSERVER).$(TARGET) cp $(CONTIKI_PROJECT).$(TARGET) $(WITH_WEBSERVER).$(TARGET)
@if (test -n "$(ELF_SIZE)");then $(ELF_SIZE) $(WITH_WEBSERVER).$(TARGET);fi
else else
APPS=webserver APPS=webserver
all : $(CONTIKI_PROJECT)
@if (test -n "$(ELF_SIZE)");then $(ELF_SIZE) $(CONTIKI_PROJECT).$(TARGET);fi
endif endif
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1

View file

@ -2,7 +2,7 @@ CONTIKI_TARGET_DIRS = . apps net loader
CONTIKI_CORE=contiki-main CONTIKI_CORE=contiki-main
CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
CONTIKI_TARGET_SOURCEFILES += contiki-main.c CONTIKI_TARGET_SOURCEFILES += contiki-main.c params.c
#Needed for slip #Needed for slip
CONTIKI_TARGET_SOURCEFILES += button-sensor.c sensors.c slip_uart0.c slip.c CONTIKI_TARGET_SOURCEFILES += button-sensor.c sensors.c slip_uart0.c slip.c

View file

@ -101,7 +101,11 @@ void rs232_send(uint8_t port, unsigned char c);
void void
raven_ping6(void) raven_ping6(void)
{ {
#define PING_GOOGLE 0 #if UIP_CONF_IPV6_RPL||1
/* No default router, so pick on someone else */
#define PING_GOOGLE 1
seqno++;
#endif
UIP_IP_BUF->vtc = 0x60; UIP_IP_BUF->vtc = 0x60;
UIP_IP_BUF->tcflow = 1; UIP_IP_BUF->tcflow = 1;

View file

@ -1,7 +1,10 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
/* Link layer ipv6 address will become fe80::11:22ff:fe33:4455 */ /* Link layer ipv6 address will become fe80::ff:fe:1 */
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t server_name[16] EEMEM = "Contiki-Raven"; uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
uint8_t domain_name[30] EEMEM = "localhost"; uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t eemem_server_name[16] EEMEM = "ATMEGA128rfa1";
uint8_t eemem_domain_name[30] EEMEM = "localhost";

View file

@ -2,10 +2,15 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
/* Link layer ipv6 address will become fe80::2 */
uint8_t mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}; /* Link layer ipv6 address will become fe80::ff:fe:1 */
uint8_t server_name[16] EEMEM = "huginn"; uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t domain_name[30] EEMEM = "localhost"; uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t eemem_server_name[16] EEMEM = "ATMEGA128rfa1";
uint8_t eemem_domain_name[30] EEMEM = "localhost";
const char data_404_html[140] PROGMEM = { const char data_404_html[140] PROGMEM = {
/* /404.html */ /* /404.html */

View file

@ -459,6 +459,10 @@ httpd_appcall(void *state)
if (1) { if (1) {
#else #else
struct httpd_state *s = (struct httpd_state *)state; struct httpd_state *s = (struct httpd_state *)state;
#if RF230BB_CONF_LEDONPORTE1
extern uint16_t ledtimer;
PORTE|=(1<<PE1);ledtimer=1000; //turn on led, set counter for turnoff
#endif
if(uip_closed() || uip_aborted() || uip_timedout()) { if(uip_closed() || uip_aborted() || uip_timedout()) {
if(s != NULL) { if(s != NULL) {
memb_free(&conns, s); memb_free(&conns, s);

View file

@ -29,11 +29,23 @@
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
*/ */
#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#define ANNOUNCE_BOOT 1 //adds about 600 bytes to program size #define ANNOUNCE_BOOT 1 //adds about 600 bytes to program size
#if ANNOUNCE_BOOT
#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#else
#define PRINTA(...)
#endif
#define DEBUG DEBUG_PRINT #define DEBUG 0
#include "uip-debug.h" ////Does #define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args) for AVR #if DEBUG
#define PRINTD(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#else
#define PRINTD(...)
#endif
/* Track interrupt flow through mac, rdc and radio driver */
#if DEBUGFLOWSIZE #if DEBUGFLOWSIZE
uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE]; uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
#define DEBUGFLOW(c) if (debugflowsize<(DEBUGFLOWSIZE-1)) debugflow[debugflowsize++]=c #define DEBUGFLOW(c) if (debugflowsize<(DEBUGFLOWSIZE-1)) debugflow[debugflowsize++]=c
@ -51,20 +63,12 @@ uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
#include "loader/symbols-def.h" #include "loader/symbols-def.h"
#include "loader/symtab.h" #include "loader/symtab.h"
#if RF230BB //radio driver using contiki core mac #include "params.h"
#include "radio/rf230bb/rf230bb.h" #include "radio/rf230bb/rf230bb.h"
#include "net/mac/frame802154.h" #include "net/mac/frame802154.h"
#include "net/mac/framer-802154.h" #include "net/mac/framer-802154.h"
#include "net/sicslowpan.h" #include "net/sicslowpan.h"
#else //radio driver using Atmel/Cisco 802.15.4'ish MAC
#include <stdbool.h>
#include "mac.h"
#include "sicslowmac.h"
#include "sicslowpan.h"
#include "ieee-15-4-manager.h"
#endif /*RF230BB*/
#include "contiki.h" #include "contiki.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "contiki-lib.h" #include "contiki-lib.h"
@ -73,7 +77,6 @@ uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
#include "dev/serial-line.h" #include "dev/serial-line.h"
#include "dev/slip.h" #include "dev/slip.h"
/* No 3290p to talk to but the lcd process still needed for uip stack ping callbacks */
#ifdef RAVEN_LCD_INTERFACE #ifdef RAVEN_LCD_INTERFACE
#include "raven-lcd.h" #include "raven-lcd.h"
#endif #endif
@ -97,11 +100,12 @@ uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
/* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */ /* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */
/* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */ /* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */
/* STAMPS will print ENERGEST outputs if that is enabled. */
#define PERIODICPRINTS 1 #define PERIODICPRINTS 1
#if PERIODICPRINTS #if PERIODICPRINTS
//#define PINGS 64 //#define PINGS 64
#define ROUTES 128 #define ROUTES 600
#define STAMPS 30 #define STAMPS 60
#define STACKMONITOR 1024 #define STACKMONITOR 1024
uint32_t clocktime; uint32_t clocktime;
#define TESTRTIMER 0 #define TESTRTIMER 0
@ -112,111 +116,86 @@ void rtimercycle(void) {rtimerflag=1;}
#endif #endif
#endif #endif
uint16_t ledtimer;
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/*----------------------Configuration of the .elf file---------------------*/ /*----------------------Configuration of the .elf file---------------------*/
typedef struct {unsigned char B2;unsigned char B1;unsigned char B0;} __signature_t; #if 1
/* The proper way to set the signature is */
#include <avr/signature.h>
#else
/* Older avr-gcc's may not define the needed SIGNATURE bytes. Do it manually if you get an error */
typedef struct {const unsigned char B2;const unsigned char B1;const unsigned char B0;} __signature_t;
#define SIGNATURE __signature_t __signature __attribute__((section (".signature"))) #define SIGNATURE __signature_t __signature __attribute__((section (".signature")))
SIGNATURE = { SIGNATURE = {
/* Older AVR-GCCs may not define the SIGNATURE_n bytes so use explicit ATmega128rfa1 values */ .B2 = 0x01,//SIGNATURE_2, //ATMEGA128rfa1
.B2 = SIGNATURE_2,//0x01,//SIGNATURE_2, .B1 = 0xA7,//SIGNATURE_1, //128KB flash
.B1 = SIGNATURE_1,//0xA7,//SIGNATURE_1, .B0 = 0x1E,//SIGNATURE_0, //Atmel
.B0 = SIGNATURE_0,//0x1E,//SIGNATURE_0,
}; };
//JTAG+SPI, Boot 4096 words @ $F000, Internal oscillator, startup 6 CK + 65 ms, Brownout disabled #endif
#if 1
/* JTAG, SPI enabled, Internal RC osc, Boot flash size 4K, 6CK+65msec delay, brownout disabled */
FUSES ={.low = 0xe2, .high = 0x99, .extended = 0xff,}; FUSES ={.low = 0xe2, .high = 0x99, .extended = 0xff,};
//JTAG+SPI, Boot 4096 words @ $F000, Internal oscillator, startup 6 CK +0 ms, Brownout 1.8 volts
//FUSES ={.low = 0xC2, .high = 0x99, .extended = 0xfe,};
/*----------------------Configuration of EEPROM---------------------------*/
/* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */
/* Put default MAC address in EEPROM */
#if AVR_WEBSERVER
extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via makefsdata.h
extern uint8_t server_name[16];
extern uint8_t domain_name[30];
#else #else
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; /* JTAG+SPI, Boot 4096 words @ $F000, Internal oscillator, startup 6 CK +0 ms, Brownout 1.8 volts */
FUSES ={.low = 0xC2, .high = 0x99, .extended = 0xfe,};
#endif #endif
uint8_t
#ifdef CHANNEL_802_15_4 rng_get_uint8(void) {
uint8_t rf_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4}; #if 1
//uint8_t rf_channel[2] EEMEM = {11, ~11}; //econotag test /* Upper two RSSI reg bits (RND_VALUE) are random in rf231 */
uint8_t j;
j = (PHY_RSSI>>6) | (PHY_RSSI>>4) | (PHY_RSSI>>4) | PHY_RSSI;
#else #else
uint8_t rf_channel[2] EEMEM = {26, ~26}; /* Get a pseudo random number using the ADC */
#endif uint8_t i,j;
static uint8_t get_channel_from_eeprom() { ADCSRA=1<<ADEN; //Enable ADC, not free running, interrupt disabled, fastest clock
uint8_t eeprom_channel; for (i=0;i<4;i++) {
uint8_t eeprom_check; ADMUX = 0; //toggle reference to increase noise
ADMUX =0x1E; //Select AREF as reference, measure 1.1 volt bandgap reference.
eeprom_channel = eeprom_read_byte(&rf_channel[0]); ADCSRA|=1<<ADSC; //Start conversion
eeprom_check = eeprom_read_byte(&rf_channel[1]); while (ADCSRA&(1<<ADSC)); //Wait till done
j = (j<<2) + ADC;
if(eeprom_channel==~eeprom_check) }
return eeprom_channel; ADCSRA=0; //Disable ADC
#ifdef CHANNEL_802_15_4
//return(11);
return(CHANNEL_802_15_4);
#else
return 26;
#endif #endif
PRINTD("rng issues %d\n",j);
return j;
} }
static bool get_mac_from_eeprom(uint8_t* macptr) {
eeprom_read_block ((void *)macptr, &mac_address, 8);
return true;
}
static uint16_t get_panid_from_eeprom(void) {
// TODO: Writeme!
return IEEE802154_PANID;
//return 0xaaaa; //econotag ack test
}
static uint16_t get_panaddr_from_eeprom(void) {
// TODO: Writeme!
return 0;
// return 0x1111; //econotag ack test
}
void calibrate_rc_osc_32k();
extern uint8_t osccal_calibrated;
/*-------------------------Low level initialization------------------------*/ /*-------------------------Low level initialization------------------------*/
/*------Done in a subroutine to keep main routine stack usage small--------*/ /*------Done in a subroutine to keep main routine stack usage small--------*/
void initialize(void) void initialize(void)
{ {
watchdog_init();
watchdog_start();
/* The Raven implements a serial command and data interface via uart0 to a 3290p,
* which could be duplicated using another host computer.
*/
#if !RF230BB_CONF_LEDONPORTE1 //Conflicts with USART0 #if !RF230BB_CONF_LEDONPORTE1 //Conflicts with USART0
#if RAVEN_LCD_INTERFACE #ifdef RAVEN_LCD_INTERFACE
/* First rs232 port for Raven 3290 port */
rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
/* Set input handler for 3290 port */
rs232_set_input(0,raven_lcd_serial_input); rs232_set_input(0,raven_lcd_serial_input);
#else #else
//Slip border router on uart0 /* Generic or slip connection on uart0 */
rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
#endif #endif
#endif #endif
/* Second rs232 port for debugging or slip alternative */ /* Second rs232 port for debugging or slip alternative */
rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
// rs232_init(RS232_PORT_1, USART_BAUD_115200,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
/* Redirect stdout to second port */ /* Redirect stdout to second port */
rs232_redirect_stdout(RS232_PORT_1); rs232_redirect_stdout(RS232_PORT_1);
clock_init(); clock_init();
#if 1 if(MCUSR & (1<<PORF )) PRINTD("Power-on reset.\n");
if(MCUSR & (1<<PORF )) PRINTA("Power-on reset.\n"); if(MCUSR & (1<<EXTRF)) PRINTD("External reset!\n");
if(MCUSR & (1<<EXTRF)) PRINTA("External reset!\n"); if(MCUSR & (1<<BORF )) PRINTD("Brownout reset!\n");
if(MCUSR & (1<<BORF )) PRINTA("Brownout reset!\n"); if(MCUSR & (1<<WDRF )) PRINTD("Watchdog reset!\n");
if(MCUSR & (1<<WDRF )) PRINTA("Watchdog reset!\n"); if(MCUSR & (1<<JTRF )) PRINTD("JTAG reset!\n");
if(MCUSR & (1<<JTRF )) PRINTA("JTAG reset!\n");
#endif
watchdog_init();
watchdog_start();
#if STACKMONITOR #if STACKMONITOR
/* Simple stack pointer highwater monitor. Checks for magic numbers in the main /* Simple stack pointer highwater monitor. Checks for magic numbers in the main
@ -232,85 +211,78 @@ uint16_t p=(uint16_t)&__bss_end;
} while (p<SP-10); //don't overwrite our own stack } while (p<SP-10); //don't overwrite our own stack
} }
#endif #endif
#if 0
/* Get a random (or probably different) seed for the 802.15.4 packet sequence number.
* Some layers will ignore duplicates found in a history (e.g. Contikimac)
* causing the initial packets to be ignored after a short-cycle restart.
*/
ADMUX =0x5E; //Select AVDD as reference, measure 1.1 volt bandgap reference.
//ADCSRB|=1<<MUX5;
// ADMUX =0x49; //Select AVDD as reference, measure ADC0 10x differential.
ADCSRA=1<<ADEN; //Enable ADC, not free running, interrupt disabled, fastest clock
ADCSRA|=1<<ADSC; //Start conversion
while (ADCSRA&(1<<ADSC)); //Wait till done
PRINTF("ADC=%d\n",ADC);
random_init(ADC);
ADCSRA=0; //Disable ADC
#endif
#define CONF_CALIBRATE_OSCCAL 0 #define CONF_CALIBRATE_OSCCAL 0
#if CONF_CALIBRATE_OSCCAL #if CONF_CALIBRATE_OSCCAL
void calibrate_rc_osc_32k();
{ {
extern uint8_t osccal_calibrated;
uint8_t i; uint8_t i;
watchdog_stop(); PRINTD("\nBefore calibration OSCCAL=%x\n",OSCCAL);
PRINTA("\nBefore calibration OSCCAL=%x\n",OSCCAL);
for (i=0;i<10;i++) { for (i=0;i<10;i++) {
calibrate_rc_osc_32k(); calibrate_rc_osc_32k();
PRINTA("Calibrated=%x\n",osccal_calibrated); PRINTD("Calibrated=%x\n",osccal_calibrated);
//#include <util/delay_basic.h> //#include <util/delay_basic.h>
//#define delay_us( us ) ( _delay_loop_2(1+(us*F_CPU)/4000000UL) ) //#define delay_us( us ) ( _delay_loop_2(1+(us*F_CPU)/4000000UL) )
// delay_us(50000); // delay_us(50000);
} }
clock_init(); clock_init();
watchdog_start();
} }
#endif #endif
#if ANNOUNCE_BOOT
PRINTA("\n*******Booting %s*******\n",CONTIKI_VERSION_STRING); PRINTA("\n*******Booting %s*******\n",CONTIKI_VERSION_STRING);
#endif
/* rtimers needed for radio cycling */ /* rtimers needed for radio cycling */
rtimer_init(); rtimer_init();
/* Initialize process subsystem */ /* Initialize process subsystem */
process_init(); process_init();
/* etimers must be started before ctimer_init */ /* etimers must be started before ctimer_init */
process_start(&etimer_process, NULL); process_start(&etimer_process, NULL);
#if RF230BB
ctimer_init(); ctimer_init();
/* Start radio and radio receive process */ /* Start radio and radio receive process */
NETSTACK_RADIO.init(); NETSTACK_RADIO.init();
#if 1 /* Get a random seed for the 802.15.4 packet sequence number.
{uint8_t somebits; * Some layers will ignore duplicates found in a history (e.g. Contikimac)
/* Upper two RSSI reg bits (RND_VALUE) are random in rf231 */ * causing the initial packets to be ignored after a short-cycle restart.
somebits= (PHY_RSSI>>6) | (PHY_RSSI>>4) | (PHY_RSSI>>4) | PHY_RSSI; */
PRINTF("rnd=%d\n", somebits); random_init(rng_get_uint8());
random_init(somebits);
}
#endif
/* Set addresses BEFORE starting tcpip process */ /* Set addresses BEFORE starting tcpip process */
rimeaddr_t addr; rimeaddr_t addr;
memset(&addr, 0, sizeof(rimeaddr_t));
get_mac_from_eeprom(addr.u8); if (params_get_eui64(addr.u8)) {
PRINTA("Random EUI64 address generated\n");
}
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, 8); memcpy(&uip_lladdr.addr, &addr.u8, sizeof(rimeaddr_t));
#elif WITH_NODE_ID
node_id=get_panaddr_from_eeprom();
addr.u8[1]=node_id&0xff;
addr.u8[0]=(node_id&0xff00)>>8;
PRINTA("Node ID from eeprom: %X\n",node_id);
#endif #endif
rf230_set_pan_addr(
get_panid_from_eeprom(),
get_panaddr_from_eeprom(),
(uint8_t *)&addr.u8
);
rf230_set_channel(get_channel_from_eeprom());
rimeaddr_set_node_addr(&addr); rimeaddr_set_node_addr(&addr);
PRINTF("MAC address %x:%x:%x:%x:%x:%x:%x:%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]); rf230_set_pan_addr(params_get_panid(),params_get_panaddr(),(uint8_t *)&addr.u8);
rf230_set_channel(params_get_channel());
rf230_set_txpower(params_get_txpower());
#if UIP_CONF_IPV6
PRINTA("EUI-64 MAC: %x-%x-%x-%x-%x-%x-%x-%x\n",addr.u8[0],addr.u8[1],addr.u8[2],addr.u8[3],addr.u8[4],addr.u8[5],addr.u8[6],addr.u8[7]);
#else
PRINTA("MAC address ");
uint8_t i;
for (i=sizeof(rimeaddr_t); i>0; i--){
PRINTA("%x:",addr.u8[i-1]);
}
PRINTA("\n");
#endif
/* Initialize stack protocols */ /* Initialize stack protocols */
queuebuf_init(); queuebuf_init();
@ -319,7 +291,7 @@ uint8_t i;
NETSTACK_NETWORK.init(); NETSTACK_NETWORK.init();
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
PRINTA("%s %s, channel %u",NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel()); PRINTA("%s %s, channel %u power %u",NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel(),rf230_get_txpower());
if (NETSTACK_RDC.channel_check_interval) {//function pointer is zero for sicslowmac if (NETSTACK_RDC.channel_check_interval) {//function pointer is zero for sicslowmac
unsigned short tmp; unsigned short tmp;
tmp=CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval == 0 ? 1:\ tmp=CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval == 0 ? 1:\
@ -327,24 +299,18 @@ uint8_t i;
if (tmp<65535) PRINTA(", check rate %u Hz",tmp); if (tmp<65535) PRINTA(", check rate %u Hz",tmp);
} }
PRINTA("\n"); PRINTA("\n");
#endif
#if UIP_CONF_IPV6_RPL
PRINTA("RPL Enabled\n");
#endif
#if UIP_CONF_ROUTER #if UIP_CONF_ROUTER
#if ANNOUNCE_BOOT
PRINTA("Routing Enabled\n"); PRINTA("Routing Enabled\n");
#endif #endif
// rime_init(rime_udp_init(NULL));
// uip_router_register(&rimeroute); #endif /* ANNOUNCE_BOOT */
#endif
process_start(&tcpip_process, NULL); process_start(&tcpip_process, NULL);
#else
/* mac process must be started before tcpip process! */
process_start(&mac_process, NULL);
process_start(&tcpip_process, NULL);
#endif /*RF230BB*/
#ifdef RAVEN_LCD_INTERFACE #ifdef RAVEN_LCD_INTERFACE
process_start(&raven_lcd_process, NULL); process_start(&raven_lcd_process, NULL);
#endif #endif
@ -352,20 +318,17 @@ uint8_t i;
/* Autostart other processes */ /* Autostart other processes */
autostart_start(autostart_processes); autostart_start(autostart_processes);
//Give ourselves a prefix
// init_net();
/*---If using coffee file system create initial web content if necessary---*/ /*---If using coffee file system create initial web content if necessary---*/
#if COFFEE_FILES #if COFFEE_FILES
int fa = cfs_open( "/index.html", CFS_READ); int fa = cfs_open( "/index.html", CFS_READ);
if (fa<0) { //Make some default web content if (fa<0) { //Make some default web content
PRINTF("No index.html file found, creating upload.html!\n"); PRINTA("No index.html file found, creating upload.html!\n");
PRINTA("Formatting FLASH file system for coffee..."); PRINTA("Formatting FLASH file system for coffee...");
cfs_coffee_format(); cfs_coffee_format();
PRINTA("Done!\n"); PRINTA("Done!\n");
fa = cfs_open( "/index.html", CFS_WRITE); fa = cfs_open( "/index.html", CFS_WRITE);
int r = cfs_write(fa, &"It works!", 9); int r = cfs_write(fa, &"It works!", 9);
if (r<0) PRINTF("Can''t create /index.html!\n"); if (r<0) PRINTA("Can''t create /index.html!\n");
cfs_close(fa); cfs_close(fa);
// fa = cfs_open("upload.html"), CFW_WRITE); // fa = cfs_open("upload.html"), CFW_WRITE);
// <html><body><form action="upload.html" enctype="multipart/form-data" method="post"><input name="userfile" type="file" size="50" /><input value="Upload" type="submit" /></form></body></html> // <html><body><form action="upload.html" enctype="multipart/form-data" method="post"><input name="userfile" type="file" size="50" /><input value="Upload" type="submit" /></form></body></html>
@ -384,9 +347,8 @@ uint8_t i;
/*--------------------------Announce the configuration---------------------*/ /*--------------------------Announce the configuration---------------------*/
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
#if AVR_WEBSERVER #if AVR_WEBSERVER
uint8_t i; { uint8_t i;
char buf[80]; char buf[80];
unsigned int size; unsigned int size;
@ -396,11 +358,15 @@ uint8_t i;
PRINTA("IPv6 Address: %s\n",buf); PRINTA("IPv6 Address: %s\n",buf);
} }
} }
eeprom_read_block (buf,server_name, sizeof(server_name)); cli();
buf[sizeof(server_name)]=0; eeprom_read_block (buf,eemem_server_name, sizeof(eemem_server_name));
sei();
buf[sizeof(eemem_server_name)]=0;
PRINTA("%s",buf); PRINTA("%s",buf);
eeprom_read_block (buf,domain_name, sizeof(domain_name)); cli();
buf[sizeof(domain_name)]=0; eeprom_read_block (buf,eemem_domain_name, sizeof(eemem_domain_name));
sei();
buf[sizeof(eemem_domain_name)]=0;
size=httpd_fs_get_size(); size=httpd_fs_get_size();
#ifndef COFFEE_FILES #ifndef COFFEE_FILES
PRINTA(".%s online with fixed %u byte web content\n",buf,size); PRINTA(".%s online with fixed %u byte web content\n",buf,size);
@ -413,25 +379,40 @@ uint8_t i;
#elif COFFEE_FILES==4 #elif COFFEE_FILES==4
PRINTA(".%s online with dynamic %u KB program memory file system\n",buf,size>>10); PRINTA(".%s online with dynamic %u KB program memory file system\n",buf,size>>10);
#endif /* COFFEE_FILES */ #endif /* COFFEE_FILES */
}
#else #else
PRINTA("Online\n"); PRINTA("Online\n");
#endif /* AVR_WEBSERVER */
#endif /* ANNOUNCE_BOOT */
}
/*---------------------------------------------------------------------------*/
void log_message(char *m1, char *m2)
{
PRINTA("%s%s\n", m1, m2);
}
#if RF230BB
extern char rf230_interrupt_flag, rf230processflag;
#endif #endif
#endif /* ANNOUNCE_BOOT */
uint16_t ledtimer; #if RF230BB_CONF_LEDONPORTE1
/* NB: PORTE1 conflicts with UART0 */
DDRE|=(1<<DDE1); //set led pin to output (Micheal Hatrtman board)
PORTE&=~(1<<PE1); //and low to turn led off
#endif
}
#if ROUTES && UIP_CONF_IPV6
static void
ipaddr_add(const uip_ipaddr_t *addr)
{
uint16_t a;
int8_t i, f;
for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) {
a = (addr->u8[i] << 8) + addr->u8[i + 1];
if(a == 0 && f >= 0) {
if(f++ == 0) PRINTF("::");
} else {
if(f > 0) {
f = -1;
} else if(i > 0) {
PRINTF(":");
}
PRINTF("%x",a);
}
}
}
#endif
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/*------------------------- Main Scheduler loop----------------------------*/ /*------------------------- Main Scheduler loop----------------------------*/
@ -439,37 +420,25 @@ uint16_t ledtimer;
int int
main(void) main(void)
{ {
initialize(); initialize();
#if RF230BB_CONF_LEDONPORTE1
/* NB: PORTE1 conflicts with UART0 */
DDRE|=(1<<DDE1); //set led pin to output (Micheal Hatrtman board)
PORTE&=~(1<<PE1); //and low to turn led off
#endif
while(1) { while(1) {
process_run(); process_run();
watchdog_periodic();
#if DEBUGFLOWSIZE
if (debugflowsize) {
debugflow[debugflowsize]=0;
PRINTA("%s",debugflow);
debugflowsize=0;
}
#endif
#if RF230BB_CONF_LEDONPORTE1
/* Turn off LED after a while */ /* Turn off LED after a while */
if (ledtimer) { if (ledtimer) {
if (--ledtimer==0) { if (--ledtimer==0) {
#if RF230BB_CONF_LEDONPORTE1
PORTE&=~(1<<PE1); PORTE&=~(1<<PE1);
/* Currently LED was turned on by received ping; ping the other way for testing */
extern void raven_ping6(void);
// raven_ping6(); //ping back
}
}
#endif #endif
#if defined(RAVEN_LCD_INTERFACE)&&0
/* ledtimer can be set by received ping; ping the other way for testing */
extern void raven_ping6(void);
raven_ping6();
#endif
}
}
#if 0 #if 0
/* Various entry points for debugging in the AVR Studio simulator. /* Various entry points for debugging in the AVR Studio simulator.
@ -483,18 +452,26 @@ main(void)
NETSTACK_RDC.input(); NETSTACK_RDC.input();
#endif #endif
watchdog_periodic();
#if 0 #if 0
/* Clock.c can trigger a periodic PLL calibration in the RF230BB driver. /* Clock.c can trigger a periodic PLL calibration in the RF230BB driver.
* This can show when that happens. * This can show when that happens.
*/ */
extern uint8_t rf230_calibrated; extern uint8_t rf230_calibrated;
if (rf230_calibrated) { if (rf230_calibrated) {
PRINTA("\nRF230 calibrated!\n"); PRINTD("\nRF230 calibrated!\n");
rf230_calibrated=0; rf230_calibrated=0;
} }
#endif #endif
/* Set DEBUGFLOWSIZE in contiki-conf.h to track path through MAC, RDC, and RADIO */
#if DEBUGFLOWSIZE
if (debugflowsize) {
debugflow[debugflowsize]=0;
PRINTF("%s",debugflow);
debugflowsize=0;
}
#endif
#if PERIODICPRINTS #if PERIODICPRINTS
#if TESTRTIMER #if TESTRTIMER
/* Timeout can be increased up to 8 seconds maximum. /* Timeout can be increased up to 8 seconds maximum.
@ -516,9 +493,9 @@ if ((clocktime%STAMPS)==0) {
print_stats(); print_stats();
#elif RADIOSTATS #elif RADIOSTATS
extern volatile unsigned long radioontime; extern volatile unsigned long radioontime;
PRINTA("%u(%u)s\n",clocktime,radioontime); PRINTF("%u(%u)s\n",clocktime,radioontime);
#else #else
PRINTA("%us\n",clocktime); PRINTF("%us\n",clocktime);
#endif #endif
} }
@ -530,7 +507,7 @@ extern volatile unsigned long radioontime;
#if PINGS && UIP_CONF_IPV6 #if PINGS && UIP_CONF_IPV6
extern void raven_ping6(void); extern void raven_ping6(void);
if ((clocktime%PINGS)==1) { if ((clocktime%PINGS)==1) {
PRINTA("**Ping\n"); PRINTF("**Ping\n");
raven_ping6(); raven_ping6();
} }
#endif #endif
@ -543,38 +520,38 @@ extern uip_ds6_route_t uip_ds6_routing_table[];
extern uip_ds6_netif_t uip_ds6_if; extern uip_ds6_netif_t uip_ds6_if;
uint8_t i,j; uint8_t i,j;
PRINTA("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB); PRINTF("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB);
for (i=0;i<UIP_DS6_ADDR_NB;i++) { for (i=0;i<UIP_DS6_ADDR_NB;i++) {
if (uip_ds6_if.addr_list[i].isused) { if (uip_ds6_if.addr_list[i].isused) {
uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr); ipaddr_add(&uip_ds6_if.addr_list[i].ipaddr);
PRINTA("\n"); PRINTF("\n");
} }
} }
PRINTA("\nNeighbors [%u max]\n",UIP_DS6_NBR_NB); PRINTF("\nNeighbors [%u max]\n",UIP_DS6_NBR_NB);
for(i = 0,j=1; i < UIP_DS6_NBR_NB; i++) { for(i = 0,j=1; i < UIP_DS6_NBR_NB; i++) {
if(uip_ds6_nbr_cache[i].isused) { if(uip_ds6_nbr_cache[i].isused) {
uip_debug_ipaddr_print(&uip_ds6_nbr_cache[i].ipaddr); ipaddr_add(&uip_ds6_nbr_cache[i].ipaddr);
PRINTA("\n"); PRINTF("\n");
j=0; j=0;
} }
} }
if (j) PRINTA(" <none>"); if (j) PRINTF(" <none>");
PRINTA("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB); PRINTF("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB);
for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) { for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) {
if(uip_ds6_routing_table[i].isused) { if(uip_ds6_routing_table[i].isused) {
uip_debug_ipaddr_print(&uip_ds6_routing_table[i].ipaddr); ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
PRINTA("/%u (via ", uip_ds6_routing_table[i].length); PRINTF("/%u (via ", uip_ds6_routing_table[i].length);
uip_debug_ipaddr_print(&uip_ds6_routing_table[i].nexthop); ipaddr_add(&uip_ds6_routing_table[i].nexthop);
// if(uip_ds6_routing_table[i].state.lifetime < 600) { // if(uip_ds6_routing_table[i].state.lifetime < 600) {
PRINTA(") %lus\n", uip_ds6_routing_table[i].state.lifetime); PRINTF(") %lus\n", uip_ds6_routing_table[i].state.lifetime);
// } else { // } else {
// PRINTA(")\n"); // PRINTF(")\n");
// } // }
j=0; j=0;
} }
} }
if (j) PRINTA(" <none>"); if (j) PRINTF(" <none>");
PRINTA("\n---------\n"); PRINTF("\n---------\n");
} }
#endif #endif
@ -584,7 +561,7 @@ if ((clocktime%STACKMONITOR)==3) {
uint16_t p=(uint16_t)&__bss_end; uint16_t p=(uint16_t)&__bss_end;
do { do {
if (*(uint16_t *)p != 0x4242) { if (*(uint16_t *)p != 0x4242) {
PRINTA("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end); PRINTF("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end);
break; break;
} }
p+=10; p+=10;
@ -596,16 +573,18 @@ if ((clocktime%STACKMONITOR)==3) {
#endif /* PERIODICPRINTS */ #endif /* PERIODICPRINTS */
#if RF230BB&&0 #if RF230BB&&0
extern uint8_t rf230processflag;
if (rf230processflag) { if (rf230processflag) {
PRINTA("rf230p%d",rf230processflag); PRINTF("rf230p%d",rf230processflag);
rf230processflag=0; rf230processflag=0;
} }
#endif #endif
#if RF230BB&&0 #if RF230BB&&0
extern uint8_t rf230_interrupt_flag;
if (rf230_interrupt_flag) { if (rf230_interrupt_flag) {
// if (rf230_interrupt_flag!=11) { // if (rf230_interrupt_flag!=11) {
PRINTA("**RI%u",rf230_interrupt_flag); PRINTF("**RI%u",rf230_interrupt_flag);
// } // }
rf230_interrupt_flag=0; rf230_interrupt_flag=0;
} }
@ -613,3 +592,10 @@ if ((clocktime%STACKMONITOR)==3) {
} }
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/
void log_message(char *m1, char *m2)
{
PRINTF("%s%s\n", m1, m2);
}

View file

@ -0,0 +1,264 @@
/*
* Copyright (c) 2011, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
*/
#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#define DEBUG 1
#if DEBUG
#define PRINTD(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#else
#define PRINTD(...)
#endif
#include "contiki.h"
#include <avr/pgmspace.h>
#include <avr/eeprom.h>
#include <stdio.h>
#include <string.h>
#if AVR_WEBSERVER
//#include "httpd-fs.h"
//#include "httpd-cgi.h"
#endif
#include "contiki-net.h"
#include "params.h"
#if WITH_NODE_ID
uint16_t node_id;
#endif
#if CONTIKI_CONF_RANDOM_MAC
extern uint8_t rng_get_uint8(void);
static void
generate_new_eui64(uint8_t eui64[8]) {
eui64[0] = 0x02;
eui64[1] = rng_get_uint8();
eui64[2] = rng_get_uint8();
eui64[3] = 0xFF;
eui64[4] = 0xFE;
eui64[5] = rng_get_uint8();
eui64[6] = rng_get_uint8();
eui64[7] = rng_get_uint8();
}
#endif
#if AVR_WEBSERVER
/* Webserver builds can set these in httpd-fsdata.c via makefsdata.h */
extern uint8_t default_mac_address[8];
extern uint8_t default_server_name[16];
extern uint8_t default_domain_name[30];
#else
uint8_t default_mac_address[8] PROGMEM = PARAMS_EUI64ADDR;
uint8_t default_server_name[] PROGMEM = PARAMS_SERVERNAME;
uint8_t default_domain_name[] PROGMEM = PARAMS_DOMAINNAME;
#endif
#if PARAMETER_STORAGE==0
/* 0 Hard coded, minmal program and eeprom usage. */
uint8_t
params_get_eui64(uint8_t *eui64) {
#if CONTIKI_CONF_RANDOM_MAC
PRINTD("Generating random EUI64 MAC\n");
generate_new_eui64(eui64);
return 1;
#else
uint8_t i;
for (i=0;i<sizeof(default_mac_address);i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);
return 0;
#endif
}
#elif PARAMETER_STORAGE==1
/* 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
* They can be manually changed and kept over program reflash.
* The channel and bit complement are used to check EEMEM integrity,
* If corrupt all values will be rewritten with the default flash values.
* To make this work, get the channel before anything else.
*/
#if !AVR_WEBSERVER
uint8_t eemem_mac_address[] EEMEM = PARAMS_EUI64ADDR;
uint8_t eemem_server_name[] EEMEM = PARAMS_SERVERNAME;
uint8_t eemem_domain_name[] EEMEM = PARAMS_DOMAINNAME;
#endif /*AVR_WEBSERVER */
uint16_t eemem_nodeid EEMEM = PARAMS_NODEID;
uint8_t eemem_channel[2] EEMEM = {PARAMS_CHANNEL, ~PARAMS_CHANNEL};
uint16_t eemem_panid EEMEM = PARAMS_PANID;
uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR;
uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER;
#if CONTIKI_CONF_RANDOM_MAC
static uint8_t randomeui64;
#endif
uint8_t
params_get_channel(void) {
uint8_t x[2];
*(uint16_t *)x = eeprom_read_word ((uint16_t *)&eemem_channel);
/* Don't return an invalid channel number */
if( (x[0]<11) || (x[0] > 26)) x[1]=x[0];
/* Do exclusive or test on the two values read */
if((uint8_t)x[0]!=(uint8_t)~x[1]) {//~x[1] can promote comparison to 16 bit
/* Verification fails, rewrite everything */
uint8_t i,buffer[32];
PRINTD("EEPROM is corrupt, rewriting with defaults.\n");
#if CONTIKI_CONF_RANDOM_MAC
PRINTD("Generating random EUI64 MAC\n");
generate_new_eui64(&buffer);
randomeui64=1;
#else
for (i=0;i<sizeof(default_mac_address);i++) buffer[i] = pgm_read_byte_near(default_mac_address+i);
#endif
/* eeprom_write_block should not be interrupted */
cli();
eeprom_write_block(&buffer, &eemem_mac_address, sizeof(eemem_mac_address));
for (i=0;i<sizeof(default_server_name);i++) buffer[i] = pgm_read_byte_near(default_server_name+i);
eeprom_write_block(&buffer, &eemem_server_name, sizeof(eemem_server_name));
for (i=0;i<sizeof(default_domain_name);i++) buffer[i] = pgm_read_byte_near(default_domain_name+i);
eeprom_write_block(&buffer, &eemem_domain_name, sizeof(eemem_domain_name));
eeprom_write_word(&eemem_panid , PARAMS_PANID);
eeprom_write_word(&eemem_panaddr, PARAMS_PANADDR);
eeprom_write_byte(&eemem_txpower, PARAMS_TXPOWER);
eeprom_write_word(&eemem_nodeid, PARAMS_NODEID);
x[0] = PARAMS_CHANNEL;
x[1]= ~x[0];
eeprom_write_word((uint16_t *)&eemem_channel, *(uint16_t *)x);
sei();
}
/* Always returns a valid channel */
return x[0];
}
uint8_t
params_get_eui64(uint8_t *eui64) {
cli();
eeprom_read_block ((void *)eui64, &eemem_mac_address, sizeof(rimeaddr_t));
sei();
#if CONTIKI_CONF_RANDOM_MAC
return randomeui64;
#else
return 0;
#endif
}
uint16_t
params_get_panid(void) {
return eeprom_read_word(&eemem_panid);
}
uint16_t
params_get_panaddr(void) {
return eeprom_read_word (&eemem_panaddr);
}
uint8_t
params_get_txpower(void)
{
return eeprom_read_byte(&eemem_txpower);
}
#else /* CONTIKI_CONF_SETTINGS_MANAGER */
uint8_t
params_get_channel() {
uint8_t x;
size_t size = 1;
if (settings_get(SETTINGS_KEY_CHANNEL, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
PRINTD("<-Get RF channel %u\n",x);
} else {
x = PARAMS_CHANNEL;
if (settings_add_uint8(SETTINGS_KEY_CHANNEL,x ) == SETTINGS_STATUS_OK) {
PRINTD("->Set EEPROM RF channel to %d\n",x);
}
}
return x;
}
uint8_t
params_get_eui64(uint8_t *eui64) {
size_t size = sizeof(rimeaddr_t);
if(settings_get(SETTINGS_KEY_EUI64, 0, (unsigned char*)eui64, &size) == SETTINGS_STATUS_OK) {
PRINTD("<-Get EUI64 MAC\n");
return 0;
}
#if CONTIKI_CONF_RANDOM_MAC
PRINTD("Generating random EUI64 MAC\n");
generate_new_eui64(eui64);
#else
{uint8_t i;for (i=0;i<8;i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);} //test this
#endif
if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) {
PRINTD("->Set EEPROM MAC address\n");
}
#if CONTIKI_CONF_RANDOM_MAC
return 1;
#else
return 0;
#endif
}
uint16_t
params_get_panid(void) {
uint16_t x;
size_t size = 2;
if (settings_get(SETTINGS_KEY_PAN_ID, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
PRINTD("<-Get PAN ID of %04x\n",x);
} else {
x=PARAMS_PANID;
if (settings_add_uint16(SETTINGS_KEY_PAN_ID,x)==SETTINGS_STATUS_OK) {
PRINTD("->Set EEPROM PAN ID to %04x\n",x);
}
}
return x;
}
uint16_t
params_get_panaddr(void) {
uint16_t x;
size_t size = 2;
if (settings_get(SETTINGS_KEY_PAN_ADDR, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
PRINTD("<-Get PAN address of %04x\n",x);
} else {
x=PARAMS_PANADDR;
if (settings_add_uint16(SETTINGS_KEY_PAN_ADDR,x)==SETTINGS_STATUS_OK) {
PRINTD("->Set EEPROM PAN address to %04x\n",x);
}
}
return x;
}
uint8_t
params_get_txpower(void) {
uint8_t x;
size_t size = 1;
if (settings_get(SETTINGS_KEY_TXPOWER, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) {
PRINTD("<-Get tx power of %d (0=max)\n",x);
} else {
x=PARAMS_TXPOWER;
if (settings_add_uint8(SETTINGS_KEY_TXPOWER,x)==SETTINGS_STATUS_OK) {
PRINTD("->Set EEPROM tx power of %d (0=max)\n",x);
}
}
return x;
}
#endif /* CONTIKI_CONF_SETTINGS_MANAGER */

View file

@ -0,0 +1,108 @@
#ifndef __PARAMS_H__
#define __PARAMS_H__
/* PARAMETER_STORAGE =
* 0 Hard coded, minmal program and eeprom usage.
* 1 Stored in fixed eeprom locations, rewritten from flash if corrupt.
* This allows parameter changes using a hardware programmer or custom application code.
* Corruption test is based on channel verify so get the channel before anything else!
* 2 Obtained from eeprom using the general settings manager and read from program flash if not present.
* Useful for for testing builds without wearing out flash memory.
* 3 Obtained from eeprom using the settings manager and rewritten from flash if not present.
* This ensures all parameters are present in upper eeprom flash.
*
* Note the parameters in this file can be changed without forcing a complete rebuild.
*/
#define CONTIKI_CONF_RANDOM_MAC 0 //adds 78 bytes
#define CONTIKI_CONF_SETTINGS_MANAGER 0 //adds 1696 bytes
#if CONTIKI_CONF_SETTINGS_MANAGER
//#define PARAMETER_STORAGE 2
#define PARAMETER_STORAGE 2
#else
#define PARAMETER_STORAGE 1
#endif
/* Include settings.h, then dummy out the write routines */
#include "settings.h"
#if PARAMETER_STORAGE==2
#define settings_add(...) 0
#define settings_add_uint8(...) 0
#define settings_add_uint16(...) 0
#endif
#if AVR_WEBSERVER
/* Webserver builds can set some defaults in httpd-fsdata.c via makefsdata.h */
extern uint8_t eemem_mac_address[8];
extern uint8_t eemem_server_name[16];
extern uint8_t eemem_domain_name[30];
#endif
#ifdef SERVER_NAME
#define PARAMS_SERVERNAME SERVER_NAME
#else
#define PARAMS_SERVERNAME "ATMEGA128rfa1"
#endif
#ifdef DOMAIN_NAME
#define PARAMS_DOMAINNAME DOMAIN_NAME
#else
#define PARAMS_DOMAINNAME "localhost"
#endif
#ifdef NODE_ID
#define PARAMS_NODEID NODE_ID
#else
#define PARAMS_NODEID 0
#endif
#ifdef CHANNEL_802_15_4
#define PARAMS_CHANNEL CHANNEL_802_15_4
#else
#define PARAMS_CHANNEL 26
#endif
#ifdef IEEE802154_PANID
#define PARAMS_PANID IEEE802154_PANID
#else
#define PARAMS_PANID 0xABCD
#endif
#ifdef IEEE802154_PANADDR
#define PARAMS_PANADDR IEEE802154_PANADDR
#else
#define PARAMS_PANADDR 0
#endif
#ifdef RF230_MAX_TX_POWER
#define PARAMS_TXPOWER RF230_MAX_TX_POWER
#else
#define PARAMS_TXPOWER 0
#endif
#ifdef EUI64_ADDRESS
#define PARAMS_EUI64ADDR EUI64_ADDRESS
#else
/* This form of of EUI64 mac allows full 6LoWPAN header compression from mac address */
#if UIP_CONF_LL_802154
//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN}
#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}
#else
//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN}
#define PARAMS_EUI64ADDR {0x00, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}
#endif
/* This form of of EUI64 mac allows 16 bit 6LoWPAN header compression on multihops */
//#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0xNN, 0xNN}
#endif
uint8_t params_get_eui64(uint8_t *eui64);
#if PARAMETER_STORAGE==0
/* Hard coded program flash parameters */
#define params_get_servername(...)
#define params_get_nodeid(...) PARAMS_NODEID
#define params_get_channel(...) PARAMS_CHANNEL
#define params_get_panid(...) PARAMS_PANID
#define params_get_panaddr(...) PARAMS_PANADDR
#define params_get_txpower(...) PARAMS_TXPOWER
#else
/* Parameters stored in eeprom */
uint16_t params_get_nodeid(void);
uint8_t params_get_channel(void);
uint16_t params_get_panid(void);
uint16_t params_get_panaddr(void);
uint8_t params_get_txpower(void);
#endif
#endif /* __PARAMS_H__ */