Merge pull request #2043 from e120guru/master

Fixed rime-tsch sync problem in Cooja
This commit is contained in:
Simon Duquennoy 2017-01-11 18:15:43 +01:00 committed by GitHub
commit bb4f2e5678

View file

@ -85,4 +85,9 @@
#undef TSCH_LOG_CONF_ID_FROM_LINKADDR #undef TSCH_LOG_CONF_ID_FROM_LINKADDR
#define TSCH_LOG_CONF_ID_FROM_LINKADDR(addr) ((addr) ? (addr)->u8[LINKADDR_SIZE - 2] : 0) #define TSCH_LOG_CONF_ID_FROM_LINKADDR(addr) ((addr) ? (addr)->u8[LINKADDR_SIZE - 2] : 0)
#if CONTIKI_TARGET_COOJA
#define COOJA_CONF_SIMULATE_TURNAROUND 0
#endif /* CONTIKI_TARGET_COOJA */
#endif /* __PROJECT_CONF_H__ */ #endif /* __PROJECT_CONF_H__ */