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

386 commits

Author SHA1 Message Date
Robert Quattlebaum 5afcbf6fff Makefiles: Allow setting UIP_CONF_IPV6=0 to work as expected. 
Setting UIP_CONF_IPV6 to zero from the make build command line is
something that seems like it should ensure that IPv6 is disabled, but in
fact it actually *enables* IPv6. This seems counter intuitive, so this
patch changes the behavior of the makefiles to handle this case
properly.
 2013-01-14 22:03:42 -08:00
Moritz 'Morty' Strübe 79aa5dbc01 Get rid of generc ihex-file to allow parallel uploads 2012-12-11 12:40:38 +01:00
Moritz 'Morty' Strübe 7213d36d63 Support MOTEIDS for flashing, etc 2012-12-11 12:40:24 +01:00
Adam Dunkels ec8c7e9be0 Cleanup of the node-id.h files. The node-id.h file contains 
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
 2012-11-20 19:59:46 +01:00
Adam Dunkels 944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
Niclas Finne 4630945475 Made the stack and heap size configurable when using the IAR compiler on the MSP430 platforms 2012-09-19 22:49:19 +02:00
Fredrik Osterlind d270e4943d bugfix: slip must be initialized after ctimer, as it uses ctimers 2012-05-30 12:59:42 +02:00
Fredrik Osterlind 4cf4a48592 minor bugfix: did not compile with PROCESS_CONF_NO_PROCESS_NAMES=1 2012-05-09 15:07:51 +02:00
Niclas Finne 40595ad5c7 Support for serialdump on MacOS X. Patch by Laurent Deru. 2012-05-07 13:16:27 +02:00
Laurent Deru cc863e7bd4 Sky motelist support for MacOS X 2012-05-07 11:18:09 +02:00
Niclas Finne 1b13b69814 Added support for mspgcc 4.6+ that no longer supports generic MCU identifiers such as msp430x1611 2012-04-10 16:05:10 +02:00
Niclas Finne ff7a977dc7 Improved support for the IAR compiler for the MSP430 platforms 2012-03-07 23:09:05 +01:00
Niclas Finne 569477b10c contiki-sky-platform is added by Makefile.sky 2012-03-07 23:07:57 +01:00
Niclas Finne 684c3edfa6 Cross compiler interrupt service routine compatibility definitions for MSP430 based platforms based on isr_compat.h by Steve Underwood. 2012-03-07 23:04:52 +01:00
Ilya Dmitrichenko 4b60851527 Missed ifeq ... 2012-02-25 10:09:35 -05:00
Ilya Dmitrichenko 9c99d46e24 Simplified host OS platform detection in Makefiles 2012-02-25 10:09:33 -05:00
Adam Dunkels 465c401cdc Reduce size of the neighbor table entries to make RPL fit into the Tmote Sky RAM. 2012-01-18 06:15:38 -08:00
Adam Dunkels 6185da7b80 Default to SMALL unless otherwise specified, to get size of binaries smaller so that Contiki with RPL/IPv6 fits on the Tmote Sky again. 2012-01-18 06:13:17 -08:00
Niclas Finne 05b10eb9ce Initial WiSMote port based on code from Arago Systems. 2012-01-09 12:25:06 +01:00
Niclas Finne 367c82a5ab added compiler flags and macros for IAR and mspgcc 4.4.5 compilers 2012-01-09 12:24:33 +01:00
Matthias Kovatsch 36763cabbd Introduced PLATFORM_HAS_LIGHT, _BATTERY, and _SHT11. 2011-12-07 20:47:31 +01:00
nvt 4f3528f7ed Move compower configuration out of the non-IPv6 conditional clause. 2011-10-10 22:11:29 +02:00
simonduq dd8576830e Added bursts support in CSMA/ContikiMAC, and CFS-swapping in 
queuebuf. Exemplified in examples/udp-stream.
 2011-09-27 16:47:03 +02:00
