Merge branch 'develop' into fix/cc2538-rf-switch
This commit is contained in:
commit
1d74ae7ec3
|
@ -272,7 +272,7 @@
|
|||
#ifdef RPL_CONF_DAG_LIFETIME
|
||||
#define RPL_DAG_LIFETIME RPL_CONF_DAG_LIFETIME
|
||||
#else
|
||||
#define RPL_DAG_LIFETIME (60 * 60) /* one hour */
|
||||
#define RPL_DAG_LIFETIME (8 * 60) /* 8 hours */
|
||||
#endif /* RPL_CONF_DAG_LIFETIME */
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue