Víctor Ariño
76e293c289
Fixes ret value for output fallback iface in tun-bridge.c
2015-09-22 12:53:04 +02:00
Víctor Ariño
561e70b18e
Updated current fallback_interface(s) to return int.
2015-09-22 12:53:04 +02:00
lebrush
b3f6019924
More flexibility for the fallback interface.
...
When there's a failure to send a packet in the fallback interface the
destination is unreachable and therefore the source should be notified.
2015-09-22 12:53:04 +02:00
Mariano Alvira
aecb591d12
Merge pull request #688 from SmallLars/flash
...
App/Tool/Example for usage of additional flash on econotag/mc1322x
2015-09-21 10:58:33 -05:00
Lars Schmertmann
46ffc509c1
Added App/Tool/Example for usage of additional flash on econotag/mc1322x
2015-09-14 20:43:12 +02:00
Mariano Alvira
552408b241
Merge pull request #685 from SmallLars/mc1322x
...
Added mc1322x functions: clock_set_seconds, soft_reset, nvm_verify
2015-09-13 12:35:53 -05:00
Mariano Alvira
1ddcdf4886
Merge pull request #839 from gebart/rf230-isr
...
rf230bb: Handle all IRQ flags in one ISR call. (Q: Is the current ISR valid?)
2015-09-13 12:06:36 -05:00
Mariano Alvira
050275293a
Merge pull request #922 from atiselsts/rs230bb_fixes
...
Atmel 230bb: always increase the rx frame ringbuffer cursor in rf230_read()
2015-09-13 11:58:16 -05:00
Nicolas Tsiftes
70b3585f76
Merge pull request #1249 from simonduq/fix-rpl-icmp-warnings
...
Fix compiler warnings in rpl-icmp6.c
2015-09-10 14:44:04 +02:00
Nicolas Tsiftes
2ec3b1e973
Merge pull request #1185 from sumanpanchal/cc2520
...
Fixed the issue with CC2520_READ_REG macro to read correct value of register.
2015-09-10 14:37:00 +02:00
Fredrik Österlind
bab413b824
Merge pull request #1251 from MattiasBuelens/cooja-cfs-file-size
...
Cooja: Track CFS file size
2015-09-10 10:31:33 +02:00
Mattias Buelens
72aac552ef
Cooja: Track CFS file size
...
Previously, the Cooja mote assumed that its file was always initially empty (file.endptr == 0). Therefore, a file uploaded to a mote's CFS could never be read by the mote, as the mote would prevent reads from going past the EOF (indicated by endptr).
By tracking the file size and making it accessible to Cooja, the correct size of the uploaded file can be reported to the mote and allow it to read the uploaded file.
2015-09-09 23:06:09 +02:00
Simon Duquennoy
5329c42034
Remove unused variables
2015-09-08 23:38:43 +02:00
Sumankumar Panchal
27dd3f493b
Solved issue with CC2520_READ_REG macro to read correct value of register.
2015-09-08 19:39:23 +05:30
Nicolas Tsiftes
677929da73
Merge pull request #1227 from simonduq/travis-er-rest-example-wismote
...
Travis: compile er-rest-example for the Wismote platform rather than Sky
2015-09-08 14:09:42 +02:00
Nicolas Tsiftes
bebf0f9156
Merge pull request #1246 from nvt/wismote-fixes
...
Minor fixes for the WisMote platform
2015-09-08 13:52:45 +02:00
Simon Duquennoy
63ddba93a9
Merge pull request #1169 from feshie/pr-warnings-fix
...
Fix multiple warnings (TCPIP, coap-observe, msp430, z1/tmp102, ContikiMAC)
2015-09-08 09:05:44 +02:00
Arthur Fabre
e8cbf2e5fb
Fix warning in TCPIP
...
When disabling TCP support, the following warning is triggered:
../..//core/net/ip/tcpip.c:159:1: warning: ‘start_periodic_tcp_timer’
defined but not used [-Wunused-function]
An added ifdef guard now only defines this function when TCP support is
enabled.
2015-09-07 17:52:22 +01:00
Arthur Fabre
158087db62
Fix warning in coap-observe
...
../..//apps/er-coap/er-coap-observe.c:237:15: warning: unused variable
‘content’ [-Wunused-variable]
This was caused by a buffer that was declared, but used only in
commented out code.
The variable was moved to the commented out block.
The block was surrounded by an #if 0 ... #endif to make it easier to
uncomment.
Everything still compiles with the code in question uncommented.
2015-09-07 17:51:27 +01:00
Nicolas Tsiftes
8a7e2e5892
Merge pull request #1240 from atiselsts/energest_accuracy
...
Improve energest accuracy
2015-09-07 15:35:35 +02:00
Fredrik Österlind
dde83500c9
Merge pull request #1056 from tim-ist/packet_sync
...
[Cooja/cc2420] Check the frame preamble and MPDU length before parsing an outgoing packet
2015-09-07 14:36:15 +02:00
George Oikonomou
dd640cd229
Merge pull request #1195 from bkozak-scanimetrics/cc26xx_improve_watchdog
...
CC26xx - various fixes and improvements for the watchdog module
2015-09-04 17:20:50 +01:00
George Oikonomou
b6dac70474
Merge pull request #1231 from bkozak-scanimetrics/cc26xx_rf_core_fix_transmit_wake
...
CC26xx - enable correct IRQ in rf_core_cmd_done_en
2015-09-04 17:08:50 +01:00
Atis Elsts
eac1973073
Introduce ENERGEST_SWITCH macro. It allows to switch between energest modes without running into the risk of losing a tick in the process
2015-09-04 11:49:02 +02:00
Atis Elsts
2f79810b58
Use ENERGEST_SWITCH to switch between different power modes to improve energest accuracy.
2015-09-04 11:46:00 +02:00
Billy Kozak
b71353181d
CC26xx - enable correct IRQ in rf_core_cmd_done_en
...
Fix for #1229
rf_core_cmd_done_en() was enabling the wrong irq for detecting the
completion of foreground operations. This was causing cc26xx devices
to not wake-up on time when calling lpm_sleep() from transmit().
2015-09-02 12:37:33 -06:00
Adam Dunkels
92c1a68b94
Merge pull request #1215 from joakimeriksson/rpl-child-locking
...
Move locking of neighbors / children from RPL to uip-ds6-route module
2015-09-02 19:42:45 +02:00
Simon Duquennoy
10395fffde
Merge pull request #1230 from simonduq/fix-wismote-random-init
...
Fix Wismote randon_init for link-layer addresses shorter than 8 bytes
2015-09-02 17:44:57 +02:00
Simon Duquennoy
265b65c67c
Fix Wismote randon_init for link-layer addresses shorter than 8 bytes
2015-09-01 19:57:37 +02:00
Antonio Lignan
c792993664
Merge pull request #1226 from simonduq/z1-wismote-minor
...
Minor fixes to Z1 and Wismote
2015-09-01 14:15:20 +02:00
Fredrik Österlind
650de13ad8
Merge pull request #822 from cmorty/pull/cooja_saferandom
...
Make Random simulation thread safe
2015-09-01 11:13:23 +02:00
Fredrik Österlind
562a451191
Merge pull request #1224 from cmorty/pull/refactor
...
Pull/refactor
2015-09-01 10:58:27 +02:00
Simon Duquennoy
4904386f41
Wismote: init random seed
2015-09-01 10:51:25 +02:00
Simon Duquennoy
29815d0696
Travis: compile er-rest-example for the Wismote platform rather than Sky
2015-09-01 10:20:58 +02:00
Simon Duquennoy
db1635cf3c
Z1: configure SFD timestamp with flag CC2420_CONF_TIMESTAMP, for consistency the Sky platform and with cc2420.c
2015-09-01 10:03:44 +02:00
Simon Duquennoy
34280338ac
Z1: init random seed
2015-09-01 10:02:35 +02:00
Billy Kozak
fde3202a3f
cc26xx - added optional locking mode for WDT
...
Added a mode, configurable by the CONTIKI_WATCHDOG_CONF_LOCK_BETWEEN_USE
macro, which locks the WDT register between uses so as to prevent
any accidental modifications
2015-08-31 09:12:16 -06:00
Billy Kozak
22d8a8dd56
cc26xx - implemented watchdog_stop
...
Also modified watchdog_start so that if we stop and start again the
watchdog timeout will be reset (by calling watchdog_periodic).
2015-08-31 09:12:16 -06:00
Billy Kozak
dfdb0a6487
cc26xx - fixed WDT reloading
...
According to the TRM, the WDT does not produce a reset until it
expires twice. After expiring the WDT will set the INT flag if it
is unset, and reset the MCU if INT is already set.
Before this patch, watchdog_periodic() only un-sets the INT flag. This
means that the behaviour of watchdog_periodic is underministic in that
the value of the countdown timer will be different depending on
when the function was called.
This patch fixes this behaviour by also reloading the timout value.
2015-08-31 09:10:26 -06:00
Billy Kozak
85555cf6cf
Made cc26xx WDT reload configurable with macro
...
CONTIKI_WATCHDOG_TIMER_TOP sets the reload value of the WDT
2015-08-31 09:10:26 -06:00
Sebastian Schinabeck
ef779d4fc1
settingsObservable superseded by radioMediumObserver
...
Wasn't used anyway
2015-08-31 14:59:53 +02:00
Sebastian Schinabeck
c1a275f0b2
Refactored RadioMediumObservable and added new Observable
...
Refactored RadioMediumObservable to RadioTransmissionObservable because of its function
Added correct RadioMediumObservable and updating in AbstractRadioMedium, DirectedGraphMedium and MRM
Added some documentation
2015-08-31 14:59:47 +02:00
Nicolas Tsiftes
b8cccb6d3c
Merge pull request #1183 from simonduq/galois_mul2
...
galois_mul2 conditional-free implementation
2015-08-31 14:41:17 +02:00
Sebastian Schinabeck
42077adbb1
Add ScnObservable class with setChangedAndNotify() function
...
The ScnObservable extends the normal Observable with the combined setChangedAndNotify() function
2015-08-31 14:40:39 +02:00
Nicolas Tsiftes
5a6c1bf948
Merge pull request #1223 from alignan/removed_unused_max_dag_entries
...
Remove unused RPL_CONF_MAX_DAG_ENTRIES
2015-08-31 13:27:59 +02:00
Adam Dunkels
023deaf49f
Merge pull request #862 from tadodotcom/ctimer-set-process
...
feat(ctimer): API extension to explictly state the process a ctimer belongs to
2015-08-31 11:51:32 +02:00
Valentin Sawadski
2cd74d043d
CTIMER API extension to explictly state the process a ctimer belongs to
2015-08-31 10:31:36 +02:00
Atis Elsts
854494109d
Atmel 230bb: always increase the rx frame ringbuffer cursor in rf230_read().
...
Avoids packet reordering in cases when RF230_CONF_RX_BUFFERS > 1.
2015-08-31 09:56:56 +02:00
Simon Duquennoy
ddf970d3db
Merge pull request #695 from sdefauw/contiki
...
IPv6 prefix bug
2015-08-29 20:27:50 +02:00
Antonio Lignan
90eca482ea
Remove unused RPL_CONF_MAX_DAG_ENTRIES
2015-08-29 20:22:18 +02:00