Commit 678bff49 authored by George Oikonomou's avatar George Oikonomou
Browse files

Do not #undef in example project-conf.h (jn516x)

parent a2e74bad
......@@ -40,7 +40,6 @@
#endif
/* Needed for slip-bridge */
#undef SLIP_BRIDGE_CONF_NO_PUTCHAR
#define SLIP_BRIDGE_CONF_NO_PUTCHAR 0
#include "../common-conf.h"
......
......@@ -61,22 +61,18 @@
#define TSCH_CALLBACK_LEAVING_NETWORK tsch_rpl_callback_leaving_network
/* TSCH per-slot logging */
#undef TSCH_LOG_CONF_PER_SLOT
#define TSCH_LOG_CONF_PER_SLOT 1
/* Do not start TSCH at init, wait for NETSTACK_MAC.on() */
#undef TSCH_CONF_AUTOSTART
#define TSCH_CONF_AUTOSTART 0
/* 6TiSCH minimal schedule length.
* Larger values result in less frequent active slots: reduces capacity and saves energy. */
#undef TSCH_SCHEDULE_CONF_DEFAULT_LENGTH
#define TSCH_SCHEDULE_CONF_DEFAULT_LENGTH 3
#if WITH_SECURITY
/* Enable security */
#undef LLSEC802154_CONF_SECURITY_LEVEL
#define LLSEC802154_CONF_SECURITY_LEVEL 1
#endif /* WITH_SECURITY */
......@@ -103,21 +99,16 @@
/* IEEE802.15.4 PANID and channel */
#undef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0xabcd
#undef MICROMAC_CONF_CHANNEL
#define MICROMAC_CONF_CHANNEL 26
/* UART Configuration */
#undef UART_HW_FLOW_CTRL
#define UART_HW_FLOW_CTRL 0
#undef UART_XONXOFF_FLOW_CTRL
#define UART_XONXOFF_FLOW_CTRL 1
#undef UART_BAUD_RATE
#define UART_BAUD_RATE UART_RATE_1000000
#endif /* __COMMON_CONF_H__ */
......@@ -36,49 +36,37 @@
/* Shall we restart after exception, or stall?
* in production code we should restart, so set this to 0 */
#undef EXCEPTION_STALLS_SYSTEM
#define EXCEPTION_STALLS_SYSTEM 1
/* CoAP */
#undef COAP_MAX_OPEN_TRANSACTIONS
#define COAP_MAX_OPEN_TRANSACTIONS 4
#undef REST_MAX_CHUNK_SIZE
#define REST_MAX_CHUNK_SIZE 256
/* Network config */
#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 */
/* Queues */
#undef QUEUEBUF_CONF_NUM
#define QUEUEBUF_CONF_NUM 32
#undef TSCH_QUEUE_CONF_NUM_PER_NEIGHBOR
#define TSCH_QUEUE_CONF_NUM_PER_NEIGHBOR 32
#undef TSCH_CONF_DEQUEUED_ARRAY_SIZE
#define TSCH_CONF_DEQUEUED_ARRAY_SIZE 32
#undef TSCH_QUEUE_CONF_MAX_NEIGHBOR_QUEUES
#define TSCH_QUEUE_CONF_MAX_NEIGHBOR_QUEUES 8
/* Radio */
#undef ENABLE_COOJA_DEBUG
#define ENABLE_COOJA_DEBUG 0
/* max 3, min 0 */
#undef UART_HW_FLOW_CTRL
#define UART_HW_FLOW_CTRL 0
#undef UART_XONXOFF_FLOW_CTRL
#define UART_XONXOFF_FLOW_CTRL 1
#undef UART_BAUD_RATE
#define UART_BAUD_RATE UART_RATE_1000000
#endif /* __COMMON_CONF_JN516X_H__ */
......@@ -40,30 +40,23 @@
#define TSCH_LOG_CONF_PER_SLOT 1
#define WITH_COAP_RESOURCES 0
#undef ENABLE_COOJA_DEBUG
#define ENABLE_COOJA_DEBUG 0
#undef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0x5254
#undef TSCH_CONF_DEFAULT_HOPPING_SEQUENCE
#define TSCH_HOPPING_SEQUENCE_MY_SEQUENCE (uint8_t[]){17, 23, 15, 25, 19, 11, 13, 21}
#define TSCH_CONF_DEFAULT_HOPPING_SEQUENCE TSCH_HOPPING_SEQUENCE_MY_SEQUENCE
#undef TSCH_CONF_JOIN_MY_PANID_ONLY
#define TSCH_CONF_JOIN_MY_PANID_ONLY 1
#undef TSCH_CONF_AUTOSTART
#define TSCH_CONF_AUTOSTART 0
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch
#define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval
/* RPL Trickle timer tuning */
#undef RPL_CONF_DIO_INTERVAL_MIN
#define RPL_CONF_DIO_INTERVAL_MIN 12 /* 4.096 s */
#undef RPL_CONF_DIO_INTERVAL_DOUBLINGS
#define RPL_CONF_DIO_INTERVAL_DOUBLINGS 2 /* Max factor: x4. 4.096 s * 4 = 16.384 s */
#define TSCH_CONF_EB_PERIOD (4 * CLOCK_SECOND)
......@@ -90,33 +83,25 @@
/* CoAP */
#undef COAP_SERVER_PORT
#define COAP_SERVER_PORT 5684
#undef COAP_OBSERVE_RETURNS_REPRESENTATION
#define COAP_OBSERVE_RETURNS_REPRESENTATION 1
/* RPL */
#undef UIP_CONF_ROUTER
#define UIP_CONF_ROUTER 1
/* RPL storing mode */
#undef RPL_CONF_MOP
#define RPL_CONF_MOP RPL_MOP_STORING_NO_MULTICAST
/* Default link metric */
#undef RPL_CONF_INIT_LINK_METRIC
#define RPL_CONF_INIT_LINK_METRIC 2 /* default 5 */
#define RPL_CONF_MAX_INSTANCES 1 /* default 1 */
#define RPL_CONF_MAX_DAG_PER_INSTANCE 1 /* default 2 */
/* No RA, No NS */
#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_UDP_CHECKSUMS
#define UIP_CONF_UDP_CHECKSUMS 1
/* Link-layer security */
......@@ -130,19 +115,15 @@
#if MAC_CONF_WITH_CSMA /* Configure Csma with ACK (default MAC) */
#undef MICROMAC_CONF_CHANNEL
#define MICROMAC_CONF_CHANNEL 26
#undef MICROMAC_CONF_AUTOACK
#define MICROMAC_CONF_AUTOACK 1
/* increase internal radio buffering */
#undef MIRCOMAC_CONF_BUF_NUM
#define MIRCOMAC_CONF_BUF_NUM 4
#endif /* MAC_CONF_WITH_CSMA */
#undef CONTIKI_VERSION_STRING
#define CONTIKI_VERSION_STRING "Contiki 3.x"
#include "common-conf-jn516x.h"
......
......@@ -37,7 +37,6 @@
#include "../../common-conf.h"
#undef UART_BAUD_RATE
#define UART_BAUD_RATE UART_RATE_115200
#endif /* __PROJECT_CONF_H__ */
......@@ -36,12 +36,10 @@
#endif
/* Needed for slip-bridge */
#undef SLIP_BRIDGE_CONF_NO_PUTCHAR
#define SLIP_BRIDGE_CONF_NO_PUTCHAR 0
#include "../../common-conf.h"
#undef UART_BAUD_RATE
#define UART_BAUD_RATE UART_RATE_230400
......
......@@ -36,7 +36,6 @@
#include "../../common-conf.h"
#undef UART_BAUD_RATE
#define UART_BAUD_RATE UART_RATE_115200
#endif /* __PROJECT_CONF_H__ */
......@@ -36,15 +36,12 @@
#endif
/* Needed for slip-bridge */
#undef SLIP_BRIDGE_CONF_NO_PUTCHAR
#define SLIP_BRIDGE_CONF_NO_PUTCHAR 0
#include "../../common-conf.h"
#undef QUEUEBUF_CONF_NUM
#define QUEUEBUF_CONF_NUM 16
#undef TSCH_QUEUE_CONF_MAX_NEIGHBOR_QUEUES
#define TSCH_QUEUE_CONF_MAX_NEIGHBOR_QUEUES 8
#endif /* PROJECT_ROUTER_CONF_H_ */
......@@ -36,16 +36,12 @@
#include "../common-conf.h"
#undef UART_BAUD_RATE
#define UART_BAUD_RATE UART_RATE_115200
#undef UART1_BAUD_RATE
#define UART1_BAUD_RATE UART_RATE_115200
#undef UART1_CONF_TX_BUFFER_SIZE
#define UART1_CONF_TX_BUFFER_SIZE 32
#undef UART1_CONF_RX_BUFFER_SIZE
#define UART1_CONF_RX_BUFFER_SIZE 32
#endif /* __PROJECT_CONF_H__ */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment