Commit graph

573 commits

Author SHA1 Message Date
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
Enric M. Calvo
425edf3a44 Cleaned up some files, moved z1-websense example 2011-03-16 17:41:03 +01:00
Joakim Eriksson
90ae09c7e5 fixed parsing of address to handle [<addr>] 2011-03-22 10:42:38 +01:00
dak664
14246ef811 Add optional build without internal webserver 2011-03-13 11:59:17 -04:00
dak664
97a71fea76 Conditional inclusion of the internal webserver 2011-03-11 15:07:15 -05:00
Joakim Eriksson
7033bc859e fixed the prefix query 2011-03-11 16:34:30 +01:00
dak664
d4f58ca7f0 Server address options giving different 6lowpan header compression 2011-03-08 14:15:55 -05:00
Enric M. Calvo
07f59a5142 Cleaned up z1-websense.c file 2011-03-08 12:18:26 +01:00
Enric M. Calvo
ae6791abb8 minor tweaks to z1-websense and .gitignore 2011-03-08 12:03:14 +01:00
Enric M. Calvo
bd2d1ee4be ictp:z1-websense with battery in mV 2011-03-08 11:19:30 +01:00
Enric M. Calvo
73fc5f6ae7 Meaningful units for msp temp&batt sensors 2011-03-08 10:05:47 +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
7c3527a062 ICTP: lowered radio power + print unicast data 2011-03-07 22:33:59 +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
9c2f335e57 Merge branch 'master' of git@github.com:enricmcalvo/contiki-2.x 2011-03-07 16:35:12 +01:00
Enric M. Calvo
ae67f3c257 added example-unicast2 and 3 for ictp 2011-03-07 16:33:01 +01:00
Mariano Alvira
ca831a1553 rest-example: add coap client to Makefile all goal 2011-03-05 17:08:25 -05:00
Mariano Alvira
53daa9e835 rest-example: include <string.h> for memcpy 2011-03-05 17:07:56 -05:00
Mariano Alvira
43f0ad85f5 rest-example: don't do a hard override of config options 2011-03-05 16:51:33 -05:00
Enric M. Calvo
c5548c5ca9 added mV test-battery file 2011-03-04 15:58:09 +01:00
Enric M. Calvo
07d921b08e Modified Makefile and test-potent.c for ICTPWSN 2011-03-04 15:54:21 +01:00
Enric M. Calvo
ef706670e5 added example-unicast2.c 2011-03-03 17:20:11 +01:00
Enric M. Calvo
a098cdb5df added makefile 2011-03-03 17:19:06 +01:00
Enric M. Calvo
70a500df50 added example unicast with temperature 2011-03-03 17:13:42 +01:00
Enric M. Calvo
efb4a69887 Cleaned up rssi-scanner example directory 2011-03-03 13:58:25 +01:00
Enric M. Calvo
b54c97c7cf Added ViewRSSI3D example. 2011-03-03 13:55:33 +01:00
Enric M. Calvo
621aff1aeb Correceted cc2420 function calls+modified makefile 2011-03-03 13:50:56 +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
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
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
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
ea527da162 don't do a hard override of platform config in rpl project config 2011-02-08 09:21:16 -05:00
Mariano Alvira
8a9384c22e rest-example is now rest-server-example 2011-02-08 09:07:45 -05:00
David Kopf
2ff236c4be Update description of make process. 2011-02-08 07:03:32 -05:00
dak664
ee65d0d887 Allow other (compatible) AVR targets 2011-02-07 13:37:43 -05:00
enricmcalvo
af6d2f3e72 Added tmp102-related makefiles directives for proper compilation. 2011-01-23 18:54:18 +00:00
enricmcalvo
47613e57ad Added test program in the z1 examples directory for the tmp102 temperature sensor. 2011-01-20 10:28:48 +00:00
joxe
db0423af20 added response to Mac addr request and added addrs in printout 2011-01-17 20:05:51 +00:00
salvopitru
dcff411f9d New example for mb851 board that comes from sky-websense. 2011-01-17 10:58:04 +00:00
joxe
d7712b27d0 added undef of putchar for platforms where it is a macro 2011-01-14 17:57:48 +00:00
joxe
8663cb8921 fixed compilation error 2011-01-12 20:00:48 +00:00
joxe
20f8777fd6 patched rest-example 2011-01-12 18:30:29 +00:00
adamdunkels
820d6eb334 Allow the network to settle before sending first packet. Packet transmissions are now periodic, and randomized within each period. 2011-01-10 15:11:44 +00:00
nvt-se
540675bc6a Updated the announcement example to follow the current API. 2011-01-07 23:23:31 +00:00
doganyazar
0630e0c465 Mentioned Matthias Kovatsch's CoAP Firefox plugin as an example CoAP client. 2011-01-03 22:31:57 +00:00