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

1604 commits

Author SHA1 Message Date
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
nvt-se
4003c3a8c9 do2unix conversion 2011-01-05 17:02:15 +00:00
joxe
2e1c856741 added support for avoiding sleeping in LPM3 when DCO needs to be running - needed for uart DMA 2011-01-05 12:04:23 +00:00
dak664
90a6d768ea Keep track of sleeptime and display on status web page. 2010-12-23 19:41:07 +00:00
dak664
013c3ac2f8 Remove contitional on clock updating, it should always be done after a sleep! 2010-12-22 17:09:03 +00:00
dak664
44a2e34005 Resolve TIMER2 conflict between sleep and possible clock usage. 2010-12-22 16:50:30 +00:00
dak664
7b7ad4336e Send text following ? in GET to Raven LCD 2010-12-20 20:06:06 +00:00
dak664
ac68ced90a Add polyphonic ringtones for received messages. 2010-12-20 20:03:56 +00:00
dak664
8af150ec0b Send temperature and voltage to 1294p webserver on startup by default. 2010-12-20 19:58:42 +00:00
dak664
b87694e272 Update documentation 2010-12-19 17:13:29 +00:00
dak664
6d1c060564 Modify menu chart for sleep and doze, add raven picture for doxygen 2010-12-19 17:12:13 +00:00
dak664
b438b78097 Fix configuration for RPL build (no packet queuing, default no TCP) 2010-12-18 22:37:02 +00:00
dak664
9575daede2 Add working cx-max configuration values. 2010-12-18 20:53:36 +00:00
dak664
d378d891c8 Add working cx-mac configuration values. 2010-12-18 20:46:14 +00:00
dak664
89d0ffffd2 Save radio ontime when webwser displays current cpu ontime for later display of corresponding value after possible TCP delays. 2010-12-18 20:44:02 +00:00
dak664
8586643d14 Implement SLEEP and DOZE commands from the 3290p menu. 
Define serial commands the same as the 3290p for grepping.
 2010-12-18 20:40:45 +00:00
dak664
555fab59a3 Add SLEEP and DOZE functions to the menu. 
Give serial commands the same defines as in the 1284p for grepping.
 2010-12-18 20:35:58 +00:00
adamdunkels
e55c3cd471 Enable DCO configuration override 2010-12-16 22:52:27 +00:00
adamdunkels
37e65264a8 Hack: reenable cc2420 SFD interrupts after resyncing the DCO. The DCO code currently messes up the SFD interrupt settings. 2010-12-16 22:52:12 +00:00
adamdunkels
6a80106236 Turn on timesynch by default 2010-12-16 22:51:22 +00:00
dak664
aa7ad8c807 Add rf230_listen_channel routine to force RX_ON state for sniffing and to read rssi for energy scan. 2010-12-15 16:50:44 +00:00
nvt-se
404230a047 Added a macro for portable watchdog calls. 2010-12-15 14:01:07 +00:00
salvopitru
5f40a5d63e Added serialdump utility from sky folder to stm32w folder. It has one more option for limiting upload speed. 2010-12-15 11:18:09 +00:00
dak664
ced88c2eff Give jackdaw fe80::0 address and number webservers from fe80::1 2010-12-14 23:22:01 +00:00
dak664
1d2a5ca671 Minor format and comment changes 2010-12-14 22:51:04 +00:00
dak664
d8fe44645c Refactor, tune, add SICSLOWPAN_CONF_ACK_ALL defines for testing radio acks 2010-12-14 22:39:38 +00:00
dak664
a9dedfee4f Refactor contiki-conf files, remove obsolete defines. 2010-12-13 23:31:13 +00:00
dak664
e06dada659 Update platform build for hello-world, includes patch from Tobias Schfer 2010-12-05 20:21:19 +00:00
dak664
8e38f5ee34 Fix comment, add WEBDIR=default to force rebuild with default web content 2010-12-05 17:32:50 +00:00
dak664
35b2ce0cdb Add status page link, show correct rssi, fix indexing off array in ipv4 builds 2010-12-04 21:32:35 +00:00
kasunch
753cd22d56 Changing line ending to LF 2010-12-04 08:22:10 +00:00
dak664
1ca7f7f940 Apply patch from Tobias Schfer to enable hello-world build. Untested otherwise. 2010-12-03 21:39:33 +00:00
dak664
58b7a19803 Hardware/software radio HAL patch from Roger Larsson. 
Use CHANNEL_802_15_4 define for RF channel on all AVR platforms, default 26.
Remove hopefully unnecessary interrupt disable wrapper on eeprom reads and writes.
 2010-12-03 20:42:01 +00:00
