Commit Graph

644 Commits

Author SHA1 Message Date
George Oikonomou
4dc15c0706 Don't manipulete ctimers inside interrupt context 2018-03-17 23:56:14 +00:00
George Oikonomou
d98d8f586f Fix code style 2018-03-17 23:55:00 +00:00
Niclas Finne
9b37e4b7fb Updated IPSO button to use the button HAL pressed/released events.
Removed support for the optional polarity resource to simplify the code.
2018-03-17 22:48:16 +00:00
George Oikonomou
c87aadc390 Change function to get button state to non-static 2018-03-17 22:05:56 +00:00
George Oikonomou
155e2c9b0a Support both old and new button API in common examples
This change is temporary so travis can pass until all platforms have been migrated to the new API
2018-03-14 09:34:47 +00:00
George Oikonomou
934856b4fd Introduce platform-independent HAL for buttons 2018-03-14 09:34:44 +00:00
Simon Duquennoy
7fe4d913b7
Merge branch 'develop' into contrib/build-all 2018-03-12 14:22:34 +01:00
George Oikonomou
c250cf93b7
Merge branch 'develop' into feature/ipv6_over_ble 2018-03-12 08:52:25 +00:00
Simon Duquennoy
a65dcea7ce uip6.c: label 'process' is only used when multicast AND routing are set 2018-03-09 16:29:06 +00:00
Simon Duquennoy
4bfab40a6c
Merge branch 'develop' into contrib/generic-leds 2018-03-02 20:15:19 +01:00
Simon Duquennoy
80c9f9ea1f http-socket.h: include cc.h instead of re-defining MAX 2018-03-02 08:11:22 -08:00
Simon Duquennoy
c1d9be1d01
Merge branch 'develop' into contrib/generic-leds 2018-03-02 17:06:04 +01:00
George Oikonomou
8dea154f81
Merge branch 'develop' into bugfix/tsch/slot-scheduling-d 2018-03-02 14:18:19 +00:00
Simon Duquennoy
aaa8658e8d tsch-log: fixed alignement of the log fields 2018-03-02 04:14:23 -08:00
Simon Duquennoy
a9a972b84a
Merge branch 'develop' into bugfix/tsch/slot-scheduling-d 2018-03-02 13:05:53 +01:00
Simon Duquennoy
b2148b8765 Remove uses of obsolete flag CONTIKI_TARGET_COOJA_IP64 2018-03-02 02:42:11 -08:00
Simon Duquennoy
2e3280b5c5
Merge branch 'develop' into contrib/csma-defaults 2018-03-02 10:06:37 +01:00
George Oikonomou
a1b9ba2630 Migrate to LED HAL (IPSO Objects) 2018-03-01 15:29:30 +00:00
George Oikonomou
e361440326 Introduce new LED Hardware Abstraction Layer 2018-03-01 15:29:28 +00:00
Atis Elsts
a64d5e0c18 Include strings.h for strncasecmp() 2018-03-01 13:34:31 +00:00
George Oikonomou
8f08ff1308 Add missing extern keyword
GCC assumes extern, but other toolchains complain about multiple variable definition at files including this header.
2018-02-28 12:51:26 +00:00
George Oikonomou
1f44c1530e
Merge branch 'develop' into contrib/tsch-print-schedule 2018-02-25 18:48:00 +00:00
George Oikonomou
92cc2843a8
Merge branch 'develop' into contrib/log-enabled 2018-02-25 17:44:32 +00:00
Simon Duquennoy
e30423f6cc
Merge branch 'develop' into contrib/gpio-hal 2018-02-25 18:17:32 +01:00
Simon Duquennoy
075d42ca24 Document LOG_*_ENABLED macros 2018-02-25 06:24:00 -08:00
Simon Duquennoy
ddaacdd41d Only use LOG_*_ENABLED flags from within C 'if' statements 2018-02-25 06:23:42 -08:00
Simon Duquennoy
d526323ce2 CSMA for Cooja motes: increase backoff_period 2018-02-25 06:02:36 -08:00
Simon Duquennoy
61880704b1 CSMA: adopt default values from IEEE for CSMA_MIN_BE and CSMA_MAX_BE 2018-02-25 06:02:36 -08:00
Simon Duquennoy
16c4b2fe6c Removing obsolete flag RPL_NS_LINK_NUM 2018-02-24 15:27:40 -08:00
George Oikonomou
46cf366698
Merge branch 'develop' into contrib/PRI 2018-02-24 15:03:46 +00:00
George Oikonomou
565305d6c3 Introduce new GPIO Hardware Abstraction Layer 2018-02-24 12:50:01 +00:00
Simon Duquennoy
9596a4285e Use PRI macros for safe printf and logs 2018-02-23 10:58:45 -08:00
Atis Elsts
b2eba53df9 TSCH: fix a bug in tsch_schedule_slot_operation scheduling 2018-02-23 14:17:37 +00:00
Simon Duquennoy
8f742a1a62 tsch_schedule_print: use LOG_PRINT instead of printf 2018-02-23 05:56:39 -08:00
Simon Duquennoy
70b43e0bf6 Logging module: added ability to force logging 2018-02-23 05:28:40 -08:00
Johan Liseborn
9aaba942e1 Handle block-wise transfer in observer notifications 2018-02-23 09:41:30 +01:00
Johan Liseborn
22e131bc6d Remove unused list of periodic services
The coap_resource_periodic_services list is no longer used, but it still
breaks the the observer functionality, so it should be removed.
2018-02-23 09:36:35 +01:00
Niclas Finne
309745780e Removed the remaining Contiki Interface declaration macros (CCIF/CLIF) 2018-02-21 01:14:10 +01:00
Simon Duquennoy
8aec2ac030 Fix lwm2m header inclusions 2018-02-02 11:14:53 -08:00
Simon Duquennoy
fe7ded0762 Routing API: add function node_has_joined 2018-02-02 08:51:29 -08:00
Simon Duquennoy
123105ab20 Move source routing state management from RPL Lite and RPL Classic to uip. 2018-02-02 08:51:29 -08:00
Simon Duquennoy
62d128f5c7 RPL Classic: added stub implementations of NS functions when NS is disabled 2018-02-02 08:51:29 -08:00
Simon Duquennoy
f8ddf8c816 Added missing includes for modules that rely on RPL 2018-02-02 08:51:29 -08:00
Simon Duquennoy
229cec630c RPL Classic: use full inclusion paths 2018-02-02 08:50:17 -08:00
Simon Duquennoy
627cb3de9c Homogenize access to RPL non-storing links from external modules 2018-02-02 08:50:17 -08:00
Simon Duquennoy
e1088e59d7 Fix includes for tsch-rpl module 2018-02-02 08:50:17 -08:00
Simon Duquennoy
65cbc45145 Rename routing module flags 2018-02-02 08:50:17 -08:00
Simon Duquennoy
5f4ad6d657 Fix compilation of multicast engines smrf and esmrf 2018-02-02 08:50:17 -08:00
Simon Duquennoy
7adfb92b63 Routing module configuration through netstack.h 2018-02-02 08:50:17 -08:00
Simon Duquennoy
f117770131 Fix inclusion paths 2018-02-02 08:50:17 -08:00
Simon Duquennoy
26d51c15d7 Routing API: added more missing functions, homogenize configuration 2018-02-02 08:50:17 -08:00
Simon Duquennoy
15b81c0fe5 Fix protocol-dependent def of UIP_MAX_ROUTES 2018-02-02 08:48:37 -08:00
Simon Duquennoy
fb8bf3d02d Remove unused define in uip6.c 2018-02-02 08:48:37 -08:00
Simon Duquennoy
b01c2d9802 Fix shell-commands.c 2018-02-02 08:48:37 -08:00
Simon Duquennoy
c9861b0726 Routing API: added neighbor_state_changed 2018-02-02 08:48:37 -08:00
Simon Duquennoy
c6f2364bd8 RPL Classic: fix rpl-ext-headers.c 2018-02-02 08:48:37 -08:00
Simon Duquennoy
dfa7d735ac Added necessary includes 2018-02-02 08:48:37 -08:00
Simon Duquennoy
4ffab13eeb Routing API: drop_route 2018-02-02 08:48:37 -08:00
Simon Duquennoy
eaa3b6ad79 Routing API: added link_callback 2018-02-02 08:48:37 -08:00
Simon Duquennoy
fac66307f6 RPL Lite: enable custom configuration of RPL_CONF_WITH_NON_STORING 2018-02-02 08:48:37 -08:00
Simon Duquennoy
fdbd89d018 Routing API: added ext_header_srh_update 2018-02-02 08:48:37 -08:00
Simon Duquennoy
25e07b7d23 Routing API: added ext_header_hbh_update 2018-02-02 08:48:37 -08:00
Simon Duquennoy
54655335c6 Routing API: added ext_header_update 2018-02-02 08:48:37 -08:00
Simon Duquennoy
4cdf2d4819 Routing API: added ext_header_srh_get_next_hop 2018-02-02 08:48:37 -08:00
Simon Duquennoy
03bab6f119 Routing API: added ext_header_remove 2018-02-02 08:48:37 -08:00
Simon Duquennoy
53facf941e Routing API: added toplogy repair 2018-02-02 08:48:37 -08:00
Simon Duquennoy
4cab396d48 Shell: explicitly include rpl-ns.h when needed 2018-02-02 08:47:46 -08:00
Simon Duquennoy
ab41114727 'rpl_init' is now static, rename to 'init' 2018-02-02 08:47:46 -08:00
Simon Duquennoy
8db37afb28 Adding missing functions in nullrouting.c 2018-02-02 08:47:46 -08:00
Simon Duquennoy
bc73bb3284 Added root_start to routing driver 2018-02-02 08:47:46 -08:00
Simon Duquennoy
83e9414a71 Add root_set_prefix to routing driver 2018-02-02 08:47:21 -08:00
Simon Duquennoy
4c9f62ebe4 Added NETSTACK_ROUTING for routing protocol selection. Only used for init() so far. 2018-02-02 08:47:21 -08:00
Simon Duquennoy
7ddee2c66a Move rpl-lite and rpl-classic to os/net/routing 2018-02-02 08:47:21 -08:00
Simon Duquennoy
14ccd337c9 rpl_dag_root module simplification 2018-02-02 08:47:21 -08:00
Simon Duquennoy
871ee1e34f Added routing module with only routing.h, now included wherever RPL is used 2018-02-02 08:45:02 -08:00
George Oikonomou
63a96752c8
Merge branch 'develop' into contrib/coap-lwm2m-dtls 2018-02-01 00:17:38 +00:00
Joakim Eriksson
3418bc7435
Merge branch 'develop' into nbr-fixes 2018-01-27 23:31:56 +01:00
Simon Duquennoy
8f7c4fb977 Shell: do not disable logging at init 2018-01-27 11:35:37 -08:00
Simon Duquennoy
d9e3abac2f Native BR: add makefile target 'connect-router-cooja' 2018-01-27 08:26:12 -08:00
Joakim Eriksson
50642b3e49 removed unused code and sensors on Sky slip-radio 2018-01-27 14:52:14 +01:00
Joakim Eriksson
1c0e76025b fixed slip-radio config, added shell to NBR and added parsing to no-framer 2018-01-26 22:59:48 +01:00
Niclas Finne
d3613ba10f Updated tinyDTLS submodule to remove some debug output 2018-01-19 13:26:47 +01:00
Niclas Finne
a18aaa4e26 Show compile information about tinyDTLS license only once. 2018-01-19 06:49:53 +01:00
Niclas Finne
833da8df76 Added compile information about license when including tinyDTLS in build 2018-01-17 20:03:28 +01:00
Niclas Finne
6562b78c6c Updated DTLS support for new logging system 2018-01-17 20:02:40 +01:00
Niclas Finne
8a44da0814 Updated tinydtls submodule 2018-01-17 20:00:18 +01:00
Niclas Finne
e746b024f0 CoAP: fixed typo in Doxygen comment 2018-01-12 18:57:14 +01:00
Niclas Finne
ee65ba289e lwm2m: moved LWM2M object resource IDs to each object header file.
Added Doxygen groups in CoAP and LWM2M.
2018-01-12 01:25:27 +01:00
Niclas Finne
811a62d8db lwm2m: made LWM2M security object URI and key size configurable + fixed typo 2018-01-12 01:20:53 +01:00
Niclas Finne
2d31c06a1e CoAP: renamed OPTION_MAP_SIZE to COAP_OPTION_MAP_SIZE for consistency 2018-01-12 01:20:53 +01:00
Niclas Finne
e37dd179d1 CoAP: added missing UIP_LLH_LEN in buffer size check as described by
Laurent Deru in #242.
2018-01-12 01:20:53 +01:00
Niclas Finne
11b005c7a4 Updated tinydtls submodule to address some Doxygen issues 2018-01-12 01:20:53 +01:00
Niclas Finne
5051b18ac9 LWM2M: changed to 30 sec RD client registration 2018-01-12 01:20:53 +01:00
Niclas Finne
c9cafb826d LWM2M: fixed token comparison to use token length 2018-01-12 01:20:53 +01:00
Joakim Eriksson
43466683ff fixed issues with the RD client 2018-01-12 01:20:53 +01:00
Joakim Eriksson
18cd711050 fixed issue with bootstrap and write of security and server object 2018-01-12 01:20:53 +01:00
Niclas Finne
04acccf9a0 Fixed compiler warnings in LWM2M logging 2018-01-12 01:20:53 +01:00
Niclas Finne
770ace0339 Removed reference to unused variable in the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne
ffffb0a9ad Fixed compiler warning in CoAP logging 2018-01-12 01:20:53 +01:00
Niclas Finne
c9d255b847 Updated LWM2M to use the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne
49d38e6d06 Added LWM2M runtime log level to the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne
4c56184a9b Updated CoAP to use the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne
21d464952b Added CoAP runtime log level to the logging module 2018-01-12 01:20:53 +01:00
Niclas Finne
0731c4f158 Added functions in uiplib to print a IP address to string and normal
output. Changed uip-debug to use the uiplib functions instead of its
own print functions.
2018-01-12 01:20:53 +01:00
Joakim Eriksson
6c729f50d6 added lwm2m-ipso test 2018-01-12 01:20:53 +01:00
Joakim Eriksson
c86b763e5d renamed coap packet to coap message - for naming closer to RFC 2018-01-12 01:20:53 +01:00
Niclas Finne
a866fcbfad CoAP: replaced coap_send_message() with coap_sendto() that returns
number of bytes sent or error.
2018-01-12 01:20:52 +01:00
Niclas Finne
074391fa7d CoAP: Various updates in coap-uip transport implementation
* Mark endpoint as secure regardless if DTLS peer exists or not
* Drop CoAP transmissions to endpoints that are not connected
* Debug output cleanup
2018-01-12 01:20:52 +01:00
Joakim Eriksson
379a3fac2b LWM2M fixed doxygen compile issues 2018-01-12 01:18:41 +01:00
Niclas Finne
082f4b920c ipso-objects: updated IPSO objects sensor/controllers to latest LWM2M API.
Added macros to setup IPSO sensor and control template data structs.
2018-01-12 01:18:41 +01:00
Niclas Finne
ebb329de5c CoAP: added make option to specify CoAP DTLS keystore to use by default.
The currently available options are:

