Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-11-03 06:06:53 +00:00
Code Issues Projects Releases Wiki Activity
11,134 Commits 1 Branch 17 Tags 75 MiB
0671640ea2
Commit Graph

11134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wojciech Bober
0671640ea2 Extended SOURCEDIRS variable with EXTRALDIRS variable in Makefile.include 
Directories listed in this variable are added to include and
source (vpath) search paths.

Contents of this variable aren't automatically prefixed with
Contki root. This allows for inclusion of folders that are
outside Contiki root.
 2016-02-15 09:37:38 +01:00
Wojciech Bober
803d170b55 Fixed unsused variable warning when SICSLOWPAN_CONF_FRAG is undefined 2016-02-15 09:37:38 +01:00
Wojciech Bober
1cc659d882 Allow for using a fixed frame header length. 
When SICSLOWPAN_FRAMER_HDRLEN is defined its value is used
as a frame header length. This allows for using sicslowpan
without calling a framer. This is usefull if framer is not
used on a given platform or when header length is always
the same.

In addition this commit also fixes an inline define.
 2016-02-15 09:37:38 +01:00
Antonio Lignan
4cd0e3ad35 Merge pull request #1516 from alignan/pull/weather-meter-contikimac 
Weather meter: replaced rtimer by ctimer as it was breaking contikimac
 2016-02-13 23:02:17 +01:00
Antonio Lignan
25ff850a43 Weather meter: replaced rtimer by ctimer as it was breaking contikimac 2016-02-13 22:33:05 +01:00
Antonio Lignan
c6ded00dc4 Merge pull request #1512 from alignan/pull/fix-z1-websense 
Fix z1-websense example
 2016-02-13 16:35:50 +01:00
Antonio Lignan
b2b573e9e7 Fix z1-websense example 2016-02-12 19:10:02 +01:00
Simon Duquennoy
99de563e8d Merge pull request #1503 from amitgeron/route_discovery_typo 
Typo
 2016-02-08 13:35:03 +01:00
Amit Geron
ba6419cc25 Typo 
* route_discovery_expicit_open --> route_discovery_explicit_open
 2016-02-07 11:58:31 +02:00
Simon Duquennoy
daa83ee3ef Merge pull request #1404 from amitgeron/route_discovery_channels 
Add route_discovery_explicit_open()
 2016-02-05 23:12:39 +01:00
Simon Duquennoy
5afdae1399 Merge pull request #1498 from alignan/pull/fix-ip64-warnings 
Fix ip64 warnings and error
 2016-02-05 23:02:39 +01:00
Benoît Thébaudeau
287092db42 Merge pull request #1486 from alignan/pull/cc2538-common 
Unified cc2538 examples into single cc2538-common placeholder
 2016-02-04 23:48:35 +01:00
Antonio Lignan
45c125949a Unified cc2538 examples into single cc2538-common placeholder 2016-02-04 17:26:11 +01:00
Nicolas Tsiftes
9b3e334c7d Merge pull request #1497 from simonduq/pr/shell-warnings 
Fix compiler warnings in shell
 2016-02-04 13:14:26 +01:00
Nicolas Tsiftes
4dce5f6765 Merge pull request #1494 from simonduq/pr/uip6-debug 
Minor debug output fixes
 2016-02-04 13:09:21 +01:00
Simon Duquennoy
ebdc536d61 Merge pull request #1496 from simonduq/pr/jn516x-serial-input 
jn516x enable serial input whenever there is no fallback interface
 2016-02-04 10:02:15 +01:00
Antonio Lignan
c924567d86 Fix ip64 warnings 2016-02-04 00:26:54 +01:00
Simon Duquennoy
fa078381cf Fix compiler warnings in shell 2016-02-03 18:01:25 +01:00
Simon Duquennoy
f87f7e7edd jn516x enable serial input whenever there is no fallback interface 2016-02-03 17:53:29 +01:00
Simon Duquennoy
521cc7600d Minor debug output fixes 2016-02-03 17:10:24 +01:00
Simon Duquennoy
9f383ba534 Merge pull request #1492 from simonduq/pr/jn516x-minor 
Reworking jn516x default configuration and examples
 2016-02-03 11:41:10 +01:00
Simon Duquennoy
658cf0d2cc Reworking jn516x default configuration and examples 2016-02-03 10:35:48 +01:00
Simon Duquennoy
79a0709cd7 Merge pull request #1491 from simonduq/pr/sicslowpan-printf 
Fix compiler errors and warnings in sicslowpan.c PRINTF statements
 2016-02-03 09:35:05 +01:00
Simon Duquennoy
f0d1b6c5bb Fix PRINTF statement in sicslowpan 2016-02-02 17:18:45 +01:00
Simon Duquennoy
5d67a612b4 Merge pull request #1402 from simonduq/pr/ci-simexec-log-output 
Travis: improved output for failed Cooja simulation
 2016-02-01 15:30:13 +01:00
Simon Duquennoy
77fac155c1 Merge pull request #1489 from simonduq/pr/jn516x-examples-tsch 
Adding TSCH to examples/jn516x/rpl
 2016-02-01 15:08:20 +01:00
