Commit graph

2489 commits

Author SHA1 Message Date
Harald Pichler
2f8549aaae Merge branch 'contiki'
Conflicts:
	cpu/cc26xx-cc13xx/lib/cc13xxware
	cpu/cc26xx-cc13xx/lib/cc26xxware
2017-01-31 15:00:59 +01:00
Oliver Schmidt
a6472c8dd9 Revert to static Ethernet driver for the ATARI.
After all there's no momentum for a W5100-based Ethernet solution on the ATARI. So I revert to static linkage of the CS8900A driver as this improves program load times.
2017-01-27 00:18:25 +01:00
Antonio Lignan
10d54f228b Orion: update motelist string
Updates the expected motelist string
2017-01-12 11:23:20 +01:00
George Oikonomou
960b81d484 Merge pull request #2024 from alignan/pull/eth-gw
Zolertia Orion ethernet router with active POE support
2017-01-09 21:03:45 +00:00
Antonio Lignan
6e07fd7019 Merge pull request #2001 from joakimeriksson/cooja-quick-ui-fix
fixed so that Cooja can run in quick mode when having UI
2017-01-03 10:26:52 +01:00
Antonio Lignan
579620ce0e Added Zolertia Orion ethernet router with active POE support 2016-12-29 13:07:53 +01:00
Antonio Lignan
2464cdadc9 Merge pull request #1973 from g-oikonomou/contrib/sensniff-submodule
Add sensniff as a submodule
2016-12-25 19:42:18 +01:00
Joakim Eriksson
f069cef73a fixed so that Cooja can run in quick mode when having UI 2016-12-15 13:52:05 +01:00
Simon Duquennoy
bba5a973ba Merge pull request #1987 from joakimeriksson/cooja-fix
Fixed COOJA to avoid using UI based message list when not using UI.
2016-12-15 08:40:03 +01:00
Niclas Finne
a02481bc99 Fixed more MessageListUI to respect visualized in Cooja 2016-12-14 10:10:25 +01:00
Nicolas Tsiftes
8fca9ced8e Merge pull request #1976 from yatch/pr/missing-single-quote
Resolve  "unmatched single quote" error in Travis CI failed tests
2016-12-12 17:06:16 +01:00
Joakim Eriksson
2a3edc9136 Fixed so that COOJA sends in isVisible instead of quick as visibility parameter to plugins to get compile info back into COOJA - and fixed CoreComm to use MessageList text if no UI 2016-12-11 20:52:03 +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
George Oikonomou
11877b4b6b Add sensniff as a submodule 2016-12-04 18:43:17 +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
Simon Duquennoy
728e417e04 Merge pull request #1502 from yatch/pr-radiologger
Fix timestamps of packets recorded in pcap files
2016-11-27 11:58:03 +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
Harald Pichler
b708fac68d Merge branch 'contiki' 2016-11-15 08:29:23 +01: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
Niclas Finne
e648373677 Cooja now supports Wismote and Z1 motes when exporting simulations as
executable JAR.
2016-09-22 10:56:56 +02:00
Harald Pichler
a5b59e8cbb Merge branch 'contiki'
Conflicts:
	.gitmodules
	core/net/mac/contikimac/contikimac.c
	cpu/cc26xx-cc13xx/lib/cc13xxware
