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

11970 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Antonio Lignan efde9132a8 Merge pull request #1769 from gebart/pr/rest-engine-periodic-add-poll 
rest-engine: Allow adding periodic resources after starting REST engine
 2016-11-11 09:01:32 +01:00
Cristiano De Alti 1bdec853e1 Prevent interger overflow on the AVR 
Compiling examples/er-rest-example for the avr-raven gives:

  integer overflow in expression [-Woverflow]

On the AVR int is 16 bit and some calculations may overflow.
This happens for example with multiplications involving
CLOCK_SECOND where all the operands are of type int.
Casting one of the operands to clock_time_t forces
the arithmetic to clock_time_t without increasing the size
of the program (the calculation is performed at compile time).
 2016-11-05 22:46:42 +01:00
Antonio Lignan 1ebceb8f23 Merge pull request #1897 from mdlemay/shrink-pinmux-array 
galileo: Shrink pinmux array
 2016-11-02 21:40:42 +01:00
Benoît Thébaudeau 4d61e8f997 Merge pull request #1906 from bthebaudeau/fix-cc2538-disabled-lpm-warnings 
cc2538: lpm: Fix build warnings with LPM_CONF_ENABLE == 0
 2016-10-31 21:38:16 +01:00
Benoît Thébaudeau 6cdba10b1d Merge pull request #1895 from alignan/pull/fix-cc2538-cca 
cpu/cc2538: CCA threshold was fixed
 2016-10-28 23:42:18 +02:00
Antonio Lignan 0bb9052840 Merge pull request #1896 from alignan/pull/tsl-256x-rework 
Renamed driver and reworked to support both TSL2561/TSL2563
 2016-10-27 09:29:49 +02:00
Benoît Thébaudeau 0e7750489a Merge pull request #1905 from nfi/compiler-warnings-cc2538 
Fixed compiler warnings for CC2538-based platforms
 2016-10-26 13:12:47 +02:00
Niclas Finne 3982aee329 Added missing include 2016-10-26 00:04:58 +02:00
Benoît Thébaudeau 14ccffd9d4 cc2538: lpm: Fix build warnings with LPM_CONF_ENABLE == 0 
Some arguments passed to the functions disabled with
LPM_CONF_ENABLE == 0 could trigger build warnings because they became
unused with this configuration option. Disable these functions by using
empty static inline functions instead of empty macros, so that the
function arguments are always considered by the compiler as used,
without having to #if-out code in many places.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-10-25 22:18:37 +02:00
George Oikonomou 1d59651632 Merge pull request #1903 from morphal/mqtt-debug-printf-fix 
Fixed debug PRINTF definition in mqtt client
 2016-10-25 12:23:43 +01:00
aho 8306aded79 fixed typo in debug PRINTF definition 2016-10-25 12:38:15 +03:00
Nicolas Tsiftes d690dcae31 Merge pull request #1864 from sumanpanchal/wismote-battery-voltage 
Wismote: Added support for Battery voltage measurement
 2016-10-24 14:41:23 +02:00
Antonio Lignan 94174be708 Renamed driver and reworked to support both TSL2561/TSL2563 2016-10-19 23:13:25 +02:00
Michael LeMay 5c4cc2722e galileo: Shrink pinmux array 
The pins array in galileo-gen2-pinmux.c:galileo_brd_to_cpu_gpio_pin is
unnecessarily large.  This patch reduces its size.
 2016-10-19 09:31:50 -07:00
Antonio Lignan 2f76fc1f77 Merge pull request #1784 from g-oikonomou/contrib/cc1350 
Add CC1350 support
 2016-10-18 12:04:48 +02:00
Antonio Lignan 2a84e68e6d cpu/cc2538: CCA threshold was fixed 2016-10-18 09:35:04 +02:00