* none   - No keystore registered.
* simple - Keystore using fixed PSK credentials.
* lwm2m  - Keystore based on LWM2M security objects

If an application wants to provide its own keystore, it selects 'none'
and registers its own at startup.
2018-01-12 01:18:41 +01:00
Joakim Eriksson
725e426c61 LWM2M: replace space with dash in endpoint name 2018-01-12 01:18:41 +01:00
Niclas Finne
83446e3f58 Imported ipso-objects from lwm2m-contiki at https://github.com/sics-iot/lwm2m-contiki 2018-01-12 01:18:41 +01:00
Niclas Finne
49d9ec182d Imported OMA LWM2M from lwm2m-contiki at https://github.com/sics-iot/lwm2m-contiki 2018-01-12 01:18:41 +01:00
Niclas Finne
ee8d85bde8 Imported CoAP from lwm2m-contiki at https://github.com/sics-iot/lwm2m-contiki 2018-01-12 01:18:41 +01:00
Niclas Finne
a0ec1a4065 Added tinyDTLS standalone as submodule 2018-01-12 01:18:41 +01:00
spoerk
f8d2c3fa48 code style fixes 2018-01-03 15:52:36 +01:00
spoerk
604e846ff1 Merge branch 'develop' of github.com:contiki-ng/contiki-ng into feature/ipv6_over_ble 2018-01-03 15:27:42 +01:00
spoerk
2a49608af6 link layer problem fixed 2018-01-03 14:51:23 +01:00
spoerk
35c08597e6 BLE L2CAP moved to the other MAC implementations 2018-01-03 14:36:14 +01:00
George Oikonomou
bcd75789d5 Make sure we don't add the same item twice
Fixes #254
2017-12-22 16:42:55 +02:00
George Oikonomou
fe2c960756 Tidy-up codestyle 2017-12-22 16:42:55 +02:00
George Oikonomou
b6aac6b008 Don't define NULL internally 2017-12-22 16:42:54 +02:00
George Oikonomou
f56822e968 Include contiki.h to pull in possible configuration 2017-12-22 16:42:54 +02:00
Simon Duquennoy
7f1dd819ef RPL BR: remove platform-specific code for sky. Add putchar with SLIP support to arch, like in other platforms 2017-12-22 05:21:39 -08:00
Simon Duquennoy
91ca67d393 CI: minor printout fix 2017-12-22 05:21:39 -08:00
Simon Duquennoy
6de6e15ce7 Move RPL border router from example to os/services 2017-12-22 05:21:39 -08:00
Simon Duquennoy
84ea0971bc Remove obsolete flag AUTOSTART_ENABLE, as well as .co and .ce files 2017-12-22 05:21:39 -08:00
Laurent Deru
c26aed5565 Always select a global address within the DODAG 2017-12-21 10:32:11 +01:00
Simon Duquennoy
836249a8c8
Merge branch 'develop' into fix-ra-rdnss 2017-12-20 12:42:34 +01:00
Simon Duquennoy
7286491c16
Merge branch 'develop' into fix-ra-rdnss 2017-12-20 11:37:55 +01:00
Simon Duquennoy
8b14fc8d4a
Merge branch 'develop' into fix-non-router-compilation 2017-12-20 11:37:06 +01:00
Laurent Deru
425b463df8 Fix logic of RA flags related to RDNSS 2017-12-20 10:23:16 +01:00
Laurent Deru
4b43e4971b Fix compilation error when not in Router mode 2017-12-20 10:14:11 +01:00
spoerk
fd0f0ca4b6 Merge branch 'develop' of github.com:contiki-ng/contiki-ng into feature/ipv6_over_ble 2017-12-15 11:41:27 +01:00
spoerk
7a7c4e0015 added support for IPv6 over BLE communication 2017-12-15 11:20:44 +01:00
George Oikonomou
e87e3850c4 Add circular, doubly-linked list library 2017-12-13 16:38:50 +00:00
George Oikonomou
09d6b123ab Add doubly-linked list library 2017-12-13 16:38:50 +00:00
George Oikonomou
b82ca1a5ef Add circular, singly-linked list library 2017-12-13 16:38:50 +00:00
George Oikonomou
9dab37eae4 Add queue library
This commit adds a queue library as a wrapper around the list library
2017-12-13 16:38:50 +00:00
George Oikonomou
8356183907 Add stack library
This commit adds a stack library as a wrapper around the list library
2017-12-13 16:38:50 +00:00
Simon Duquennoy
b938ad9aa7
Merge branch 'develop' into fix-icmp-error-source 2017-12-12 19:33:04 +01:00
Simon Duquennoy
a7e5cf85cf
Merge branch 'develop' into fix-rpl-ext-header-remove 2017-12-12 19:02:14 +01:00
Simon Duquennoy
6125637e40
Merge branch 'develop' into fix-rpl-classic-addr-autoconf-root 2017-12-12 18:05:01 +01:00
Simon Duquennoy
980a420b44
Merge branch 'develop' into fix-rpl-classic-multi-dodag-probing 2017-12-12 16:54:44 +01:00
Laurent Deru
3b24a57ad2 Move to next header when encountering DESTO instead of aborting the loop in rpl_ext_header_remove() 2017-12-12 16:17:20 +01:00
Laurent Deru
5bf06d851d rpl_ext_header_remove() should only remove RPL Hop-by-Hop extention header 2017-12-12 16:17:20 +01:00
Simon Duquennoy
efb1f13c9e
Merge branch 'develop' into fix-missing-llhlen 2017-12-12 16:12:20 +01:00
Laurent Deru
aae6276b56 Add missing UIP_LLH_LEN 2017-12-12 16:06:45 +01:00
Simon Duquennoy
118912d681
Merge branch 'develop' into fix-update-proto-remove-ext-hdr 2017-12-12 15:38:48 +01:00
Simon Duquennoy
66de2395fe
Merge branch 'develop' into fix-sicslowpan-llhlen 2017-12-12 13:54:59 +01:00
Simon Duquennoy
d609fb9eec
Merge branch 'develop' into fix-sicslowpan-llhlen 2017-12-12 13:49:16 +01:00
Laurent Deru
74efdf688e Always try to find the best dag 2017-12-12 13:35:29 +01:00
Simon Duquennoy
eadb9ea219
Merge branch 'develop' into fix-rpl-classic-addr-autoconf-root 2017-12-12 12:07:27 +01:00
Laurent Deru
a79fa13805 Additional cleanup when becoming DODAG Root (rpl-classic) 2017-12-12 09:27:27 +01:00
George Oikonomou
7be2524e1b
Merge branch 'develop' into contrib/uipbuf 2017-12-11 21:48:20 +00:00
George Oikonomou
79450eb10a
Merge branch 'develop' into fix-multicast-llhlen 2017-12-11 21:47:18 +00:00
Laurent Deru
a97148abd4 Make multicast route lifetime identical to unicast routes 2017-12-11 18:00:36 +01:00
Laurent Deru
ebb1f5475e Always use uip_ds6_select_src when sending back an icmp error 2017-12-11 17:49:26 +01:00
Laurent Deru
b782cda837 Do RPL probing on all the known DAG 2017-12-11 17:48:16 +01:00
Laurent Deru
52f7e4a9f5 Don't autoconfigure address on RPL Root 2017-12-11 17:45:55 +01:00
Laurent Deru
2bf9031b02 Update proto field in remove_ext_hdr() 2017-12-11 16:10:37 +01:00
Laurent Deru
418d792a4b Sicslowpan uses twice UIP_LLH_LEN for IPPAYLOAD_BUF 2017-12-11 16:08:43 +01:00
Laurent Deru
ed239372c1 Use UIP_LLH_LEN in multicast engines and add more traces 2017-12-11 15:40:18 +01:00
Joakim Eriksson
bd6de2401f added some documentation 2017-12-10 21:17:37 +01:00
Atis Elsts
5caff5290c Readd back 'uip_stat' if UIP_STATISTICS is enabled 2017-12-10 20:04:14 +00:00
George Oikonomou
7cd076a199 Add mutex API and generic implementation 2017-12-09 17:09:57 +00:00
George Oikonomou
1b89bba47e Add library for critical section entry/exit 2017-12-09 17:09:57 +00:00
George Oikonomou
a6dbc589a1 Add an API for memory barriers 2017-12-09 17:09:56 +00:00
George Oikonomou
21809648ad Add a master interrupt manipulation API 2017-12-09 17:08:31 +00:00
Joakim Eriksson
85eff304be set MAX_MAC_TRANSMISSION to undefined in uipbuf clear 2017-12-09 10:22:19 +01:00
Joakim Eriksson
52e012d3c1 optimized flash usage due to fit sky 2017-12-09 10:22:19 +01:00
Joakim Eriksson
1356994795 added support for usage of the transmission count attirbute in uipbuf 2017-12-09 10:22:19 +01:00
Joakim Eriksson
941ddf35b8 IPv6: added uipbuf attributes similar to packetbuf 2017-12-09 10:22:19 +01:00
George Oikonomou
05c65f3c4a Update documentation 2017-12-08 17:07:33 +00:00
Simon Duquennoy
e795517750
Merge branch 'develop' into contrib/stack-guard 2017-12-05 15:16:54 +01:00
Atis Elsts
f9516eae73 Add stack check library and example 2017-12-01 13:35:06 +00:00
Joakim Eriksson
646b3bcbe8
Merge branch 'develop' into contrib/logging-custom-prefix 2017-12-01 07:21:01 +01:00
Niclas Finne
91e3fa37d7 Added comment to the custom module prefix function in the logging module. 2017-11-30 22:40:09 +01:00
Niclas Finne
11b50009e9 Extend the logging module to support custom module prefix 2017-11-30 16:19:39 +01:00
Simon Duquennoy
4a790b8904
Merge branch 'develop' into contrib/coap-fix 2017-11-29 20:26:48 +01:00
Simon Duquennoy
a24a05f269 Fix CoAP bug with option parsing 2017-11-29 08:39:10 -08:00
George Oikonomou
1ba2eac5cb Use slip_write to slip_send 2017-11-24 12:31:21 +00:00
George Oikonomou
f9e17a6c76 Document slip_write 2017-11-24 12:31:20 +00:00
George Oikonomou
3e93e21646 Change return type of slip_send to void
The return value was not checked anywhere in the code
2017-11-24 12:31:20 +00:00
George Oikonomou
38df9fdfb2 Change slip_write return type and use it where possible 2017-11-24 12:31:20 +00:00
George Oikonomou
8f2fa80401 Make SLIP stats properly configurable 2017-11-24 12:31:20 +00:00
George Oikonomou
7fd76dc23e Change variables to static 2017-11-24 12:31:20 +00:00
George Oikonomou
4522b5b942 Tidy-up file structure and code style 2017-11-24 12:31:20 +00:00
George Oikonomou
24b17e58b1 Remove dead code and obsolete comments 2017-11-24 12:31:20 +00:00
George Oikonomou
80bfbe67e8 Include headers unconditionally 2017-11-21 15:13:57 +00:00
Joakim Eriksson
a5039634d5 fixed rpl-classic bug and moved the two lifetime loops into one 2017-11-17 11:58:17 -08:00
Simon Duquennoy
cbdc3e4569 RPL non-storing mode: increase routing state lifetime by one period (60s) so as to ensure no link espired before its avertised lifetime 2017-11-17 11:58:17 -08:00
Simon Duquennoy
faf526b441
Merge branch 'develop' into contrib/remove-mt 2017-11-17 19:40:06 +01:00
Simon Duquennoy
83fb4b68b5
Merge branch 'develop' into contrib/traceroute 2017-11-17 17:26:17 +01:00
Atis Elsts
a211cb6e31 Allow to set a different number of MAC retransmissions for different classes of packets 2017-11-17 14:13:20 +00:00
Simon Duquennoy
0bd107b0a0 uIP6 forwarding: clearer log messages 2017-11-14 10:04:31 +01:00
Simon Duquennoy
071f542078 uIP6: check MTU, check and update TTL even in the case of routing header forwarding 2017-11-13 16:37:23 +01:00
Xenofon (Fontas) Fafoutis
f206ee6fe6 Bugfix in HAL for LEDs. Static variable leds removed.
Bugfix in HAL for LEDs. Inline function show_leds removed.
2017-11-13 15:10:23 +00:00
Xenofon (Fontas) Fafoutis
828ed7a9c6 Bugfix in HAL for LEDs. Static variable leds did not get updated. 2017-11-13 13:05:08 +00:00
Simon Duquennoy
0952960b91 Removing multi-threading support 2017-11-11 15:28:11 +01:00
Simon Duquennoy
80ddae94d0
Merge branch 'develop' into develop 2017-11-09 16:13:15 +01:00
Simon Duquennoy
1a4efcd38d
TSCH: when not sending KA, issue LOG_ERR rather than LOG_INFO 2017-11-09 16:13:00 +01:00
Simon Duquennoy
f5511dfbd5 Doxygen: add more descriptions in rpl-lite/rpl-types.h 2017-11-07 15:46:36 +01:00
Simon Duquennoy
ae9aaf7632 Doxygen: fix glitch that caused some of the rpl-lite not to be included in the documentation 2017-11-07 15:46:36 +01:00
Michael Karlsson
c33c10540a Avoid tsch crash when loosing timesource 2017-11-07 01:43:54 +01:00
Niclas Finne
36362a49d3 Added energest configuration to viewconf 2017-11-02 00:10:56 +01:00
Simon Duquennoy
1275c4cb9e
Merge pull request #139 from nfi/contrib/energest-deep-lpm
New energest type for deep sleep plus configurable type for Energest time source
2017-10-31 23:24:12 +01:00
George Oikonomou
73544572cf Change all calls to adhere to new prototype 2017-10-31 21:56:38 +00:00
George Oikonomou
e1df7be496 Change slip_arch_init prototype
All current platforms ignore the ubr argument, so we remove it
2017-10-31 21:56:38 +00:00
Niclas Finne
e6ba2664b8 energest: removed include of energest from contiki.h to avoid circular dependency 2017-10-31 22:18:17 +01:00
Niclas Finne
cffe0c59f2 energest: activate energest type CPU at init 2017-10-31 22:18:17 +01:00
Niclas Finne
1c4622bad6 energest: Added new energest type ENERGEST_TYPE_DEEP_LPM to support
energy estimations of both sleep and deep sleep CPU modes.

