Commit Graph

1722 Commits

Author SHA1 Message Date
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