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

1900 commits

Author SHA1 Message Date
George Oikonomou
bce34e4b9a For cc2x30, moved CLOCK_CONF_SENCOND to the cpu dir. 
The value is not really configurable by the platform so having it
in contiki-conf.h didn't make huge sense.
 2012-04-02 11:22:19 +01:00
George Oikonomou
e02c287f15 Solved a text encoding issue 2012-04-02 11:22:19 +01:00
George Oikonomou
d958ee3125 Deleted the old Sensinode 'read mac from flash' routine. 
Since the introduction of a purpose-written routine, the old
generic one (which was written in asm) was never being used.
There was a configuration directive which allowed us to switch
between the two. All references to this configuration directive
have also been removed.
 2012-04-02 11:21:32 +01:00
George Oikonomou
4f1e251603 Some uN_t had crept back in cc2530dk and sensinode. 
Changed to uintN_t plus a bit of code formatting
 2012-03-29 13:10:10 +01:00
Joakim Eriksson
7482fd6962 quick fix for enabling native-border router to run under windows - need to cleanup the arguments 2012-03-27 11:09:54 +02:00
simonduq
946f00bf7b stm32w: added ability to upload and reset all connected boards, and login using MOTE=x 2012-03-26 23:00:44 +02:00
George Oikonomou
ad256e5014 New platform: TI cc2530 Development Kit 
This commits adds support for TI's SmartRF05 Eval. Board with cc2530 EMs
Some initial support for cc2531 USB dongles
 2012-03-23 14:41:07 +00:00
George Oikonomou
b7674c3636 Reincarnate the sensinode/cc2430 port 2012-03-23 14:41:07 +00:00
Matthias Kovatsch
d716ee55e7 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-21 21:51:03 +01:00
Matthias Kovatsch
d57904b289 Fixed bug in IPv6 address print function. 2012-03-21 21:27:52 +01:00
simonduq
e4fb360262 stm32w platforms: contikimac support in the Rime case, with EUI-64 2012-03-20 17:30:59 +01:00
simonduq
0eb9a46e3a stm32w platforms: contiki-conf cleanup and added platform-conf 2012-03-20 17:30:57 +01:00
simonduq
762097eb50 stm32w platforms: 64-bit rtimer causes a bug in arm-none-eabi-objcopy 2.18.50, use 32-bit rtimer instead 2012-03-20 17:30:45 +01:00
simonduq
7784cf7827 stm32w platforms: use 2 cca and default contikimac guard time 2012-03-20 17:30:05 +01:00
simonduq
5da4463236 adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La) 2012-03-20 17:29:58 +01:00
Fredrik Osterlind
862452b5b0 removed debugging output, code style 2012-03-13 14:17:43 +01:00
Niclas Finne
cf3827829d Added resource definition for button, leds, and battery, and removed obsolete compiler setup 2012-03-09 20:35:49 +01:00
Fredrik Osterlind
97c7a55eea simulating 1 ms turnaround time (before transmissions) by default, and no transmissions on channel busy 2012-03-09 14:58:13 +01:00
Fredrik Osterlind
e8294e8699 added objcopy external tools configuration 
changed nm command to sort numerically, and changed regexpressions to accept output from newer gcc versions
added more debugging info under help menu
 2012-03-09 14:57:21 +01:00
Niclas Finne
c2e07c9798 Improved support for the IAR compiler. 
io and signal have been moved into contiki include file.
 2012-03-08 22:41:55 +01:00
