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

update for new contiki fetch

Browse source
This commit is contained in:
Harald Pichler 2013-07-30 17:42:44 +02:00
parent e9c033688b
commit 48fff35bd9
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/osd-merkur/Makefile.osd-merkur
View file

@ -42,6 +42,7 @@ AVRDUDE_PORT=usb:00B000000D79
# Additional avrdude options
# Verify off
AVRDUDE_OPTIONS=-V
AVRDUDE_MCU=m128rfa1
#debug
# CFLAGS += -save-temps

14
platform/osd-merkur/contiki-conf.h
View file

@ -146,7 +146,7 @@ typedef unsigned short uip_stats_t;
#define RIMEADDR_CONF_SIZE 8
#define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1
#define UIP_CONF_TCP 0
//#define UIP_CONF_TCP 1
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else
@ -157,6 +157,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_LL_802154 1
#define UIP_CONF_LLH_LEN 0
#define UIP_CONF_BUFFER_SIZE 240
/* 10 bytes per stateful address context - see sicslowpan.c */
/* Default is 1 context with prefix aaaa::/64 */
@ -225,7 +226,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 20
#define UIP_CONF_MAX_ROUTES 20
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -245,7 +246,7 @@ typedef unsigned short uip_stats_t;
/* Not tested much yet */
#define WITH_PHASE_OPTIMIZATION 0
#define CONTIKIMAC_CONF_COMPOWER 1
#define RIMESTATS_CONF_ON 1
#define RIMESTATS_CONF_ENABLED 1
#define NETSTACK_CONF_FRAMER framer_802154
#define NETSTACK_CONF_RADIO rf230_driver
#define CHANNEL_802_15_4 26
@ -270,7 +271,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 4
#define UIP_CONF_MAX_ROUTES 4
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -306,7 +307,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 4
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 4
#define UIP_CONF_MAX_ROUTES 4
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -342,6 +343,9 @@ typedef unsigned short uip_stats_t;
#define CCIF
#define CLIF
#ifndef CC_CONF_INLINE
#define CC_CONF_INLINE inline
#endif
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */

5
platform/osd-merkur/contiki-main.c
View file

@ -326,7 +326,7 @@ uint8_t i;
#ifdef RAVEN_LCD_INTERFACE
process_start(&raven_lcd_process, NULL);
#endif
process_start(&sensors_process, NULL);
/* Autostart other processes */
@ -448,7 +448,7 @@ main(void)
PORTE&=~(1<<PE1);
#endif
#if defined(RAVEN_LCD_INTERFACE)&&0
// ledtimer can be set by received ping; ping the other way for testing
/* ledtimer can be set by received ping; ping the other way for testing */
extern void raven_ping6(void);
raven_ping6();
#endif
@ -589,6 +589,7 @@ if ((clocktime%STACKMONITOR)==3) {
} while (p<RAMEND-10);
}
#endif
}
#endif /* PERIODICPRINTS */

6
platform/osd-merkur/params.h
View file

@ -14,14 +14,14 @@
*/
#define CONTIKI_CONF_RANDOM_MAC 0 //adds 78 bytes
#define CONTIKI_CONF_SETTINGS_MANAGER 0 //adds 1696 bytes
#define BOOTLOADER_GET_MAC 0 // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
#define BOOTLOADER_GET_MAC 1 // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
#if CONTIKI_CONF_SETTINGS_MANAGER
//#define PARAMETER_STORAGE 2
#define PARAMETER_STORAGE 2
#else
#define PARAMETER_STORAGE 1
//#define PARAMETER_STORAGE 0 // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
//#define PARAMETER_STORAGE 1
#define PARAMETER_STORAGE 0 // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0
#endif
/* Include settings.h, then dummy out the write routines */