Nicolas Tsiftes
eef96f3ba7 Merge pull request #1480 from mdlemay/revise-clang-flags 
galileo: Revise include flags for LLVM Clang
 2016-02-01 14:25:53 +01:00
Nicolas Tsiftes
deb39df3a3 Merge pull request #1478 from zq301/patch-11 
a memory overflow in shell-vars.c
 2016-02-01 14:25:06 +01:00
Simon Duquennoy
badc4b77f1 Merge pull request #1488 from simonduq/pr/jn516x-uart 
jn516x: flush only uart Tx FIFO in main loop, leaving Rx FIFO intact
 2016-02-01 14:19:44 +01:00
Simon Duquennoy
15a5f27080 Adding TSCH to examples/jn516x/rpl 2016-02-01 13:38:53 +01:00
Simon Duquennoy
7c3108bf3b jn516x: flush only uart Tx FIFO in main loop, leaving Rx FIFO intact 2016-02-01 13:36:18 +01:00
Antonio Lignan
447286197f Merge pull request #1487 from alignan/pull/weather-meter-wind-bane-fix 
Fixed casts and calculations for the wind direction circular averaging
 2016-01-31 23:40:42 +01:00
Antonio Lignan
35345cdb40 Fixed casts and calculations for the wind direction circular averaging 2016-01-31 22:51:08 +01:00
George Oikonomou
7d6966b22c Merge pull request #1483 from Zolertia/pm10-sensor 
Added PM10, VAC and AAC sensor drivers
 2016-01-27 11:47:07 +00:00
George Oikonomou
a2d7b87936 Merge pull request #1479 from g-oikonomou/bugfix/cc13xx/dont-mask-cmdsta 
Allow the caller to access the entire content of CMDSTA
 2016-01-27 11:46:01 +00:00
Toni Lozano
1f6dafecb0 Modified ADC measurement of PM10 driver to include adc-zoul direct access 2016-01-26 17:55:48 +01:00
Antonio Lignan
8337843d69 Minor fixes 2016-01-26 09:45:43 +01:00
Michael LeMay
6557194fc5 galileo: Revise include flags for LLVM Clang 
This patch revises the compiler flags when LLVM Clang is in use to
cause Clang to automatically use its built-in header files rather than
those for GCC.
 2016-01-25 14:01:16 -08:00
Antonio Lignan
9f1376d37a Merge pull request #1453 from g-oikonomou/contrib/test-with-arm-gcc-5 
Change travis arm tests to use gcc-arm-embedded v5
 2016-01-25 21:32:28 +01:00
Toni Lozano
31e6cc48ca Solved doxygen comments information from VAC, AAC and PM10 sensor files 2016-01-25 18:13:00 +01:00
Toni Lozano
42e1beb931 Added PM10 GP2Y1010AU0F sensor driver and demo test 2016-01-25 10:06:17 +01:00
Toni Lozano
4907842821 Added parameters of aac-sensor on adc-sensors file and adapted AAC and VAC test files for correct results 2016-01-25 10:05:43 +01:00
Toni Lozano
1fca3e810a Added PM10 and VAC parameters to adc_sensors driver 2016-01-25 10:04:25 +01:00
Antonio Lignan
d4251d7c3b Merge pull request #1470 from alignan/pull/grove-rgb-backlight-lcd 
Ported Grove LCD with RGB backlight for the Zoul platforms
 2016-01-25 09:54:25 +01:00
zq301
d36eab3750 Update shell-vars.c 2016-01-25 09:35:49 +08:00
zq301
e7c26c57db Update shell-vars.c 2016-01-25 09:35:15 +08:00
George Oikonomou
9e9e6d07b0 Adjust READMEs to point explicitly to the arm-gcc version used by travis 2016-01-24 13:59:19 +00:00
George Oikonomou
d42b1b50e5 Allow the caller to access the entire content of CMDSTA 
When sending a command to the CC13xx/CC25xx RF core, we wait for command completion by checking the LSB of CMDSTA (correctly so). However, in doing so we also zero out the 3 CMDSTA return bytes. For some commands, those bytes contain useful information (e.g. an RSSI value) and are required by the caller.

This problem manifests itself e.g. in PROP mode `channel_clear()`, whereby the caller will always see an RSSI value of 0.

This pull therefore fixes the logic in `rf_core_send_cmd()` to check for command completion by blocking on the CMDSTA result byte without zeroing out the 3 return bytes.

Fixes #1465
 2016-01-24 13:39:14 +00:00
zq301
915facad22 a memory overflow in shell-vars.c 
" sprintf(numbuf, "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x",...)" . the formatted data wrote to "numbuf" is 39 bytes, but numbuf is 32 bytes.
 2016-01-24 14:39:48 +08:00
Antonio Lignan
9a5682b75b Merge pull request #1476 from alignan/pull/update-weather-meter 
Updated to new adc-zoul renaming
 2016-01-23 16:20:22 +01:00