Commit Graph

1536 Commits

Author SHA1 Message Date
Simon Duquennoy a89df3b279 TSCH-RPL: configure callbacks automatically 2017-10-12 17:08:55 +02:00
Simon Duquennoy 2e39fe0d6b TSCH: disable per-slot logging in most examples 2017-10-12 17:08:45 +02:00
Simon Duquennoy 41967732b1 Added MAKE_ROUTING make variable for cleaner routing protocol selection 2017-10-12 08:42:42 +02:00
George Oikonomou bf433fb6f0 Fix file permissions 2017-10-10 21:04:21 +02:00
George Oikonomou be9fbc8f9b Do not #undef in example project-conf.h (sensniff) 2017-10-08 17:05:40 +01:00
George Oikonomou 97ee63f872 Do not #undef in example project-conf.h (Native BR) 2017-10-08 17:05:31 +01:00
George Oikonomou 2f5b60af5d Don't try to define CONTIKI_VERSION_STRING in the example 2017-10-08 17:03:05 +01:00
George Oikonomou 2f8779471b Allow overriding common example configuration 2017-10-08 17:03:05 +01:00
George Oikonomou 8e8101728c Don't pass -DWITH_COAP in example Makefiles
This does not seem to be needed anywhere or to achieve anything
2017-10-08 17:03:04 +01:00
George Oikonomou f40cc506a3 Don't try to define REST=coap_rest_implementation
We only have one rest engine now, the example does not need to try and configure this
2017-10-08 17:00:37 +01:00
George Oikonomou 4cc0a8d8bc Don't define in Makefile things that can be defined in project-conf.h 2017-10-08 17:00:37 +01:00
George Oikonomou 678bff4991 Do not #undef in example project-conf.h (jn516x) 2017-10-08 17:00:37 +01:00
George Oikonomou a2e74bad8b Do not #undef in example project-conf.h (nrf52dk) 2017-10-08 17:00:37 +01:00
George Oikonomou 7f0a2a9e3f Do not #undef in example project-conf.h (zoul) 2017-10-08 17:00:37 +01:00
George Oikonomou e8f5c71666 Do not #undef in example project-conf.h (SLIP radio) 2017-10-08 17:00:37 +01:00
George Oikonomou 9f86311406 Do not #undef in example project-conf.h (6top) 2017-10-08 17:00:36 +01:00
George Oikonomou d97df21396 Do not #undef in example project-conf.h (RPL TSCH) 2017-10-08 17:00:36 +01:00
George Oikonomou 4ef5feca77 Do not #undef in example project-conf.h (RPL Simple) 2017-10-08 17:00:36 +01:00
George Oikonomou ef2df48518 Configure TSCH irrespective whether it is selected 2017-10-08 17:00:36 +01:00
George Oikonomou 530eefac4c Do not #undef in example project-conf.h (Native BR) 2017-10-08 17:00:36 +01:00
George Oikonomou 87ba325c93 Do not #undef in example project-conf.h (JSON-ws) 2017-10-08 17:00:36 +01:00
George Oikonomou 657dd33092 Do not #undef in example project-conf.h (multicast) 2017-10-08 17:00:36 +01:00
George Oikonomou 0ef5539fc1 Do not #undef in example project-conf.h (CoAP) 2017-10-08 17:00:36 +01:00
George Oikonomou 09a5a157bc Do not #undef in example project-conf.h (6tisch) 2017-10-08 17:00:32 +01:00
George Oikonomou 9fef8a0fd7 Do not #undef in example project-conf.h (IPSO objects) 2017-10-08 16:50:26 +01:00
Simon Duquennoy e81864e8d8 NullNet: move buffer variables from examples to os/net module 2017-10-08 14:56:47 +02:00
Simon Duquennoy fb0de6dd7a Various fixes to netstack config 2017-10-08 14:47:34 +02:00
Joakim Eriksson 40f189a3a3 removed NETSTACK_CONF_MAC_OTHER 2017-10-08 00:46:57 +02:00
Joakim Eriksson 1143d6f5aa addressed some of the suggestions on the PR - naming and netstack MAC 2017-10-08 00:44:02 +02:00
Joakim Eriksson 761d19dafc fixed nullnet to work with new network interface 2017-10-08 00:44:02 +02:00
Joakim Eriksson 8cf65ed01a changed NETSTACK configuration on network layer 2017-10-08 00:44:02 +02:00
Joakim Eriksson adb2f9b010 fixed so that NBR compiles - added TCP support 2017-10-08 00:44:02 +02:00
Joakim Eriksson 1b2b043f24 fixed nullnet and its examples 2017-10-08 00:44:02 +02:00
Joakim Eriksson 3091a9010a added tun6 interface for native - removed old codebase for tap/tun/wpcap 2017-10-08 00:44:02 +02:00
Joakim Eriksson 48049f120c fixed compilation issue on cooja-net driver 2017-10-08 00:44:02 +02:00
Joakim Eriksson 4aaf680c5b fixed some compilation issues cause by removing tcpip-output callback 2017-10-08 00:44:02 +02:00
Joakim Eriksson f73454071f added an example for packet processing - and added uipbuf module for header processing 2017-10-08 00:44:02 +02:00
Simon Duquennoy 20559fd308 Auto-include project-conf.h whenever found 2017-10-07 09:45:38 +02:00
Simon Duquennoy 543408db68 Re-organzie ip stack implementation 2017-09-22 17:09:54 +02:00
Simon Duquennoy add9098f20 Added NullNet examples 2017-09-22 14:34:20 +02:00
Simon Duquennoy 7d262d6d89 Move no-framer from slip-radio to os, now named nullframer 2017-09-22 14:34:20 +02:00
Simon Duquennoy 0aa44c3c22 Homogenize NET layer config with MAC 2017-09-22 14:34:20 +02:00
Simon Duquennoy 1a8f04effc TSCH: move platform-specific configuration flags to platform configuration files 2017-09-22 14:34:20 +02:00
Simon Duquennoy 5f2b3c2fcb Use global MAC_CONF_WITH_TSCH instead of ad-hoc WITH_TSCH flags 2017-09-22 14:34:20 +02:00
Simon Duquennoy ffc94f832c MAC layer configuration done from Makefile instead of .h files 2017-09-22 14:34:20 +02:00
Yasuyuki Tanaka 81d34e1d51 Add an example for ETSI Plugtest 2017
The 1st F-Interop 6TiSCH Interoperability Event:
http://www.etsi.org/news-events/events/1197-6tisch-interop-prague-2017
2017-09-15 16:01:11 +09:00
Yasuyuki Tanaka cac54874d2 sixtop: add an example generating 6P frames 2017-09-13 14:38:06 +09:00
Yasuyuki Tanaka a5fadb2ebe sixtop: refactoring
- support draft-ietf-6tisch-6top-protocol-03
- maintain a sequence number per neighbor
- rename variables and constants
- reconsider file structure and file names
- make sf-simple part of example
- update sixtop/README.md
- add regression-tests for 6tisch
- apply C-DAC copyright notice
- bugfix + cleanup
2017-09-13 14:38:06 +09:00
Shalu-here cc1c763db9 sixtop: 6top protocol implementation by CDAC
https://github.com/contiki-os/contiki/pull/1898
2017-09-13 14:38:06 +09:00
Simon Duquennoy 0f92c6ebfd Include contiki.h instead of contiki-conf.h so as to ensure consistent inclusion of contiki-default-conf.h 2017-09-08 14:20:59 +02:00
Simon Duquennoy 3bb55f7393 nrf52 coap example: fix coap module path 2017-09-02 09:54:30 +02:00
Niclas Finne b4f8f21b4d Updated examples after CoAP moved to module 2017-09-01 17:45:58 +02:00
Joakim Eriksson 3852fce45a fixed some er-coap includes 2017-09-01 17:22:12 +02:00
Joakim Eriksson 7930d35810 replaced er-coap APP with the coap module 2017-09-01 17:22:12 +02:00
Simon Duquennoy dc0a0ed60f WITH_WEBSERVER as a module 2017-09-01 17:22:11 +02:00
Simon Duquennoy ffe3b811b0 Move http to os/net/app-layer 2017-09-01 17:22:10 +02:00
Simon Duquennoy 1987b316fd Move mqtt to os/net/app-layer 2017-09-01 17:22:10 +02:00
Joakim Eriksson 08613960e2 moved CoAP, LWM2M and IPSO Objects 2017-09-01 17:22:04 +02:00
Simon Duquennoy a3b87a46a5 Moving at-master to os/services 2017-09-01 16:12:57 +02:00
Nicolas Tsiftes a7da684b4b Move unit-test to the services directory. 2017-09-01 16:09:29 +02:00
Simon Duquennoy dfd2caf17a Move slip-cmd to os/services 2017-09-01 16:07:13 +02:00
Simon Duquennoy bbd058a570 Move json to os/lib 2017-09-01 16:01:22 +02:00
Nicolas Tsiftes c528562908 Moved Antelope to a new storage directory. 2017-09-01 15:52:11 +02:00
Simon Duquennoy c9906caf3c Moved orchestra to os/services 2017-09-01 15:43:25 +02:00
Simon Duquennoy 192f8ee582 Move shell from apps to os/services 2017-09-01 15:39:39 +02:00
Joakim Eriksson 5fa13e0093 remove-rest-engine 2017-09-01 15:32:21 +02:00
Niclas Finne 2c86194ef8 Renamed core to os 2017-09-01 15:29:00 +02:00
766f0766e6 Removed platform Galileo 2017-08-31 15:58:56 +02:00
Simon Duquennoy 8966460b1f Added per-module runtime log level configuration 2017-07-17 12:16:52 +02:00
Simon Duquennoy 5999323a05 More Shell commands 2017-07-07 18:13:21 +02:00
Simon Duquennoy 09e0d75b53 Simplify rpl-tsch example 2017-07-07 15:23:32 +02:00
Simon Duquennoy 75f3a154ad Added shell command to configure log level at runtime 2017-07-07 15:13:43 +02:00
Simon Duquennoy 0d6282171f Enable Shell in rpl-tsch example 2017-07-07 15:13:41 +02:00
Simon Duquennoy 74ed8bc585 Merge pull request #51 from simonduq/pr/cleanup-config
Some config cleanup
2017-07-07 13:54:17 +02:00
Simon Duquennoy a642c9696d More cleanup 2017-07-06 10:01:56 +02:00
Simon Duquennoy dc9e77eaf2 Simplify CSMA configuration 2017-07-06 10:01:56 +02:00
Simon Duquennoy 9a0087faf3 Simplify configuration through more suitable defaults, and removed unused features. Cleanup many configuration files. 2017-07-06 10:01:55 +02:00
Simon Duquennoy 9143729ded Use 802.15.4-2015 frame v2 by default 2017-07-05 17:46:22 +02:00
Simon Duquennoy 3f6cc0256f Renaming FRAME802154_IEEE802154E_2012 to FRAME802154_IEEE802154_2015 2017-07-05 17:43:00 +02:00
Nicolas Tsiftes 0f5a87645d Merge pull request #47 from simonduq/pr/sent-callback
Refactor packet sent callbacks
2017-07-04 14:41:20 +02:00
Simon Duquennoy c3ec92dc2c Refactor how packet sent callbacks are handled for TSCH, RPL, 6lowpan and DS6 2017-07-04 10:15:05 +02:00
Simon Duquennoy 5eff873bde Remove deprecated RPL_WITH_NON_STORING config flag from some example makefiles 2017-07-03 17:04:56 +02:00
Simon Duquennoy ffdbbb3084 Rename NETSTCK_ROUTING_STATE_SIZE to NETSTACK_MAX_ROUTE_ENTRIES, fix rpl-udp example accordingly 2017-06-30 18:03:58 +02:00
Simon Duquennoy bf5bea583e Disable TCP by default, homogenize UDP and TCP connections config 2017-06-29 16:46:29 +02:00
Simon Duquennoy f64ec24c9b Rename CONTIKI_NETWORK_DENSITY and CONTIKI_NETWORK_SIZE to NBR_TABLE_CONF_MAX_NEIGHBORS and NETSTCK_ROUTING_STATE_SIZE 2017-06-29 16:46:23 +02:00
Simon Duquennoy b5ece8b128 rpl-simple example: add configuration for TSCH 2017-06-29 16:46:18 +02:00
Simon Duquennoy 821590c4b5 Logging: added feature for compact address logging (last 16 bits). Cleanup more logs in MAC layers, IPv6 and RPL 2017-06-29 16:46:13 +02:00
Simon Duquennoy a6643a9835 Added RPL-lite, a lightweight implementation of RPL. This is the new default. 2017-06-29 16:46:07 +02:00
Nicolas Tsiftes 9bb51087bf Renamed the drivers directory to arch to reflect that this is the main place for architecture-dependent functionality. 2017-06-28 16:20:43 +02:00
Simon Duquennoy fcc1778dc0 Remove all references to Rime 2017-06-22 18:31:13 +02:00
Simon Duquennoy 1dcba2a700 Added logging example for regression testing with all logs enabled 2017-06-21 17:09:38 +02:00
Simon Duquennoy 661f4c5023 Use logging module for MAC layers 2017-06-21 17:09:37 +02:00
Joakim Eriksson 795f646787 Merge pull request #34 from simonduq/pr/no-ipv4
Removing IPv4 stack
2017-06-21 14:31:58 +02:00
Nicolas Tsiftes a5a830beb1 Merge pull request #37 from simonduq/pr/rm-libs
Removing old/unused libs
2017-06-21 14:30:15 +02:00
Simon Duquennoy 1c5c8798c7 Removing old/unused libs 2017-06-19 11:41:42 +02:00
Simon Duquennoy 1a0f8ab737 Removing IPv4 stack 2017-06-16 17:32:22 +02:00
Nicolas Tsiftes 7e273ff48c Removed servreg-hack. 2017-06-16 15:37:14 +02:00
Simon Duquennoy 2928e3e440 Remove cooja-ip64 compiler warnings 2017-05-18 10:23:28 +02:00
Simon Duquennoy dd4ea6d412 Move zoul examples one level up 2017-05-18 09:56:47 +02:00
Simon Duquennoy 78e424200b http-socket as an app 2017-05-18 09:26:44 +02:00
Simon Duquennoy 880e69f770 Merging csma and nullrdc 2017-05-17 21:50:33 +02:00
Simon Duquennoy 6366ad162e Fix makefiles for native-border-router and sensniff 2017-05-17 15:30:36 +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 aa1191d8f0 Remove RDC layer 2017-05-17 15:09:19 +02:00
Simon Duquennoy bd6f26963a Fix cc2538-common example makefile 2017-05-17 15:09:07 +02:00
Simon Duquennoy 95323b9ce7 Remove channel_check_interval 2017-05-17 14:34:29 +02:00
Simon Duquennoy c3559a6df3 slip-radio: use CSMA instead of nullmac 2017-05-17 14:26:53 +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 8cc5e082ac Removing more refs to old platforms 2017-05-17 13:56:30 +02:00
Simon Duquennoy 802e498380 Removed refs to econotag and micaz 2017-05-17 13:49:51 +02:00
Simon Duquennoy 766c0e21dd Removing platform z1 2017-05-17 13:48:01 +02:00
Simon Duquennoy e7088ec6c4 Removing platform wismote 2017-05-17 13:37:27 +02:00
Simon Duquennoy 35a9984122 Removing the need for nullrdc-noframer 2017-05-16 22:12:40 +02:00
Simon Duquennoy e8efe98c71 Use nullmac less 2017-05-16 22:12:36 +02:00
Simon Duquennoy 8a988396d7 New default: CSMA over 802.15.4 2017-05-16 22:12:29 +02:00
Simon Duquennoy 90361f2719 Remove example that uses deprecated MAC layers 2017-05-16 22:12:26 +02:00
Simon Duquennoy a980593bd6 Added framer sub-directory to core/net/mac 2017-05-16 21:05:21 +02:00
Simon Duquennoy ccbb55de2e Enable code size optimization by default on most platforms 2017-05-16 17:47:59 +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 54d6756815 Move cpu, dev and platform into a new top-level directory: drivers 2017-05-16 09:04:52 +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
George Oikonomou edebc1dd2c Add documentation for the new boards 2017-05-13 15:57:56 +02:00
Nicolas Tsiftes 391a84726f Merge pull request #2148 from niziak/master
native-border-router: fix for disappearing timer 'uip_ds6_timer_perio…
2017-04-18 15:19:57 +02:00
George Oikonomou e823ead4b0 Tidy up web demo ADC code style 2017-04-02 13:44:02 +01:00
George Oikonomou 474dc33e12 Wrap web demo ADC functionality inside #if blocks 2017-04-02 13:43:21 +01:00
chenek 22b262ce73 Add ADC example to cc26xx-web-demo 2017-04-02 13:43:12 +01:00
George Oikonomou e4da7c66e0 Merge pull request #2165 from alexandruioanp/check-ipv6addrconv-mqtt
Check broker IP conversion. Adjust state machine accordingly
2017-04-02 00:33:43 +01:00
George Oikonomou 6eac73103d Merge pull request #2164 from alexstanoev/web-demo-crash-fix
Zero out httpd_state before deallocating
2017-04-02 00:32:53 +01:00
Robert Olsson 417f32c65d Adding sensniff support for Atmel via avr-rss2 platform 2017-03-31 20:00:20 +02:00
Alexandru-Ioan Pop f15b86158b Check broker IP conversion. Adjust state machine accordingly
The result of converting the IP address of the broker wasn't checked. As a result, the pointer was left uninitialised and the IPv6 address used for connecting was some random data. The function now returns an error. Before connect_to_broker is called, mqtt_register is executed, which memsets conn to 0, making its state 0 (MQTT_CONN_STATE_ERROR). In order to recover from this error state, the extra check was added in the MQTT_CLIENT_STATE_NEWCONFIG state.