Matthias Kovatsch
f67fb672eb Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-08 00:49:25 +01:00
Matthias Kovatsch
87cd18539b Eliminated RPL_CONF_ADJUST_LLH_LEN correction by using uip_l3_icmp_hdr_len instead of uip_l2_l3_icmp_hdr_len. 2012-03-08 00:48:04 +01: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
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
a8e8e6f51d io and signal have been moved into contiki include file 2012-03-07 23:05:10 +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
1214086f97 Fixed TARGET=minimal-net compilation issues on Darwin. 2012-03-02 15:15:49 -05:00
Ilya Dmitrichenko
499d3052ee Fixed TARGET=native compilation issues on Darwin. 2012-03-02 15:15:42 -05:00
David Kopf
79d65d2adc Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-25 10:17:57 -05: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
Mariano Alvira
008250afc6 econotag: increase UIP_CONF_RECEIVE_WINDOW to 300 for webserver nano 2012-02-24 12:19:05 -05:00
David Kopf
deb75d3d97 Several bugfixes 2012-02-21 11:14:52 -05:00
David Kopf
6e45dfe5ff PROGMEM changes needed for newer avr-gcc compiler 2012-02-21 11:10:57 -05: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
David Kopf
20a5c794dd Move address initialization to after proce_init. Something in that now wiping the address array. 2012-02-11 15:19:28 -05:00
Fredrik Osterlind
aecb4b03cc bug fix: rpl was not included correctly 2012-01-31 14:53:52 +01:00
Adam Dunkels
acb2c28fdd small code style fixes; removed left-over function call 2012-01-25 06:41:39 -08:00
Adam Dunkels
cdfc788967 Increased wait time between main loop polls; cleaned up the code to Contiki code style standards; moved process autostart code to after network setup 2012-01-25 06:34:10 -08:00
Niclas Finne
aceb36c66b Replaced SELECT_CALLBACK with an API that supports multiple select callbacks 2012-01-19 17:52:01 +01:00
Adam Dunkels
5e1946276b Removed erroneous character from first line of file. 2012-01-18 12:37:03 -08:00
Adam Dunkels
959096ca67 Contiki port to the TI EXP5438 MSP430x5438a experimenters board 2012-01-18 07:27:59 -08: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
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
David Kopf
58298f59db Add F_CPU=0x800000 option with phase lock to external 32768 Hz crystal 
Add MCU_CONF_LOW_WEAR option to avoid eeprom writes during development.
 2012-01-10 12:42:27 -05:00
Niclas Finne
f3db12c19d MSP430 setup for f2xxx based on Z1 2012-01-09 14:56:03 +01:00
Niclas Finne
9ffcd53868 Fixed compiler warning (with IAR compiler) 2012-01-09 14:56:00 +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
8aaa9d14b7 minor code cleanup 2012-01-09 14:55:51 +01:00
Niclas Finne
987b57b015 moved macros to implementation file, end-of-line normalization, code style 2012-01-09 14:55:43 +01:00
Niclas Finne
013571ed3f * Removed __MSP430X__ (already defined by newer mspgcc4) 
* Commented out pragma not supported by mspgcc
 2012-01-09 14:55:40 +01:00
Niclas Finne
866bc91e5a enabled nullrdc autoack support 2012-01-09 14:55:37 +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
f4f84ffca4 Updated SPI config for faster SPI, split msp430/clock/spi into separate versions for MSP430/MSP430X 2012-01-09 14:54:01 +01:00
Niclas Finne
d1b22d40fa leds setup for WiSMote 2012-01-09 14:41:45 +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
Niclas Finne
708f9d77d2 Corrected timing for higher CPU speed 2012-01-09 14:41:36 +01:00
Niclas Finne
6c5379606b Set node_id, disabled watchdog for now 2012-01-09 14:39:32 +01: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
David Kopf
b251619a2f Add wpcap for cygwin/Windows native border router 2012-01-08 13:37:56 -05:00
Joakim Eriksson
5da8a9261b fixed so that it works for non IPv6 applications 2012-01-06 03:59:43 -08:00
Joakim Eriksson
c3af79b795 Made native main loop sleep a bit more 2012-01-01 09:29:33 +01:00
Niclas Finne
8b83ffec67 Added native-border-router and slip-radio 2012-01-01 09:29:33 +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
Nicolas Tsiftes
d0ebeb409e Merge remote-tracking branch 'sf/master' into rpl-patch 
Conflicts:
	core/net/tcpip.c
 2011-12-08 15:26:11 +01:00
