From 9a0087faf30b327ac85205d3c04280e71275d958 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy <simon.duquennoy@gmail.com> Date: Mon, 3 Jul 2017 17:20:22 +0200 Subject: [PATCH] Simplify configuration through more suitable defaults, and removed unused features. Cleanup many configuration files. --- arch/cpu/cc253x/8051def.h | 4 - arch/dev/cc2420/cc2420.c | 26 ---- arch/dev/cc2420/cc2420.h | 26 ++++ arch/platform/cc2538dk/contiki-conf.h | 83 +------------ arch/platform/cooja-ip64/subplatform-conf.h | 4 - arch/platform/cooja/contiki-conf.h | 70 ----------- arch/platform/galileo/contiki-conf.h | 1 + arch/platform/jn516x/contiki-conf.h | 117 +----------------- arch/platform/jn516x/platform-conf.h | 21 ++-- arch/platform/native/contiki-conf.h | 70 ----------- arch/platform/nrf52dk/contiki-conf.h | 41 +----- arch/platform/openmote-cc2538/contiki-conf.h | 84 +------------ arch/platform/sky/contiki-conf.h | 98 +-------------- arch/platform/sky/platform-conf.h | 5 + arch/platform/srf06-cc26xx/contiki-conf.h | 74 +---------- arch/platform/zoul/contiki-conf.h | 84 ------------- arch/platform/zoul/contiki-main.c | 1 + core/contiki-default-conf.h | 2 +- core/net/ip/uip.h | 4 + core/net/ip/uipopt.h | 50 ++------ core/net/ipv6/sicslowpan.c | 9 -- core/net/ipv6/uip-nd6.h | 2 +- core/net/ipv6/uip6.c | 4 - core/net/linkaddr.h | 2 +- core/net/mac/csma/csma.c | 2 +- core/net/mac/csma/csma.h | 16 +-- core/net/packetbuf.c | 2 - core/net/packetbuf.h | 31 ----- examples/ip64-router/ip64-router.c | 1 + examples/ipv6/json-ws/project-conf.h | 4 - examples/ipv6/multicast/project-conf.h | 6 +- .../ipv6/native-border-router/project-conf.h | 3 - .../ipv6/rpl-border-router/project-conf.h | 4 - examples/ipv6/slip-radio/project-conf.h | 3 - .../cc2538-common/mqtt-demo/project-conf.h | 3 + .../cc26xx/cc26xx-web-demo/project-conf.h | 4 + .../cc26xx/very-sleepy-demo/project-conf.h | 1 + .../jn516x/tsch/common-conf-jn516x.h | 10 -- .../jn516x/tsch/common-conf.h | 8 -- .../nrf52dk/mqtt-demo/project-conf.h | 4 + .../sky-websense/project-conf.h | 3 - 41 files changed, 102 insertions(+), 885 deletions(-) diff --git a/arch/cpu/cc253x/8051def.h b/arch/cpu/cc253x/8051def.h index e16cf3c2ea..617c754081 100644 --- a/arch/cpu/cc253x/8051def.h +++ b/arch/cpu/cc253x/8051def.h @@ -99,10 +99,6 @@ typedef unsigned short clock_time_t; /* Macro for a soft reset. */ #define SOFT_RESET() do {((void (__code *) (void)) 0x0000) ();} while(0) -/* We don't provide architecture-specific checksum calculations */ -#define UIP_ARCH_ADD32 0 -#define UIP_ARCH_CHKSUM 0 - #define CC_CONF_ASSIGN_AGGREGATE(dest, src) \ memcpy(dest, src, sizeof(*dest)) diff --git a/arch/dev/cc2420/cc2420.c b/arch/dev/cc2420/cc2420.c index 56428706f0..89aee6b75a 100644 --- a/arch/dev/cc2420/cc2420.c +++ b/arch/dev/cc2420/cc2420.c @@ -45,32 +45,6 @@ #include "net/packetbuf.h" #include "net/netstack.h" -#define WITH_SEND_CCA 1 - -#ifndef CC2420_CONF_CHANNEL -#define CC2420_CONF_CHANNEL 26 -#endif /* CC2420_CONF_CHANNEL */ - -#ifndef CC2420_CONF_CCA_THRESH -#define CC2420_CONF_CCA_THRESH -45 -#endif /* CC2420_CONF_CCA_THRESH */ - -#ifndef CC2420_CONF_AUTOACK -#define CC2420_CONF_AUTOACK 0 -#endif /* CC2420_CONF_AUTOACK */ - -#define CHECKSUM_LEN 2 -#define FOOTER_LEN 2 -#define FOOTER1_CRC_OK 0x80 -#define FOOTER1_CORRELATION 0x7f - -#ifdef CC2420_CONF_RSSI_OFFSET -#define RSSI_OFFSET CC2420_CONF_RSSI_OFFSET -#else /* CC2420_CONF_RSSI_OFFSET */ -/* The RSSI_OFFSET is approximate -45 (see CC2420 specification) */ -#define RSSI_OFFSET -45 -#endif /* CC2420_CONF_RSSI_OFFSET */ - enum write_ram_order { /* Begin with writing the first given byte */ WRITE_RAM_IN_ORDER, diff --git a/arch/dev/cc2420/cc2420.h b/arch/dev/cc2420/cc2420.h index 985fc42133..74b641ad67 100644 --- a/arch/dev/cc2420/cc2420.h +++ b/arch/dev/cc2420/cc2420.h @@ -48,6 +48,32 @@ #include "cc2420_const.h" #include "lib/aes-128.h" +#define WITH_SEND_CCA 1 + +#ifndef CC2420_CONF_CHANNEL +#define CC2420_CONF_CHANNEL 26 +#endif /* CC2420_CONF_CHANNEL */ + +#ifndef CC2420_CONF_CCA_THRESH +#define CC2420_CONF_CCA_THRESH -45 +#endif /* CC2420_CONF_CCA_THRESH */ + +#ifndef CC2420_CONF_AUTOACK +#define CC2420_CONF_AUTOACK 1 +#endif /* CC2420_CONF_AUTOACK */ + +#define CHECKSUM_LEN 2 +#define FOOTER_LEN 2 +#define FOOTER1_CRC_OK 0x80 +#define FOOTER1_CORRELATION 0x7f + +#ifdef CC2420_CONF_RSSI_OFFSET +#define RSSI_OFFSET CC2420_CONF_RSSI_OFFSET +#else /* CC2420_CONF_RSSI_OFFSET */ +/* The RSSI_OFFSET is approximate -45 (see CC2420 specification) */ +#define RSSI_OFFSET -45 +#endif /* CC2420_CONF_RSSI_OFFSET */ + int cc2420_init(void); #define CC2420_MAX_PACKET_LEN 127 diff --git a/arch/platform/cc2538dk/contiki-conf.h b/arch/platform/cc2538dk/contiki-conf.h index 0ee6425dd4..1b1e70b840 100644 --- a/arch/platform/cc2538dk/contiki-conf.h +++ b/arch/platform/cc2538dk/contiki-conf.h @@ -108,9 +108,6 @@ typedef uint32_t rtimer_clock_t; * * @{ */ -#ifndef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 0 /**< Energest Module */ -#endif #ifndef STARTUP_CONF_VERBOSE #define STARTUP_CONF_VERBOSE 1 /**< Set to 0 to decrease startup verbosity */ @@ -255,8 +252,8 @@ typedef uint32_t rtimer_clock_t; /*---------------------------------------------------------------------------*/ /* Configure CSMA for when it's selected */ -#define CSMA_802154_AUTOACK 1 -#define CSMA_802154_AUTOACK_HW 1 +#define CSMA_CONF_802154_AUTOACK 1 +#define CSMA_CONF_802154_AUTOACK_HW 1 #define NETSTACK_CONF_RADIO cc2538_rf_driver /** @} */ @@ -324,10 +321,6 @@ typedef uint32_t rtimer_clock_t; * @{ */ /* RF Config */ -#ifndef IEEE802154_CONF_PANID -#define IEEE802154_CONF_PANID 0xABCD -#endif - #ifdef RF_CHANNEL #define CC2538_RF_CONF_CHANNEL RF_CHANNEL #endif @@ -348,79 +341,7 @@ typedef uint32_t rtimer_clock_t; #define CC2538_RF_CONF_RX_USE_DMA 1 /**< RF RX over DMA */ #endif /** @} */ -/*---------------------------------------------------------------------------*/ -/** - * \name IPv6 and network buffer configuration - * - * @{ - */ - -/* Don't let contiki-default-conf.h decide if we are an IPv6 build */ -#ifndef NETSTACK_CONF_WITH_IPV6 -#define NETSTACK_CONF_WITH_IPV6 0 -#endif - -#if NETSTACK_CONF_WITH_IPV6 -/* Addresses, Sizes and Interfaces */ -/* 8-byte addresses here, 2 otherwise */ -#define LINKADDR_CONF_SIZE 8 -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 -#define UIP_CONF_NETIF_MAX_ADDRESSES 3 - -/* TCP, UDP, ICMP */ -#ifndef UIP_CONF_TCP -#define UIP_CONF_TCP 1 -#endif -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS 64 -#endif -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_ICMP6 1 -/* ND and Routing */ -#ifndef UIP_CONF_ROUTER -#define UIP_CONF_ROUTER 1 -#endif - -#define UIP_CONF_ND6_SEND_RA 0 -#define RPL_CONF_STATS 0 - -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -/* uIP */ -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 1300 -#endif - -#define UIP_CONF_IPV6_QUEUE_PKT 0 -#define UIP_CONF_IPV6_CHECKS 1 -#define UIP_CONF_IPV6_REASSEMBLY 0 -#define UIP_CONF_MAX_LISTENPORTS 8 - -/* 6lowpan */ -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 -#endif -#define SICSLOWPAN_CONF_MAXAGE 8 - -/* Define our IPv6 prefixes/contexts here */ -#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1 -#ifndef SICSLOWPAN_CONF_ADDR_CONTEXT_0 -#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \ - addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0; \ - addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1; \ -} -#endif - -#ifndef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 8 -#endif - -#endif /* NETSTACK_CONF_WITH_IPV6 */ -/** @} */ /*---------------------------------------------------------------------------*/ /** * \name Security diff --git a/arch/platform/cooja-ip64/subplatform-conf.h b/arch/platform/cooja-ip64/subplatform-conf.h index 773100051f..b2f1d2beb4 100644 --- a/arch/platform/cooja-ip64/subplatform-conf.h +++ b/arch/platform/cooja-ip64/subplatform-conf.h @@ -47,8 +47,4 @@ #define UIP_CONF_ND6_SEND_RA 1 #endif -#ifndef UIP_CONF_ROUTER -#define UIP_CONF_ROUTER 1 -#endif - #endif /* __PLATFORM_CONF_H__ */ diff --git a/arch/platform/cooja/contiki-conf.h b/arch/platform/cooja/contiki-conf.h index 4a14609a94..e7f16c840a 100644 --- a/arch/platform/cooja/contiki-conf.h +++ b/arch/platform/cooja/contiki-conf.h @@ -37,8 +37,6 @@ #include "subplatform-conf.h" #endif /* INCLUDE_SUBPLATFORM_CONF */ -#define PROFILE_CONF_ON 0 -#define ENERGEST_CONF_ON 0 #define LOG_CONF_ENABLED 1 #define COOJA 1 @@ -80,14 +78,6 @@ /* Radio setup */ #define NETSTACK_CONF_RADIO cooja_radio_driver -#define NETSTACK_CONF_WITH_IPV6 1 - -#define LINKADDR_CONF_SIZE 8 - -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 - -#define UIP_CONF_ROUTER 1 /* configure network size and density */ #ifndef NETSTACK_MAX_ROUTE_ENTRIES @@ -99,42 +89,12 @@ #define TCPIP_CONF_ANNOTATE_TRANSMISSIONS 1 -#ifndef UIP_CONF_ND6_SEND_RA -#define UIP_CONF_ND6_SEND_RA 0 -#endif - -#ifndef UIP_CONF_ND6_REACHABLE_TIME -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#endif - -#ifndef UIP_CONF_ND6_RETRANS_TIMER -#define UIP_CONF_ND6_RETRANS_TIMER 10000 -#endif - -#define LINKADDR_CONF_SIZE 8 -#define UIP_CONF_NETIF_MAX_ADDRESSES 3 - #ifndef UIP_CONF_IPV6_QUEUE_PKT #define UIP_CONF_IPV6_QUEUE_PKT 1 #endif /* UIP_CONF_IPV6_QUEUE_PKT */ -#define UIP_CONF_IPV6_CHECKS 1 -#define UIP_CONF_IPV6_REASSEMBLY 0 - -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 -#define SICSLOWPAN_CONF_MAXAGE 8 -#endif /* SICSLOWPAN_CONF_FRAG */ -#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 #endif /* NETSTACK_CONF_WITH_IPV6 */ - -#define PACKETBUF_CONF_ATTRS_INLINE 1 - -#ifndef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 16 -#endif - #define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1 #define CC_CONF_VA_ARGS 1 @@ -161,24 +121,7 @@ typedef uint64_t rtimer_clock_t; #define RADIO_DELAY_BEFORE_RX 0 #define RADIO_DELAY_BEFORE_DETECT 0 -#define AODV_COMPLIANCE -#define AODV_NUM_RT_ENTRIES 32 - -#define WITH_ASCII 1 - -#define UIP_CONF_ICMP_DEST_UNREACH 1 - -#define UIP_CONF_DHCP_LIGHT -#define UIP_CONF_LLH_LEN 0 -#define UIP_CONF_TCP_CONNS 4 -#define UIP_CONF_MAX_LISTENPORTS 8 -#define UIP_CONF_FWCACHE_SIZE 30 -#define UIP_CONF_BROADCAST 1 #define UIP_ARCH_IPCHKSUM 1 -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_PINGADDRCONF 0 -#define UIP_CONF_LOGGING 0 #if NETSTACK_CONF_WITH_IPV6 #endif /* NETSTACK_CONF_WITH_IPV6 */ @@ -189,20 +132,7 @@ typedef uint64_t rtimer_clock_t; #define CFS_CONF_OFFSET_TYPE long -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 1600 -#endif - -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS (UIP_CONF_BUFFER_SIZE - 70) -#endif - -#ifndef UIP_CONF_RECEIVE_WINDOW -#define UIP_CONF_RECEIVE_WINDOW (UIP_CONF_BUFFER_SIZE - 70) -#endif - #define RF_CHANNEL 26 -#define IEEE802154_CONF_PANID 0xABCD #define NETSTACK_RADIO_MAX_PAYLOAD_LEN 125 /* include the project config */ diff --git a/arch/platform/galileo/contiki-conf.h b/arch/platform/galileo/contiki-conf.h index 2d64c440f0..10719c2ef7 100644 --- a/arch/platform/galileo/contiki-conf.h +++ b/arch/platform/galileo/contiki-conf.h @@ -56,6 +56,7 @@ typedef uint64_t rtimer_clock_t; #define UIP_CONF_LLH_LEN 14 +#define UIP_CONF_LL_802154 0 #define LINKADDR_CONF_SIZE 6 typedef unsigned short uip_stats_t; diff --git a/arch/platform/jn516x/contiki-conf.h b/arch/platform/jn516x/contiki-conf.h index 515a5b11a4..f119c49696 100644 --- a/arch/platform/jn516x/contiki-conf.h +++ b/arch/platform/jn516x/contiki-conf.h @@ -39,123 +39,18 @@ #include "platform-conf.h" #endif /* PLATFORM_CONF_H */ -#ifndef CCM_STAR_CONF -#define CCM_STAR_CONF ccm_star_driver_jn516x -#endif /* CCM_STAR_CONF */ - +/* Configure radio driver */ #ifndef NETSTACK_CONF_RADIO #define NETSTACK_CONF_RADIO micromac_radio_driver #endif /* NETSTACK_CONF_RADIO */ -#define PACKETBUF_CONF_ATTRS_INLINE 1 - -#ifndef IEEE802154_CONF_PANID -#define IEEE802154_CONF_PANID 0xABCD -#endif /* IEEE802154_CONF_PANID */ - -#ifndef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 1 -#endif /* ENERGEST_CONF_ON */ - -#define WITH_ASCII 1 - -#define PROCESS_CONF_NUMEVENTS 8 -#define PROCESS_CONF_STATS 1 - -#if !defined NETSTACK_CONF_WITH_IPV6 -#define NETSTACK_CONF_WITH_IPV6 1 -#endif /* NETSTACK_CONF_ not defined */ - -/* Network setup for IP */ -#if NETSTACK_CONF_WITH_IPV6 - -#define LINKADDR_CONF_SIZE 8 - -#ifndef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 16 -#endif - -/* Network setup for non-IP */ -#else - -#define LINKADDR_CONF_SIZE 2 - -#ifndef COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS -#define COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS 32 -#endif /* COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS */ - -#ifndef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 16 -#endif /* QUEUEBUF_CONF_NUM */ - -#endif /* NETSTACK_CONF_WITH_IPV6 */ - -/* Network setup for IPv6 */ -#if NETSTACK_CONF_WITH_IPV6 - -/* Network setup for IPv6 */ -#define NETSTACK_CONF_NETWORK sicslowpan_driver -#define UIP_CONF_BROADCAST 1 - -/* Configure CSMA for when it is selected */ +/* Csma: use hardware ACKs */ #define CSMA_CONF_802154_AUTOACK_HW 1 -#define RDC_CONF_HARDWARE_ACK 1 - -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 - -#define UIP_CONF_ROUTER 1 -#ifndef UIP_CONF_IPV6_RPL -#define UIP_CONF_IPV6_RPL 1 -#endif /* UIP_CONF_IPV6_RPL */ - -#define UIP_CONF_ND6_SEND_RA 0 -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -#ifndef UIP_CONF_IPV6_QUEUE_PKT -#define UIP_CONF_IPV6_QUEUE_PKT 0 -#endif /* UIP_CONF_IPV6_QUEUE_PKT */ -#define UIP_CONF_IPV6_CHECKS 1 -#define UIP_CONF_IPV6_REASSEMBLY 0 -#define UIP_CONF_NETIF_MAX_ADDRESSES 3 -#define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_DEFROUTERS 2 -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 1280 -#endif - -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 -#define SICSLOWPAN_CONF_MAXAGE 8 -#endif /* SICSLOWPAN_CONF_FRAG */ -#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 -#define UIP_CONF_ICMP_DEST_UNREACH 1 - -#define UIP_CONF_DHCP_LIGHT -#ifndef UIP_CONF_RECEIVE_WINDOW -#define UIP_CONF_RECEIVE_WINDOW 48 -#endif -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS 48 -#endif -#define UIP_CONF_TCP_CONNS 4 -#define UIP_CONF_MAX_LISTENPORTS 8 -#define UIP_CONF_FWCACHE_SIZE 30 -#define UIP_CONF_BROADCAST 1 -#define UIP_ARCH_CHKSUM 0 -#define UIP_ARCH_ADD32 0 -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_PINGADDRCONF 0 -#define UIP_CONF_LOGGING 0 -#define LOG_CONF_ENABLED 0 - -#define UIP_CONF_BYTE_ORDER UIP_BIG_ENDIAN -#define UIP_CONF_LOGGING 0 - -#endif /* NETSTACK_CONF_WITH_IPV6 */ +/* Platform-specific (H/W) CCM* implementation */ +#ifndef CCM_STAR_CONF +#define CCM_STAR_CONF ccm_star_driver_jn516x +#endif /* CCM_STAR_CONF */ /* include the project config */ /* PROJECT_CONF_H might be defined in the project Makefile */ diff --git a/arch/platform/jn516x/platform-conf.h b/arch/platform/jn516x/platform-conf.h index e098fed8f9..703826ce74 100644 --- a/arch/platform/jn516x/platform-conf.h +++ b/arch/platform/jn516x/platform-conf.h @@ -47,6 +47,9 @@ /* Delay between the SFD finishes arriving and it is detected in software */ #define RADIO_DELAY_BEFORE_DETECT ((unsigned)US_TO_RTIMERTICKS(14)) +/* uIP endinanness */ +#define UIP_CONF_BYTE_ORDER UIP_BIG_ENDIAN + /* Micromac configuration */ #ifndef MIRCOMAC_CONF_BUF_NUM @@ -276,34 +279,34 @@ typedef uint32_t clock_time_t; #define SLIP_BRIDGE_CONF_NO_PUTCHAR 1 #endif /* SLIP_BRIDGE_CONF_NO_PUTCHAR */ -/* Extension of LED definitions from leds.h for various JN516x dev boards +/* Extension of LED definitions from leds.h for various JN516x dev boards JN516x Dongle: LEDS_RED Red LED on dongle LEDS_GREEN Green LED on dongle Note: Only one LED can be switch on at the same time - + DR1174-only: LEDS_GP0 LED D3 on DR1174 LEDS_GP1 LED D6 on DR1174 - + DR1174+DR1199: - LEDS_RED LED D1 on DR1199 + LEDS_RED LED D1 on DR1199 LEDS_GREEN LED D2 on DR1199 LEDS_BLUE LED D3 on DR1199 LEDS_GP0 LED D3 on DR1174 LEDS_GP1 LED D6 on DR1174 - + DR1174+DR1175: - LEDS_RED Red led in RGB-led with level control on DR1175 - LEDS_GREEN Green led in RGB-led with level control on DR1175 - LEDS_BLUE Blue led in RGB-led with level control on DR1175 + LEDS_RED Red led in RGB-led with level control on DR1175 + LEDS_GREEN Green led in RGB-led with level control on DR1175 + LEDS_BLUE Blue led in RGB-led with level control on DR1175 LEDS_WHITE White power led with level control on DR1175 LEDS_GP0 LEDS D3 on DR1174 LEDS_GP1 LEDS D6 on DR1174 */ #define LEDS_WHITE 8 #define LEDS_GP0 16 -#define LEDS_GP1 32 +#define LEDS_GP1 32 #define LEDS_GP2 64 #define LEDS_GP3 128 #define LEDS_CONF_ALL 255 diff --git a/arch/platform/native/contiki-conf.h b/arch/platform/native/contiki-conf.h index 9468fa2d5d..7d2eef7fdb 100644 --- a/arch/platform/native/contiki-conf.h +++ b/arch/platform/native/contiki-conf.h @@ -64,19 +64,10 @@ typedef int32_t s32_t; typedef unsigned short uip_stats_t; -#define UIP_CONF_UDP 1 -#define UIP_CONF_TCP_CONNS 40 -#define UIP_CONF_MAX_LISTENPORTS 40 -#define UIP_CONF_BUFFER_SIZE 420 #define UIP_CONF_BYTE_ORDER UIP_LITTLE_ENDIAN -#define UIP_CONF_TCP 1 -#define UIP_CONF_LOGGING 0 -#define UIP_CONF_UDP_CHECKSUMS 1 #if NETSTACK_CONF_WITH_IPV6 -#define LINKADDR_CONF_SIZE 8 - #ifndef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC nullmac_driver #endif /* NETSTACK_CONF_MAC */ @@ -85,52 +76,10 @@ typedef unsigned short uip_stats_t; #define NETSTACK_CONF_RADIO nullradio_driver #endif /* NETSTACK_CONF_RADIO */ -#define NETSTACK_CONF_NETWORK sicslowpan_driver - #define NETSTACK_CONF_LINUXRADIO_DEV "wpan0" -#define UIP_CONF_ROUTER 1 - -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 -#define SICSLOWPAN_CONF_MAXAGE 8 -#endif /* SICSLOWPAN_CONF_FRAG */ -#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 - -#define UIP_CONF_IPV6_CHECKS 1 #define UIP_CONF_IPV6_QUEUE_PKT 1 -#define UIP_CONF_IPV6_REASSEMBLY 0 -#define UIP_CONF_NETIF_MAX_ADDRESSES 3 -#define UIP_CONF_ICMP6 1 - -#define UIP_CONF_ND6_SEND_RA 0 -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 240 -#endif - - -#define UIP_CONF_LLH_LEN 0 -#define UIP_CONF_LL_802154 1 - -#define UIP_CONF_ICMP_DEST_UNREACH 1 - -#define UIP_CONF_DHCP_LIGHT -#ifndef UIP_CONF_RECEIVE_WINDOW -#define UIP_CONF_RECEIVE_WINDOW 48 -#endif -#define UIP_CONF_TCP_MSS 48 -#define UIP_CONF_FWCACHE_SIZE 30 -#define UIP_CONF_BROADCAST 1 #define UIP_ARCH_IPCHKSUM 1 -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_PINGADDRCONF 0 -#define UIP_CONF_LOGGING 0 - - #endif /* NETSTACK_CONF_WITH_IPV6 */ @@ -145,25 +94,6 @@ typedef unsigned long clock_time_t; #define PROGRAM_HANDLER_CONF_MAX_NUMDSCS 10 #define PROGRAM_HANDLER_CONF_QUIT_MENU 1 -#define EMAIL_CONF_WIDTH 78 -#define EMAIL_CONF_HEIGHT 17 -#ifndef PLATFORM_BUILD -#define EMAIL_CONF_ERASE 0 -#endif - -#define IRC_CONF_WIDTH 78 -#define IRC_CONF_HEIGHT 17 -#define IRC_CONF_SYSTEM_STRING "*nix" - -#ifdef PLATFORM_BUILD -#define TELNETD_CONF_GUI 1 -#endif /* PLATFORM_BUILD */ - -#ifdef PLATFORM_BUILD -#define WWW_CONF_WEBPAGE_WIDTH 78 -#define WWW_CONF_WEBPAGE_HEIGHT 17 -#endif /* PLATFORM_BUILD */ - /* Not part of C99 but actually present */ int strcasecmp(const char*, const char*); diff --git a/arch/platform/nrf52dk/contiki-conf.h b/arch/platform/nrf52dk/contiki-conf.h index 53a70c2a00..c06be0f710 100644 --- a/arch/platform/nrf52dk/contiki-conf.h +++ b/arch/platform/nrf52dk/contiki-conf.h @@ -55,9 +55,6 @@ * * @{ */ -#ifndef NETSTACK_CONF_NETWORK -#define NETSTACK_CONF_NETWORK sicslowpan_driver -#endif /* NETSTACK_CONF_NETWORK */ #ifndef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC ble_ipsp_mac_driver @@ -88,52 +85,16 @@ * * @{ */ -/* Don't let contiki-default-conf.h decide if we are an IPv6 build */ -#ifndef NETSTACK_CONF_WITH_IPV6 -#define NETSTACK_CONF_WITH_IPV6 0 -#endif #if NETSTACK_CONF_WITH_IPV6 /*---------------------------------------------------------------------------*/ -/* Addresses, Sizes and Interfaces */ -#define LINKADDR_CONF_SIZE 8 -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 - -/* The size of the uIP main buffer */ -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 1280 -#endif /* ND and Routing */ #define UIP_CONF_ROUTER 0 /**< BLE master role, which allows for routing, isn't supported. */ #define UIP_CONF_ND6_SEND_NS 1 -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -#ifndef UIP_CONF_TCP -#define UIP_CONF_TCP 1 -#endif - -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS 64 -#endif - -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_ICMP6 1 #endif /* NETSTACK_CONF_WITH_IPV6 */ -/** @} */ -/*---------------------------------------------------------------------------*/ -/** - * \name Generic Configuration directives - * - * @{ - */ -#ifndef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 1 /**< Energest Module */ -#endif + /** @} */ #endif /* CONTIKI_CONF_H */ /** diff --git a/arch/platform/openmote-cc2538/contiki-conf.h b/arch/platform/openmote-cc2538/contiki-conf.h index f088661ac1..1a9fcecce8 100644 --- a/arch/platform/openmote-cc2538/contiki-conf.h +++ b/arch/platform/openmote-cc2538/contiki-conf.h @@ -157,10 +157,6 @@ typedef uint32_t rtimer_clock_t; * * @{ */ -#ifndef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 0 /**< Energest Module */ -#endif - #ifndef STARTUP_CONF_VERBOSE #define STARTUP_CONF_VERBOSE 1 /**< Set to 0 to decrease startup verbosity */ #endif @@ -309,8 +305,8 @@ typedef uint32_t rtimer_clock_t; */ /* Configure CSMA for when it's selected */ -#define CSMA_802154_AUTOACK 1 -#define CSMA_802154_AUTOACK_HW 1 +#define CSMA_CONF_802154_AUTOACK 1 +#define CSMA_CONF_802154_AUTOACK_HW 1 #ifndef NETSTACK_CONF_RADIO #define NETSTACK_CONF_RADIO cc2538_rf_driver @@ -381,9 +377,6 @@ typedef uint32_t rtimer_clock_t; * @{ */ /* RF Config */ -#ifndef IEEE802154_CONF_PANID -#define IEEE802154_CONF_PANID 0xABCD -#endif #ifdef RF_CHANNEL #define CC2538_RF_CONF_CHANNEL RF_CHANNEL @@ -406,79 +399,6 @@ typedef uint32_t rtimer_clock_t; #endif /** @} */ /*---------------------------------------------------------------------------*/ -/** - * \name IPv6 and network buffer configuration - * - * @{ - */ - -/* Don't let contiki-default-conf.h decide if we are an IPv6 build */ -#ifndef NETSTACK_CONF_WITH_IPV6 -#define NETSTACK_CONF_WITH_IPV6 0 -#endif - -#if NETSTACK_CONF_WITH_IPV6 -/* Addresses, Sizes and Interfaces */ -/* 8-byte addresses here, 2 otherwise */ -#define LINKADDR_CONF_SIZE 8 -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 -#define UIP_CONF_NETIF_MAX_ADDRESSES 3 - -/* TCP, UDP, ICMP */ -#ifndef UIP_CONF_TCP -#define UIP_CONF_TCP 1 -#endif -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS 64 -#endif -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_ICMP6 1 - -/* ND and Routing */ -#ifndef UIP_CONF_ROUTER -#define UIP_CONF_ROUTER 1 -#endif - -#define UIP_CONF_ND6_SEND_RA 0 -#define RPL_CONF_STATS 0 - -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -/* uIP */ -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 1300 -#endif - -#define UIP_CONF_IPV6_QUEUE_PKT 0 -#define UIP_CONF_IPV6_CHECKS 1 -#define UIP_CONF_IPV6_REASSEMBLY 0 -#define UIP_CONF_MAX_LISTENPORTS 8 - -/* 6lowpan */ -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 -#endif -#define SICSLOWPAN_CONF_MAXAGE 8 - -/* Define our IPv6 prefixes/contexts here */ -#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1 -#ifndef SICSLOWPAN_CONF_ADDR_CONTEXT_0 -#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \ - addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0; \ - addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1; \ -} -#endif - -#ifndef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 8 -#endif - -#endif /* NETSTACK_CONF_WITH_IPV6 */ -/** @} */ -/*---------------------------------------------------------------------------*/ /** * \name Security * diff --git a/arch/platform/sky/contiki-conf.h b/arch/platform/sky/contiki-conf.h index 5fdcdfa29d..a513a14f4e 100644 --- a/arch/platform/sky/contiki-conf.h +++ b/arch/platform/sky/contiki-conf.h @@ -9,111 +9,26 @@ #include "platform-conf.h" #endif /* PLATFORM_CONF_H */ +/* Configure radio driver */ #ifndef NETSTACK_CONF_RADIO #define NETSTACK_CONF_RADIO cc2420_driver #endif /* NETSTACK_CONF_RADIO */ -#ifndef CC2420_CONF_AUTOACK -#define CC2420_CONF_AUTOACK 1 -#endif /* CC2420_CONF_AUTOACK */ - /* The TSCH default slot length of 10ms is a bit too short for this platform, * use 15ms instead. */ +#ifndef TSCH_CONF_DEFAULT_TIMESLOT_LENGTH #define TSCH_CONF_DEFAULT_TIMESLOT_LENGTH 15000 +#endif /* TSCH_CONF_DEFAULT_TIMESLOT_LENGTH */ -#if NETSTACK_CONF_WITH_IPV6 -/* Network setup for IPv6 */ -#define NETSTACK_CONF_NETWORK sicslowpan_driver - -#ifndef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 8 -#endif - -#endif /* NETSTACK_CONF_WITH_IPV6 */ - -#define PACKETBUF_CONF_ATTRS_INLINE 1 - -#ifdef RF_CHANNEL -#define CC2420_CONF_CHANNEL RF_CHANNEL -#endif - -#ifndef CC2420_CONF_CHANNEL -#define CC2420_CONF_CHANNEL 26 -#endif /* CC2420_CONF_CHANNEL */ - -#ifndef CC2420_CONF_CCA_THRESH -#define CC2420_CONF_CCA_THRESH -45 -#endif /* CC2420_CONF_CCA_THRESH */ - -#define IEEE802154_CONF_PANID 0xABCD - -#define PROFILE_CONF_ON 0 -#ifndef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 1 -#endif /* ENERGEST_CONF_ON */ - -#define AODV_COMPLIANCE -#define AODV_NUM_RT_ENTRIES 32 - -#define WITH_ASCII 1 - -#define PROCESS_CONF_NUMEVENTS 8 -#define PROCESS_CONF_STATS 1 -/*#define PROCESS_CONF_FASTPOLL 4*/ - -#ifdef NETSTACK_CONF_WITH_IPV6 - -#define LINKADDR_CONF_SIZE 8 - -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 - -#define UIP_CONF_ROUTER 1 - -#define UIP_CONF_ND6_SEND_RA 0 -#define UIP_CONF_ND6_SEND_NS 0 -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -#define NETSTACK_CONF_WITH_IPV6 1 -#ifndef UIP_CONF_IPV6_QUEUE_PKT -#define UIP_CONF_IPV6_QUEUE_PKT 0 -#endif /* UIP_CONF_IPV6_QUEUE_PKT */ -#define UIP_CONF_IPV6_CHECKS 1 -#define UIP_CONF_IPV6_REASSEMBLY 0 -#define UIP_CONF_NETIF_MAX_ADDRESSES 3 +/* Save RAM through a smaller uIP buffer */ #ifndef UIP_CONF_BUFFER_SIZE #define UIP_CONF_BUFFER_SIZE 240 #endif -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 -#define SICSLOWPAN_CONF_MAXAGE 8 -#endif /* SICSLOWPAN_CONF_FRAG */ -#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 - -#endif /* NETSTACK_CONF_WITH_IPV6 */ - -#define UIP_CONF_ICMP_DEST_UNREACH 1 - -#define UIP_CONF_DHCP_LIGHT -#define UIP_CONF_LLH_LEN 0 -#ifndef UIP_CONF_RECEIVE_WINDOW -#define UIP_CONF_RECEIVE_WINDOW 48 -#endif -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS 48 -#endif -#define UIP_CONF_TCP_CONNS 4 -#define UIP_CONF_MAX_LISTENPORTS 8 -#define UIP_CONF_FWCACHE_SIZE 30 -#define UIP_CONF_BROADCAST 1 +/* Platform-specific checksum implementation */ #define UIP_ARCH_IPCHKSUM 1 -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_PINGADDRCONF 0 -#define UIP_CONF_LOGGING 0 +/* Platform-specific (H/W) AES implementation */ #ifndef AES_128_CONF #define AES_128_CONF cc2420_aes_128_driver #endif /* AES_128_CONF */ @@ -124,5 +39,4 @@ #include PROJECT_CONF_H #endif /* PROJECT_CONF_H */ - #endif /* CONTIKI_CONF_H */ diff --git a/arch/platform/sky/platform-conf.h b/arch/platform/sky/platform-conf.h index 5ba273047c..e0ac1b3e4e 100644 --- a/arch/platform/sky/platform-conf.h +++ b/arch/platform/sky/platform-conf.h @@ -62,6 +62,11 @@ #define PLATFORM_HAS_SHT11 1 #define PLATFORM_HAS_RADIO 1 +/* Map RF_CHANNEL to cc2420 default channel */ +#ifdef RF_CHANNEL +#define CC2420_CONF_CHANNEL RF_CHANNEL +#endif /* RF_CHANNEL */ + /* CPU target speed in Hz */ #define F_CPU 3900000uL /*2457600uL*/ diff --git a/arch/platform/srf06-cc26xx/contiki-conf.h b/arch/platform/srf06-cc26xx/contiki-conf.h index 91dd122381..5613b874d6 100644 --- a/arch/platform/srf06-cc26xx/contiki-conf.h +++ b/arch/platform/srf06-cc26xx/contiki-conf.h @@ -49,9 +49,6 @@ * * @{ */ -#ifndef NETSTACK_CONF_NETWORK -#define NETSTACK_CONF_NETWORK sicslowpan_driver -#endif /* NETSTACK_CONF_NETWORK */ /* * If set, the systems keeps the HF crystal oscillator on even when the radio is off. @@ -68,6 +65,10 @@ #define RF_CORE_CONF_CHANNEL RF_CHANNEL #endif +#ifndef RF_CORE_CONF_CHANNEL +#define RF_CORE_CONF_CHANNEL 25 +#endif + /* Number of Prop Mode RX buffers */ #ifndef PROP_MODE_CONF_RX_BUF_CNT #define PROP_MODE_CONF_RX_BUF_CNT 4 @@ -99,19 +100,12 @@ #else #define NETSTACK_CONF_RADIO ieee_mode_driver -#ifndef RF_CORE_CONF_CHANNEL -#define RF_CORE_CONF_CHANNEL 25 -#endif - #define CSMA_CONF_802154_AUTOACK_HW 1 #define CSMA_CONF_SEND_802154_ACK 0 #endif #define NETSTACK_RADIO_MAX_PAYLOAD_LEN 125 -/* 6LoWPAN */ -#define SICSLOWPAN_CONF_FRAG 1 -#define SICSLOWPAN_CONF_MAXAGE 8 /** @} */ /*---------------------------------------------------------------------------*/ /** @@ -144,9 +138,6 @@ * @{ */ /* RF Config */ -#ifndef IEEE802154_CONF_PANID -#define IEEE802154_CONF_PANID 0xABCD /**< Default PAN ID */ -#endif #ifndef IEEE_MODE_CONF_AUTOACK #define IEEE_MODE_CONF_AUTOACK 1 /**< RF H/W generates ACKs */ @@ -161,63 +152,6 @@ #endif /** @} */ /*---------------------------------------------------------------------------*/ -/** @} */ -/** - * \name IPv6 and network buffer configuration - * - * @{ - */ -/* Don't let contiki-default-conf.h decide if we are an IPv6 build */ -#ifndef NETSTACK_CONF_WITH_IPV6 -#define NETSTACK_CONF_WITH_IPV6 0 -#endif - -#if NETSTACK_CONF_WITH_IPV6 -/*---------------------------------------------------------------------------*/ -/* Addresses, Sizes and Interfaces */ -#define LINKADDR_CONF_SIZE 8 -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 - -/* The size of the uIP main buffer */ -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 1000 -#endif - -/* ND and Routing */ -#ifndef UIP_CONF_ROUTER -#define UIP_CONF_ROUTER 1 -#endif - -#define UIP_CONF_ND6_SEND_RA 0 - -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -#ifndef UIP_CONF_TCP -#define UIP_CONF_TCP 1 -#endif -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS 64 -#endif - -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_ICMP6 1 - -#endif /* NETSTACK_CONF_WITH_IPV6 */ -/** @} */ -/*---------------------------------------------------------------------------*/ -/** - * \name Generic Configuration directives - * - * @{ - */ -#ifndef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 0 /**< Energest Module */ -#endif -/** @} */ -/*---------------------------------------------------------------------------*/ /** * \name Character I/O Configuration * diff --git a/arch/platform/zoul/contiki-conf.h b/arch/platform/zoul/contiki-conf.h index 23f784504f..7ff15a9007 100644 --- a/arch/platform/zoul/contiki-conf.h +++ b/arch/platform/zoul/contiki-conf.h @@ -155,10 +155,6 @@ typedef uint32_t rtimer_clock_t; * * @{ */ -#ifndef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 0 /**< Energest Module */ -#endif - #ifndef STARTUP_CONF_VERBOSE #define STARTUP_CONF_VERBOSE 1 /**< Set to 0 to decrease startup verbosity */ #endif @@ -306,8 +302,6 @@ typedef uint32_t rtimer_clock_t; * @{ */ /* Configure CSMA for when it's selected */ -#define CSMA_CONF_802154_AUTOACK 1 -#define CSMA_CONF_802154_AUTOACK_HW 1 #if CC1200_CONF_SUBGHZ_50KBPS_MODE #define NETSTACK_CONF_RADIO cc1200_driver @@ -412,9 +406,6 @@ typedef uint32_t rtimer_clock_t; * @{ */ /* RF Config */ -#ifndef IEEE802154_CONF_PANID -#define IEEE802154_CONF_PANID 0xABCD -#endif #ifdef RF_CHANNEL #define CC2538_RF_CONF_CHANNEL RF_CHANNEL @@ -437,81 +428,6 @@ typedef uint32_t rtimer_clock_t; #endif /** @} */ /*---------------------------------------------------------------------------*/ -/** - * \name IPv6 and network buffer configuration - * - * @{ - */ - -/* Don't let contiki-default-conf.h decide if we are an IPv6 build */ -#ifndef NETSTACK_CONF_WITH_IPV6 -#define NETSTACK_CONF_WITH_IPV6 0 -#endif - -#if NETSTACK_CONF_WITH_IPV6 -/* Addresses, Sizes and Interfaces */ -/* 8-byte addresses here, 2 otherwise */ -#define LINKADDR_CONF_SIZE 8 -#define UIP_CONF_LL_802154 1 -#define UIP_CONF_LLH_LEN 0 -#define UIP_CONF_NETIF_MAX_ADDRESSES 3 - -/* TCP, UDP, ICMP */ -#ifndef UIP_CONF_TCP -#define UIP_CONF_TCP 1 -#endif -#ifndef UIP_CONF_TCP_MSS -#define UIP_CONF_TCP_MSS 64 -#endif -#define UIP_CONF_UDP 1 -#define UIP_CONF_UDP_CHECKSUMS 1 -#define UIP_CONF_ICMP6 1 - -/* ND and Routing */ -#ifndef UIP_CONF_ROUTER -#define UIP_CONF_ROUTER 1 -#endif - -#define UIP_CONF_ND6_SEND_RA 0 -#define RPL_CONF_STATS 0 - -#define UIP_CONF_ND6_REACHABLE_TIME 600000 -#define UIP_CONF_ND6_RETRANS_TIMER 10000 - -/* uIP */ -#ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 1300 -#endif - -#define UIP_CONF_IPV6_QUEUE_PKT 0 -#define UIP_CONF_IPV6_CHECKS 1 -#define UIP_CONF_IPV6_REASSEMBLY 0 -#define UIP_CONF_MAX_LISTENPORTS 8 - -/* 6lowpan */ -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 -#endif -#define SICSLOWPAN_CONF_MAXAGE 8 - -/* Define our IPv6 prefixes/contexts here */ -#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1 -#ifndef SICSLOWPAN_CONF_ADDR_CONTEXT_0 -#define SICSLOWPAN_CONF_ADDR_CONTEXT_0 { \ - addr_contexts[0].prefix[0] = UIP_DS6_DEFAULT_PREFIX_0; \ - addr_contexts[0].prefix[1] = UIP_DS6_DEFAULT_PREFIX_1; \ -} -#endif - -#define MAC_CONF_CHANNEL_CHECK_RATE 8 - -#ifndef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 8 -#endif - -#endif /* NETSTACK_CONF_WITH_IPV6 */ -/** @} */ -/*---------------------------------------------------------------------------*/ /** * \name Security * diff --git a/arch/platform/zoul/contiki-main.c b/arch/platform/zoul/contiki-main.c index d97654b737..0e6bdb5390 100644 --- a/arch/platform/zoul/contiki-main.c +++ b/arch/platform/zoul/contiki-main.c @@ -70,6 +70,7 @@ #include "reg.h" #include "ieee-addr.h" #include "lpm.h" +#include "sys/autostart.h" #include <stdint.h> #include <string.h> diff --git a/core/contiki-default-conf.h b/core/contiki-default-conf.h index 839a0d64d4..445de49c3d 100644 --- a/core/contiki-default-conf.h +++ b/core/contiki-default-conf.h @@ -113,7 +113,7 @@ for the uIP packet buffer. This sets an upper bound on the largest IP packet that can be received by the system. */ #ifndef UIP_CONF_BUFFER_SIZE -#define UIP_CONF_BUFFER_SIZE 128 +#define UIP_CONF_BUFFER_SIZE 1280 #endif /* UIP_CONF_BUFFER_SIZE */ /* UIP_CONF_ROUTER specifies if the IPv6 node should be a router or diff --git a/core/net/ip/uip.h b/core/net/ip/uip.h index 39350b117d..e7354e380f 100755 --- a/core/net/ip/uip.h +++ b/core/net/ip/uip.h @@ -127,6 +127,10 @@ typedef struct uip_eth_addr { } uip_eth_addr; +#ifndef UIP_CONF_LL_802154 +#define UIP_CONF_LL_802154 1 +#endif /* UIP_CONF_LL_802154 */ + #if UIP_CONF_LL_802154 /** \brief 802.15.4 address */ typedef uip_802154_longaddr uip_lladdr_t; diff --git a/core/net/ip/uipopt.h b/core/net/ip/uipopt.h index fe99145f9c..21e81fdde3 100644 --- a/core/net/ip/uipopt.h +++ b/core/net/ip/uipopt.h @@ -102,25 +102,6 @@ */ #define UIP_FIXEDADDR 0 -/** - * Ping IP address assignment. - * - * uIP uses a "ping" packets for setting its own IP address if this - * option is set. If so, uIP will start with an empty IP address and - * the destination IP address of the first incoming "ping" (ICMP echo) - * packet will be used for setting the hosts IP address. - * - * \note This works only if UIP_FIXEDADDR is 0. - * - * \hideinitializer - */ -#ifdef UIP_CONF_PINGADDRCONF -#define UIP_PINGADDRCONF (UIP_CONF_PINGADDRCONF) -#else /* UIP_CONF_PINGADDRCONF */ -#define UIP_PINGADDRCONF 0 -#endif /* UIP_CONF_PINGADDRCONF */ - - /** * Specifies if the uIP ARP module should be compiled with a fixed * Ethernet MAC address or not. @@ -189,21 +170,6 @@ #define UIP_STATISTICS (UIP_CONF_STATISTICS) #endif /* UIP_CONF_STATISTICS */ -/** - * Determines if logging of certain events should be compiled in. - * - * This is useful mostly for debugging. The function uip_log() - * must be implemented to suit the architecture of the project, if - * logging is turned on. - * - * \hideinitializer - */ -#ifndef UIP_CONF_LOGGING -#define UIP_LOGGING 0 -#else /* UIP_CONF_LOGGING */ -#define UIP_LOGGING (UIP_CONF_LOGGING) -#endif /* UIP_CONF_LOGGING */ - /** * Broadcast support. * @@ -214,7 +180,7 @@ * */ #ifndef UIP_CONF_BROADCAST -#define UIP_BROADCAST 0 +#define UIP_BROADCAST 1 #else /* UIP_CONF_BROADCAST */ #define UIP_BROADCAST (UIP_CONF_BROADCAST) #endif /* UIP_CONF_BROADCAST */ @@ -351,7 +317,7 @@ void uip_log(char *msg); #ifdef UIP_CONF_UDP_CHECKSUMS #define UIP_UDP_CHECKSUMS (UIP_CONF_UDP_CHECKSUMS) #else -#define UIP_UDP_CHECKSUMS (NETSTACK_CONF_WITH_IPV6) +#define UIP_UDP_CHECKSUMS 1 #endif /** @@ -567,28 +533,28 @@ void uip_log(char *msg); #ifdef SICSLOWPAN_CONF_MAXAGE #define SICSLOWPAN_REASS_MAXAGE (SICSLOWPAN_CONF_MAXAGE) #else -#define SICSLOWPAN_REASS_MAXAGE 20 +#define SICSLOWPAN_REASS_MAXAGE 8 #endif /** - * Do we compress the IP header or not (default: no) + * Do we compress the IP header or not */ #ifndef SICSLOWPAN_CONF_COMPRESSION -#define SICSLOWPAN_CONF_COMPRESSION 0 +#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #endif /** * If we use IPHC compression, how many address contexts do we support */ -#ifndef SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS +#ifndef SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1 #endif /** * Do we support 6lowpan fragmentation */ -#ifndef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 0 +#ifndef SICSLOWPAN_CONF_FRAG +#define SICSLOWPAN_CONF_FRAG 1 #endif /** @} */ diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c index 2a48951dce..95064e8ea3 100644 --- a/core/net/ipv6/sicslowpan.c +++ b/core/net/ipv6/sicslowpan.c @@ -147,15 +147,6 @@ #define MAC_MAX_PAYLOAD (127 - 2) #endif /* SICSLOWPAN_CONF_MAC_MAX_PAYLOAD */ - -/** \brief Some MAC layers need a minimum payload, which is configurable - through the SICSLOWPAN_CONF_COMPRESSION_THRESHOLD option. */ -#ifdef SICSLOWPAN_CONF_COMPRESSION_THRESHOLD -#define COMPRESSION_THRESHOLD SICSLOWPAN_CONF_COMPRESSION_THRESHOLD -#else -#define COMPRESSION_THRESHOLD 0 -#endif - /** \brief Fixed size of a frame header. This value is * used in case framer returns an error or if SICSLOWPAN_USE_FIXED_HDRLEN * is defined. diff --git a/core/net/ipv6/uip-nd6.h b/core/net/ipv6/uip-nd6.h index 7c83e4f659..95e7f30458 100644 --- a/core/net/ipv6/uip-nd6.h +++ b/core/net/ipv6/uip-nd6.h @@ -159,7 +159,7 @@ be added regardless of their reachability and liveness. */ #ifdef UIP_CONF_ND6_REACHABLE_TIME #define UIP_ND6_REACHABLE_TIME UIP_CONF_ND6_REACHABLE_TIME #else -#define UIP_ND6_REACHABLE_TIME 30000 +#define UIP_ND6_REACHABLE_TIME 60000 #endif #ifdef UIP_CONF_ND6_RETRANS_TIMER diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c index 2dc8c07319..8398a4f95d 100644 --- a/core/net/ipv6/uip6.c +++ b/core/net/ipv6/uip6.c @@ -275,9 +275,6 @@ struct uip_icmp6_conn uip_icmp6_conns; /* Functions */ /*---------------------------------------------------------------------------*/ #if UIP_TCP -#if UIP_ARCH_ADD32 -void uip_add32(uint8_t *op32, uint16_t op16); -#else /* UIP_ARCH_ADD32 */ void uip_add32(uint8_t *op32, uint16_t op16) { @@ -304,7 +301,6 @@ uip_add32(uint8_t *op32, uint16_t op16) } } } -#endif /* UIP_ARCH_ADD32 */ #endif /* UIP_TCP */ #if ! UIP_ARCH_CHKSUM diff --git a/core/net/linkaddr.h b/core/net/linkaddr.h index da9000253e..a9092cdb00 100644 --- a/core/net/linkaddr.h +++ b/core/net/linkaddr.h @@ -58,7 +58,7 @@ #ifdef LINKADDR_CONF_SIZE #define LINKADDR_SIZE LINKADDR_CONF_SIZE #else /* LINKADDR_SIZE */ -#define LINKADDR_SIZE 2 +#define LINKADDR_SIZE 8 #endif /* LINKADDR_SIZE */ typedef union { diff --git a/core/net/mac/csma/csma.c b/core/net/mac/csma/csma.c index a7bd086420..8f2fa15ed2 100644 --- a/core/net/mac/csma/csma.c +++ b/core/net/mac/csma/csma.c @@ -65,7 +65,7 @@ input_packet(void) original_datalen = packetbuf_datalen(); original_dataptr = packetbuf_dataptr(); -#endif +#endif /* CSMA_SEND_802154_ACK */ #if CSMA_802154_AUTOACK if(packetbuf_datalen() == CSMA_ACK_LEN) { diff --git a/core/net/mac/csma/csma.h b/core/net/mac/csma/csma.h index cc814a0e31..7e81e3e09d 100644 --- a/core/net/mac/csma/csma.h +++ b/core/net/mac/csma/csma.h @@ -45,21 +45,23 @@ #include "net/mac/mac.h" #include "dev/radio.h" -#ifndef CSMA_802154_AUTOACK #ifdef CSMA_CONF_802154_AUTOACK #define CSMA_802154_AUTOACK CSMA_CONF_802154_AUTOACK #else #define CSMA_802154_AUTOACK 0 #endif /* CSMA_CONF_802154_AUTOACK */ -#endif /* CSMA_802154_AUTOACK */ -#ifndef CSMA_802154_AUTOACK_HW #ifdef CSMA_CONF_802154_AUTOACK_HW #define CSMA_802154_AUTOACK_HW CSMA_CONF_802154_AUTOACK_HW #else #define CSMA_802154_AUTOACK_HW 0 #endif /* CSMA_CONF_802154_AUTOACK_HW */ -#endif /* CSMA_802154_AUTOACK_HW */ + +#ifdef CSMA_CONF_SEND_802154_ACK +#define CSMA_SEND_802154_ACK CSMA_CONF_SEND_802154_ACK +#else /* CSMA_CONF_SEND_802154_ACK */ +#define CSMA_SEND_802154_ACK 0 +#endif /* CSMA_CONF_SEND_802154_ACK */ #ifdef CSMA_CONF_ACK_WAIT_TIME #define CSMA_ACK_WAIT_TIME CSMA_CONF_ACK_WAIT_TIME @@ -73,12 +75,6 @@ #define CSMA_AFTER_ACK_DETECTED_WAIT_TIME RTIMER_SECOND / 1500 #endif /* CSMA_CONF_AFTER_ACK_DETECTED_WAIT_TIME */ -#ifdef CSMA_CONF_SEND_802154_ACK -#define CSMA_SEND_802154_ACK CSMA_CONF_SEND_802154_ACK -#else /* CSMA_CONF_SEND_802154_ACK */ -#define CSMA_SEND_802154_ACK 0 -#endif /* CSMA_CONF_SEND_802154_ACK */ - #define CSMA_ACK_LEN 3 extern const struct mac_driver csma_driver; diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c index 68dd9b6201..26260847ee 100644 --- a/core/net/packetbuf.c +++ b/core/net/packetbuf.c @@ -201,7 +201,6 @@ packetbuf_attr_copyfrom(struct packetbuf_attr *attrs, memcpy(packetbuf_addrs, addrs, sizeof(packetbuf_addrs)); } /*---------------------------------------------------------------------------*/ -#if !PACKETBUF_CONF_ATTRS_INLINE int packetbuf_set_attr(uint8_t type, const packetbuf_attr_t val) { @@ -228,7 +227,6 @@ packetbuf_addr(uint8_t type) return &packetbuf_addrs[type - PACKETBUF_ADDR_FIRST].addr; } /*---------------------------------------------------------------------------*/ -#endif /* PACKETBUF_CONF_ATTRS_INLINE */ int packetbuf_holds_broadcast(void) { diff --git a/core/net/packetbuf.h b/core/net/packetbuf.h index 8ec160b7ec..d25dcd9369 100644 --- a/core/net/packetbuf.h +++ b/core/net/packetbuf.h @@ -249,41 +249,10 @@ enum { #define PACKETBUF_IS_ADDR(type) ((type) >= PACKETBUF_ADDR_FIRST) -#if PACKETBUF_CONF_ATTRS_INLINE - -extern struct packetbuf_attr packetbuf_attrs[]; -extern struct packetbuf_addr packetbuf_addrs[]; - -static inline int -packetbuf_set_attr(uint8_t type, const packetbuf_attr_t val) -{ - packetbuf_attrs[type].val = val; - return 1; -} -static inline packetbuf_attr_t -packetbuf_attr(uint8_t type) -{ - return packetbuf_attrs[type].val; -} - -static inline int -packetbuf_set_addr(uint8_t type, const linkaddr_t *addr) -{ - linkaddr_copy(&packetbuf_addrs[type - PACKETBUF_ADDR_FIRST].addr, addr); - return 1; -} - -static inline const linkaddr_t * -packetbuf_addr(uint8_t type) -{ - return &packetbuf_addrs[type - PACKETBUF_ADDR_FIRST].addr; -} -#else /* PACKETBUF_CONF_ATTRS_INLINE */ int packetbuf_set_attr(uint8_t type, const packetbuf_attr_t val); packetbuf_attr_t packetbuf_attr(uint8_t type); int packetbuf_set_addr(uint8_t type, const linkaddr_t *addr); const linkaddr_t *packetbuf_addr(uint8_t type); -#endif /* PACKETBUF_CONF_ATTRS_INLINE */ /** * \brief Checks whether the current packet is a broadcast. diff --git a/examples/ip64-router/ip64-router.c b/examples/ip64-router/ip64-router.c index e2f0ce3533..05fecfef75 100644 --- a/examples/ip64-router/ip64-router.c +++ b/examples/ip64-router/ip64-router.c @@ -3,6 +3,7 @@ #include "ip64.h" #include "net/netstack.h" #include "rpl-dag-root.h" +#include "sys/autostart.h" /*---------------------------------------------------------------------------*/ PROCESS(router_node_process, "Router node"); diff --git a/examples/ipv6/json-ws/project-conf.h b/examples/ipv6/json-ws/project-conf.h index eed779828d..2b1a6bd2a3 100644 --- a/examples/ipv6/json-ws/project-conf.h +++ b/examples/ipv6/json-ws/project-conf.h @@ -42,10 +42,6 @@ #undef CSMA_CONF_802154_AUTOACK #define CSMA_CONF_802154_AUTOACK 1 -/* Reduce code size */ -#undef ENERGEST_CONF_ON -#define ENERGEST_CONF_ON 0 - /* needs to be ~4 for fragmentation to work */ #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 4 diff --git a/examples/ipv6/multicast/project-conf.h b/examples/ipv6/multicast/project-conf.h index d35212b32b..932f75d216 100644 --- a/examples/ipv6/multicast/project-conf.h +++ b/examples/ipv6/multicast/project-conf.h @@ -49,11 +49,7 @@ /* For Imin: Use 16 over CSMA, 64 over Contiki MAC */ #define ROLL_TM_CONF_IMIN_1 64 -#undef UIP_CONF_IPV6_RPL -#undef UIP_CONF_ND6_SEND_RA -#undef UIP_CONF_ROUTER -#define UIP_CONF_ND6_SEND_RA 0 -#define UIP_CONF_ROUTER 1 +#undef UIP_MCAST6_ROUTE_CONF_ROUTES #define UIP_MCAST6_ROUTE_CONF_ROUTES 1 #undef UIP_CONF_TCP diff --git a/examples/ipv6/native-border-router/project-conf.h b/examples/ipv6/native-border-router/project-conf.h index 04c59e33c3..0e4b67950c 100644 --- a/examples/ipv6/native-border-router/project-conf.h +++ b/examples/ipv6/native-border-router/project-conf.h @@ -39,9 +39,6 @@ #undef UIP_CONF_BUFFER_SIZE #define UIP_CONF_BUFFER_SIZE 1280 -#undef UIP_CONF_RECEIVE_WINDOW -#define UIP_CONF_RECEIVE_WINDOW 60 - #define SLIP_DEV_CONF_SEND_DELAY (CLOCK_SECOND / 32) #undef WEBSERVER_CONF_CFS_CONNS diff --git a/examples/ipv6/rpl-border-router/project-conf.h b/examples/ipv6/rpl-border-router/project-conf.h index 9d91167959..e9a63c48f8 100644 --- a/examples/ipv6/rpl-border-router/project-conf.h +++ b/examples/ipv6/rpl-border-router/project-conf.h @@ -43,10 +43,6 @@ #define UIP_CONF_BUFFER_SIZE 140 #endif -#ifndef UIP_CONF_RECEIVE_WINDOW -#define UIP_CONF_RECEIVE_WINDOW 60 -#endif - #ifndef WEBSERVER_CONF_CFS_CONNS #define WEBSERVER_CONF_CFS_CONNS 2 #endif diff --git a/examples/ipv6/slip-radio/project-conf.h b/examples/ipv6/slip-radio/project-conf.h index 45c69cdc12..308ed65516 100644 --- a/examples/ipv6/slip-radio/project-conf.h +++ b/examples/ipv6/slip-radio/project-conf.h @@ -59,9 +59,6 @@ #undef NETSTACK_CONF_FRAMER #define NETSTACK_CONF_FRAMER no_framer -#undef CC2420_CONF_AUTOACK -#define CC2420_CONF_AUTOACK 1 - #undef UART1_CONF_RX_WITH_DMA #define UART1_CONF_RX_WITH_DMA 1 diff --git a/examples/platform-specific/cc2538-common/mqtt-demo/project-conf.h b/examples/platform-specific/cc2538-common/mqtt-demo/project-conf.h index bcdabff20b..a3cc4073b3 100644 --- a/examples/platform-specific/cc2538-common/mqtt-demo/project-conf.h +++ b/examples/platform-specific/cc2538-common/mqtt-demo/project-conf.h @@ -40,6 +40,9 @@ #ifndef PROJECT_CONF_H_ #define PROJECT_CONF_H_ /*---------------------------------------------------------------------------*/ +/* Enable TCP */ +#define UIP_CONF_TCP 1 + /* User configuration */ #define MQTT_DEMO_STATUS_LED LEDS_GREEN #define MQTT_DEMO_PUBLISH_TRIGGER &button_right_sensor diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h index 137e994748..43095dfe98 100644 --- a/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h +++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h @@ -36,6 +36,10 @@ #define RF_CORE_CONF_CHANNEL 25 #define RF_BLE_CONF_ENABLED 1 /*---------------------------------------------------------------------------*/ + +/* Enable TCP */ +#define UIP_CONF_TCP 1 + /* Enable/Disable Components of this Demo */ #define CC26XX_WEB_DEMO_CONF_MQTT_CLIENT 1 #define CC26XX_WEB_DEMO_CONF_6LBR_CLIENT 1 diff --git a/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h b/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h index 8e58e12da1..b60df036d5 100644 --- a/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h +++ b/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h @@ -35,6 +35,7 @@ #define IEEE802154_CONF_PANID 0xABCD #define RF_CORE_CONF_CHANNEL 25 /*---------------------------------------------------------------------------*/ + /* Enable the ROM bootloader */ #define ROM_BOOTLOADER_ENABLE 1 /*---------------------------------------------------------------------------*/ diff --git a/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h b/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h index 9e576b6d81..3f33730dcc 100644 --- a/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h +++ b/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h @@ -47,21 +47,11 @@ #define REST_MAX_CHUNK_SIZE 256 /* Network config */ -#undef SICSLOWPAN_CONF_FRAG -#define SICSLOWPAN_CONF_FRAG 1 #undef UIP_CONF_BUFFER_SIZE //#define UIP_CONF_BUFFER_SIZE (REST_MAX_CHUNK_SIZE + UIP_LLH_LEN + UIP_IPUDPH_LEN + COAP_MAX_HEADER_SIZE) //#define UIP_CONF_BUFFER_SIZE (REST_MAX_CHUNK_SIZE + 0 + 48 + 70) #define UIP_CONF_BUFFER_SIZE 1280 /* ipv6 required minimum */ -/* No IPv6 reassembly */ -#undef UIP_CONF_IPV6_REASSEMBLY -#define UIP_CONF_IPV6_REASSEMBLY 0 - -/* Timeout for packet reassembly at the 6lowpan layer (should be < 60s) */ -#undef SICSLOWPAN_CONF_MAXAGE -#define SICSLOWPAN_CONF_MAXAGE 10 - /* Queues */ #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 32 diff --git a/examples/platform-specific/jn516x/tsch/common-conf.h b/examples/platform-specific/jn516x/tsch/common-conf.h index 385fa1d03c..398003a285 100644 --- a/examples/platform-specific/jn516x/tsch/common-conf.h +++ b/examples/platform-specific/jn516x/tsch/common-conf.h @@ -113,18 +113,10 @@ #define RPL_CONF_MAX_DAG_PER_INSTANCE 1 /* default 2 */ /* No RA, No NS */ -#undef UIP_CONF_ND6_SEND_NS -#define UIP_CONF_ND6_SEND_NS 0 - -#undef UIP_CONF_ND6_SEND_RA -#define UIP_CONF_ND6_SEND_RA 0 - #undef UIP_CONF_TCP #define UIP_CONF_TCP 0 #undef UIP_CONF_DS6_ADDR_NBU #define UIP_CONF_DS6_ADDR_NBU 1 -#undef UIP_CONF_FWCACHE_SIZE -#define UIP_CONF_FWCACHE_SIZE 1 #undef UIP_CONF_UDP_CHECKSUMS #define UIP_CONF_UDP_CHECKSUMS 1 diff --git a/examples/platform-specific/nrf52dk/mqtt-demo/project-conf.h b/examples/platform-specific/nrf52dk/mqtt-demo/project-conf.h index b52e1a48fb..14e4749da3 100644 --- a/examples/platform-specific/nrf52dk/mqtt-demo/project-conf.h +++ b/examples/platform-specific/nrf52dk/mqtt-demo/project-conf.h @@ -40,6 +40,10 @@ #ifndef PROJECT_CONF_H_ #define PROJECT_CONF_H_ /*---------------------------------------------------------------------------*/ + +/* Enable TCP */ +#define UIP_CONF_TCP 1 + /* User configuration */ #define MQTT_DEMO_STATUS_LED LEDS_GREEN diff --git a/examples/platform-specific/sky-websense/project-conf.h b/examples/platform-specific/sky-websense/project-conf.h index 87834d8609..8190cf1dec 100644 --- a/examples/platform-specific/sky-websense/project-conf.h +++ b/examples/platform-specific/sky-websense/project-conf.h @@ -37,9 +37,6 @@ #undef UIP_CONF_BUFFER_SIZE #define UIP_CONF_BUFFER_SIZE 140 -#undef UIP_CONF_RECEIVE_WINDOW -#define UIP_CONF_RECEIVE_WINDOW 60 - #undef WEBSERVER_CONF_CFS_CONNS #define WEBSERVER_CONF_CFS_CONNS 2 -- GitLab