Added configurable type ENERGEST_TIME_T to re-add support for clocks with
wrapping time as energest time source.
2017-10-31 22:17:30 +01:00
Simon Duquennoy
d9ae1118ef
Merge pull request #137 from simonduq/pr/logging-fixes
Minor logging fixes
2017-10-31 22:04:46 +01:00
Simon Duquennoy
d494ee85c7 Fix logging in uip-ds6.c 2017-10-31 16:16:04 +01:00
Simon Duquennoy
3bb8123038 Fix RPL log message 2017-10-30 21:49:02 +00:00
George Oikonomou
d6872f8cd9 Extend documentation 2017-10-29 23:18:39 +00:00
Simon Duquennoy
0321da5e88 Main: initialize modules only after phase three 2017-10-29 23:18:39 +00:00
Simon Duquennoy
56d1f795ff Minor fixes to platform initialization 2017-10-29 23:18:38 +00:00
George Oikonomou
5cbb82b9e0 Remove definition of old startup verbosity macros 2017-10-29 23:18:38 +00:00
George Oikonomou
66aa99d78e Use the logging module (Main) 2017-10-29 23:18:37 +00:00
George Oikonomou
e9509be98c Extend the logging module to support the common main + platform-specific hooks 2017-10-29 23:18:37 +00:00
George Oikonomou
8de3ffbc2e Don't initialise the queuebuf unconditionally
Currently, it is only used by 6LoWPAN when fragmentation is enabled, by TSCH and by CSMA. Platforms that disable fragmentation and choose a different MAC layer (e.g. NULLMAC) will unnecessarily end up with the module linked in the image, wasting flash and/or RAM space.
2017-10-29 23:18:36 +00:00
George Oikonomou
adbe10881f Return a value in our main() 2017-10-29 23:18:36 +00:00
George Oikonomou
5d95f8bd54 Hand main()'s arguments over to the platform 2017-10-29 23:18:36 +00:00
George Oikonomou
c3c5668ccd Update documentation to use \os 2017-10-29 23:18:36 +00:00
George Oikonomou
f2ee2c706c Call startup sequence stage 3 later 2017-10-29 23:18:36 +00:00
George Oikonomou
f89da621d9 Allow our main to accept arguments 2017-10-29 23:18:36 +00:00
George Oikonomou
d776ba035b Allow the platform to provide its own main loop 2017-10-29 23:18:35 +00:00
George Oikonomou
476e311ea7 Initialise watchdogs in the common main 2017-10-29 23:18:35 +00:00
George Oikonomou
0ca938245f Add implementation of the common main routine 2017-10-29 23:18:35 +00:00
George Oikonomou
9c20dc37c2 Add header file and documentation for a common main 2017-10-29 23:18:34 +00:00
George Oikonomou
21f5ff8edf Fix RPL configuration in mcast scenarios 2017-10-28 21:46:46 +01:00
Simon Duquennoy
0f1dd71124 nbr-table: fix default value for NBR_TABLE_MAX_NEIGHBORS 2017-10-26 16:29:04 +02:00
George Oikonomou
521d5c5aec Make logging module/level prefix optional 2017-10-18 01:11:06 +01:00
Simon Duquennoy
882be25428 Merge pull request #94 from simonduq/pr/misc
Miscellaneous fixes
2017-10-14 09:24:45 +02:00
Simon Duquennoy
4d8277366d Merge pull request #97 from sics-iot/contrib/cleanup-energest
Made energest more configurable
2017-10-14 09:24:14 +02:00
Simon Duquennoy
12a953cd88 Merge pull request #98 from nvt/remove-arg-module
Remove obsolete argument buffer module
2017-10-14 09:19:45 +02:00
Joakim Eriksson
7af63c740c Merge pull request #96 from sics-iot/contrib/remove-radio-sensor
Removed obsolete radio-sensor API
2017-10-13 18:54:43 +02:00
Simon Duquennoy
40e6b4be61 Fix typo in comment 2017-10-13 16:55:59 +02:00
Nicolas Tsiftes
d0c7c7c0ec Remove obsolete argument buffer module. 2017-10-13 14:38:29 +02:00
Niclas Finne
c845ea7453 Removed obsolete library procinit 2017-10-13 13:23:23 +02:00
Niclas Finne
358385b450 Removed obsolete radio-sensor API 2017-10-13 01:06:47 +02:00
Niclas Finne
18b5f6d667 energest: made energest more configurable
* energest time defaults to rtimer but can be configured via
  ENERGEST_CONF_CURRENT_TIME and ENERGEST_CONF_SECOND.

