deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11973 commits 6 branches 13 tags 80 MiB
Commit graph

205 commits

Author SHA1 Message Date
Ralf Schlatterbeck 7d63a0f487 Merge branch 'osd' into ico 
Conflicts resolved:
	core/net/mac/contikimac/contikimac.c
 2016-06-30 09:28:54 +02:00
Yasuyuki Tanaka ca3a4726d1 Rename two macros related to multicast, which are not user configuration 
- UIP_CONF_IPV6_MULTICAST -> UIP_IPV6_MULTICAST
- RPL_CONF_MULTICAST      -> RPL_WITH_MULTICAST
 2016-06-20 16:35:09 +02:00
Sumankumar Panchal 373fda46f7 TSCH port for Zolertia ReMote/Zoul. 2016-06-12 16:37:01 +05:30
Simon Duquennoy b32b3f6666 RPL non-storing: add compile-test to also check for warnings 2016-06-08 14:03:22 +02:00
Simon Duquennoy 1a7133bbf2 Simplified configuration of RPL non-storing mode 2016-06-08 14:03:21 +02:00
Simon Duquennoy 2fe2a28439 Make some of the rpl examples configurable in non-storing mode 2016-06-08 14:03:10 +02:00
Simon Duquennoy 64679642f2 Saving ROM and RAM 2016-06-03 16:44:06 +02:00
Simon Duquennoy 26bf33c762 Merge pull request #1550 from thomas-ha/tsch-cc2538-port 
Port of TSCH for CC2538
 2016-06-02 21:33:55 +02:00
Ralf Schlatterbeck d7e6935ec2 Channel check interval is clock_time_t 
Fix channel_check_interval routine in struct rdc_driver to be of type
clock_time_t -- otherwise this may overflow on some architectures.
 2016-05-07 11:46:27 +02:00
Nicolas Tsiftes be13fc7d23 Merge pull request #1605 from tonnenpinguin/pr_fix_slip_config 
Add typecast to native border router switch statement
 2016-04-20 12:51:43 +02:00
Bernhard Hackl 2ad3d85d41 Fix slip config switch statement 2016-04-20 08:14:08 +00:00
kkrentz 4a88e9e537 llsec: Removed TSCH_SECURITY_CONF_LEVEL and TSCH_SECURITY_LEVEL 2016-04-13 09:16:08 -07:00
kkrentz 10d8b05bc6 llsec: Permit dynamic security levels 2016-04-13 07:54:46 -07:00
thomas-ha a7b43de535 add comment, use spaces 2016-04-06 16:54:45 +02:00
Joakim Eriksson 12ac02650b fixed a bug in nbr policy and DAO retransmission handling and added new wismote simulation 2016-03-26 09:45:39 +01:00
Joakim Eriksson ee97dc4bcd tuned configuration for rpl-collect and micaz platform 2016-03-26 09:45:39 +01:00
Joakim Eriksson f4255fad0f updated rpl-udp example with scalability test 2016-03-26 09:45:36 +01:00
thomas-ha 199b1b5316 remove define for SFD interrupt 
not needed anymore when using MAC timer
 2016-03-23 09:10:19 +01:00
Simon Duquennoy 4bf868fd99 Fix a number of leftover mentions of aaaa as a prefix (now fd00) 2016-03-14 13:56:00 +01:00
Simon Duquennoy cd981b23d5 Merge pull request #1297 from simonduq/pr/default-prefix 
Change the default IPv6 prefix from aaaa::/64 to fd00::/64
 2016-03-13 20:39:16 +01:00
