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

Merge pull request #950 from patoman007/master

Browse source 
Fix: Misconfigurations to compile for avr-zigbit platform
This commit is contained in:
Nicolas Tsiftes 2015-02-17 09:41:20 +01:00
parent 6e3119234b 2c2b930648
commit e58aae1dcd
2 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
platform/avr-zigbit/Makefile.avr-zigbit
View file

@ -1,30 +1,20 @@
CONTIKI_TARGET_DIRS = . apps net loader CONTIKIDIRS += ${addprefix $(CONTIKI)/core/, net/mac net/mac/sicslowmac . }
CONTIKI_CORE=contiki-avr-zigbit
CONTIKI_TARGET_DIRS = . apps /core/net/mac/ /core/net/mac/sicslowmac/
CONTIKI_CORE = contiki-avr-zigbit
CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
CONTIKI_TARGET_SOURCEFILES += rs232.c cfs-eeprom.c eeprom.c random.c \ CONTIKI_TARGET_SOURCEFILES += rs232.c cfs-eeprom.c eeprom.c random.c mmem.c \
mmem.c contiki-avr-zigbit-main.c contiki-avr-zigbit-main.c \
sicslowmac.c linkaddr.c queuebuf.c nullmac.c packetbuf.c \
frame802154.c framer-802154.c framer.c nullsec.c nbr-table.c
CONTIKIAVR=$(CONTIKI)/cpu/avr CONTIKIAVR = $(CONTIKI)/cpu/avr
CONTIKIBOARD=. CONTIKIBOARD = .
CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAUTO_CRC_PADDING=2 CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAUTO_CRC_PADDING=2
MCU=atmega1281 MCU = atmega1281
AVRDUDE_PROGRAMMER=jtag2
# For usb devices, you may either use PORT=usb, or (e.g. if you have more than one
# programmer connected) you can use the following trick to find out the serial number:
#
# The example is for an JTAGICE mkII used to program an ATmega128:
# avrdude -v -P usb:xxxx -c jtag2 -p atmega128
AVRDUDE_PORT=usb:00B000000D79
# Additional avrdude options
# Verify off
AVRDUDE_OPTIONS=-V
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio include $(CONTIKIAVR)/radio/Makefile.radio

18
platform/avr-zigbit/contiki-avr-zigbit-main.c
View file

@ -95,15 +95,19 @@ PROCINIT(&etimer_process, &mac_process );
#endif #endif
#endif #endif
/* Put default MAC address in EEPROM */ /* Put default MAC address in EEPROM */
#if MY_NODE_ID
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44,
MY_NODE_ID};
#else
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
#endif
void void
init_lowlevel(void) init_lowlevel(void)
{ {
/* Second rs232 port for debugging */ /* Second rs232 port for debugging */
rs232_init(RS232_PORT_1, USART_BAUD_115200, rs232_init(RS232_PORT_1, USART_BAUD_38400,
USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
/* Redirect stdout to second port */ /* Redirect stdout to second port */
@ -167,8 +171,8 @@ init_lowlevel(void)
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
printf_P(PSTR("Routing Enabled\n")); printf_P(PSTR("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);
#endif #endif
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4 #if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL); process_start(&tcpip_process, NULL);
@ -195,13 +199,13 @@ main(void)
/* Register initial processes */ /* Register initial processes */
// procinit_init(); // procinit_init();
/* Autostart processes */
autostart_start(autostart_processes);
printf_P(PSTR("\n********BOOTING CONTIKI*********\n")); printf_P(PSTR("\n********BOOTING CONTIKI*********\n"));
printf_P(PSTR("System online.\n")); printf_P(PSTR("System online.\n"));
/* Autostart processes */
autostart_start(autostart_processes);
/* Main scheduler loop */ /* Main scheduler loop */
while(1) { while(1) {
process_run(); process_run();