dak664
09c45f0497 Add address, neighbor, routes cgi's 2010-12-02 15:37:13 +00:00
dak664
6f66d45917 Add status web page with addresses, neighbors, routes 2010-12-02 15:28:38 +00:00
dak664
30885ba4ce Do clock init before any RS232 output 2010-12-01 16:30:34 +00:00
dak664
3d3ad9e2c2 Fixes to allow ipv4 (hello world) builds 2010-12-01 16:23:55 +00:00
dak664
c027c1664a Informative error when bogus platform is used in a contiki build 2010-12-01 15:09:06 +00:00
zhitao
af7b81efdb resolved conflict with type declaration 2010-12-01 10:19:58 +00:00
dak664
5a4fa388da Refuse to play ping-pong with host interface 2010-11-29 21:22:41 +00:00
dak664
0735b431aa Enable RPL neighbor webserver page 2010-11-29 21:21:36 +00:00
dak664
dc028b3f85 Get rssi correctly in either rx mode, clean up radio driver debugging 2010-11-26 20:39:15 +00:00
adamdunkels
353bb07cc9 Changed the RDC rate configuration name to the new configuration name 2010-11-26 12:09:04 +00:00
dak664
880233a451 RSSI read fix (use ED register in AACK mode), add reduced power configuration for miniature mesh testing. 2010-11-24 18:46:57 +00:00
nifi
3bd78893e5 Renamed nullrdc to nullrdc-noframer and nullrdc-framer to nullrdc. 
nullrdc (previously nullrdc-framer) is now a RDC implementation that
does not do any radio duty cycling but supports link layer addresses
and frame format via framer (for example 802.15.4). nullrdc can now be
used in the same way as contikimac, xmac, etc.

nullrdc-noframer (previously nullrdc) is a null RDC implementation
that does not do any radio duty cycling, does not add any header of its
own to the packets, and does not support link layer addresses.
 2010-11-23 18:11:00 +00:00
dak664
da8ad17c02 Save 256 bytes of RAM by excluding floating point routine 2010-11-21 17:56:36 +00:00
dak664
b3324c6d23 Add menu option to temporarily disable RS232 debug output for higher 6lowpan throughput. 
Functional rpl with RNDIS/Ubuntu (tested on Raven single hops)
 2010-11-19 20:02:25 +00:00
dak664
c6c81acede Add optional pings to google and cisco 2010-11-19 19:44:10 +00:00
dak664
fe19719a16 Fix printf_P error 2010-11-18 14:33:10 +00:00
adamdunkels
9446d37285 Increased the default Cooja CFS size to 4000 bytes so that examples work (found by Roger Larsson) 2010-11-15 21:44:37 +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
dak664
cc7fea92d2 Force ipv6 when building with fakeuip 2010-11-13 16:28:46 +00:00
dak664
72d49c20af Allow non-ipv6 build (hello world) 2010-11-12 20:49:03 +00:00
dak664
9e94ba9803 Allow non-ipv6 build, e.g. Hello World 2010-11-12 17:15:00 +00:00
fros4943
0a8d898678 #ifndef'd elfloader's default memory usage 2010-11-11 13:56:02 +00:00
enricmcalvo
436e4dce1c Updated accelerometer drivers to avoid conflicts with radio transceiver. 2010-11-10 13:46:39 +00:00
fros4943
3563089a91 reimplemented initial support for referencing contiki source files in cooja projects 2010-11-10 13:11:43 +00:00
maralvira
5b4c63440b fix typos 2010-11-09 01:30:38 +00:00
oliverschmidt
7432afa036 Both apps/webbrowser and apps/webserver contain a http-strings.c so the object files generated overwrite each other. However, currently webserver/http-strings.c is a clean superset of webbrowser/http-strings.c so using only that one even in the www.prg project makes things (sort of) work. 2010-11-07 23:36:34 +00:00
maralvira
24b6071234 change maca_raw_mode to contiki_maca_raw_mode 2010-11-07 18:39:39 +00:00
maralvira
3747f9a7c5 use the nullmac and nullrdc with framer layer. 2010-11-07 18:36:52 +00:00
maralvira
e029fa8da0 fix defines for raw mode 2010-11-07 18:34:52 +00:00
maralvira
8cd50c90ba initial commit for the redbee-dev platform 2010-11-07 13:56:17 +00:00
maralvira
26725e7c19 use sicslowmac_driver instead of contikimac_driver --- since contikimac 
power saving doesn't seem to be working.
 2010-11-07 13:46:03 +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
