Commit graph

9792 commits

Author SHA1 Message Date
Adam Dunkels
5f7b75d660 Merge pull request #452 from AriZuu/uip6-udp-stats-twice-fix
Received UDP packet was counted twice in statistics, first in udp_input ...
2013-11-22 07:18:47 -08:00
Adam Dunkels
7a310935d8 An implementation of the mc1322x watchdog 2013-11-22 15:54:06 +01:00
Adam Dunkels
88f9d79053 Enable the silent compilation mode from the latest Contiki 2013-11-22 15:53:30 +01:00
Adam Dunkels
ea4bc3816f Produce an error if the UIP_TCP_MSS is too large for UIP_BUFSIZE 2013-11-22 15:46:48 +01:00
Adam Dunkels
61a8fa9977 Allow the default TTL to be configured with UIP_CONF_TTL 2013-11-22 15:44:48 +01:00
Adam Dunkels
d577d03e21 Bugfix: correctly handle the case if uip_sappdata is NULL. 2013-11-22 15:38:20 +01:00
Adam Dunkels
f31d6f271f Bugfix: if a SYN is received in the SYN_RCVD state we should not send a blank SYN, but a SYNACK in response. 2013-11-22 15:37:21 +01:00
Adam Dunkels
b31e84649a If the 6lowpan layer is currently reassembling a packet, and a non-fragmented packet comes along, this is a sign that one of the fragments were lost (as they normally would arrive back-to-back, in sequence). So we'll grab the non-fragmented packet instead of dropping it. 2013-11-22 15:12:02 +01:00
Adam Dunkels
3788b08780 Added a way to get the RSSI of the last received packet 2013-11-22 15:10:44 +01:00
Adam Dunkels
6265219775 Merge pull request #453 from adamdunkels/push/travis-fix
Fix broken travis
2013-11-22 02:36:09 -08:00
Fredrik Österlind
c98b55b5e0 Merge pull request #338 from cmorty/Cooja-Make-updateGUIComponentState-public
Cooja: Make updateGUIComponentState public.
2013-11-22 02:30:11 -08:00
Adam Dunkels
df7c4131b5 After travis updated to jdk 1.7.0_45 we have to run java -Xshare:dump before running the Cooja tests 2013-11-22 11:07:26 +01:00
Fredrik Österlind
fb84f65ba2 Merge pull request #447 from darki2002/unneeded_if
Cooja: deleted unneeded if in Visualizer.java
2013-11-22 01:53:21 -08:00
Ari Suutari
c1c64dd1cc Received UDP packet was counted twice in statistics, first in udp_input and then again in udp_found.
Fix this to use same logic as in uip.c: valid packet is counted only in udp_found.
2013-11-22 08:16:05 +02:00
Oliver Schmidt
dbe074bdaf Merge pull request #451 from oliverschmidt/master
Replaced web configurator with target-based ethconfig.
2013-11-21 13:08:58 -08:00
Oliver Schmidt
737d5fd6dc Replaced web configurator with target-based ethconfig. 2013-11-21 21:57:42 +01:00
Sebastian Schinabeck
4deb687209 deleted unneeded if
getStringArrayValue never returns null
2013-11-21 15:25:52 +01:00
Adam Dunkels
b5f4588e56 Loaded the simulation files in Cooja and saved them again to avoid them having any non-backward-compatible constructs in them. 2013-11-20 23:03:50 +01:00
Oliver Schmidt
79f97981fb Merge pull request #446 from oliverschmidt/master
Show current IP config on startup.
2013-11-20 13:34:53 -08:00
Oliver Schmidt
3abd5d3d8d Show current IP config on startup. 2013-11-20 22:33:11 +01:00
Oliver Schmidt
0ac3e0f924 Merge pull request #445 from oliverschmidt/master
Reduce travis overhead for testing 6502 ports.
2013-11-20 12:38:24 -08:00
Oliver Schmidt
1f8fbbd161 Reduce travis overhead for testing 6502 ports.
- build cc65 libraries only for target supported by Contiki
- instead of building all examples for all 6502 targets build
  - all examples for one target (c64)
  - the most demanding client example (webbrowser) for all 6502 targets
  - the most demanding server examples (webserver) for all 6502 targets
2013-11-20 21:17:43 +01:00
Oliver Schmidt
e5a0f2d663 Merge pull request #444 from oliverschmidt/master
Changed handling of predefined macros in cc65 allows for simplification.
2013-11-20 11:59:55 -08:00
Oliver Schmidt
1fdeb4c788 Changed handling of predefined macros in cc65 allows for simplification. 2013-11-20 20:55:56 +01:00
Moritz 'Morty' Strübe
3359a86d29 Move call to updateGUIComponentState from doAddMotes to addMote 2013-11-20 18:00:16 +01:00
Adam Dunkels
2e257eff9b Merge pull request #439 from fros4943/feature-contiki-org-refactoring
Cooja cleanup
2013-11-20 08:25:13 -08:00
Fredrik Osterlind
51e62e8cb3 Cooja backwards compatibility with simulation files that uses non-Contiki Java package names 2013-11-20 16:43:28 +01:00
Fredrik Osterlind
b5c94910ac Renamed Java packages to match our contiki-os.org domain. Note that this commit does not affect external dependencies
like /tools/mspsim.