Matthias Kovatsch
36763cabbd Introduced PLATFORM_HAS_LIGHT, _BATTERY, and _SHT11. 2011-12-07 20:47:31 +01:00
Adam Dunkels
66c280039b Removed obsolete platforms 2011-12-05 21:49:38 +01:00
Nicolas Tsiftes
0e32956a63 Merge remote-tracking branch 'sf/master' into rpl-patch 2011-11-21 14:59:31 +01:00
David Kopf
fb977cb9ef Better fix for hardware FCS error on JTAG reset 
Correct silly error introduced by trying to save two bytes.
 2011-11-15 13:24:58 -05:00
David Kopf
3612fdff5b Add params.c to Raven and sync with 128rfa1 contiki-conf.h 
Contikimac works with mcu sleep on both platforms.
 2011-11-14 11:56:34 -05:00
David Kopf
65032c4d35 Get better random seed on startup 2011-11-14 11:51:54 -05:00
David Kopf
bdd164e003 Reverse node_id bytes, patch from Geog von Zengen 2011-11-08 12:23:29 -05:00
Mariano Alvira
af4ef9531c Add node_id to econotag 2011-10-25 10:09:28 -04:00
Niclas Finne
ed1780f9af Removed quickstart rule for target 'clean' to avoid make warnings 2011-10-24 17:04:45 +02:00
nvt
d711887a1b Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-10-10 22:11:52 +02:00
nvt
4f3528f7ed Move compower configuration out of the non-IPv6 conditional clause. 2011-10-10 22:11:29 +02:00
Matthias Kovatsch
efeebe953c Enabled UDP checksums for minimal-net 2011-10-10 14:25:03 +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
David Kopf
f721f646fa Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer 2011-09-10 12:44:49 -04:00
Mariano Alvira
3e5afa2b59 replace MAC_CONF_CHANNEL_CHECK_RATE with 
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE for redbee-dev and econotag

Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
 2011-09-06 07:49:23 -04: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
8fee2a507c Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) 2011-09-05 20:43:10 +02:00
Adam Dunkels
0f8145c78b Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) 2011-09-05 20:43:01 +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
Mariano Alvira
6c0bbc492b change mc1322x rtimers to 32-bit 
hardcode a close default value for the RTC
 2011-09-02 12:32:47 -04: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
add8367947 Include stdlib.h for the NULL macro 2011-08-31 21:56:28 +02:00
David Kopf
3520cc0bae flash led on tcp get, fix pingbacks on rpl build, patch web data for params 2011-08-31 12:13:31 -04:00
David Kopf
36b290a1cd Refactor with params.c, h 2011-08-31 11:47:17 -04:00
David Kopf
d2aece89ef Add settings manager with program flash defaults, random routine, periodic prints with ENERGEST, node-id. 2011-08-28 16:22:39 -04:00
David Kopf
bdec65b889 Fix typos and file endings 2011-08-28 16:04:36 -04:00
David Kopf
9fec648b3e Allow selection of slip port 2011-08-25 14:43:18 -04:00
David Kopf
dff77aea61 Correct typo 2011-08-25 14:37:12 -04:00
David Kopf
94fc40f736 Move LEDONPORTE1 define to contiki-conf.h, fixing typo. 2011-08-24 11:35:58 -04:00
David Kopf
3c18372939 Add periodic prints and stack monitor 2011-08-24 10:55:58 -04:00
David Kopf
b55dddcd38 Free rtimer for contikimac, add print-stats option 2011-08-15 14:55:18 -04:00
David Kopf
83e3b99d54 Let RPL examples enable platform RPL 2011-08-15 14:45:44 -04:00
David Kopf
50d1086553 Add changes needed for contikimac 2011-08-13 11:38:38 -04:00
David Kopf
ea1345d3fe Update to proper webserver define 2011-08-13 11:36:43 -04:00
David Kopf
f36c97a9a4 Get random seed from noisy ADC conversion at startup. 2011-08-13 11:31:20 -04:00
Adam Dunkels
40bf585af8 The Z1 platform has LEDs 2011-08-08 22:46:30 +02:00
David Kopf
c9b19ce655 Change timer setups for arbitrary CLOCK_CONF_SECOND 
Change raven to 128 ticks and enable 32KHz crystal as default.
 2011-08-05 15:14:35 -04:00
