Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-06-11 01:29:33 +00:00
Code Issues Projects Releases Wiki Activity
12,344 Commits 1 Branch 17 Tags 75 MiB
main
Commit Graph

12344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Tsiftes
d133ed898f Merge pull request #1914 from yatch/pr/802154-panid-handling 
frame802154: comply with IEEE 802.15.4-2015 on PAN ID Field Handling
 2016-12-08 18:37:58 +01:00
Antonis Makrogiannakis
ba241db968 Added NullRDC and ContikiMAC timings for Zolertia RE-Mote. 
CC1200 SubGHz 50 Kbps mode.
 2016-12-06 13:34:26 +02:00
Yasuyuki Tanaka
5fdd731166 frame802154: fix a typo in a comment 2016-12-05 22:45:07 +01:00
Yasuyuki Tanaka
3872965362 frame802154: comply with IEEE 802.15.4-2015 on PAN ID Field Handling 
This patch changes the behaviors of frame802154_has_panid() for frames
of frame version 0b10 so that it complies with the PAN ID Field Handling
specification in IEEE 802.15.4-2015. For the other frame versions, 0b00
and 0b01, no change is made in frame802154_has_panid().

For more information, please refer to:
https://github.com/contiki-os/contiki/pull/1914/
 2016-12-05 22:45:07 +01:00
Nicolas Tsiftes
f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote 
Miscellaneous updates for tsch-cooja-mote
 2016-12-05 18:40:28 +01:00
Yasuyuki Tanaka
f5d6b7ed0f ContikiMoteType: add a missing single quote in a log message 
This resolves the error of "unmatched single quote" by xargs seen in a
failed log of Travis CI.
 2016-12-05 18:07:39 +01:00
Simon Duquennoy
f6439121b4 Merge pull request #1963 from yatch/pr/code-style 
Update doc/code-style.c
 2016-12-05 13:40:36 +01:00
Antonio Lignan
95f69d92a8 Merge pull request #1918 from adamdunkels/pr-websocket-2 
Contiki websocket client
 2016-12-05 06:46:43 +01:00
Antonio Lignan
027f1c3e64 Merge pull request #1924 from g-oikonomou/contrib/cc26xx-cc13xx/update-ccxxwares 
Update to latest CC13xxware/CC26xxware
 2016-12-04 23:55:31 +01:00
George Oikonomou
bad3384365 Update sensniff example documentation 2016-12-04 19:07:40 +00:00
George Oikonomou
aaf0d1eb86 Automatically specify a correct baudrate for jn516x 2016-12-04 19:07:40 +00:00
George Oikonomou
7ef5902c3d Add the sniff make target 
We can now run make sniff and this will provide correct command line arguments for all supported devices.
 2016-12-04 18:51:57 +00:00
George Oikonomou
44edc187bc Specify default baudrate for CC2538DK 2016-12-04 18:43:41 +00:00
George Oikonomou
11877b4b6b Add sensniff as a submodule 2016-12-04 18:43:17 +00:00
Mohamed Seliem
88fdc46e03 update httpd_cgi to enable the compilation of webserver-ipv6 example 
this simple change fixes the bug reported in @#1541.
../../apps/webserver/httpd.h:63:9: note: expected ‘uip_ip6addr_t’ but argument is of type ‘union uip_ipaddr_t *’
 2016-12-04 19:03:15 +02:00
George Oikonomou
367104166e Update to latest CC13xxware/CC26xxware 2016-12-04 13:33:40 +00:00
Antonio Lignan
af4f1e1c30 Merge pull request #1866 from yschroeder/pull-req/serialdump 
Improved serialdump.c
 2016-12-04 13:17:39 +01:00
Antonio Lignan
2be999c707 Merge pull request #1967 from MohamedSeliem/patch-9 
Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00)
 2016-12-04 12:46:07 +01:00
Antonio Lignan
36519a9742 Merge pull request #1969 from g-oikonomou/contrib/fix-typo 
Fix minor typo
 2016-12-04 12:45:04 +01:00
Mohamed seliem
4a93babb58 fix msg.dst.sin6_addr.__u6_addr.__u6_addr16 2016-12-04 03:29:50 +02:00
Mohamed seliem
452666b43e add missing include 2016-12-04 03:29:49 +02:00
Mohamed Seliem
82b5fb5073 Fix the leftover mentions of aaaa as a prefix to be UIP_DS6_DEFAULT_PREFIX (now fd00) 2016-12-04 03:29:49 +02:00
George Oikonomou
d6656ccde1 Fix minor typo 2016-12-03 23:26:25 +00:00
Yasuyuki Tanaka
49808b8f1c Update code-style.c 
- mention Uncrustify instead of GNU Indent
- add a missing argument of code_style_example_function()
- make the function return 0 or 1 as per doxygen comment
- replace tab with spaces
- correct case() to switch() in a comment
- add an indentation example for switch statement
 2016-12-03 12:21:04 +01:00
Antonio Lignan
9ccc1697cf Merge pull request #1966 from yatch/pr/travis-jdk 
travis: workaround for the Java issue on Travis CI
 2016-12-03 12:13:40 +01:00
Yasuyuki Tanaka
120632b4a8 travis: workaround for the Java issue on Travis CI 
References:
https://docs.travis-ci.com/user/build-environment-updates/2016-12-01/
https://github.com/travis-ci/travis-ci/issues/6928#issuecomment-264227708
 2016-12-02 16:48:57 +01:00
Antonio Lignan
94854177e2 Merge pull request #1961 from jdede/uart-init 
Do not initialize and use the wrong UART (z1)
 2016-12-02 15:41:32 +01:00
Antonio Lignan
6565652e43 Merge pull request #1962 from MohamedSeliem/patch-8 
update contiki-conf to avoid redfintion of UIP_CONF_RECEIVE_WINDOW
 2016-12-02 09:52:48 +01:00
Mohamed seliem
0ef0a21d9e update for all platforms 2016-12-01 21:26:32 +02:00
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
Jens Dede
0d3ff7b785 Rm unnecessary uart commands 2016-12-01 15:12:23 +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
Robert Olsson
4ef4bdd0a5 bme280 delay fixes plus Makefile for avr-rss2 2016-11-30 12:04:57 +01:00
Antonio Lignan
f9b32f8139 bme280: reworked to allow platform-specific I2C implementations 2016-11-30 12:04:57 +01:00
Antonio Lignan
bd1a6bf94e zoul: Added bme280 example 2016-11-30 12:04:57 +01:00
Robert Olsson
23a481600a BME280 fixes, codestyle, return code for bme280_init added, Unneeded header files removed 2016-11-30 12:04:57 +01:00
Robert Olsson
1c0e33be79 Update README.bme280 2016-11-30 12:04:57 +01:00
Robert Olsson
cfed856720 I2C fixes 
modified:   examples/avr-rss2/hello-sensors/hello-sensors.c
 2016-11-30 12:04:57 +01:00
Robert Olsson
dcbb5f6271 BME280 I2C integration fixes 2016-11-30 12:04:57 +01:00
Robert Olsson
5c25ec4d11 Example modified to use BME280 2016-11-30 12:04:57 +01:00
Robert Olsson
cfabf0e6a2 Support for BME280 added. 
new file:   dev/bme280/README.bme280
	new file:   dev/bme280/bme280-sensor.c
	new file:   dev/bme280/bme280-sensor.h
	new file:   dev/bme280/bme280.c
	new file:   dev/bme280/bme280.h
 2016-11-30 12:04:57 +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