Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity
12,000 Commits 1 Branch 17 Tags 75 MiB
95f69d92a8
Commit Graph

12000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Lignan
95f69d92a8 Merge pull request #1918 from adamdunkels/pr-websocket-2 
Contiki websocket client
 2016-12-05 06:46:43 +01:00
Antonio Lignan
027f1c3e64 Merge pull request #1924 from g-oikonomou/contrib/cc26xx-cc13xx/update-ccxxwares 
Update to latest CC13xxware/CC26xxware
 2016-12-04 23:55:31 +01:00
George Oikonomou
367104166e Update to latest CC13xxware/CC26xxware 2016-12-04 13:33:40 +00:00
Antonio Lignan
af4f1e1c30 Merge pull request #1866 from yschroeder/pull-req/serialdump 
Improved serialdump.c
 2016-12-04 13:17:39 +01:00
Antonio Lignan
2be999c707 Merge pull request #1967 from MohamedSeliem/patch-9 
Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00)
 2016-12-04 12:46:07 +01:00
Antonio Lignan
36519a9742 Merge pull request #1969 from g-oikonomou/contrib/fix-typo 
Fix minor typo
 2016-12-04 12:45:04 +01:00
Mohamed seliem
4a93babb58 fix msg.dst.sin6_addr.__u6_addr.__u6_addr16 2016-12-04 03:29:50 +02:00
Mohamed seliem
452666b43e add missing include 2016-12-04 03:29:49 +02:00
Mohamed Seliem
82b5fb5073 Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00) 2016-12-04 03:29:49 +02:00
George Oikonomou
d6656ccde1 Fix minor typo 2016-12-03 23:26:25 +00:00
Antonio Lignan
9ccc1697cf Merge pull request #1966 from yatch/pr/travis-jdk 
travis: workaround for the Java issue on Travis CI
 2016-12-03 12:13:40 +01:00
Yasuyuki Tanaka
120632b4a8 travis: workaround for the Java issue on Travis CI 
References:
https://docs.travis-ci.com/user/build-environment-updates/2016-12-01/
https://github.com/travis-ci/travis-ci/issues/6928#issuecomment-264227708
 2016-12-02 16:48:57 +01:00
Antonio Lignan
94854177e2 Merge pull request #1961 from jdede/uart-init 
Do not initialize and use the wrong UART (z1)
 2016-12-02 15:41:32 +01:00
Antonio Lignan
6565652e43 Merge pull request #1962 from MohamedSeliem/patch-8 
update contiki-conf to avoid redfintion of UIP_CONF_RECEIVE_WINDOW
 2016-12-02 09:52:48 +01:00
Mohamed seliem
0ef0a21d9e update for all platforms 2016-12-01 21:26:32 +02:00
Mohamed Seliem
0c65a4db9c update contiki-conf to avoid redfintion of UIP_CONF_RECEIVE_WINDOW 
in case of compiling any example that contains the definition of UIP_CONF_RECEIVE_WINDOW over Z1 mote.
i receive this warning: 
 In file included from ../../../core/./contiki.h:38:0,
                   from ../../../core/./contiki-net.h:37,
                   from httpd-simple.c:43:
  ../../../platform/z1/./contiki-conf.h:225:0: warning: "UIP_CONF_RECEIVE_WINDOW" redefined
 ./project-conf.h:60:0: note: this is the location of the previous definition
 2016-12-01 20:35:29 +02:00
Antonio Lignan
63322fdfb2 Merge pull request #1960 from pablocorbalan/rm-rpl-conf-of 
Remove definitions of outdated RPL_CONF_OF
 2016-12-01 16:30:46 +01:00
Nicolas Tsiftes
238e8b4dcf Merge pull request #1949 from simonduq/pr/non-storing-fix-dtsn 
RPL non-storing: more conservative DTSN update
 2016-12-01 16:27:38 +01:00
Simon Duquennoy
7bb50da178 Merge pull request #1271 from drugo72/pr-rpl 
RPL: fix clock_time_t calculations
 2016-12-01 16:22:43 +01:00
Jens Dede
0d3ff7b785 Rm unnecessary uart commands 2016-12-01 15:12:23 +01:00
Pablo Corbalán
983d858570 Remove definitions of outdated RPL_CONF_OF 2016-12-01 13:13:41 +01:00
Antonio Lignan
5e7acd4dc2 Merge pull request #1643 from akshaypm/zoul-uart-example 
Zoul UART example
 2016-12-01 11:42:44 +01:00