David Kopf
96c3c1093a Assign aaaa:: prefix if HARD_CODED_ADDRESS not defined 2011-08-03 12:30:20 -04:00
David Kopf
6ae3e2bcb2 Restore micaz/dev/clock.c, mysteriously renamed to iris/dev/sensors/battery-sensor.c 2011-08-03 11:44:22 -04:00
David Kopf
e2ad2acde4 Add stk500 platform and changes suggested by Daniel Willmann 2011-08-03 11:18:55 -04:00
David Kopf
44f4ee9315 Use PROCESS_NAME_STRING macro to handle NO_PROCESS_NAMES 2011-08-03 11:08:40 -04:00
David Kopf
6ec85fe079 Add Iris port of Shinta Hatatani 2011-08-03 10:17:59 -04: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
David Kopf
0774fef827 Add explicit RADIOSTATS to platform contiki-conf.h 2011-07-25 15:12:12 -04:00
David Kopf
05c11d362b Clock seconds since startup on minimal-net 2011-07-24 11:53:36 -04:00
David Kopf
0bb585fd60 Replace WEBSERVER by AVR_WEBSERVER 2011-07-24 11:43:17 -04:00
HATATANI Shinta
11d6bc78c5 some fix 2011-07-19 16:21:41 +09:00
Mariano Alvira
697af5ef08 adding tmp102 sensor for the econotag from Hedde Bosman. 
This can be pulling in as a common driver if we can make a generic i2c
Contiki driver.
 2011-07-18 07:30:49 -04:00
HATATANI Shinta
3c168cc395 merge iris and micaz 2011-07-17 10:36:35 +09:00
HATATANI Shinta
94a6f4087c some trivial change 2011-07-15 16:36:25 +09:00
HATATANI Shinta
a7d713d253 Now iris port works with tunslip6 (Thanks to Suhas K) 2011-07-15 16:36:25 +09:00
HATATANI Shinta
f4740a062a IRIS port is working with uIPv6 2011-07-15 16:36:25 +09:00
HATATANI Shinta
9a201f6934 create iris directory 2011-07-15 16:36:24 +09:00
David Kopf
6355545ded Add template for AUTOSTART_PROCESS 2011-07-11 11:34:04 -04:00
Vincent Brillault
dc9cbe647d Changes in RPL implementation : 
- Structural modification of RPL data storage.
- Support multiple gateways (multiple DODAG-ID with a unique InstanceID)
- Use Lollipop counters
- Add leaf-only configuration option for RPL
Bugfix :
- Correctly send "Grounded" flag in DIO
 2011-07-11 16:52:45 +02:00
Mariano Alvira
e80f9eb4b5 mc1322x: build fixes for uart2 2011-07-08 19:40:42 -04:00
Niclas Finne
4b26f92e04 Added platform configuration files with resource definitions for the JCreate and Sentilla USB platforms 2011-07-01 17:18:57 +02:00
Niclas Finne
1d07330ac0 Made the platform config file configurable. 2011-07-01 17:16:12 +02:00
Niclas Finne
d635c03b52 Fixed bug when reading temperature (abstemp was not always set). 2011-06-30 18:16:35 +02:00
David Kopf
6ea7250af7 Change ctimer startup order, add multihop to wpcap and minimal-net platform. 2011-06-30 12:12:07 -04:00
David Kopf
46de21e771 Allow ipv6 builds on win32 platform. (webserver6 builds with cygwin, needs changes for VC++ compiler) 2011-06-28 08:24:23 -04:00
David Kopf
c48b7ab78d Add RPL nodes and border router to minimal-net platform (cygwin only) 2011-06-28 08:19:48 -04:00
dak664
d6db9e4e86 Add project-conf.h to platform contiki-conf.h files. 
Fix jackdaw comments.
 2011-06-08 09:12:57 -04:00
