Commit Graph

571 Commits

Author SHA1 Message Date
Simon Duquennoy
08c52a1bcf
Merge branch 'release-4.1' into contrib/update-tinydtls 2018-05-04 21:03:04 +02:00
Niclas Finne
7aed97f514 Updated tinydtls submodule to latest version 2018-05-04 19:15:03 +02:00
Nicolas Tsiftes
f5cee451d1 Use a default Coffee file reservation size in Antelope that is selected in relation to the file system size. 2018-05-04 18:12:10 +02:00
George Oikonomou
684167cd91
Merge branch 'release-4.1' into contrib/shell-refresh-routes-lite 2018-05-04 12:16:56 +01:00
Simon Duquennoy
1dd49c2ffb
Merge branch 'release-4.1' into contrib/nullrouting-nullnet-consistent-naming 2018-05-04 12:03:28 +02:00
Niclas Finne
f6330996f7 dtls: shorter log module name for aligned log output 2018-05-04 11:11:17 +02:00
Niclas Finne
3c12738050 lwm2m: shorter log module names for aligned log output 2018-05-04 11:02:43 +02:00
Niclas Finne
5c4fad921e coap: shorter log module names for aligned log output 2018-05-04 11:02:37 +02:00
Niclas Finne
641a0d5e45 shell: the rpl-refresh-routes API is currently only provided by rpl-lite 2018-05-04 10:04:25 +02:00
Simon Duquennoy
846ab211b6 Nullrouting: lowercase string description 2018-05-04 00:43:31 -07:00
Niclas Finne
c176103aae shell: check if a preferred parent exists before showing status 2018-05-04 09:09:15 +02:00
Joakim Eriksson
183ae55bb2
Merge branch 'release-4.1' into contrib/slip-uip-llh-len 2018-04-30 17:53:40 +02:00
Simon Duquennoy
34ca2c06c1 TSCH: added file descriptions in .h files 2018-04-28 13:02:11 -07:00
Niclas Finne
274a5daa7d Updated users of SLIP to respect UIP_LLH_LEN 2018-04-27 01:43:19 +02:00
Simon Duquennoy
4da9202d22 Add lrwrap to login and native BR 2018-04-26 03:00:04 -07:00
George Oikonomou
ec4f04bef8
Merge branch 'develop' into fix/main-print-def-channel 2018-04-25 22:56:34 +01:00
Simon Duquennoy
ab2b1f4693 Main: always log 802.15.4 default channel 2018-04-25 10:37:30 -07:00
Niclas Finne
01a4b38fc8 uiplib: ensure string is null-terminated when printing unspecified address 2018-04-25 16:53:46 +02:00
Simon Duquennoy
3bd6c67e64 RPL native border router: use logging module 2018-04-24 11:37:28 -07:00
Simon Duquennoy
0fdacc86ac
Merge branch 'release-4.1' into fix/remove-leftover-coojaip64 2018-04-22 09:10:11 +02:00
Simon Duquennoy
f9a1f958e1 Merge remote-tracking branch 'origin/release-4.1' into develop 2018-04-20 08:37:14 -07:00
Simon Duquennoy
c5e8c2097f Remove leftover COOJA_IP64 flags 2018-04-20 05:24:07 -07:00
Simon Duquennoy
f339747218 rtimer: homogenize clock size configuration 2018-04-20 05:20:37 -07:00
Simon Duquennoy
ff7c3ee042 Make rtimer 32-bit by default 2018-04-20 05:20:37 -07:00
Simon Duquennoy
10ada60849 Doxygen for tsch-queue.h 2018-04-18 01:49:07 -07:00
Simon Duquennoy
6dc34c128f Doxygen for tsch-packet.h 2018-04-18 01:49:06 -07:00
Simon Duquennoy
0f41b9d1a6 tsch_packet_update_eb: fix return value to indicate failures 2018-04-17 12:36:43 -07:00
Simon Duquennoy
3728350ad4 Doxygen for tsch-adaptive-sync.h 2018-04-14 13:08:26 -07:00
Simon Duquennoy
5734b32a6f Doxygen for tsch-log.h 2018-04-14 13:08:26 -07:00
Simon Duquennoy
eb81487267 Doxygen for tsch-rpl.h 2018-04-14 13:08:25 -07:00
Simon Duquennoy
68ec94e0fb Doxygen for tsch-asn.h 2018-04-14 13:08:25 -07:00
Simon Duquennoy
8be446d0ea Doxygen for tsch-schedule.h 2018-04-14 13:08:25 -07:00
Simon Duquennoy
a48bf54668 Doxygen for tsch-slot-operation.h 2018-04-14 12:25:23 -07:00
Simon Duquennoy
533351f4dd Doxygen for tsch-types.h 2018-04-14 12:25:22 -07:00
Simon Duquennoy
bacdfcb253 Doxygen for tsch.h 2018-04-14 12:25:22 -07:00
Simon Duquennoy
61a7a377a3
Merge branch 'release-4.1' into fix/rpl-max-rank-16bit 2018-04-14 09:56:10 +02:00
Simon Duquennoy
2adf8544b2
Merge branch 'release-4.1' into fix/rpl-various 2018-04-13 18:07:39 +02:00
George Oikonomou
362641007a
Merge branch 'develop' into contrib/15.4-default-channel 2018-04-13 16:10:19 +01:00
Simon Duquennoy
0750824f19 Fix nullrouting for compilation with nullnet 2018-04-13 08:06:03 -07:00
Simon Duquennoy
3325c44f4e Main: print out 802.15.4 panid and channel, as well as routing layer configuration 2018-04-13 08:06:03 -07:00
Simon Duquennoy
5e753f73d0
Merge branch 'release-4.1' into contrib/coap-block2-offset 2018-04-13 16:52:25 +02:00
Simon Duquennoy
36bb007b19
Merge branch 'release-4.1' into contrib/root-old-version-reset-trickle 2018-04-13 15:52:25 +02:00
Simon Duquennoy
02b96f7474 Remove warning in case coap_engine_init is called twice 2018-04-13 06:51:33 -07:00
Simon Duquennoy
7a96a8f8a9 CoAP: auto-initialize module 2018-04-13 06:51:33 -07:00
Simon Duquennoy
cc37c1a558 CoAP: enable calling coap_get_payload with a NULL pointer 2018-04-13 06:51:33 -07:00
Simon Duquennoy
ebcb941867 Shell command 'rpl_status': show last DTSN of current parent 2018-04-13 05:44:49 -07:00
Simon Duquennoy
a49a5dc675 RPL handle_proving_timer: fix defensive programming check 2018-04-13 05:44:49 -07:00
Simon Duquennoy
dd8bf5d60a RPL DTSN increment log: fix format, promote from INFO to WARN 2018-04-13 05:44:49 -07:00
Simon Duquennoy
86ac0fba68 RPL global repair: stop all timers before re-initializing 2018-04-13 05:44:49 -07:00
Simon Duquennoy
cdca6959eb RPL global repair: log new version rather than old one. Re-init DTSN instead of incrementing it. Log format fixes. 2018-04-13 05:44:36 -07:00
Simon Duquennoy
d3c37eb61b rpl_refresh_routes: log new DTSN rather than old one 2018-04-13 05:44:36 -07:00
Simon Duquennoy
6022585ad0
Merge branch 'release-4.1' into fix/coap_get_payload 2018-04-13 14:39:39 +02:00
Simon Duquennoy
0df3c4fb90 CoAP: enable calling coap_get_payload with a NULL pointer 2018-04-13 05:37:10 -07:00
Joakim Eriksson
fc8619608a
fixed typo in comment. 2018-04-13 14:27:01 +02:00
Niclas Finne
24e24b8edc coap: added check for block offset overflow in block2 requests.
The block offset is stored in a signed variable in calls to CoAP handlers and
too large block offsets will overflow into negative values.