Joakim Eriksson 5b1d9617c4 moved io and signal and IAR-GCC checks from driver files into contiki include file 2011-09-26 10:38:41 +02:00
Joakim Eriksson 95dde73618 fixed Sky platform for IAR compiler 2011-09-11 17:18:02 +02:00
Adam Dunkels a06cf93e4c Made the sky and z1 platform handling of PROJECT_CONF_H the same as the other platforms: the makefile should define PROJECT_CONF_H to be the name of the header file to include. This header file should #undef everything it #defines, as it is included after all the other configuration options in contiki-conf.h 2011-09-05 11:46:15 +02:00
Adam Dunkels ee75ec3ced Be a little more conservative in terms of what headers not to compress 2011-09-05 11:41:41 +02:00
Adam Dunkels 6c607b702a Use the SICSLOWPAN_CONF_COMPRESSION_THRESHOLD to avoid compressing IPv6 packets smaller than 60 bytes. This allows us to use ContikiMAC without its header, making it 802.15.4 compliant again. 2011-09-02 13:52:19 +02:00
Adam Dunkels 8962136b1a Added a motelist target that is the same on both sky and z1 2011-07-29 13:06:00 +02:00
Niclas Finne 1d07330ac0 Made the platform config file configurable. 2011-07-01 17:16:12 +02:00
Niclas Finne 374722b2e0 Added resource definition for leds and button 2011-05-20 14:27:53 +02:00
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
Niclas Finne a199ae920e Changed the order in which io.h and signal.h is included. Some versions of mspgcc4 seem to have a problem when signal.h is included before io.h. 2011-03-07 20:54:02 +01:00
Enric M. Calvo 0c6fd04f44 Modified contiki-conf.h and added sensys-scanner. 2011-03-03 13:44:28 +01:00
Lionel Debroux 5cb49e8b07 Several compiler warning fixes: 
* msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h;
     * sky: fix a couple pointer target signedness warnings;
     * core: fix several signed/unsigned comparison warnings;
     * framer-802154: "const static" -> "static const" to fix compiler warnings;
     * core: comment or remove unused variables and function definitions.

Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Signed-off-by: Mariano Alvira <mar@devl.org>
 2011-02-20 19:28:14 -05:00
Fredrik Osterlind 747eafd5f0 support for tinyos style node ids, to simplify testbed experiments 
with automatic node ids
 2011-02-11 15:27:14 +01:00