Niclas Finne
dc426d789b msp430.h has been merged with msp430def.h for code to compile with IAR compiler 2011-06-07 18:54:57 +02:00
Joakim Eriksson
af601dfb23 improved support for IAR compiler for z1 2011-06-05 00:21:47 +02:00
Mariano Alvira
cb29a9c667 add leds and button capabilities to the econotag. 2011-05-27 11:01:54 -04: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
Niclas Finne
374722b2e0 Added resource definition for leds and button 2011-05-20 14:27:53 +02:00
dak664
55c1ce6e93 Fix ip4 hello-world build 2011-05-18 11:09:16 -04:00
Niclas Finne
41dd2d09f4 Added missing include 2011-05-10 15:28:30 +02:00
Mariano Alvira
e2d9082fc7 factor maca hw autoack and nullrdc hw autoack config 2011-05-08 09:50:57 -04:00
Mariano Alvira
65671c66c6 turn on insert ack packet by default 2011-05-08 09:50:57 -04:00
Salvatore Pitrulli
6e20a4c0ce Added missing include. 2011-04-27 18:12:23 +02:00
Salvatore Pitrulli
5eabf33211 Added functions for deep sleep to mbxxx platform. 2011-04-27 18:12:23 +02:00
Salvatore Pitrulli
01a7a78a94 Fixed temperature ADC conversion bug on mbxxx. 
The conversion was made from an incorrect source when
the GPIO pin was not PB7.
Added functions and macros used to select the correct
ADC channel.
 2011-04-20 18:06:20 +02:00
Salvatore Pitrulli
aa968309af Merge remote branch 'sf/master' 2011-04-16 16:27:10 +02:00
Salvatore Pitrulli
738c5dcd4b Files for platform mbxxx. 
MBXXX is a fake platform that actually include
all the platforms based on STM32W108 microcontroller.
Detection of the board is made at runtime, at the
expense of code size.
 2011-04-14 08:11:54 +02:00
Salvatore Pitrulli
80605d4045 Change from DEV to PORT in login command for mb851. 
DEV variable was already used in Makefile.include.
 2011-04-14 08:07:15 +02:00
Salvatore Pitrulli
af8e58e063 Set LED pins to output when MB851 is in sleep mode. 
This reduces power consumption.
 2011-04-13 18:14:12 +02:00
Oliver Schmidt
b19fb0ac9e Activate Telnet-server GUI-support only for project builds. 2011-04-10 17:08:50 +02:00
Oliver Schmidt
c6c0d6247b Merge remote-tracking branch 'origin/master' 2011-04-10 13:23:13 +02:00
Oliver Schmidt
7c3adef1c8 Added dependency handling and README.VC 2011-04-10 13:21:39 +02:00
Oliver Schmidt
f2678ff7b4 Renamed README to README.1X 2011-04-10 12:43:24 +02:00
Oliver Schmidt
199d51275d Removed section about (recently deleted) VC solution file. 2011-04-10 12:38:11 +02:00
dak664
2e14df3981 Options to extend mc1322x fifo to RAM buffer, or use hardware flow control with tunslip6. 2011-04-08 15:15:16 -04:00
Salvatore Pitrulli
6655c876f2 Added functions and example for deep sleep on mb851. 
The added function let a process to make the system go
into deep sleep for maximum power saving.
The udp-ipv6-example shows how to use these new functions.
 2011-04-08 11:53:48 +00:00
Niclas Finne
236c459ecf Added missing include 2011-04-07 09:26:12 +02:00
Oliver Schmidt
eadd74ae5f Removed VC++ project files. 
Being able to build about any Contiki project in the WIN32 target using VC++ is _so_ much more useful than those project files not integrated in any way into the Contiki build system.
 2011-04-03 22:37:03 +02:00