* Additional energest types can be added by platform and application
  using ENERGEST_CONF_PLATFORM_ADDITIONS and ENERGEST_CONF_ADDITIONS.

* Energest times are now 64 bit and thereby non-wrapping in most systems.

* Removed unused energest types for serial and sensors.
2017-10-13 00:17:30 +02:00
Niclas Finne
888a04e70f energest: removed support for ENERGEST_CONF_LEVELDEVICE_LEVELS 2017-10-13 00:05:31 +02:00
Niclas Finne
7317316942 energest: removed energest type ENERGEST_TYPE_IRQ 2017-10-12 23:57:38 +02:00
Niclas Finne
8b930bfa06 energest: removed energest types for reading/writing flash 2017-10-12 23:53:31 +02:00
Niclas Finne
68a8a0c445 energest: removed energest types for LEDs 2017-10-12 23:52:03 +02:00
Simon Duquennoy
663d1f121d Autoconfigure Orchestra whenever the module is included 2017-10-12 18:32:19 +02:00
Simon Duquennoy
81fe587574 Shell-commands: RPL commands are only compatible with rpl-lite. Disable them when rpl-lite is not used. 2017-10-12 17:09:29 +02:00
Simon Duquennoy
623fdf4a96 Shell tsch-set-coordinator: enable setting security 2017-10-12 17:09:26 +02:00
Simon Duquennoy
d26e5fb489 TSCH: automatically leave the network when setting as coordinator/node 2017-10-12 17:09:23 +02:00
Simon Duquennoy
741a1d5816 Shell: stop tsch_log at init 2017-10-12 17:09:13 +02:00
Simon Duquennoy
f14d6d4afe Shell: added command tsch-set-coordinator 2017-10-12 17:09:10 +02:00
Simon Duquennoy
9590b21888 TSCH: default Max EB period to 16s 2017-10-12 17:09:07 +02:00
Simon Duquennoy
c320717d9a tsch-log: fix autoconfiguration of TSCH_LOG_PER_SLOT 2017-10-12 17:09:01 +02:00
Simon Duquennoy
27e0357595 Shell: do not use tsch-logs when not enabled 2017-10-12 17:08:58 +02:00
Simon Duquennoy
a89df3b279 TSCH-RPL: configure callbacks automatically 2017-10-12 17:08:55 +02:00
Simon Duquennoy
1b97641e7f rpl-lite: simplify SRH insertion 2017-10-12 17:08:51 +02:00
Simon Duquennoy
02f5929ade insert_srh_header: return 0 when failing to insert SRH due too packet too long 2017-10-12 17:08:48 +02:00
Simon Duquennoy
a1f74d6568 Shell: start automatically whenver the module is included 2017-10-12 17:08:42 +02:00
Simon Duquennoy
bf8cc69252 contiki-default-conf.h: unfold definitions for more readable 'viewconf' 2017-10-12 08:42:45 +02:00
Simon Duquennoy
77cae0f45c Shell: prefix all lines with '#' 2017-10-11 17:43:26 +02:00
Simon Duquennoy
4c7d2a4bfc Minor changes to shell-commands 2017-10-11 17:26:39 +02:00
Simon Duquennoy
48997bb3ad Use 802.15.4 frames v2 by default only for TSCH, else fall back to v1 2017-10-11 17:26:08 +02:00
Simon Duquennoy
df01ebc219 Minor logging fixes 2017-10-11 17:25:07 +02:00
Simon Duquennoy
9d77bad2c2 sicslowpan: set SICSLOWPAN_COMPRESSION from .h file rather than .c, for integration with viewconf 2017-10-11 17:23:36 +02:00
Simon Duquennoy
c4f89ee44d Minor changes to contiki-default-conf.h 2017-10-11 17:22:13 +02:00
Simon Duquennoy
9087448dc4 Removing from contiki-default-conf.h configuration flags that are now set from Makefile exclusively 2017-10-10 21:04:36 +02:00
George Oikonomou
163ccafcba Fix erroneous comment 2017-10-08 17:03:04 +01:00
George Oikonomou
ab7b4676e0 Make CoAP more configurable 2017-10-08 17:00:37 +01:00
George Oikonomou
3a90439778 Make serial line special char values configurable 2017-10-08 17:00:37 +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
32e9c5067e Fix netstack.h comment 2017-10-08 14:50:07 +02:00
Simon Duquennoy
fb0de6dd7a Various fixes to netstack config 2017-10-08 14:47:34 +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
1b2b043f24 fixed nullnet and its examples 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
Joakim Eriksson
0f9207640b added netstack-ip-processor 2017-10-08 00:44:02 +02:00
Joakim Eriksson
ac12496e6d added output function to network layer 2017-10-08 00:44:02 +02:00
Simon Duquennoy
a92319bbca Rename PROJECT_CONF_H to PROJECT_CONF_PATH for clarity and so as to avoid possible conflicts with guards in project-conf.h files 2017-10-07 09:45:41 +02:00
Simon Duquennoy
20559fd308 Auto-include project-conf.h whenever found 2017-10-07 09:45:38 +02:00
Simon Duquennoy
25d69965a4 Move some readme files to wiki 2017-10-06 16:28:26 +02:00
Simon Duquennoy
c851357800 Doxygen fixes 2017-10-06 14:26:59 +02:00
Simon Duquennoy
14779f29f8 Rework Doxygen modules 2017-09-29 22:18:48 +02:00
Niclas Finne
cb5df665a2 Added boundary checks when parsing CoAP packets.
Thanks to Stephan Zeisberg for reporting this issue.
2017-09-29 10:57:09 +02:00
Simon Duquennoy
a3afb0d13e Merge pull request #72 from simonduq/pr/ip-reorg
Restructure ip implementation
2017-09-28 12:02:14 +02:00
Simon Duquennoy
e0f5929849 Merge pull request #45 from nvt/new-docs
Major documentation update.
2017-09-28 11:56:10 +02:00
Simon Duquennoy
543408db68 Re-organzie ip stack implementation 2017-09-22 17:09:54 +02:00
Nicolas Tsiftes
3166e29af7 Various documentation updates, including a modified main page and
the removal of various obsolete platforms and modules.
2017-09-22 16:00:55 +02:00
Simon Duquennoy
d9f9138ed2 Added NullNet, a network layer for non-IP-enabled cases 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
9cde0886d6 Simplify framer configuration 2017-09-22 14:34:20 +02:00
Simon Duquennoy
117dbe44c8 Simplify radio driver configuration 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
13f014f882 Update TSCH Readme file 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
Simon Duquennoy
3c9369737e Merge pull request #66 from yatch/pr/etsi-plugtest-2017
Project for ETSI Plugtest 2017
2017-09-16 09:18:02 +02:00
Nicolas Tsiftes
8ae774d413 Merge pull request #71 from simonduq/pr/rename-rpl
Rename old RPL implementation as rpl-legacy (update: rpl-classic)
2017-09-15 14:50:59 +02:00
Yasuyuki Tanaka
514a0365fe shell: add 6top command 2017-09-14 21:48:08 +09:00
Yasuyuki Tanaka
3a1cfc6f3e log: add a null check and fix indentation 2017-09-14 21:48:08 +09:00
Yasuyuki Tanaka
78a4d60584 sixtop: log fix 2017-09-14 21:48:08 +09:00
Simon Duquennoy
786cc13a95 Rename old RPL implementation as rpl-classic 2017-09-14 04:55:36 +02:00
Simon Duquennoy
af556985a8 Merge pull request #65 from yatch/pr/6p
6top protocol
2017-09-14 03:39:08 +02:00
Yasuyuki Tanaka
efd84940d8 sixtop: start transaction timer in its allocation process
While the timer is designed to get started on state transition from
SIXP_TRANS_STATE_INIT, the state transition may not happen in some
erroneous situation. This change makes sure that the timer is started
once it's allocated.
2017-09-13 14:38:06 +09:00
Yasuyuki Tanaka
57263042ae sixtop: use LOG APIs instead of PRINTF from net-debug.h 2017-09-13 14:38:06 +09:00
Yasuyuki Tanaka
7530c560c5 sixtop: support draft-ietf-6tisch-6top-protocol-07 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
Yasuyuki Tanaka
69affad825 framer-802154: suppress src panid and put dest pan id by default 2017-09-13 14:38:05 +09:00
Simon Duquennoy
2817b9212a framer-802154: compress PANID by default 2017-09-13 14:38:05 +09:00
Yasuyuki Tanaka
e9951e9341 framer-802154: do away with "type" of create_frame()
The argument, "type", is not used effectively in create_frame(). In
addition, it's confusing because create() calls create_frame() with
FRAME802154_DATAFRAME as "type" though it does not always create a data
frame.
2017-09-13 14:38:05 +09:00
Yasuyuki Tanaka
4ba8b2e684 TSCH: add argument validation in tsch_schedule_add_link()
The purpose is to avoid allocating a meaningless link, which could cause
communication issue with a peer.
2017-09-13 14:38:05 +09:00
Yasuyuki Tanaka
4fdaef2694 TSCH: make tsch_packet_create_eb() use NETSTACK_FRAMER.create()
tsch_packet_create_eb() is changed to build an Enhanced Beacon in the
packetbuf directly. Along with this, its signature is updated by
removing buf and buf_size from the argument list.
2017-09-13 14:38:05 +09:00
Yasuyuki Tanaka
6e8c5906bc TSCH: remove duplicate code from tsch_packet_create_eack()
tsch_packet_create_eack() prepares a frame802154_t data by itself, which
is similar to what framer_802154_setup_params() does. In order to avoid
duplicate code, tsch_packet_create_eack() is going to use
framer_802154_setup_params() to have a ready-to-use frame802154_t data.
2017-09-13 14:38:05 +09:00
Yasuyuki Tanaka
a35c3cad08 framer-802154: introduce framer_802154_setup_params() 2017-09-13 14:37:56 +09:00
Simon Duquennoy
0758755dad Merge pull request #68 from yatch/pr/shell-reboot
reboot command
2017-09-11 12:08:16 +02:00
Simon Duquennoy
e0edcd9800 Merge pull request #67 from yatch/pr/log-fixes
Log Message Fixes
2017-09-11 10:49:15 +02:00
Yasuyuki Tanaka
58f37fe72e shell: add reboot command which causes reset by watchdog_reboot() 2017-09-11 15:08:19 +09:00
Simon Duquennoy
37b7c2e90b TSCH: log parsing errors even when security is not enabled 2017-09-11 15:07:17 +09:00
Simon Duquennoy
a11c2f4a1f TSCH: bugfix in tsch-adaptive-sync 2017-09-11 15:07:17 +09:00
Yasuyuki Tanaka
0fd22a425a TSCH: bugfix in frame encryption
Header IEs shouldn't be encrypted since they are part of the header.
2017-09-11 15:07:17 +09:00
Simon Duquennoy
d1a24b64ce IEEE 802.15.4 log fixes 2017-09-11 15:05:19 +09:00
Simon Duquennoy
3537d06cc8 RPL log fixes 2017-09-11 15:05:19 +09:00
Simon Duquennoy
e9610ec647 Fix IPv6 log 2017-09-11 15:05:19 +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
fc9e77b562 Move websocket implementation to os/net/app-layer/http-socket 2017-09-04 16:29:19 +02:00
Nicolas Tsiftes
65fe7a1bb3 Removed incomplete file system implementations that have not been used much. 2017-09-01 17:22:11 +02:00
Niclas Finne
2165978d14 Moved cfs-posix to native platform 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
Nicolas Tsiftes
4a14896770 Moved CFS 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
Niclas Finne
2c86194ef8 Renamed core to os 2017-09-01 15:29:00 +02:00