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