Oliver Schmidt
5da4faf71e Allow VC++ to be used as alternative to GCC for building in the WIN32 target. 
TODOs:
- Update README
- Add dependency handling
- Add rtimersupport
 2011-04-03 22:32:11 +02:00
Oliver Schmidt
f83fb3704b Replaced make-empty-symbols with empty-symbols.[c|h] 
The symbol generation shell scripts cause CRLF issues on Windows/Cygwin again and again. Instead of fixing this yet again I opted to remove the symbol generation script at least for the "no symbols" scenario with two C source files to be copied.
 2011-04-03 13:24:58 +02:00
Oliver Schmidt
4a731dfda9 Allow for non-GUI win32 apps. 2011-04-03 10:56:18 +02:00
dak664
4e8b4e408c Temporary fix for RNDIS enumeration before the mac address is set up. 
(Turn on RS232 debug to bypass the enumeration wait and let the mac address get set first)
 2011-03-27 14:21:47 -04:00
Enric M. Calvo
4ba4d55e34 cleaned up main 2011-03-26 10:15:49 +01: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
dak664
fcb41fa5c2 Refactor with settings manager and better usb enumeration for debug prints 2011-03-23 18:10:49 -04:00
dak664
a9cbbb4570 Add sneezer mode and tx power change 2011-03-23 18:08:07 -04:00
Mariano Alvira
0af24040f1 econotag: add an option to use the watchdog timer 2011-03-22 16:35:54 -04:00
Salvatore Pitrulli
45db1a6faf Reduced uip buffer size in order to compile all the examples. 2011-03-22 19:35:50 +01:00
Salvatore Pitrulli
eb588f1aec New HAL and SimpleMAC for STM32W108. 2011-03-22 19:35:49 +01:00
Niclas Finne
ccc1687319 Made energest configuration configurable 2011-03-21 21:28:43 +01:00
dak664
5dd7500d0b Add configurable auto cca threshold and implement driver cca call. 
Show smallest rssi in jackdaw menu.
 2011-03-21 11:10:30 -04:00
joakime
7984ec38ce fixed so that accelerometer is initialized and the isr vector is included 2011-03-16 13:56:29 +01:00
Mariano Alvira
59768e7bc7 econotag: fix problem with how IAB based mac addresses are formed 2011-03-13 17:48:47 -04:00
dak664
16a73eafd9 Use uip-debug.h defines and print routines 
Add print to show cause of startup
 2011-03-13 14:07:17 -04:00
dak664
533a827adb Defines need to be above their use in a conditional test 2011-03-11 16:28:02 -05:00
dak664
abf6f1a153 Include objects needed for slip rpl border router build 2011-03-11 15:08:55 -05:00
dak664
e4fcd7ebd7 Add files needed for slip rpl-border-router build. 2011-03-11 14:16:27 -05:00
dak664
02091b083a MAC address to EEMEM, not PROGMEM 
Sync atmega128rfa1 main routine to the raven (timed route prints, etc.)
 2011-03-11 13:47:47 -05:00
dak664
69da4c8cfa Fix unresolved references when built without webserver and/or tcp. Changes suggested by Harald Pichler. 2011-03-10 10:57:43 -05:00
dak664
ad67c573de Fix unused variable warning 2011-03-10 10:37:15 -05:00
dak664
de7bcda99f avrdude and makefile changes suggested by Georg von Zengen 2011-03-08 13:07:00 -05: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
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
Niclas Finne
ccc0a3f7c4 Changed LEDS_ALL to 8 leds for the JCreate platform 2011-03-07 20:12:26 +01:00
Fredrik Osterlind
dd7cec737d removed obsolete leds_[color]() functions, replaced by leds_{on,off}() 
allow LEDS_[COLOR] to be configured by platform-conf
 2011-03-03 17:48:32 +01:00