thomas-ha 45c7477650 original node.c 2016-03-11 11:02:43 +01:00
thomas-ha 57a47bb12f node_id on cc2538dk 2016-03-10 18:36:47 +01:00
thomas-ha a4ccce8dac enable 32 kHz crystal oscillator for TSCH 2016-03-08 15:54:03 +01:00
thomas-ha b32ad0dbbd define for SFD timestamp on cc2538 2016-03-07 18:37:03 +01:00
Simon Duquennoy dea04c67d7 Change the default IPv6 prefix from aaaa::/64 to fd00::/64 2016-03-07 17:47:44 +01:00
Simon Duquennoy 8b63b41b96 TSCH-security: disable TSCH logs to save ROM, relax checks in 21-z1-rpl-tsch-security.csc accordingly 2016-03-07 17:43:25 +01:00
Michael Klemm c03b05c702 Fixed loading SerialSocketServer plugin in Cooja using FQDN 2016-01-16 12:25:42 +01:00
Simon Duquennoy 7eabf8d391 TSCH: latest update from https://github.com/EIT-ICT-RICH/contiki 2015-12-04 15:21:58 +01:00
Simon Duquennoy f225ff43d3 Added TSCH+RPL example, with support for link-layer security and Orchestra scheduling 2015-12-04 15:21:54 +01:00
Rémy Léone f2440235b5 Fix CSC & XML export to match .gitattributes 2015-10-22 16:05:40 +02:00
Simon Duquennoy 2daa3d7377 Merge pull request #1269 from tadodotcom/tmp-uip-fallback-iface 
More flexibility for the fallback interface
 2015-10-20 11:33:14 +02:00
Simon Duquennoy 10bd49a71a Merge pull request #756 from sieben/dos2unix 
dos2unix fix
 2015-10-18 20:26:07 +02:00
Konrad Krentz 2059b6559e llsec: Let llsec_drivers define their own framer 2015-10-14 08:21:40 -07:00
Víctor Ariño 76e293c289 Fixes ret value for output fallback iface in tun-bridge.c 2015-09-22 12:53:04 +02:00
Víctor Ariño 561e70b18e Updated current fallback_interface(s) to return int. 2015-09-22 12:53:04 +02:00
Rémy Léone 7a5071dd30 Adding a gitattributes and correcting line-endings 
https://help.github.com/articles/dealing-with-line-endings/
 2015-09-07 15:40:02 +02:00
Laurent Deru 1784338b2e Add uip_clear_buf() macro and replace all instances of uip_len = 0; with it 2015-06-15 11:10:51 +02:00
George Oikonomou 11a5e0a49a Merge pull request #1051 from simonduq/fix-warning 
Fixed a number of compiler warnings
 2015-05-13 00:52:40 +01:00
Simon Duquennoy 4a93f5148d Fixed a number of compiler warnings 2015-05-08 09:07:20 +02:00
Simon Duquennoy 290fc829ea Consistently use PACKETBUF_ATTR_MAC_SEQNO for MAC sequence number, both input and output. Disable PACKETBUF_ATTR_PACKET_ID in the non-Rime case. 2015-05-06 16:34:44 +02:00
Simon Duquennoy bb76bb8beb Remove unused flag SICSLOWPAN_CONF_ACK_ALL. Include packetbuf attribute PACKETBUF_ATTR_RELIABLE only when RIME is compiled. 2015-05-06 16:34:26 +02:00
Michael Richardson 5699127c9a additional edits to further clarify interface between native-border-router and slip-radio 2015-02-07 10:51:41 -05:00
Michael Richardson a0ac6bceb6 added some documentation of native-border-router and slip-radio relationship 2015-02-03 11:05:13 -05:00
Simon Duquennoy c2ca3e9fdb Cleanup UIP_CONF_IPV6_RPL configuration 2014-12-02 12:38:55 +01:00
Simon Duquennoy 74f6ae3751 slip-radio: remove unneeded definition of NETSTACK_CONF_WITH_RPL (now set from makefile with CONTIKI_WITH_RPL) 2014-12-01 21:04:25 +01:00
Simon Duquennoy a9cc909794 Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_* 2014-12-01 21:02:57 +01:00
Simon Duquennoy 722b3258d1 Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack. 2014-12-01 20:13:09 +01:00
Joakim Gebart 1e03cdd553 examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS 
The example used to rely on the default value being set to 1 which
caused build failures on platforms which have a default UIP_CONF_TCP=0

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
 2014-11-26 19:05:32 +01:00
Adam Dunkels d891d11324 Merge pull request #557 from kkrentz/llsec-integration 
Integration of Link Layer Security
 2014-10-08 15:45:46 +02:00
Joakim Gebart d4179a0a0c examples/rpl-border-router: Fix two minor warnings. 
- Remove unused variable i in generate_routes.
 - Add cast to unsigned long for printf(..%lu..) in generate_routes.

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
 2014-10-04 18:05:38 +02:00