Commit graph

95 commits

Author SHA1 Message Date
Enric M. Calvo
aba380b960 removed modif. to sky files 2011-03-25 17:57:17 +01:00
Enric M. Calvo
1716d837fc Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup
Makefile.z1 is broken into .common and .z1 to share it with Z1 Starter Platform

Conflicts:
	.gitignore
	platform/z1/Makefile.z1
2011-03-25 17:46:38 +01:00
Niclas Finne
ccc1687319 Made energest configuration configurable 2011-03-21 21:28:43 +01:00
Enric M. Calvo
0c6fd04f44 Modified contiki-conf.h and added sensys-scanner. 2011-03-03 13:44:28 +01:00
adamdunkels
34f2d3e025 Disable timesynch by default - it is not well-tested enough yet. 2011-01-09 21:04:14 +00:00
adamdunkels
6a80106236 Turn on timesynch by default 2010-12-16 22:51:22 +00:00
fros4943
0a8d898678 #ifndef'd elfloader's default memory usage 2010-11-11 13:56:02 +00:00
adamdunkels
896f627290 Made uIPv6 packet queueuing configuration configurable 2010-11-02 11:06:01 +00:00
joxe
dfff488a3d configured tmote sky to use 5 retransmissions 2010-10-26 13:26:16 +00:00
adamdunkels
726bd0e58e Made collect neighbors, queuebuf number, uip-ds6 configuration settable through project-conf.h 2010-10-24 21:12:31 +00:00
joxe
a1e7d9c256 fixed some config params to avoid re-defining if already defined 2010-10-21 18:25:39 +00:00
adamdunkels
37a4200f40 Made a lot of things configurable via the (optional) project-conf.h 2010-10-20 22:21:16 +00:00
adamdunkels
93f6fda353 Updated configuration options to reflect recent changes. Increased number of queuebufs. Corrected the name of the collection neighbors option. 2010-10-03 20:40:42 +00:00
joxe
80942abaf7 split hw config into platform-conf and adapted to new SPI and CC2420 naming 2010-06-23 10:18:05 +00:00
joxe
f758f6569e moved cc2420 config to platform config 2010-06-21 19:57:18 +00:00
adamdunkels
f81ca85157 Increase the size of the route and neighbor tables; remove the uIP packet buffer queue for every neighbor to save RAM 2010-06-14 07:04:20 +00:00
joxe
3c9256c39f removed RPL routing state struct from platform config file 2010-05-01 12:04:13 +00:00
nvt-se
d529132002 Added missing parts of the RPL configuration 2010-04-30 15:06:00 +00:00
joxe
b0640af3a2 added rpl support for tmote sky - enabled by default 2010-04-30 13:52:14 +00:00
adamdunkels
91afe5b0f4 Turned on broadcast announcements by default, turn on announcements for collect 2010-03-19 13:27:46 +00:00
nifi
5e43a6998b Replaced old framer (framer_get/framer_set) with new NETSTACK style configuration. Added nullrdc-framer that is a nullrdc with framer support. 2010-03-01 13:30:21 +00:00
joxe
80b289f7c1 updated sky platform for new sicslowpan 2010-02-25 15:51:37 +00:00
adamdunkels
eadfe5f3d6 Enabled 32-bit clock ticks to allow longer timeouts; experimentally disabled polite announcements in favour of a non-announcement based collect protocol 2010-02-23 18:44:52 +00:00
adamdunkels
e34eb54960 A work-in-progress rework of the Contiki MAC and radio layers. The
main ideas are:

* Separates the Contiki low-layer network stack into four layers:
  network (e.g. sicslowpan / rime), Medium Access Control MAC
  (e.g. CSMA), Radio Duty Cycling RDC (e.g. ContikiMAC, X-MAC), and
  radio (e.g. cc2420).
* Introduces a new way to configure the network stack. Four #defines
  that specify what mechanism/protocol/driver to use at the four
  layers: NETSTACK_CONF_NETWORK, NETSTACK_CONF_MAC, NETSTACK_CONF_RDC,
  NETSTACK_CONF_RADIO.
* Adds a callback mechanism to inform the MAC and network layers about
  the fate of a transmitted packet: if the packet was not possible to
  transmit, the cause of the failure is reported, and if the packets
  was successfully transmitted, the number of tries before it was
  finally transmitted is reported.
* NULL-protocols at both the MAC and RDC layers: nullmac and nullrdc,
  which can be used when MAC and RDC functionality is not needed.
