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

1640 commits

Author SHA1 Message Date
Oliver Schmidt
7c3adef1c8 Added dependency handling and README.VC 2011-04-10 13:21:39 +02:00
Oliver Schmidt
f2678ff7b4 Renamed README to README.1X 2011-04-10 12:43:24 +02:00
Oliver Schmidt
199d51275d Removed section about (recently deleted) VC solution file. 2011-04-10 12:38:11 +02:00
dak664
2e14df3981 Options to extend mc1322x fifo to RAM buffer, or use hardware flow control with tunslip6. 2011-04-08 15:15:16 -04:00
Salvatore Pitrulli
6655c876f2 Added functions and example for deep sleep on mb851. 
The added function let a process to make the system go
into deep sleep for maximum power saving.
The udp-ipv6-example shows how to use these new functions.
 2011-04-08 11:53:48 +00:00
Niclas Finne
236c459ecf Added missing include 2011-04-07 09:26:12 +02:00
Oliver Schmidt
eadd74ae5f Removed VC++ project files. 
Being able to build about any Contiki project in the WIN32 target using VC++ is _so_ much more useful than those project files not integrated in any way into the Contiki build system.
 2011-04-03 22:37:03 +02:00
Oliver Schmidt
5da4faf71e Allow VC++ to be used as alternative to GCC for building in the WIN32 target. 
TODOs:
- Update README
- Add dependency handling
- Add rtimersupport
 2011-04-03 22:32:11 +02:00
Oliver Schmidt
f83fb3704b Replaced make-empty-symbols with empty-symbols.[c|h] 
The symbol generation shell scripts cause CRLF issues on Windows/Cygwin again and again. Instead of fixing this yet again I opted to remove the symbol generation script at least for the "no symbols" scenario with two C source files to be copied.
 2011-04-03 13:24:58 +02:00
Oliver Schmidt
4a731dfda9 Allow for non-GUI win32 apps. 2011-04-03 10:56:18 +02:00
dak664
4e8b4e408c Temporary fix for RNDIS enumeration before the mac address is set up. 
(Turn on RS232 debug to bypass the enumeration wait and let the mac address get set first)
 2011-03-27 14:21:47 -04:00
Enric M. Calvo
4ba4d55e34 cleaned up main 2011-03-26 10:15:49 +01:00
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
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