Simon Duquennoy
|
880e69f770
|
Merging csma and nullrdc
|
2017-05-17 21:50:33 +02:00 |
|
Simon Duquennoy
|
d1641530dd
|
Merge branch 'wip/platform-cleanup' into wip/mac-rdc
Conflicts:
drivers/dev/cc2520/cc2520.c
drivers/platform/wismote/Makefile.wismote
drivers/platform/wismote/contiki-conf.h
drivers/platform/wismote/contiki-wismote-main.c
drivers/platform/z1/Makefile.z1
drivers/platform/z1/contiki-conf.h
drivers/platform/z1/contiki-z1-main.c
examples/ipso-objects/cooja-example-ipso-objects.csc
examples/rssi-scanner/Makefile
|
2017-05-17 15:13:16 +02:00 |
|
Simon Duquennoy
|
5a04f1969e
|
Remove explicit configuration of nullrdc as it is the new default
|
2017-05-17 14:19:14 +02:00 |
|
Simon Duquennoy
|
766c0e21dd
|
Removing platform z1
|
2017-05-17 13:48:01 +02:00 |
|
Simon Duquennoy
|
3eefb4e10f
|
Merge Travis sub-tests for faster check time
|
2017-05-16 20:55:13 +02:00 |
|
Simon Duquennoy
|
51beaee1b5
|
Re-arrange examples, in particular, move platform-specific examples to examples/platform-specific
|
2017-05-16 17:47:57 +02:00 |
|
Simon Duquennoy
|
6220aea14a
|
Removing Rime, old platforms, old MAC layers, LLSEC (as a layer), some examples and apps
|
2017-05-14 01:14:05 +02:00 |
|