Commit graph

11954 commits

Author SHA1 Message Date
Yasuyuki Tanaka
87337e12fc Revert coordinator selection based on node-id for Cooja mote
(example/ipv6/rpl-tsch/node.c)
2016-11-26 11:47:59 +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
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
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
Oliver Schmidt
b8d753d35e Merge pull request #1889 from oliverschmidt/master
Several retrotarget changes
2016-10-16 13:12:24 +02:00
Oliver Schmidt
fb4c42a357 Added custom log function for CBM machines.
The log function writes directly to the screen. Combined with the usage of PFS this means that the POSIX layer of the C library isn't referenced anymore thus reducing the memory requirements.
2016-10-15 23:36:53 +02:00
Oliver Schmidt
d864e73579 Added directory functions to the Commodore Platform File System.
They reduce the Telnet server's run size by 1231 bytes.
2016-10-15 18:36:54 +02:00
Oliver Schmidt
c25e965b0c Avoid unnecessary key presses.
The recently added doesclrscrafterexit() allows cc65 programs to determine if the screen will be cleared after exit(). If that isn't the case then there's no need to ask the user to press a key in order to allow him to read the final program output.
2016-10-15 15:27:42 +02:00
Simon Duquennoy
14bfaffe00 Merge pull request #1883 from zhitaoh/fix-6LoWPAN-typo
fix comment with 6LoWPAN typo and break long lines
2016-10-12 15:05:24 +02:00
Oliver Schmidt
957ac63a7c Improved dicarding of text in the HTML header.
Plain text in the HTML header (think of <title>text</title>) is collected as usual. The decision to discard it is triggered by the first withspace following. In the usual case of the <body> no preceeded by any whitespace this means that by the point the first whitespace is encountered we're not in "discard mode" anymore and therefore incorrectly render the text.

Explicitly calling do_word() just before leaving "discard mode" discards all text collected so far.
2016-10-11 11:25:31 +02:00
Oliver Schmidt
72cc19c680 Fixed ProDOS 800kB image.
The 800kB file claimed to be a 32MB image. Now the logical size and pysical size match.
2016-10-11 11:18:23 +02:00
g.oikonomou@bristol.ac.uk
ec4b403e77 Allow and document IEEE mode for CC13xx 2016-10-07 10:05:14 +01:00
Zhitao He
7bb10dc2a0 fix comment with 6LoWPAN typo and break long lines 2016-10-03 15:53:28 +02:00
Antonio Lignan
6157dce0b5 Merge pull request #1877 from alignan/pull/fix-zoul-doc
Zoul: updated pin-out images
2016-09-28 23:05:17 +02:00
Antonio Lignan
fd881bec19 Merge pull request #1874 from alignan/pull/zolertia-firefly-reva1
Zoul: added new Firefly revision A
2016-09-28 17:01:19 +02:00
Antonio Lignan
1758eaa08c Zoul: updated pin-out images 2016-09-28 16:54:51 +02:00
Nicolas Tsiftes
272c7b92d0 Merge pull request #1875 from mdlemay/fix-dhcp-ipv6
galileo: Omit DHCP code when IPv6 is enabled
2016-09-27 17:04:23 +02:00
Michael LeMay
04446e8da5 galileo: Omit DHCP code when IPv6 is enabled 2016-09-24 17:37:07 -07:00