Enric M. Calvo
0c6fd04f44 Modified contiki-conf.h and added sensys-scanner. 2011-03-03 13:44:28 +01:00
Fredrik Osterlind
499c13a357 removed execute flag of source files (avoids diff problems with egit) 2011-03-01 18:16:42 +01:00
dak664
7f3c198a78 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-02-28 16:32:48 -05:00
dak664
1e7479f8e4 Add periodic print of stack monitor and neighbors/routes. 
Refactor PRINTFs.
 2011-02-28 16:26:28 -05: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
f1fe8782b0 Removed unwanted files 2011-02-25 16:29:55 +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
Mariano Alvira
05a4961604 econotag: generate EUI64 mac adresses properly 2011-02-23 15:20:08 -08:00
Mariano Alvira
e9c904a74c econotag: turn DEBUG off by default 2011-02-23 15:19:44 -08:00
Mariano Alvira
c2c70a22df mc1322x: setup hardware addresses and enable AUTOACK mode if 
configured
 2011-02-23 15:19:44 -08:00
Mariano Alvira
e826ccd3b9 add NULLRDC_CONF_802154_AUTOACK_HW for radios that only pass-up NOACK 
status but not the actual ack packet.
 2011-02-23 15:19:44 -08:00
dak664
ef4bb08c3e Add stack monitor. Change internal uip address to 200 for RPL. 2011-02-23 14:14:21 -05: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
Enric M. Calvo
1b2878baa4 Corrected some typos in the PORT1 ISR function. 2011-02-16 12:02:36 -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
Fredrik Osterlind
a501816472 example of adding cooja-platform mote interface manually 2011-02-11 15:23:59 +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
Mariano Alvira
ad200384ac add a dummy light sensor for econotag 2011-02-08 09:07:45 -05:00
Mariano Alvira
227b72c88d add dummy node-id.h for econotag 2011-02-08 09:07:34 -05:00
Mariano Alvira
9572baa71b fix mc13224v led driver to only touch gpio used for leds. 2011-02-08 09:07:11 -05:00
Mariano Alvira
dbe6407a22 change mc13224v button-sensor to use gpio structs 2011-02-08 09:07:03 -05:00
dak664
bbcd43a9aa Merge branch 'master' of github.com:adamdunkels/contiki-2.x 2011-02-07 15:14:54 -05:00
dak664
71612fd6a4 Replace file, some problem with my local master line endings. 2011-02-07 15:12:54 -05:00
dak664
b33b89216f Delete obsolete file 2011-02-07 14:35:19 -05:00
dak664
574feaa866 Test web-based commit, see if it fixes the line endings. 2011-02-07 11:25:07 -08:00
dak664
574927c776 Delete obsolete file 2011-02-07 14:07:37 -05:00
dak664
519cce0019 Add comments, bugfixes, merge avr-atmega128rfa1 platform changes to avr-raven 2011-02-07 14:06:53 -05:00
dak664
62b894e560 Add avr-atmega128rfa1 platform based on Michael Hartman's board (single LED peripheral) 2011-02-07 13:15:21 -05:00
David Kopf
ceea35f7a8 Test TortoiseGit commit from Vista laptop 2011-02-04 10:41:18 -05:00
David Kopf
16df31b143 Merge branch 'master' of https://github.com/adamdunkels/contiki-2.x 2011-02-04 10:39:34 -05:00
dak664
0b23116c30 Test TortoiseGit commit from windows 7 2011-02-04 09:03:03 -05:00
David Kopf
c18d12e8a4 Test git commit 2011-02-03 18:29:17 -05:00
oliverschmidt
10a7bb2579 Made Atari build compabile with make.exe from GnuWin32 and cmd.exe. cmd.exe comes with a builtin mkdir which doesn't understand -p. However -p isn't necessary as long as the disk creation works - and therefore the directory is successfully deleted. 2011-01-23 16:25:45 +00:00
nvt-se
375e1d76ef Print the error if select fails 2011-01-21 14:19:57 +00: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
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