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

147 commits

Author SHA1 Message Date
Adam Dunkels 0b805e4763 Moved the cc2420 driver into a separate dev/cc2420 module 2014-01-26 23:20:27 +01:00
Adam Dunkels 5f3fe7f7c7 Updated include paths for the moved files under net/ 2014-01-26 23:20:23 +01:00
Adam Dunkels 0fd503af42 Removed the experimental checkpointing code 2013-11-28 14:09:17 +01:00
Adam Dunkels bb2dcaa057 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
Adam Dunkels 523c03e4b8 Removed old unused profile.h code 2013-11-19 08:31:52 +01:00
Moritz 'Morty' Strübe c67c048cac Clean up setting channel and CCA-threshold for CC2420 based motes. 
The CCA-threshold now defaults to -46 which give better simulation
results and typically also better experimental results.
This adjustment is also needed due to commit 0a13f99 in mspsim. As
promised in https://github.com/mspsim/mspsim/pull/18 it broke the
regression tests.
 2013-11-07 17:28:33 +01:00
Simon Duquennoy 248301a041 Fix naming issues and includes in uip-ds6-nbr.h 2013-08-19 17:48:30 +02:00
Simon Duquennoy ff093a2b50 Removed now unused per-module neighbor table size configs. Use NEIGHBOR_CONF_MAX_NEIGHBORS instead. 2013-08-19 17:48:30 +02:00
Jelmer Tiete 4e0d5cf65e Corrected copyright holder. 2013-06-24 16:13:35 +02:00
Jelmer Tiete 9810bfbcfd contiki code style changes and copyright update + added source to ARCH instead of SOURCEFILES in platform Makefile 2013-06-24 15:17:52 +02:00
Jelmer Tiete 0a4a14aacb added tlc59116 datasheet url 2013-06-24 15:17:52 +02:00
Jelmer Tiete ed8be502db tlc59116 for zolertia, added 0 values at init and code clean-up 2013-06-24 15:17:52 +02:00
Jelmer Tiete cc2567b988 working tlc59116 implementation for z1 2013-06-24 15:17:52 +02:00
Jelmer Tiete 8b61492152 first implementation for tlc59116 on z1 2013-06-24 15:17:52 +02:00
Adam Dunkels 277a348f60 Changed the name of the IPv6 number of route entries configuration from UIP_CONF_DS6_ROUTE_NBU to UIP_CONF_MAX_ROUTES. 2013-03-18 11:12:44 +01:00
Adam Dunkels 0841bce833 Merge pull request #82 from darconeous/master 
Makefiles: Allow setting UIP_CONF_IPV6=0 to work as expected.
 2013-03-10 12:51:03 -07:00
Nicolas Tsiftes a7b3e99644 Merge pull request #91 from JelmerT/z1-mac 
Added support for motelist and uploading to Z1 motes under Mac OSX
 2013-02-17 09:28:49 -08:00
Jelmer Tiete f4976140fc fixed z1 i2c bug where 2 extra bytes were read with every i2c-receive 2013-01-30 14:23:07 +01:00
Jelmer Tiete 12dd138915 fixed z1 i2c bug where 2 extra bytes were read with every i2c-receive 2013-01-30 14:15:16 +01:00
Jelmer Tiete edf4e36094 removed tag from z1 Makefile.common 2013-01-30 11:13:19 +01:00
Jelmer Tiete 7ce2688d84 Added support for motelist and uploading to Z1 motes under Mac OSX 2013-01-23 22:56:43 +01:00
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
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
Antonio Lignan c5e9d688a5 Fixed sht11 driver, now ensures the i2c bus is disabled when initializing 2012-08-16 14:12:27 +02:00
Antonio Lignan 73e7f25cbc Simple phidget-like relay driver for the Z1 mote with basic functionalities 2012-07-30 11:27:13 +02:00
Niclas Finne d1bef2b68a Bug fix: setup MAC address based on node id if no MAC address was restored from external flash 2012-06-07 10:45:05 +02:00
Antonio Lignan 6df9ffb731 Zolertia's light sensor ziglet 2012-05-11 13:39:59 +02:00
Antonio Lignan 3dde89971c Add disable function to I2C driver 2012-05-09 10:54:21 +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
David Kopf cac4e9a222 Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t. 
Remove the troublesome avr/dev/delay.* files.
Add PLATFORM_NAME and combine the confusing *_REVISION defines into a single PLATFORM_TYPE
 2012-04-09 15:49:53 -04:00