* Extends the radio API with three new functions that enable more
  efficient radio duty cycling protocols: channel check, pending
  packet, and receiving packet.
* New initialization mechanism, which takes advantage of the NETSTACK
  #defines.
2010-02-18 21:48:39 +00:00
adamdunkels
6414bf3a55 Enabled sicslowpan fragmentation and reassembly by default on the sky platform 2010-02-08 22:12:29 +00:00
adamdunkels
37f7770bd8 Made it possible to override the SICSLOWPAN_CONF_FRAG option. Increased the default uIP buffer size on IPv6 to provide some room for fragmented packets 2010-02-06 10:00:25 +00:00
adamdunkels
a9c742402c Use cxmac for IP, xmac for non-IP. Increased uIP buffer size for IPv6 to accomodate ICMP packets 2010-02-03 16:48:04 +00:00
adamdunkels
f63f6a7a88 Added default configuration options for the cxmac driver 2010-01-31 18:48:41 +00:00
adamdunkels
ba2c445676 Reduce the TCP MSS so that it runs nicely over IPv6/802.15.4 2010-01-28 13:38:40 +00:00
adamdunkels
5922402b3e Added the CSMA MAC mechanism on top of the default duty cycling
mechanism X-MAC. The CSMA is configurable with a MAC_CSMA define, just
like the MAC protocol is configurable with the MAC_DRIVER define.
2010-01-25 11:48:16 +00:00
nifi
467df8ad4c reverted accidental commit 2010-01-14 22:26:38 +00:00
nifi
dbe56e4666 Updated to match the new sensors API 2010-01-14 20:01:18 +00:00
joxe
3c0dcb45c7 fixed for updated sensors API 2010-01-14 15:50:13 +00:00
fros4943
99a540fd0d macro renamed to SPI_IS_ENABLED() to avoid confusions 2009-10-27 15:33:24 +00:00
fros4943
6b36cd9de9 added macro for checking whether SPI is ENABLED 2009-10-27 15:25:02 +00:00
adamdunkels
79d7c366a3 Rime polite announcements should be used when IPv6 is enabled, and not used otherwise 2009-10-18 07:15:33 +00:00
nifi
d4b619bcc5 Renamed SPI_WAITFOREOTxBUF to SPI_WAITFORTxREADY for clarity and generalized SPI transmission status checks to work with both AVR and MSP430 2009-09-07 11:31:26 +00:00
nifi
3a8ee769cb Changed to monitor the UART transmitter buffer ready flag instead of the UART transmitter empty flag. This almost doubles the speed of transmitting data to CC2420. Patch by James Brown. 2009-08-31 12:06:34 +00:00
nifi
05d4bc4532 allow UIP_CONF_ROUTER to be set as compilation flag 2009-06-29 09:54:39 +00:00
joxe
1cc33ac451 configured routing to off for sky-IPv6 2009-06-26 12:01:23 +00:00
nvt-se
b912a41ea3 use polite announcements when running Rime over UDP. 2009-06-24 16:44:26 +00:00
nifi
912aba7280 added init function in MAC driver for easier configuration 2009-06-22 11:14:11 +00:00
fros4943
d54176205c decreased default elfloader memory usage for sky platform 2009-05-18 10:32:56 +00:00
adamdunkels
900480959b Increased the default number of queue buffers: there usually is plenty of RAM left, so we should be able to afford it 2009-05-10 21:15:16 +00:00
adamdunkels
064f4488d4 Increase default CPU speed from 2.4576 MHz to 3.9 MHz. Communication works better, at a low power cost 2009-04-29 11:43:48 +00:00
fros4943
bc6704079c cc2420 checksums temporarily disabled, due to timing problems with the x-mac unicast optimization 2009-04-16 14:34:51 +00:00
adamdunkels
3415ff26bd Added CC2420 checksums to non-ipv6 packets. Set a conservative TCP MSS 2009-04-10 00:39:19 +00:00
nifi
b41b79e3a9 Disable timestamp when using 802.15.4 frames (CC2420_CONF_TIMESTAMPS adds timestamp to radio packets). 2009-04-06 17:18:20 +00:00
nifi
900d8d8e17 changed to use HC01 compression for uip6 2009-04-06 16:01:11 +00:00
nifi
8b41f3a6a8 set rime addr size to 8 for uip6, restored clock resolution 2009-04-06 14:59:49 +00:00