Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

MAC address to EEMEM, not PROGMEM

Browse Source 
Sync atmega128rfa1 main routine to the raven (timed route prints, etc.)
This commit is contained in:
dak664 2011-03-11 13:47:47 -05:00
parent 7033bc859e
commit 02091b083a
2 changed files with 185 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
platform/avr-atmega128rfa1/contiki-main.c
View File

@ -30,16 +30,15 @@
* *
* @(#)$$ * @(#)$$
*/ */
#define LED_ON_PORTE1 0 //for Michael Hartman's prototype board
#define ANNOUNCE_BOOT 1 //adds about 600 bytes to program size #define ANNOUNCE_BOOT 1 //adds about 600 bytes to program size
#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if DEBUG
#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) #define PRINTFD(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#define PRINTSHORT(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#else #else
#define PRINTF(...) #define PRINTFD(...)
#define PRINTSHORT(...)
#endif #endif
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
@ -120,7 +119,7 @@ extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via mak
extern uint8_t server_name[16]; extern uint8_t server_name[16];
extern uint8_t domain_name[30]; extern uint8_t domain_name[30];
#else #else
uint8_t mac_address[8] PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
#endif #endif
@ -173,13 +172,17 @@ void initialize(void)
{ {
watchdog_init(); watchdog_init();
watchdog_start(); watchdog_start();
#ifdef RAVEN_LCD_INTERFACE #if !LED_ON_PORTE1 //Conflicts with USART0
#if RAVEN_LCD_INTERFACE
/* First rs232 port for Raven 3290 port */ /* First rs232 port for Raven 3290 port */
//conflicts with led on Hartmann's board, so bypass for now 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 */ /* Set input handler for 3290 port */
// rs232_set_input(0,raven_lcd_serial_input); rs232_set_input(0,raven_lcd_serial_input);
#else
//Slip border router on uart0
rs232_init(RS232_PORT_0, USART_BAUD_38400,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
#endif
#endif #endif
/* Second rs232 port for debugging */ /* Second rs232 port for debugging */
@ -188,14 +191,29 @@ void initialize(void)
rs232_redirect_stdout(RS232_PORT_1); rs232_redirect_stdout(RS232_PORT_1);
clock_init(); clock_init();
#define CONF_CALIBRATE_OSCCAL 1 #if STACKMONITOR
/* Simple stack pointer highwater monitor. Checks for magic numbers in the main
* loop. In conjuction with TESTRTIMER, never-used stack will be printed
* every STACKMONITOR seconds.
*/
{
extern uint16_t __bss_end;
uint16_t p=(uint16_t)&__bss_end;
do {
*(uint16_t *)p = 0x4242;
p+=10;
} while (p<SP-10); //don't overwrite our own stack
}
#endif
#define CONF_CALIBRATE_OSCCAL 0
#if CONF_CALIBRATE_OSCCAL #if CONF_CALIBRATE_OSCCAL
{ {
uint8_t i; uint8_t i;
printf_P(PSTR("\nBefore calibration OSCCAL=%x\n"),OSCCAL); PRINTF("\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();
printf_P(PSTR("Calibrated=%x\n"),osccal_calibrated); PRINTF("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);
@ -205,7 +223,7 @@ uint8_t i;
#endif #endif
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
printf_P(PSTR("\n*******Booting %s*******\n"),CONTIKI_VERSION_STRING); PRINTF("\n*******Booting %s*******\n",CONTIKI_VERSION_STRING);
#endif #endif
watchdog_start(); watchdog_start();
/* rtimers needed for radio cycling */ /* rtimers needed for radio cycling */
@ -240,7 +258,7 @@ uint8_t i;
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]); PRINTFD("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]);
/* Initialize stack protocols */ /* Initialize stack protocols */
queuebuf_init(); queuebuf_init();
@ -249,19 +267,19 @@ uint8_t i;
NETSTACK_NETWORK.init(); NETSTACK_NETWORK.init();
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
printf_P(PSTR("%s %s, channel %u"),NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel()); PRINTF("%s %s, channel %u",NETSTACK_MAC.name, NETSTACK_RDC.name,rf230_get_channel());
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:\
NETSTACK_RDC.channel_check_interval()); NETSTACK_RDC.channel_check_interval());
if (tmp<65535) printf_P(PSTR(", check rate %u Hz"),tmp); if (tmp<65535) PRINTF(", check rate %u Hz",tmp);
} }
printf_P(PSTR("\n")); PRINTF("\n");
#endif #endif
#if UIP_CONF_ROUTER #if UIP_CONF_ROUTER
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
printf_P(PSTR("Routing Enabled\n")); PRINTF("Routing Enabled\n");
#endif #endif
// rime_init(rime_udp_init(NULL)); // rime_init(rime_udp_init(NULL));
// uip_router_register(&rimeroute); // uip_router_register(&rimeroute);
@ -289,13 +307,13 @@ uint8_t i;
#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_P(PSTR("No index.html file found, creating upload.html!\n")); PRINTF("No index.html file found, creating upload.html!\n");
printf_P(PSTR("Formatting FLASH file system for coffee...")); PRINTF("Formatting FLASH file system for coffee...");
cfs_coffee_format(); cfs_coffee_format();
printf_P(PSTR("Done!\n")); PRINTF("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_P(PSTR("Can''t create /index.html!\n")); if (r<0) PRINTF("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>
@ -323,29 +341,29 @@ uint8_t i;
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) {
httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr,buf); httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr,buf);
printf_P(PSTR("IPv6 Address: %s\n"),buf); PRINTF("IPv6 Address: %s\n",buf);
} }
} }
eeprom_read_block (buf,server_name, sizeof(server_name)); eeprom_read_block (buf,server_name, sizeof(server_name));
buf[sizeof(server_name)]=0; buf[sizeof(server_name)]=0;
printf_P(PSTR("%s"),buf); PRINTF("%s",buf);
eeprom_read_block (buf,domain_name, sizeof(domain_name)); eeprom_read_block (buf,domain_name, sizeof(domain_name));
buf[sizeof(domain_name)]=0; buf[sizeof(domain_name)]=0;
size=httpd_fs_get_size(); size=httpd_fs_get_size();
#ifndef COFFEE_FILES #ifndef COFFEE_FILES
printf_P(PSTR(".%s online with fixed %u byte web content\n"),buf,size); PRINTF(".%s online with fixed %u byte web content\n",buf,size);
#elif COFFEE_FILES==1 #elif COFFEE_FILES==1
printf_P(PSTR(".%s online with static %u byte EEPROM file system\n"),buf,size); PRINTF(".%s online with static %u byte EEPROM file system\n",buf,size);
#elif COFFEE_FILES==2 #elif COFFEE_FILES==2
printf_P(PSTR(".%s online with dynamic %u KB EEPROM file system\n"),buf,size>>10); PRINTF(".%s online with dynamic %u KB EEPROM file system\n",buf,size>>10);
#elif COFFEE_FILES==3 #elif COFFEE_FILES==3
printf_P(PSTR(".%s online with static %u byte program memory file system\n"),buf,size); PRINTF(".%s online with static %u byte program memory file system\n",buf,size);
#elif COFFEE_FILES==4 #elif COFFEE_FILES==4
printf_P(PSTR(".%s online with dynamic %u KB program memory file system\n"),buf,size>>10); PRINTF(".%s online with dynamic %u KB program memory file system\n",buf,size>>10);
#endif /* COFFEE_FILES */ #endif /* COFFEE_FILES */
#else #else
printf_P(PSTR("Online\n")); PRINTF("Online\n");
#endif /* WEBSERVER */ #endif /* WEBSERVER */
#endif /* ANNOUNCE_BOOT */ #endif /* ANNOUNCE_BOOT */
@ -354,17 +372,22 @@ uint8_t i;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void log_message(char *m1, char *m2) void log_message(char *m1, char *m2)
{ {
printf_P(PSTR("%s%s\n"), m1, m2); PRINTF("%s%s\n", m1, m2);
} }
/* Test rtimers, also useful for pings and time stamps in simulator */ /* Test rtimers, also for pings, stack monitor, neighbor/route printout and time stamps */
#define TESTRTIMER 0 #define TESTRTIMER 1
#if TESTRTIMER #if TESTRTIMER
#define PINGS 60 //#define PINGS 64
#define ROUTES 64
#define STAMPS 30 #define STAMPS 30
#define STACKMONITOR 128
uint8_t rtimerflag=1; uint8_t rtimerflag=1;
uint16_t rtime; uint16_t rtime;
struct rtimer rt; struct rtimer rt;
void rtimercycle(void) {rtimerflag=1;} void rtimercycle(void) {rtimerflag=1;}
static void ipaddr_add(const uip_ipaddr_t *addr);
#endif /* TESTRTIMER */ #endif /* TESTRTIMER */
#if RF230BB #if RF230BB
@ -379,85 +402,140 @@ uint16_t ledtimer;
int int
main(void) main(void)
{ {
#define CONFIG_STACK_MONITOR 1
#if CONFIG_STACK_MONITOR
extern uint16_t __bss_end;
__bss_end = 0x4242;
*(uint16_t *)(&__bss_end+100) = 0x4242;
#endif
initialize(); initialize();
#if LED_ON_PORTE1
/* NB: PORTE1 conflicts with UART0 */ /* NB: PORTE1 conflicts with UART0 */
DDRE|=(1<<DDE1); //set led pin to output DDRE|=(1<<DDE1); //set led pin to output (Micheal Hatrtman board)
PORTE&=~(1<<PE1); //and low to turn led off PORTE&=~(1<<PE1); //and low to turn led off
#endif
while(1) { while(1) {
process_run(); process_run();
#if LED_ON_PORTE1
/* Turn off LED after a while */ /* Turn off LED after a while */
if (ledtimer) { if (ledtimer) {
if (--ledtimer==0) { if (--ledtimer==0) {
PORTE&=~(1<<PE1); PORTE&=~(1<<PE1);
/* Currently LED was turned on by received ping; ping the other way for testing */ /* Currently LED was turned on by received ping; ping the other way for testing */
extern void raven_ping6(void); extern void raven_ping6(void);
raven_ping6(); //ping back // raven_ping6(); //ping back
} }
}
#if CONFIG_STACK_MONITOR
if (*(uint16_t *)(&__bss_end+100) != 0x4242) {
printf_P(PSTR("\nStack Warning, overflow within 100 bytes!\n"));
if (__bss_end != 0x4242) {
__bss_end = 0x4242;
printf_P(PSTR("\n!!!!!!!Stack Overflow!!!!!!!!\n"));
}
*(uint16_t *)(&__bss_end+100) = 0x4242;
} }
#endif #endif
#if 0 #if 0
extern uint8_t rf230_calibrated; /* Various entry points for debugging in the AVR Studio simulator.
* Set as next statement and step into the routine.
*/
NETSTACK_RADIO.send(packetbuf_hdrptr(), 42);
process_poll(&rf230_process);
packetbuf_clear();
len = rf230_read(packetbuf_dataptr(), PACKETBUF_SIZE);
packetbuf_set_datalen(42);
NETSTACK_RDC.input();
#endif
watchdog_periodic();
#if 0
/* Clock.c can trigger a periodic PLL calibration in the RF230BB driver.
* This can show when that happens.
*/
extern uint8_t rf230_calibrated;
if (rf230_calibrated) { if (rf230_calibrated) {
printf_P(PSTR("\nRF230 calibrated!")); PRINTF("\nRF230 calibrated!\n");
rf230_calibrated=0; rf230_calibrated=0;
} }
#endif #endif
//Various entry points for debugging in AVR simulator
// NETSTACK_RADIO.send(packetbuf_hdrptr(), 42);
// process_poll(&rf230_process);
// packetbuf_clear();
// len = rf230_read(packetbuf_dataptr(), PACKETBUF_SIZE);
// packetbuf_set_datalen(42);
// NETSTACK_RDC.input();
watchdog_periodic();
#if TESTRTIMER #if TESTRTIMER
if (rtimerflag) { //8 seconds is maximum interval, my raven 6% slow /* Timeout can be increased up to 8 seconds maximum.
* A one second cycle is convenient for triggering the various debug printouts.
* The triggers are staggered to avoid printing everything at once.
* My raven is 6% slow.
*/
if (rtimerflag) {
rtimer_set(&rt, RTIMER_NOW()+ RTIMER_ARCH_SECOND*1UL, 1,(void *) rtimercycle, NULL); rtimer_set(&rt, RTIMER_NOW()+ RTIMER_ARCH_SECOND*1UL, 1,(void *) rtimercycle, NULL);
rtimerflag=0; rtimerflag=0;
#if STAMPS
if ((rtime%STAMPS)==0) {
printf("%us ",rtime);
#if 0 //test timer0
extern unsigned long seconds;
printf("clock= %lus ",clock_seconds());
printf("scount=%us",scount);
printf(" %us %us",(unsigned int)(seconds&0xffff),(unsigned int)(seconds>>16));
#endif
}
#if STAMPS
if ((rtime%STAMPS)==0) {
PRINTF("%us ",rtime);
}
#endif #endif
rtime+=1; rtime+=1;
#if PINGS #if PINGS
if ((rtime%PINGS)==0) { if ((rtime%PINGS)==1) {
PRINTF("**Ping\n"); PRINTF("**Ping\n");
raven_ping6(); raven_ping6();
} }
#endif #endif
#if ROUTES
if ((rtime%ROUTES)==2) {
//#if UIP_CONF_IPV6_RPL
//#include "rpl.h"
extern uip_ds6_nbr_t uip_ds6_nbr_cache[];
extern uip_ds6_route_t uip_ds6_routing_table[];
extern uip_ds6_netif_t uip_ds6_if;
uint8_t i,j;
PRINTF("\nAddresses [%u max]\n",UIP_DS6_ADDR_NB);
for (i=0;i<UIP_DS6_ADDR_NB;i++) {
if (uip_ds6_if.addr_list[i].isused) {
ipaddr_add(&uip_ds6_if.addr_list[i].ipaddr);
PRINTF("\n");
} }
}
PRINTF("\nNeighbors [%u max]\n",UIP_DS6_NBR_NB);
for(i = 0,j=1; i < UIP_DS6_NBR_NB; i++) {
if(uip_ds6_nbr_cache[i].isused) {
ipaddr_add(&uip_ds6_nbr_cache[i].ipaddr);
PRINTF("\n");
j=0;
}
}
if (j) PRINTF(" <none>");
PRINTF("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB);
for(i = 0,j=1; i < UIP_DS6_ROUTE_NB; i++) {
if(uip_ds6_routing_table[i].isused) {
ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
PRINTF("/%u (via ", uip_ds6_routing_table[i].length);
ipaddr_add(&uip_ds6_routing_table[i].nexthop);
// if(uip_ds6_routing_table[i].state.lifetime < 600) {
PRINTF(") %lus\n", uip_ds6_routing_table[i].state.lifetime);
// } else {
// PRINTF(")\n");
// }
j=0;
}
}
if (j) PRINTF(" <none>");
PRINTF("\n---------\n");
}
#endif #endif
#if STACKMONITOR
if ((rtime%STACKMONITOR)==3) {
extern uint16_t __bss_end;
uint16_t p=(uint16_t)&__bss_end;
do {
if (*(uint16_t *)p != 0x4242) {
PRINTF("Never-used stack > %d bytes\n",p-(uint16_t)&__bss_end);
break;
}
p+=10;
} while (p<RAMEND-10);
}
#endif
}
#endif /* TESTRTIMER */
//Use with RF230BB DEBUGFLOW to show path through driver //Use with RF230BB DEBUGFLOW to show path through driver
#if RF230BB&&0 #if RF230BB&&0
extern uint8_t debugflowsize,debugflow[]; extern uint8_t debugflowsize,debugflow[];
@ -486,3 +564,27 @@ extern uint8_t debugflowsize,debugflow[];
} }
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/
#if ROUTES
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

2
platform/avr-raven/contiki-raven-main.c
View File

@ -130,7 +130,7 @@ extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via mak
extern uint8_t server_name[16]; extern uint8_t server_name[16];
extern uint8_t domain_name[30]; extern uint8_t domain_name[30];
#else #else
uint8_t mac_address[8] PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
#endif #endif