Niclas Finne ff7a977dc7 Improved support for the IAR compiler for the MSP430 platforms 2012-03-07 23:09:05 +01:00
Niclas Finne 09e45cb12c contiki-z1-platform is added by Makefile.z1 2012-03-07 23:07:47 +01:00
Niclas Finne 11fecd86da Moved i2cmaster and adxl345 to contiki target source files 2012-03-07 23:07:28 +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
Nicholas J Humfrey 680225e99d Converted u8_t to uint8_t and u16_t to uint16_t in the platforms directory. 
Added "These names are deprecated, use C99 names" warnings the contiki-conf.h files that were missing it.
 2012-02-21 08:33:25 -05:00
Niclas Finne 42a7125ce7 fixed compiler warning 2012-01-17 21:47:48 +01:00
Niclas Finne 9ea5149433 The definitions for PxSEL2 are missing in some versions of mspgcc 2012-01-16 13:00:16 +01:00
Niclas Finne 1c6c4ba2f1 Added resource definition for button and removed obsolete compiler setup (compiler setup is now handled by cpu/msp430/msp430def.h) 2012-01-11 01:54:52 +01:00
Niclas Finne f3db12c19d MSP430 setup for f2xxx based on Z1 2012-01-09 14:56:03 +01:00
Niclas Finne 3daa822f89 Moved configuration of memcpy workaround to cpu (only needed for an older version of mspgcc) 2012-01-09 14:55:57 +01:00
Niclas Finne cdfa8708e3 * Added f2xxx for two series (for example z1) 
* f1xxx is baseline and always included
* Cleaned up the names of uart and spi (no x in names)
* Updated SPI configuration for WiSMote
 2012-01-09 14:54:57 +01:00
Niclas Finne 8aa1011c03 Removed explicit specification of data model small for IAR compiler. Data model small is default and this will allow projects to override the data model 2012-01-09 14:41:39 +01:00
Joakim Eriksson 0ea95c21b3 Added api for reading out tmp100 x100 temps 2012-01-01 09:29:10 +01:00
Niclas Finne d14d90ea68 Moved variable definitions from header file 2011-12-20 05:09:31 +01:00
Niclas Finne c0cf69ecbd fixed compiler warnings 2011-12-20 05:09:28 +01:00
Niclas Finne 3661ff242e io, signal and IAR-GCC checks have been moved into contiki include file 2011-12-20 05:09:16 +01: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
Adam Dunkels eeb25b9667 If no MAC is defined, create one from the node ID 2011-09-05 22:04:06 +02:00
Adam Dunkels 25c28e06cc Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) 2011-09-05 20:42:12 +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 40bf585af8 The Z1 platform has LEDs 2011-08-08 22:46:30 +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
Adam Dunkels aedf4fe8b5 Made ContikiMAC/8 default on z1 platform; enabled power profiling by default 2011-07-29 13:05:36 +02:00
Niclas Finne d635c03b52 Fixed bug when reading temperature (abstemp was not always set). 2011-06-30 18:16:35 +02:00
Joakim Eriksson af601dfb23 improved support for IAR compiler for z1 2011-06-05 00:21:47 +02:00
Joakim Eriksson 77ec0bfa0f fixed the z1 platform and generic code used by z1 to work with IAR compiler 2011-05-25 17:21:51 +02:00
Enric M. Calvo 4ba4d55e34 cleaned up main 2011-03-26 10:15:49 +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
joakime 7984ec38ce fixed so that accelerometer is initialized and the isr vector is included 2011-03-16 13:56:29 +01:00
Enric M. Calvo 127a3d03ad Added IPv6 z1-websense demo w/MSP batt&temp sensor 2011-03-08 09:27:38 +01:00
Enric M. Calvo 13ff778d73 added temperature-sensor to Makefile.common 2011-03-08 09:20:35 +01:00
Enric M. Calvo 7fc41e1706 M Makefile.common to add tmp102 sensor by default 2011-03-07 21:23:58 +01:00
Enric M. Calvo 0c6fd04f44 Modified contiki-conf.h and added sensys-scanner. 2011-03-03 13:44:28 +01:00
Enric M. Calvo 701a42e239 Added dummy light driver. Now skywebsense likes Z1 
The light sensor driver is mapped to the same pin as the potentiometer
in Z1 Starter Platform. sky-websense is untouched, though.
 2011-02-27 21:28:25 +01:00