2016-09-21 21:09:29 +02:00
Yannic Schröder
d524211c2a Clean exit of serialdump when hitting Ctrl-C
Ctrl-C is the best way to close serialdump after using make login.
With a clean exit it will signal to make that the make run was successful.
2016-09-20 14:18:21 +02:00
Yannic Schröder
9e080e8aa5 Terminate serialdump when serial device disconnects
The running serialdump does not recover from a disconnected device but
runs indefinitely with outputting anything. This makes it quit with a
proper error message.
2016-09-20 14:16:40 +02:00
Yannic Schröder
2974b796d1 Initialize serialdump termios properly
termios i_flags were not initialized and could be set to arbitrary values
this resulted in unpredicted behaviour of the output like additional
newlines
2016-09-20 14:14:14 +02:00
Yasuyuki Tanaka
6d51c5f58e Reimplement Rtimer of Cooja mote as a microsecond resolution timer 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
33e86042e5 Support RADIO_PARAM_LAST_PACKET_TIMESTAMP with get_object() 2016-09-06 15:14:10 +02:00
Yasuyuki Tanaka
ca715fdd6b Use appropriate types for "value" of setInt{16,32,64}ValueOf() 2016-09-06 15:14:10 +02:00
Antonio Lignan
23eb3756c0 Zoul: added firefly to motelist targets 2016-08-12 13:21:09 +02:00
Oliver Schmidt
98a795b967 Merge pull request #1730 from groessler/something_to_pull
Some 6502 target changes
2016-07-06 09:17:39 +02:00
Christian Groessler
4373aecec2 Tag non-file goals as ".PHONY" 2016-07-05 00:47:52 +02:00
Antonio Lignan
bc8b6cd8ed Updated cc2538-bsl to version 2.1 (c6100a7) 2016-06-24 22:10:39 +02:00
Christian Groessler
c26085ec8c Some 6502 target changes
- platform/atarixl/Makefile.atarixl: put two more objects into high memory
- platform/atarixl/contiki-conf.h: define WWW_CONF_WGET_EXEC
- tools/6502/Makefile: add 'clean' target; remove unused CONTIKI define
2016-06-17 16:42:50 +02:00
Fredrik Österlind
0313a429e2 Merge pull request #1575 from atiselsts/cooja_bit_errors
Cooja: add Msp802154BitErrorRadio interface
2016-06-06 11:39:45 +02:00
Fredrik Österlind
5f7e77b3f9 Merge pull request #1307 from cmorty/pull/uninitmotes
Cooja: Make sure motes are always removed from the list of unintialized motes
2016-06-06 10:55:29 +02:00
Oliver Schmidt
0151a7c27e Merge pull request #1706 from oliverschmidt/master
Make use of new cl65 option --print-target-path.
2016-06-03 15:13:08 +02:00
Oliver Schmidt
ae0c5f0dd0 Make use of new cl65 option --print-target-path.
The new cl65 option --print-target-path allows to get rid of CC65_HOME altogether.
2016-06-03 13:30:25 +02:00
Jens Dede
cd7885ae76 do not use setBaudrate 2016-05-02 18:48:16 +02:00
Joakim Eriksson
19120788c0 made a text-based version of the MessageList for headless execution 2016-04-27 19:32:14 +02:00
Nicolas Tsiftes
204dcb9bbc Merge pull request #1332 from tsparber/collect-view-add-osx
collect-view gui: Add support for OS X serialdump and motelist
2016-04-20 11:57:12 +02:00
Atis Elsts
c7c3ef3b9c Cooja: add Msp802154BitErrorRadio interface
The interface more accurately models bit errors due to signal fading as observed in IEEE 802.15.4-compatible radios, such as CC2420 and CC2520.
2016-03-31 13:41:16 +03:00
Yasuyuki Tanaka
15d30b1125 Make PcapExporter record timestamps with preserving packet intervals 2016-03-30 18:26:20 +02:00
Rémy Léone
60acf7de98 fix SerialSocketServer when run without GUI 2016-03-16 18:48:09 +01:00
Simon Duquennoy
dea04c67d7 Change the default IPv6 prefix from aaaa::/64 to fd00::/64 2016-03-07 17:47:44 +01:00
Simon Duquennoy
c7bb3b7b9f Merge pull request #1309 from iot-lab/tunslip_tun_conflict
Fix default tun/tap issue with multiple tunslip6
2016-03-02 09:53:00 +01:00
Jelmer Tiete
d7ee563023 Updates cc2538-bsl to 4340542, main changes are fix for contiki-os/contiki#1533 and an added option to invert the RTS and DTR lines when auto starting the bootloader 2016-02-29 13:48:24 +01:00
George Oikonomou
707353f71b Remove Sensinode platform, cpu, example and tools files
This is part of a set of commits that will obsolete the Sensinode platform
2016-01-10 15:01:58 +00:00
Joakim Eriksson
e4744d1e59 fixed make login for Zoul on MAC 2015-12-19 10:28:30 +01:00
Tommy Sparber
1eb1f88aa4 collect-view gui: Add support for OS X serialdump and motelist
Select the tools for macos when checking for motes or opening a
serial dump connection on OS X.
2015-12-02 14:37:36 +11:00
Antonio Lignan
27fd1a5eb8 Updated RE-Mote revision A support and cleaning up Zolertia platforms 2015-11-24 21:15:33 +01:00
Jelmer Tiete
6a40a4b749 Updated cc2538-bsl submodule to 6185d8b, small bugfix 2015-11-23 11:09:06 -08:00