Commit graph

1528 commits

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