This is a very simple modification that affects a very large number of files in Contiki: Cooja,
/platform/cooja, Collect-view, Coffe-manager, and Cooja simulation files (.csc).

I've gone through Contiki to update all references I could find. Nevertheless, this commit will likely
break external dependencies, like saved Cooja simulation files.
2013-11-20 16:43:27 +01:00
Fredrik Osterlind
2a9283884c renamed getGUI() method to getCooja(), to better reflect its purpose 2013-11-20 16:43:20 +01:00
Fredrik Osterlind
625537158f renamed main Java class of Cooja from GUI to Cooja.
se.sics.cooja.GUI -> se.sics.cooja.Cooja

this commit does not contain any functional changes, but may require external scripts to be updated
such as Makefiles.
2013-11-20 16:43:18 +01:00
George Oikonomou
4eeb527cb8 Don't specify -DUIP_CONF_IPV6 in platform makefiles
Makefile.include has done it for us already, we no longer need to do so ourselves
2013-11-20 14:52:33 +00:00
George Oikonomou
58ef2342c2 Stop setting WITH_UIP6=1 in example Makefiles
It achieves exactly nothing other than generate confusion
2013-11-20 14:52:32 +00:00
George Oikonomou
f13af20f12 Merge pull request #409 from ADVANSEE/cc2538-spi
cc2538: spi: Bug fix and various improvements
2013-11-20 06:51:26 -08:00
Oliver Schmidt
38e8d8bde0 Merge pull request #443 from g-oikonomou/6502-travis
Add 6502 tests to travis
2013-11-20 06:39:24 -08:00
George Oikonomou
820e50f3ed Add 6502 tests to travis 2013-11-20 13:31:32 +00:00
Nicolas Tsiftes
0e24fb0bc0 Merge pull request #432 from adamdunkels/push/154-len
Allow the 802.15.4/6lowpan code to operate on packets larger than 256 bytes
2013-11-20 05:23:26 -08:00
Benoît Thébaudeau
e8a8870d1d cc2538: spi: Add enable and disable functions
This makes it possible to reduce the power consumption when the SPI is unused.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-20 14:20:50 +01:00
Benoît Thébaudeau
b134e35450 cc2538: spi: Add format configuration options
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-11-20 14:20:43 +01:00
Nicolas Tsiftes
263e212427 Merge pull request #431 from adamdunkels/push/ipv6-const
Make IP addresses const
2013-11-20 04:26:05 -08:00
Christian Taedcke
6a30e78390 In stm32w_flasher added check for pyudev and updated ubuntu package instructions. 2013-11-19 21:47:07 +01:00
Mariano Alvira
4899e34882 Merge pull request #440 from ismb-pert/fix-sleep
Fixing sleep on stm32w108 cpu
2013-11-19 11:42:42 -08:00
Nicolas Tsiftes
d183b87f4b Merge pull request #434 from adamdunkels/push/cleanup-sys
Remove old unused code from the core/sys/ directory
2013-11-19 09:53:57 -08:00
Nicolas Tsiftes
2cd2575ca5 Merge pull request #435 from adamdunkels/push/cleanup-net
Removed old unused tcpdump.c code
2013-11-19 09:45:07 -08:00
Nicolas Tsiftes
5c7b61e939 Merge pull request #436 from adamdunkels/push/cleanup-examples
A first cleanup of the examples/ directory
2013-11-19 09:41:19 -08:00
Gianfranco Costamagna
542d8490ef Fixing sleep on stm32w108 cpu 2013-11-19 18:39:58 +01:00
Fredrik Österlind
e7789f969f Merge pull request #54 from cmorty/contiki_mote_lqi_support
Add access to LQI and RSSI to Contiki motes
2013-11-19 07:56:52 -08:00
George Oikonomou
dc05eea3f5 Merge pull request #426 from ADVANSEE/cc2538-rom
cc2538: Add driver for the rom utility function library
2013-11-19 03:09:16 -08:00
George Oikonomou
12c936ec79 Merge pull request #433 from ADVANSEE/cc2538-lpm-static-periph_permit_pm1_funcs
cc2538: lpm: Make periph_permit_pm1_funcs static
2013-11-19 02:54:28 -08:00
Adam Dunkels
523c03e4b8 Removed old unused profile.h code 2013-11-19 08:31:52 +01:00
Adam Dunkels
30c0c5eaf6 Removed old unused timetable code 2013-11-19 08:29:23 +01:00