dak664
acd9d516d8 Add RPL neighbors and routes printout to Jackdaw menu 2010-11-05 20:35:15 +00:00
joxe
f08e262055 fixed buggy config of phidget sensors for Z1 2010-11-05 10:31:57 +00:00
dak664
abf4791db4 Add Raven RPL build option 2010-11-03 16:51:55 +00:00
adamdunkels
896f627290 Made uIPv6 packet queueuing configuration configurable 2010-11-02 11:06:01 +00:00
oliverschmidt
0d1db1a78b Since a few days the cc65 trunk contains a POSIX dirent implementation for the Atari. Until a new cc65 release is available - and Contiki has switched to that release - I'll borrow the implementation from the cc65 trunk. 2010-11-01 19:44:34 +00:00
dak664
9194b3ac69 Fix error when RS232 not enabled 2010-10-28 19:31:28 +00:00
dak664
ad6712736b Fix Windows XP RNDIS+CDC serial port enumeration 2010-10-28 19:30:14 +00:00
oliverschmidt
0ef1171705 Just always call process_run() and etimer_request_poll() in turn - like the "major" platforms do. 2010-10-27 22:17:39 +00:00
dak664
258e3cc93a Allow simultaneous use of RS232 and USB serial ports 2010-10-27 14:51:20 +00:00
salvopitru
d8711d32a3 Added configuration in order to run Rime. 2010-10-27 14:05:23 +00:00
oliverschmidt
46122f558f Skip the CBM volume header. 2010-10-26 18:56:39 +00:00
joxe
dfff488a3d configured tmote sky to use 5 retransmissions 2010-10-26 13:26:16 +00:00
salvopitru
ec5e3ce0d7 New Contiki port to STM32W108. 2010-10-25 09:03:38 +00:00
adamdunkels
726bd0e58e Made collect neighbors, queuebuf number, uip-ds6 configuration settable through project-conf.h 2010-10-24 21:12:31 +00:00
dak664
123e3cae41 Fix compiler warnings 2010-10-23 15:26:46 +00:00
oliverschmidt
5e10cf2eed Implemented cfs_opendir() and friends for CBMs based on cc65's cbm_opendir() and friends. 2010-10-23 13:48:06 +00:00
oliverschmidt
9e9eb4b55c There's no point in pulling in cfs-posix-dir.c if the POSIX functions it depends on are dummies anyway. 2010-10-23 08:17:45 +00:00
joxe
a1e7d9c256 fixed some config params to avoid re-defining if already defined 2010-10-21 18:25:39 +00:00
adamdunkels
37a4200f40 Made a lot of things configurable via the (optional) project-conf.h 2010-10-20 22:21:16 +00:00
oliverschmidt
da7c9700cb Added support for the FTP standalone client to the c128 target. 2010-10-19 22:41:24 +00:00
oliverschmidt
bcc2120570 Added support for the FTP standalone client to the c64 target. 2010-10-19 22:31:59 +00:00
oliverschmidt
842c6a018a The recent global change regarding htons allowed to remove this hack :-) 2010-10-19 20:30:47 +00:00
adamdunkels
5585d72c86 A simple but substantial change: uIP used the htons()/HTONS() macro 
functions for converting between host and network byte order. These
names are the de facto standard names for this functionality because
of the original BSD TCP/IP implementation. But they cause problems for
uIP/Contiki: some platforms define these names themselves (Mac OS,
most notably), causing compilation problems for Contiki on those
platforms.

This commit changes all htons to uip_htons instead. Same goes for
htonl, ntohs, and ntohl. All-caps versions as well.
 2010-10-19 18:29:03 +00:00
kasunch
5a46c629de Added missing slip.c file to CONTIKI_TARGET_SOURCEFILES 2010-10-19 17:05:45 +00:00
oliverschmidt
f4e2c41c76 Added support for the FTP standalone client to the atari target. 2010-10-16 11:42:40 +00:00
oliverschmidt
abe360e9fb Added support for the FTP standalone client to the apple2enh target. 2010-10-16 10:41:46 +00:00
oliverschmidt
b943e73b9b Made default IP config identical to minimal-net and log the IP config similar to minimal-net. 2010-10-15 21:14:18 +00:00
nifi
9a4d17fe7c Bug fix: put device in standby mode at startup in case it has previously been put in deep power-down mode; patch by Martin Bor 2010-10-12 22:55:11 +00:00
oliverschmidt
a5df3e8d00 Removed unnecessary include. 2010-10-12 19:57:44 +00:00
oliverschmidt
284f7166b7 Allow standalone win32 programs to exit the Contiki process by calling LOAD_UNLOAD(). 2010-10-12 11:03:53 +00:00
adamdunkels
93f6fda353 Updated configuration options to reflect recent changes. Increased number of queuebufs. Corrected the name of the collection neighbors option. 2010-10-03 20:40:42 +00:00