Add project-conf.h to platform contiki-conf.h files.
Fix jackdaw comments.
This commit is contained in:
parent
154f971b2b
commit
d6db9e4e86
|
@ -267,4 +267,9 @@ unsigned long clock_seconds(void);
|
||||||
#define CCIF
|
#define CCIF
|
||||||
#define CLIF
|
#define CLIF
|
||||||
|
|
||||||
|
/* include the project config */
|
||||||
|
/* PROJECT_CONF_H might be defined in the project Makefile */
|
||||||
|
#ifdef PROJECT_CONF_H
|
||||||
|
#include PROJECT_CONF_H
|
||||||
|
#endif /* PROJECT_CONF_H */
|
||||||
#endif /* __CONTIKI_CONF_H__ */
|
#endif /* __CONTIKI_CONF_H__ */
|
||||||
|
|
|
@ -261,4 +261,10 @@ unsigned long clock_seconds(void);
|
||||||
#define CCIF
|
#define CCIF
|
||||||
#define CLIF
|
#define CLIF
|
||||||
|
|
||||||
|
/* include the project config */
|
||||||
|
/* PROJECT_CONF_H might be defined in the project Makefile */
|
||||||
|
#ifdef PROJECT_CONF_H
|
||||||
|
#include PROJECT_CONF_H
|
||||||
|
#endif /* PROJECT_CONF_H */
|
||||||
|
|
||||||
#endif /* __CONTIKI_CONF_H__ */
|
#endif /* __CONTIKI_CONF_H__ */
|
||||||
|
|
|
@ -384,8 +384,8 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
|
||||||
#define UIP_CONF_MAX_LISTENPORTS 2
|
#define UIP_CONF_MAX_LISTENPORTS 2
|
||||||
#define UIP_CONF_UDP_CONNS 6
|
#define UIP_CONF_UDP_CONNS 6
|
||||||
|
|
||||||
/* Optional, TCP needed to serve the RPL neighbor web page currently hard coded at bbbb::11 */
|
/* Optional, TCP needed to serve the RPL neighbor web page currently hard coded at bbbb::200 */
|
||||||
/* The RPL neighbors can also be viewed using the jack menu */
|
/* The RPL neighbors can also be viewed using the jackdaw menu */
|
||||||
/* A small MSS is adequate for the internal jackdaw webserver and RAM is very limited*/
|
/* A small MSS is adequate for the internal jackdaw webserver and RAM is very limited*/
|
||||||
#define RPL_HTTPD_SERVER 0
|
#define RPL_HTTPD_SERVER 0
|
||||||
#if RPL_HTTPD_SERVER
|
#if RPL_HTTPD_SERVER
|
||||||
|
|
Loading…
Reference in a new issue