Enric M. Calvo 414d926966 Sky-websense compiles for Z1 (testing) 2011-02-27 20:10:09 +01:00
Enric M. Calvo 02d097674c Corrected contiki-conf.h to include project-conf.h 2011-02-27 20:00:45 +01:00
Enric M. Calvo a779cb4d0d XXX Interrupts by cc2420 & adxl345 compatible now 
Still remains to be seen why i2cmaster.c and adxl345.c need to be added
in the Makefile.common at the very beginnig with the env. var.
PROJECT_SOURCEFILES += i2cmaster.c adxl345.c
 2011-02-27 18:02:12 +01:00
Enric M. Calvo 18e1f92f0e Set QUEUEBUF_CONF_NUM to 4 to avoid .data overflow 2011-02-27 17:52:00 +01:00
Enric M. Calvo fc51115ace optional lines in Makefile.common 2011-02-27 17:14:27 +01:00
Enric M. Calvo e0882d7769 corrected adxl345, ISR was not disabled, now it is. 2011-02-27 13:09:14 +01:00
Enric M. Calvo 404b735cc4 Fixed radio and contiki conf to get RIME working 
cc2420 isr handled at cc2420-arch, disabled accel. interrupts and modified
platform/z1/contiki-conf.h to use same mac as sky.
Added example-broadcast-button, sends packets every second or when button pushed.
Works with other Z1s and Sky
 2011-02-27 12:35:19 +01:00
Enric M. Calvo 9acdb98a56 Added a quick sht11 sensor driver support for Z1 
Support for Sensirion SHT1x/SHT7x support is adapted from core for Z1 in the Ziglet port.
XXX TODO:
 + Remove SHT11_PWR
 + Lines are shared with I2C, hence port reconfiguration must be added at the driver level.
 2011-02-26 12:41:56 +01:00
Enric M. Calvo 44ce1699f2 Definition of Z1 Starter Platform in contiki/platforms + LEDs + Potentiometer 2011-02-25 16:08:50 +01:00
Enric M. Calvo 3ec4143252 Added Potentiometer sensor in Z1 Platform 2011-02-25 16:01:40 +01:00
Enric M. Calvo 43db4fd10e Added MAC overwriting/burning capability to the Z1 
Added compilation parameter "nodemac=1234" that can be used
to overwrite the MAC at compilation time, and that combined
with the burn-nodeid app can record a prestablished MAC on ext. mem.
 2011-02-25 15:35:41 +01:00
Enric M. Calvo 659f36eb79 Updated *-sensor.c files from the sky platform. 
Fixed battery-sensor plus added simple test (XXX)
 2011-02-25 15:35:41 +01:00
Enric M. Calvo 1b2878baa4 Corrected some typos in the PORT1 ISR function. 2011-02-16 12:02:36 -05:00
enricmcalvo 594d033c04 Added device drivers for tmp102 sensor for the Zolertia Z1 platform. 2011-01-20 10:28:00 +00:00
nifi 3d28da8813 Coffee no longer uses watchdog calls 2011-01-18 15:49:37 +00:00
nifi 1e69c4c795 Moved watchdog_periodic into the lowest level to avoid multiple redundant calls higher up 2011-01-18 15:48:38 +00:00
adamdunkels 353bb07cc9 Changed the RDC rate configuration name to the new configuration name 2010-11-26 12:09:04 +00:00
enricmcalvo f4c1953563 Added temporary definition of P1SEL2 for those mspgcc4 without complete port register definitions. 2010-11-14 21:59:02 +00:00
enricmcalvo 436e4dce1c Updated accelerometer drivers to avoid conflicts with radio transceiver. 2010-11-10 13:46:39 +00:00
enricmcalvo 01f886dad9 Slight modification to clean properly 2010-11-07 08:40:24 +00:00
enricmcalvo 59bdebe842 Added I2C Master drivers and accelerometer drivers 2010-11-07 08:38:51 +00:00
joxe f08e262055 fixed buggy config of phidget sensors for Z1 2010-11-05 10:31:57 +00:00
joxe f02cdc7c8f minor polish to the phidget sensor driver 2010-08-27 12:58:57 +00:00
joxe 53840aca67 added basic phidget support for the Z1 2010-08-27 12:17:40 +00:00
nifi 91be7cebc4 Node ID is stored in external flash and restored on bootup 2010-08-26 22:08:11 +00:00
joxe a461eceff8 fixed configuration of button sensor 2010-08-26 16:01:20 +00:00
joxe 2c5f5cd849 added init of xmem for z1 platform 2010-08-26 09:16:39 +00:00
joxe d946fdd574 added Z1 xmem + coffee driver 2010-08-25 17:28:15 +00:00
joxe 645c48a332 added Z1 platform 2010-08-24 16:26:38 +00:00