This was discovered using [CodeSonar](https://www.grammatech.com/products/codesonar)
2017-03-31 17:33:29 +01:00
alexstanoev a30364189a Zero out httpd_state before deallocating
When a connection is aborted by the HTTP server while it's still being processed it is possible to hit a null pointer dereference issue by jumping back to a protothread (outputpt) after its httpd_state has been freed. This can be triggered by sending a POST to any form in the CC26xx web demo server using Firefox.
This patch prevents that by zeroing out httpd_state structs before freeing them, thus also clearing the httpd_state->outputpt field.
Tested using Firefox 55.0a1 on a CC2650 LaunchPad.
2017-03-31 16:44:11 +01:00
Wojciech Nizinski 5a0d085451 native-border-router: fix for disappearing timer 'uip_ds6_timer_periodic'
When UIP_ND6_SEND_NS is enabled, I've noticed that unreachable
neighbours still remains in REACHABLE state even if lifetime
(nbr->reachable) expired.

During network init 'tcpip_process' is scheduling
'uip_ds6_timer_periodic' is to tick every 100ms and make necessary
expirations.

When MAC addres is received from slip-radio (from 'etimer_process'
context), network is "reinitialized" and timer 'uip_ds6_timer_periodic'
is set again with wrong process.
2017-03-21 13:13:10 +01:00
Nicolas Tsiftes 5eb2ac15ff Merge pull request #2073 from cetic/pr-fix-send-na
Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS
2017-01-20 13:18:43 +01:00
Yasuyuki Tanaka 2d44b47050 Print an entry for the root node as well as other entries 2017-01-19 14:36:59 +01:00
Laurent Deru 12c930893c Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
George Oikonomou 82fd325b7a Merge pull request #2069 from alignan/pull/light-example-verbatim
Explicitly specify light sensor model in example
2017-01-15 11:52:09 +00:00
Antonio Lignan 999b246fd2 Explicitly specify light sensor model in example 2017-01-14 22:57:08 +01:00
Michael Karlsson 22d10ba03a Added Cooja target config to rime-tsch example 2017-01-11 16:35:16 +01:00
Yasuyuki Tanaka 667dd6a210 TSCH: put tsch_ prefix to definitions in the global scope
struct asn_t         -> struct tsch_asn_t
  struct asn_divisor_t -> tsch_asn_divisor_t
  ASN_ macros          -> TSCH_ASN_ macros
  current_asn          -> tsch_current_asn
2017-01-10 11:45:59 +01:00
George Oikonomou 960b81d484 Merge pull request #2024 from alignan/pull/eth-gw
Zolertia Orion ethernet router with active POE support
2017-01-09 21:03:45 +00:00
Thanos Tsakiris 92ad29ab33 Minor typo change 2016-12-30 13:13:53 +02:00
Antonio Lignan 579620ce0e Added Zolertia Orion ethernet router with active POE support 2016-12-29 13:07:53 +01:00
Antonio Lignan 2464cdadc9 Merge pull request #1973 from g-oikonomou/contrib/sensniff-submodule
Add sensniff as a submodule
2016-12-25 19:42:18 +01:00
Yasuyuki Tanaka 8b3f29325d Update example-collect.c
- bugfix: more frequent transmissions than expected (every 30 seconds)
- indentation: replace tabs with spaces
2016-12-14 12:38:55 +01:00
Antonio Lignan ac2a31455e Merge pull request #1957 from alignan/pull/bme280-sensor
sensors: bme280 weather sensor
2016-12-10 18:37:21 +01:00
Antonio Lignan bd3f8fa3c5 Merge pull request #1939 from bthebaudeau/re-mote-sd-fat
Add global SD/MMC and FAT support, with RE-Mote as an example
2016-12-10 18:32:39 +01:00
Nicolas Tsiftes f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote
Miscellaneous updates for tsch-cooja-mote
2016-12-05 18:40:28 +01:00
Antonio Lignan 95f69d92a8 Merge pull request #1918 from adamdunkels/pr-websocket-2
Contiki websocket client
2016-12-05 06:46:43 +01:00
George Oikonomou bad3384365 Update sensniff example documentation 2016-12-04 19:07:40 +00:00
George Oikonomou aaf0d1eb86 Automatically specify a correct baudrate for jn516x 2016-12-04 19:07:40 +00:00