Nicolas Tsiftes 39ea9405bb Added a function for setting the I/O semantics on a Coffee file descriptor. Changed the configuration parameters slightly and updated the platform definitions to reflect this change. 2011-02-09 15:03:57 +01:00
nvt-se 9ad02dbdd8 Removed header inclusion 2011-01-18 14:58:39 +00:00
nvt-se 28421f1fe2 Removed watchdog calls from Coffee 2011-01-18 14:06:33 +00:00
nvt-se 00ac8cfaa0 Moved watchdog_periodic into the lowest level to avoid multiple redundant calls higher up 2011-01-18 14:03:55 +00:00
adamdunkels 34f2d3e025 Disable timesynch by default - it is not well-tested enough yet. 2011-01-09 21:04:14 +00:00
adamdunkels a6fe42f60f Restart CC2420 SFD interrupt after DCO calibration only if it is enabled. 2011-01-09 21:03:42 +00:00
joxe 2e1c856741 added support for avoiding sleeping in LPM3 when DCO needs to be running - needed for uart DMA 2011-01-05 12:04:23 +00:00
adamdunkels e55c3cd471 Enable DCO configuration override 2010-12-16 22:52:27 +00:00
adamdunkels 37e65264a8 Hack: reenable cc2420 SFD interrupts after resyncing the DCO. The DCO code currently messes up the SFD interrupt settings. 2010-12-16 22:52:12 +00:00
adamdunkels 6a80106236 Turn on timesynch by default 2010-12-16 22:51:22 +00:00
nvt-se 404230a047 Added a macro for portable watchdog calls. 2010-12-15 14:01:07 +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
nifi 9a4d17fe7c Bug fix: put device in standby mode at startup in case it has previously been put in deep power-down mode; patch by Martin Bor 2010-10-12 22:55:11 +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
nifi 14873a923b Added temperature sensor for the builtin temperature sensor in MSP430 2010-08-25 19:34:06 +00:00
nifi 198db63c3b Moved the ADC configuration to sky-sensors.c and sensors now only need to specify their sample channel. This helps to avoid conflicts when using multiple sensors. 2010-08-25 19:30:52 +00:00
joxe b04ebb2b29 minor fix for making the msp430 makefile work for msp430X arch 2010-08-24 16:24:11 +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
nifi eb63cb21e0 Added make variable with command name to show in warning 2010-05-27 12:42:48 +00:00
joxe 97fc9d2ee8 no aaaa address if configured for RPL 2010-05-25 21:32:41 +00:00
joxe 50cca91d93 made use of the new link-local address api in ds6 2010-05-09 17:53:31 +00:00
nifi 4aba60ad25 acc-sensor and ext-sensor moved to the jcreate platform 2010-05-06 13:55:21 +00:00
nifi 7cebc4ed99 added missing include 2010-05-03 13:55:26 +00:00
nifi bf198ec695 Moved sensors setup to contiki-sky-platform.c and common make rules to Makefile.common for easier reuse in similar platforms 2010-05-03 13:51:11 +00:00
joxe aa980e3f67 removed initialization of RPL from platform main 2010-05-01 13:07:31 +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
fros4943 170e4d6a99 sky simulation bug workaround: explicit write to compare register wakes up timer scheduling again 2010-03-31 13:15:32 +00:00
fros4943 e640c61b78 commented unused functions 2010-03-29 12:57:57 +00:00
fros4943 540f30d855 improved support for checkpointing operations via serial, several minor fixes 2010-03-29 09:48:06 +00:00
joxe 29335f2f7d added possibility to hard-code 7 bytes of the MAC address - last byte picked from nodeid 2010-03-19 14:08:15 +00:00
adamdunkels fc61ee5dbb Bugfix: turn on watchdog before starting processes to avoid a process hanging in its startup phase 2010-03-19 13:28:27 +00:00
adamdunkels 91afe5b0f4 Turned on broadcast announcements by default, turn on announcements for collect 2010-03-19 13:27:46 +00:00
joxe 7d220c910a removed uip_router 2010-03-16 15:45:20 +00:00
nifi 0299aab5e4 Fixed to use sky-sensors to setup ADC12 2010-03-15 23:37:01 +00:00
joxe fd3d6c44d0 integration of new uip6 code from Mathilde and Julien - adds routing and improved interface handling 2010-03-15 16:41:24 +00:00
fros4943 f36cfffc99 Makefile target for uploading precompiled firmware, example: 
make upload-ihex FILE=myfile.ihex
 2010-03-10 11:46:57 +00:00
nifi 1025e7337c Added configurable router module 2010-03-01 14:46:57 +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
nifi 07ee8458e7 Fixed bootup printf() with 32-bit timer values 2010-02-23 21:02:30 +00:00
nifi bb9d430138 added bootup print of NETSTACK_RDC name 2010-02-23 20:54:09 +00:00
adamdunkels 85a9f7db42 Fix bootup printf() with 32-bit timer values 2010-02-23 18:45:16 +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
joxe 3a2eec2b1a fixed ext-sensor for jcreate 2010-02-13 11:20:48 +00:00
adamdunkels 6414bf3a55 Enabled sicslowpan fragmentation and reassembly by default on the sky platform 2010-02-08 22:12:29 +00:00
nifi 978d383395 Corrected include path 2010-02-08 00:02:39 +00:00
joxe 1da7c3eccd convert registers upto 9 instead of upto 4 2010-02-06 18:28:26 +00:00
adamdunkels 3717c39431 Updated the ext-sensor to use the new sensor API; patch by Jesper Karlsson 2010-02-06 14:41:24 +00:00
adamdunkels aaab082f27 Correctly print out the aaaa: address, if enabled 2010-02-06 10:00:49 +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
nifi 18f5ef71f0 added missing include 2010-02-03 20:30:07 +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