Thanks to Bruno Melo for reporting this issue.
2018-04-13 14:18:21 +02:00
Simon Duquennoy
15a06b85bc Added flag for 802.15.4 default channel 2018-04-13 02:26:48 -07:00
carlosgp143@gmail.com
f9c91ce527 Changed RPL_LEAF_ONLY flag to a runtime flag with getter and setter 2018-04-12 16:49:17 +02:00
Simon Duquennoy
8f3376691f RPL Lite: fix handling of max rank on 16-bit platforms 2018-04-11 11:46:54 -07:00
Simon Duquennoy
eae1e7eb5a sicslowpan: abort fragmentation in case the header does not fit the first fragment 2018-04-11 04:19:03 -07:00
Simon Duquennoy
0c9d2b4049 sicslowpan: when compressing, make sure never to overflow packetbuf with headers 2018-04-11 02:07:25 -07:00
George Oikonomou
58261ad53e Delete trailing whitespaces (tests/) 2018-04-07 14:49:19 +01:00
Simon Duquennoy
8abd9ad984
Merge branch 'develop' into pr/ndc-bugfix 2018-04-07 14:30:04 +02:00
Simon Duquennoy
c48173eb5b RPL Lite: whenever hearing an old version from the root, reset DIO timer to let the root know about the current version 2018-04-07 14:00:16 +02:00
Simon Duquennoy
b45276775e sicslowpan: fix compilation with fragmentation disabled 2018-04-06 12:47:09 -07:00
Simon Duquennoy
07c3e411ea Fix typos in comments 2018-04-06 12:47:08 -07:00
Simon Duquennoy
b10274d042 sicslowpan: neater logs 2018-04-06 12:47:08 -07:00
Simon Duquennoy
6c309825f9 sicslowpan: rework fragment output. Minimizes #frags. Fixes early #frag estimate. Clearer logs. 2018-04-06 12:47:08 -07:00
Simon Duquennoy
bf3d93decc sicslowpan: rename SICSLOWPAN_FIXED_HDRLEN to MAC_MAX_HEADER 2018-04-06 12:47:08 -07:00
Simon Duquennoy
d0aea6d0a1 sicslowpan: removing unused option SICSLOWPAN_USE_FIXED_HDRLEN 2018-04-06 12:47:08 -07:00
George Oikonomou
8eb9e0f276
Merge branch 'develop' into contrib/shell-rpl-refresh-routes 2018-04-05 23:47:24 +01:00
George Oikonomou
e1816115be
Merge branch 'develop' into fix/csma 2018-04-05 23:12:52 +01:00
Simon Duquennoy
9dfcb2ebb6 Various logging improvements 2018-04-05 20:47:02 +02:00
Simon Duquennoy
c56d11502b CSMA: fix configuration bug 2018-04-05 20:44:04 +02:00
Simon Duquennoy
9630245cda CSMA: reset collision count to 0, not CSMA_MIN_BE 2018-04-05 20:43:51 +02:00
Simon Duquennoy
96032fa47b Shell: added ability to trigger a RPL DTSN increment 2018-04-05 20:33:28 +02:00
Xenofon (Fontas) Fafoutis
629803c5e5 ext-flash driver moved to arch/dev/ 2018-04-04 11:30:32 +01:00
Xenofon (Fontas) Fafoutis
ab40997fd0 ext-flash driver: minor with pin unknown 2018-04-04 11:30:32 +01:00
Xenofon (Fontas) Fafoutis
b4b6ab1bdf improvements in ext-flash driver 2018-04-04 11:30:32 +01:00
Xenofon (Fontas) Fafoutis
d7baa54bd0 SPI HAL API: lock()/open() and close()/unlock() merged 2018-04-04 11:30:32 +01:00
George Oikonomou
2cad626360 Rename new SPI API to spi.[ch] 2018-04-04 11:30:32 +01:00
George Oikonomou
ee4e287fc5 Rename old SPI API to -legacy.h 2018-04-04 11:30:32 +01:00
George Oikonomou
7160e1dbd2 Change the way of configuring SPI controller count 2018-04-04 11:30:32 +01:00
George Oikonomou
f6f0c15421 Rename macro and move to HAL 2018-04-04 11:30:32 +01:00
George Oikonomou
e7eee05c7d Add some inludes explicitly 2018-04-04 11:30:32 +01:00
George Oikonomou
fe05c6f865 Fix doxygen errors 2018-04-04 11:30:32 +01:00
xenofon (Fontas) Fafoutis
e7d7ee3962 generic spi driver for cc26xx-cc13xx
launchpad and ext-flash implementation
2018-04-04 11:30:32 +01:00
Xenofon (Fontas) Fafoutis
cf291c22f0 Minor changes in the GPIO HAL 2018-04-04 11:30:32 +01:00
Xenofon (Fontas) Fafoutis
91882209bf HAL SPI API Proposal
Documenting the SPI HAL API
2018-04-04 11:30:32 +01:00
Niclas Finne
0683d4dc3d Imported SPI API from Yanzi Networks internal Contiki fork. 2018-04-04 11:30:32 +01:00
George Oikonomou
46f73b9a8a Remove obsolete Makefile 2018-04-02 23:00:52 +01:00
Simon Duquennoy
5e21edb20b
Merge branch 'develop' into contrib/gpio/logging 2018-04-02 21:15:16 +02:00
Simon Duquennoy
d01f6381be
Merge branch 'develop' into contrib/led-hal/no-led-support 2018-04-02 19:26:27 +02:00
George Oikonomou
84a74907f3 Allow the LED HAL to work on platforms without LEDs 2018-04-01 15:20:19 +01:00
George Oikonomou
59e26c8b21 Add some logging to the GPIO HAL 2018-04-01 14:33:04 +01:00
Yasuyuki Tanaka
601e14ebc7 uip-nd6: bugfix on address resolution by Neighbor Discovery protocol
nbr_table_update_lladdr() fails to update the lladdr of a nbr with a
new one when the new lladdr is used in nbr_table. This causes
communication errors when NS/NA is employed.