akshaypm
cd75e50c28 cc2538 uart example 2016-12-01 12:45:10 +05:30
George Oikonomou
7c54b7cd50 Merge pull request #1867 from MohamedSeliem/patch-6 
update uart1.c to include Special function registers bits definitions
 2016-11-30 16:37:49 +01:00
Antonio Lignan
a8acaf08d5 Merge pull request #1938 from makrog/pr/cc1200-fixes 
Fixed checking of the cc1200 GPIO0 pin status.
 2016-11-30 14:24:48 +01:00
MakA
91a6ce6576 Fixed checking of the cc1200 GPIO0 pin status. 2016-11-29 12:16:03 +02:00
Antonio Lignan
1abc95a08e Merge pull request #1952 from arurke/fix_rf_channel_cc13xx 
Move RF_CHANNEL check in cc13xx/cc26xx such that it applies for cc13xx prop mode
 2016-11-28 09:37:00 +01:00
Andreas Urke
835a6aa6e6 Move RF_CHANNEL such that it is applied for prop mode as well 2016-11-27 16:13:58 +01:00
Simon Duquennoy
728e417e04 Merge pull request #1502 from yatch/pr-radiologger 
Fix timestamps of packets recorded in pcap files
 2016-11-27 11:58:03 +01:00
Antonio Lignan
58243bc14a Merge pull request #1827 from alignan/pull/rf-channel 
Harmonize RF_CHANNEL definition
 2016-11-25 21:11:20 +01:00
George Oikonomou
610eefc2ff Merge pull request #1741 from simonduq/pr/tsch-adaptive-control-traffic 
TSCH adaptive control traffic
 2016-11-25 15:53:32 +00:00
Simon Duquennoy
3e00adacc0 RPL non-storing: more conservative DTSN update, as per RFC 6550, section 9.6. 2016-11-25 16:30:08 +01:00
Nicolas Tsiftes
edf3a27920 Merge pull request #1879 from pernin/master 
Change on DIO trickle timer condition for DIO sending
 2016-11-25 16:15:08 +01:00
Nicolas Tsiftes
a69d78ac73 Merge pull request #1948 from zhitaoh/zoul-example-readme 
correct shell arguments
 2016-11-25 16:13:02 +01:00
Zhitao He
7ba88a6800 correct shell arguments 2016-11-25 14:59:30 +01:00
Antonio Lignan
fc582606f2 Harmonize RF_CHANNEL definition 2016-11-25 10:37:14 +01:00
Benoît Thébaudeau
52a8dcc65b Merge pull request #1816 from bthebaudeau/cm-cc2538-mt 
Cortex-M and CC2538 multi-threading
 2016-11-24 23:28:05 +01:00
Benoît Thébaudeau
9c47f874c4 CC2538: Enable Cortex-M mtarch implementation 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
3f676a5a16 ARM: Add common Cortex-M mtarch implementation 
This includes support for preemption ready to be integrated into
exception handlers.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
81805129f8 mt: Fix preemption 
Preemption was supposed to be supported, but it had no means of safely
updating the state of a thread, so mt_exec() could fail to resume a
preempted thread.

mt_exec() is allowed to be called only from the main Contiki thread, so
the mt threads passed to it may be only ready or exited, not running.
Consequently, there is no need for a distinction between the ready and
running states, so merge them as a started state, which avoids having to
update the state of a thread upon preemption.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
927e9b8150 mt: Fix missing call to mtarch_pstop() 
If mt_yield() needs it, then mt_exit() too. A thread could indeed be
preempted while calling mt_exit().

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
82afa72c13 mt: Remove unused code 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
ab1491be69 CC2538: Use CMSIS-CORE 
Switch to CMSIS-CORE and remove the duplicate code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
9195b49c18 ARM: CMSIS-CORE: Introduce NVIC_IsIRQEnabled() 
This function returns the enable state of an interrupt.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
d3158897c2 ARM: CMSIS-CORE: Fix doxygen warnings 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
280dc091d2 ARM: CMSIS-CORE: Bump version to 4.30 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Benoît Thébaudeau
ca86d5febf ARM: Fix doxygen style 
The rule in Contiki is to use backslashes, not at signs.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-11-24 22:30:26 +01:00
Luca Pernini
5803971adc Changing DIO timer condition - merge 2016-11-24 10:52:10 +01:00
Simon Duquennoy
86dbd590db Merge pull request #1400 from pablocorbalan/nud-with-acks 
Refresh nbr reachable state after received IPv6 unicast message
 2016-11-23 12:00:13 +01:00
Simon Duquennoy
ecd1d57eec Merge pull request #1661 from yatch/pr-tsch-cooja-mote 
TSCH on Cooja mote
 2016-11-23 11:59:29 +01:00