example\webserver-ipv6-raven works!
This commit is contained in:
parent
d5865cb2b6
commit
6e42bd3496
7 changed files with 23 additions and 23 deletions
|
@ -1,13 +0,0 @@
|
|||
#ifndef raven_lcd_h
|
||||
#define raven_lcd_h
|
||||
|
||||
int raven_lcd_serial_input(unsigned char ch);
|
||||
PROCESS_NAME(raven_lcd_process);
|
||||
|
||||
/* Events for the Raven LCD processing loop */
|
||||
#define PING_REQUEST 0xc1
|
||||
#define PING_REPLY 0xc0
|
||||
#define SERIAL_CMD 0x1
|
||||
|
||||
|
||||
#endif
|
|
@ -1,6 +1,6 @@
|
|||
webserver_src = webserver-nogui.c httpd.c http-strings.c psock.c memb.c \
|
||||
raven-webserver_src = webserver-nogui.c httpd.c http-strings.c psock.c memb.c \
|
||||
httpd-fs.c httpd-cgi.c
|
||||
webserver_dsc = webserver-dsc.c
|
||||
raven-webserver_dsc = webserver-dsc.c
|
||||
|
||||
#$(CONTIKI)/apps/webserver/http-strings.c: $(CONTIKI)/apps/webserver/http-strings
|
||||
# cd $(CONTIKI)/apps/webserver/; $(CONTIKI)/tools/makestrings $<
|
|
@ -2,7 +2,7 @@ CONTIKI_TARGET_DIRS = . rf230 apps net loader
|
|||
CONTIKI_CORE=contiki-raven-main
|
||||
CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
|
||||
|
||||
CONTIKI_TARGET_SOURCEFILES += rs232.c slip.c cfs-eeprom.c eeprom.c random.c \
|
||||
CONTIKI_TARGET_SOURCEFILES += rs232.c cfs-eeprom.c eeprom.c random.c \
|
||||
mmem.c contiki-raven-main.c contiki-raven-default-init-net.c
|
||||
|
||||
CONTIKIAVR=$(CONTIKI)/cpu/avr
|
||||
|
@ -21,7 +21,6 @@ AVRDUDE_PROGRAMMER=jtag2
|
|||
AVRDUDE_PORT=usb:00B000000D79
|
||||
|
||||
|
||||
|
||||
# Additional avrdude options
|
||||
# Verify off
|
||||
AVRDUDE_OPTIONS=-V
|
||||
|
|
|
@ -101,6 +101,7 @@ typedef int32_t s32_t;
|
|||
#define UIP_CONF_ND6_MAX_PREFIXES 3
|
||||
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
|
||||
#define UIP_CONF_ND6_MAX_DEFROUTERS 2
|
||||
#define UIP_CONF_ICMP6 1
|
||||
|
||||
#define UIP_CONF_UDP 1
|
||||
#define UIP_CONF_UDP_CHECKSUMS 1
|
||||
|
|
|
@ -32,11 +32,11 @@
|
|||
*
|
||||
* @(#)$$
|
||||
*/
|
||||
#include "contiki-raven.h"
|
||||
#include "contiki-raven.h"
|
||||
|
||||
void
|
||||
init_lowlevel(void)
|
||||
{
|
||||
{
|
||||
/* Configure default slip port with 19200 baud */
|
||||
//rs232_init(RS232_PORT_0, USART_BAUD_19200, USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
|
||||
|
||||
|
|
|
@ -41,11 +41,12 @@ void
|
|||
init_net(void)
|
||||
{
|
||||
|
||||
uip_ipaddr_t ipprefix;
|
||||
|
||||
/* uip_ipaddr_t ipprefix;
|
||||
|
||||
uip_ip6addr(&ipprefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
uip_netif_addr_add(&ipprefix, UIP_DEFAULT_PREFIX_LEN, 0, AUTOCONF);
|
||||
uip_nd6_prefix_add(&ipprefix, UIP_DEFAULT_PREFIX_LEN, 0);
|
||||
|
||||
*/
|
||||
}
|
||||
|
|
|
@ -40,6 +40,8 @@
|
|||
*/
|
||||
|
||||
#include <avr/pgmspace.h>
|
||||
#include <avr/fuse.h>
|
||||
#include <avr/eeprom.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "lib/mmem.h"
|
||||
|
@ -63,6 +65,16 @@
|
|||
|
||||
#include "sicslowmac.h"
|
||||
|
||||
FUSES =
|
||||
{
|
||||
.low = 0xe2,
|
||||
.high = 0x99,
|
||||
.extended = 0xff,
|
||||
};
|
||||
|
||||
|
||||
/* Put default MAC address in EEPROM */
|
||||
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
|
||||
|
||||
PROCINIT(&etimer_process, &mac_process, &tcpip_process, &raven_lcd_process);
|
||||
|
||||
|
@ -108,11 +120,11 @@ main(void)
|
|||
autostart_start(autostart_processes);
|
||||
|
||||
//Give ourselves a prefix
|
||||
init_net();
|
||||
//init_net();
|
||||
|
||||
printf_P(PSTR("\n********BOOTING CONTIKI*********\n"));
|
||||
|
||||
printf_P(PSTR("System online.\n"));
|
||||
printf_P(PSTR("System online.\n"));
|
||||
|
||||
/* Main scheduler loop */
|
||||
while(1) {
|
||||
|
|
Loading…
Reference in a new issue