uip_ds6_nbr_update_ll() is introduced to resolve this issue. And
nbr_table_update_lladdr() is removed since it's not used any more.
2018-04-01 13:11:47 +02:00
George Oikonomou
148e796ee1 Don't implement putc and __sp
Those two functions are not necessary in Contiki-NG
2018-03-30 22:21:24 +01:00
George Oikonomou
b2438b4563 Enable putchar for all arm platforms
Instead of having to #undef putchar in every file where we want to use it, we undef it across the board. See the comment in arm-def.h as to why this needs done.
2018-03-30 22:20:48 +01:00
George Oikonomou
04ca5fd46a Update doxygen content and structure 2018-03-30 15:24:04 +01:00
George Oikonomou
6d592945a0 Use a single common dbg.h 2018-03-30 15:23:50 +01:00
George Oikonomou
ed3e2c850e Remove depedency to a debug-uart.h 2018-03-30 15:23:50 +01:00
George Oikonomou
8e52414e44 Fix naming convention 2018-03-30 15:23:50 +01:00
George Oikonomou
bb338affeb Move dbg-io to os 2018-03-30 15:23:50 +01:00
Yasuyuki Tanaka
c7d60bc8a6 sixtop: update to draft-ietf-6tisch-6top-protocol-10
- remove the schedule generation management using GEN field
- add SIGNAL command
- add RC_ERR_SEQNUM
- rename and reorder return codes
2018-03-29 16:19:21 +02:00
Yasuyuki Tanaka
62a93a7e62 sixtop: fix typos in error messages 2018-03-29 16:19:21 +02:00
Simon Duquennoy
a3e62befb8 TSCH: rework .h system, now following the same structure as rpl-lite 2018-03-28 10:39:41 -07:00
Joakim Eriksson
5e45ffc194
Merge branch 'develop' into fix_observer 2018-03-28 08:21:47 +02:00
Yasuyuki Tanaka
4206761ccf shell: add missing UIP_CONF_IPV6_RPL guard 2018-03-27 17:22:52 +02:00
Yasuyuki Tanaka
49e5cf3c8c sicslowpan: fix debug messages and remove TABs 2018-03-26 20:55:56 +02:00
Simon Duquennoy
146427724a TSCH-RPL: reset link statistics when leaving network 2018-03-25 07:02:32 -07:00
Simon Duquennoy
c6a5819d8d RPL local repair: do not reset link statistics 2018-03-25 06:31:01 -07:00
Simon Duquennoy
35bcaeb828
Merge branch 'develop' into infinite-ka-fix 2018-03-23 19:01:19 +01:00
Tim van der Lee
5b0c5b7007 Changed keepalive callback to avoid sending immediate keepalive when the network is congested 2018-03-23 11:40:05 +01:00
Simon Duquennoy
bc3e37e5e1
Merge branch 'develop' into pr/shell-improvement 2018-03-22 21:21:22 +01:00
Yasuyuki Tanaka
90248b6dc2 shell: minor fix on shell output message 2018-03-22 17:42:21 +00:00
Yasuyuki Tanaka
ecd64846a8 shell: add NULL pointer check 2018-03-22 17:41:54 +00:00
Yasuyuki Tanaka
fb5fa58ec3 shell: replace TAB with spaces 2018-03-22 17:37:14 +00:00
Yasuyuki Tanaka
039d5b4c8d shell: increase buffer size for SHELL_OUTPUT() 2018-03-22 17:36:10 +00:00
Simon Duquennoy
e19a7f1a40 Fix a number of comments in rpl-lite/rpl-timers.c 2018-03-21 09:34:41 -07:00
Joakim Eriksson
0c31f4dd95
Merge branch 'develop' into wip/button-hal 2018-03-21 07:19:51 +01:00
Johan Liseborn
512d648319
Merge branch 'develop' into fix_observer 2018-03-20 10:32:09 +01:00
Simon Duquennoy
eb62a7894c nbr_table_register: make sure not to register a given table twice 2018-03-19 12:09:07 -07:00
Simon Duquennoy
baa02a76f2 nbr_table_is_registered: prevent potential buffer overflow 2018-03-19 12:08:02 -07:00
Simon Duquennoy
fc053b15b9 Rename nbr_table_is_register to nbr_table_is_registered 2018-03-19 12:05:32 -07:00
Simon Duquennoy
850e6fefb3 RPL-Lite: initialize rpl-neighbor module only once, in rpl.c 2018-03-19 11:51:40 -07:00
George Oikonomou
a8c9931257 Add a function to retrieve a button by index 2018-03-18 12:50:37 +00:00
George Oikonomou
180a52b4ff Add a way to retrieve device button count 2018-03-18 12:50:37 +00:00
George Oikonomou
708127dfb8 Change variable to volatile 2018-03-18 00:10:10 +00:00
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