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

11425 commits

This branch
This branch
All branches
Author SHA1 Message Date
harald42
b462052bf5 CRLF will be replaced by LF 2016-02-25 08:20:41 +01:00
harald42
98e4451518 Merge branch 'contiki' into osd 2016-02-25 08:18:55 +01:00
harald42
e7f270cf37 crf replace by lf 2016-02-25 08:11:05 +01:00
harald42
a7b230a0b7 bugfix get macaddress 2016-02-24 08:29:24 +01:00
Harald Pichler
855bc65b8a initial upload 2016-02-23 20:32:53 +01:00
Harald Pichler
1e5163cbb3 bugfix remove testcode 2016-02-23 20:31:10 +01:00
George Oikonomou
93b9089164 Merge pull request #1504 from bthebaudeau/travis-force-aapcs-toolchain-version 
travis: Force AAPCS toolchain version
 2016-02-20 23:50:17 +00:00
Simon Duquennoy
b53a1569d9 Merge pull request #1439 from jkent/jsontree 
jsontree: new features
 2016-02-20 12:49:07 +01:00
Ralf Schlatterbeck
de6477efa8 Fix run.sh scripts to use jumptable of bootloader 
Otherwise a crash results with a bootloader compiled with a newer AVR
toolchain (e.g. Debian Jessie). If you still have an ages-old bootloader
without a jump-table, as a short-term measure you can revert this change
in your run.sh. As a long-term fix we recommend you get your bootloader
updated!
 2016-02-19 17:32:09 +01:00
Ralf Schlatterbeck
0068611b4d Implement localtime 
Now we manage a timezone and daylight-savings aware version of
localtime. We parse UNIX timezone strings. The default (active after the
first call to localtime or localtime_r) is CET/CEST, the timezone of
Europe/Vienna. The wallclock-time osd-example demonstrates how to set a
different timezone via the timezone resource.

Note: After startup no timezone is set. So in this state querying the
timezone resource will return an empty string. After first call to
localtime (if not timezone has been set via the timezone resource) a
query to timezone will return the default timezone string for CET/CEST.

The string returned by the localtime and utc timezones now also includes
the timezone name.

New fields tm_gmtoff and tm_zone were added to the tm structure. These
are available in BSD systems and when setting special compiler
definitions on Linux.

Note: the timezone offset information in the tm structure (tm_gmtoff)
as well as in the tz structure returned by gettimeofday (tz_minuteswest)
may be wrong sign, this code is largely untested.
 2016-02-18 09:55:07 +01:00
Antonio Lignan
0e17b98372 Merge pull request #1518 from Zolertia/pm10-remove-issue 
Removed PM10 code lines from adc-sensors driver
 2016-02-15 17:38:36 +01:00
Toni Lozano
2cbde75b02 Removed PM10 code lines from adc-sensors driver 2016-02-15 14:45:26 +01:00
Antonio Lignan
0dbed519a5 Merge pull request #1507 from Zolertia/remote-voc-test 
Added VOC (iAQ-Core) drivers and test application
 2016-02-15 12:21:32 +01:00
Aitor Mejias
cb1e7c2c45 Added VOC (iAQ-Core) drivers and test application 2016-02-15 11:00:48 +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
Benoît Thébaudeau
910f7b1ac8 travis: Force AAPCS toolchain version 
Make Travis CI use the GNU ARM Embedded toolchain version specified by
the READMEs, instead of automatically using the latest version provided
by the PPA. In this way, the READMEs will still be correct after a PPA
upgrade, and the version used by Contiki is under control.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
 2016-02-07 18:21:57 +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
Harald Pichler
b8c5ee0e2b add Test code 2016-01-28 17:08:56 +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