Commit graph

2034 commits

Author SHA1 Message Date
George Oikonomou 8c0cf50dca Rename RIMESTATS_CONF_ON to RIMESTATS_CONF_ENABLED 2013-03-20 21:14:34 +00:00
Robert Quattlebaum 28a1e40ebd core/lib/settings: Generalized Settings Manager to work on any platform
This commit moves the Settings Manager from the AVR codebase
into the Contiki core library. Any platform that implements
the Contiki EEPROM API can now use the Settings Manager's
key-value store for storing their persistent configuration info.

The Settings Manager is a EEPROM-based key-value store. Keys
are 16-bit integers and values may be up to 16,383 bytes long.
It is intended to be used to store configuration-related information,
like network settings, radio channels, etc.

 * Robust data format which requires no initialization.
 * Supports multiple values with the same key.
 * Data can be appended without erasing EEPROM.
 * Max size of settings data can be easily increased in the future,
   as long as it doesn't overlap with application data.

The format was inspired by the [OLPC manufacturing data format][].

Since the beginning of EEPROM often contains application-specific
information, the best place to store settings is at the end of EEPROM
(the "top"). Because we are starting at the end of EEPROM, it makes
sense to grow the list of key-value pairs downward, toward the start of
EEPROM.

Each key-value pair is stored in memory in the following format:

Order    | Size     | Name         | Description
--------:|---------:|--------------|-------------------------------
       0 |        2 | `key`        | 16-bit key
      -2 |        1 | `size_check` | One's-complement of next byte
      -3 |   1 or 2 | `size`       | The size of `value`, in bytes
-4 or -5 | variable | `value`      | Value associated with `key`

The end of the key-value pairs is denoted by the first invalid entry.
An invalid entry has any of the following attributes:

 * The `size_check` byte doesn't match the one's compliment of the
   `size` byte (or `size_low` byte).
 * The key has a value of 0x0000.

[OLPC manufacturing data format]: http://wiki.laptop.org/go/Manufacturing_data
2013-03-20 11:57:13 -07:00
François Revol b7601c3acb ctk-curses: Cleanup 2013-03-20 17:16:37 +01:00
Oliver Schmidt 6ba28bf74f Merge pull request #180 from mmuman/cleanup-and-fixes
Cleanup and fixes
2013-03-20 02:37:24 -07:00
François Revol 1ce1232d0f ctk-curses: Add configuration for various apps 2013-03-20 02:01:05 +01:00
François Revol 06d3c14213 ctk-curses: Enable screensaver 2013-03-20 02:01:05 +01:00
François Revol 1c5d6a9db7 ctk-curses: Cleanup + fixes
* Cleanup
* Fix warnings
* Fix indentation
* Only wait 1ms for keyboard timeout
* Hide text cursor
* Pump mouse events just in case
* Add F9 as menu key since F10 is used as menu trigger by Gnome
2013-03-20 02:00:32 +01:00
François Revol db982f7b82 ctk-curses: Add mouse support to the ncurses CTK backend. 2013-03-20 01:35:42 +01:00
François Revol 25e3f828aa Ncurses-based CTK backend for the native platform. 2013-03-20 01:35:01 +01:00
François Revol 3d33248eff native: Fix trailing whitespace 2013-03-19 20:00:26 +01:00
François Revol 877b059bc7 native: Use stderr for logging
Since we will hopefully one day use stdout as a CTK display,
use stderr instead for log output, which can be redirected to a file.
2013-03-19 19:24:59 +01:00
Adam Dunkels a5046e83c7 Cleanup and refactoring of the STM32w port
This is a general cleanup of things like code style issues and code structure of the STM32w port to make it more like the rest of Contiki is structured.
2013-03-18 13:31:26 +01:00
Adam Dunkels 277a348f60 Changed the name of the IPv6 number of route entries configuration from UIP_CONF_DS6_ROUTE_NBU to UIP_CONF_MAX_ROUTES. 2013-03-18 11:12:44 +01:00
Oliver Schmidt a0e2120fdb Added configurations of the new resolver. 2013-03-14 23:17:59 +01:00
Oliver Schmidt bbc26ef489 Added support for strncasecmp() which is now used in resolv.c. 2013-03-13 14:43:05 +01:00
Adam Dunkels 0841bce833 Merge pull request #82 from darconeous/master
Makefiles: Allow setting UIP_CONF_IPV6=0 to work as expected.
2013-03-10 12:51:03 -07:00
Adam Dunkels c7ef7198a8 Merge pull request #85 from darconeous/native-target-osx
Various updates to the minimal-net platform.
2013-03-10 12:48:07 -07:00
Adam Dunkels 9c8f1d5356 Merge pull request #137 from darconeous/pull-requests/platform-avr-ravenusb-httpd-isused-fix
Fix for avr-ravenusb target builds due to missing 'isused'.
2013-03-09 06:24:46 -08:00
Oliver Schmidt 8e05c80d96 Merge pull request #151 from oliverschmidt/master
Reorganized web page attribute data handling.
2013-03-06 07:34:07 -08:00
Oliver Schmidt c7b8bac006 Reorganized web page attribute data handling.
- Up to now the web browser used several fixed size arrays to hold the various types attribute data of the web page. This turned out to be way to inflexible for any non-trivial web page. Therefore now all attribute data is stored in a single buffer one after the other as they arrive from the parser only occupying the memory actually needed. This allows for pages with many links with rather short URLs as well as pages with few link with long URLs as well as pages with several simple forms as well as pages with one form with many form inputs.

- Using the actual web page buffer to hold the text buffers of text entry fields was in general a cool idea but in reality it  is often necessary to enter text longer than the size of the text entry field. Therefore the text buffer is now stored in the new unified attribute data buffer.

- Splitting up the process of canonicalizing a link URL and actually navigating to the resulting URL allowed to get rid of the 'tmpurl' buffer used during form submit. Now the form action is canonicalized like a usual link, then the form input name/value pairs are written right into the 'url' buffer and afterwards the navigation is triggered.

- Support for the 'render states' was completely removed. The only actually supported render state was centered output. The new unified attribute buffer would have complicated enumerating all widgets added to the page in order to adjust their position. Therefore I decided to drop the whole feature as the <center> tag is barely used anymore and newer center attributes are to hard to parse.
2013-03-06 16:29:36 +01:00
Oliver Schmidt cdb16c02fa Removed web browser settings that aren't actually different from the defaults. 2013-03-06 15:17:39 +01:00
Oliver Schmidt 830b500a7d Merge pull request #149 from oliverschmidt/master
Finetuned Language Card usage.
2013-03-06 05:58:14 -08:00
Oliver Schmidt 65ad87422f Finetuned Language Card usage.
Both the source code and the cc65 compiler have changed. So it made sense to review which object files are to be compiled for placement in the Language Card.
2013-03-06 14:57:24 +01:00
Mariano Alvira ab8fe95864 Revert "Merge pull request #120 from Jeff-Ciesielski/stm32_cl"
This reverts commit 029bc0ee27, reversing
changes made to a7b3e99644.

This uses LGPL libopencm3. While the patch doesn't include the code,
the resulting binary would force the release of all code as LGPL.
2013-03-02 08:11:28 -05:00
Robert Quattlebaum d454a7ca96 httpd-simple-avr: 'isused' seems to not be used anymore. 2013-02-28 22:08:28 -08:00
Nicolas Tsiftes b3de9a05e7 Merge pull request #141 from cmorty/sky_MOTEID_missing_brace
Add missing brace in sky Makefile
2013-02-24 15:27:23 -08:00
Mariano Alvira 029bc0ee27 Merge pull request #120 from Jeff-Ciesielski/stm32_cl
Add initial support for STM32F1x Connectivity Line devices
2013-02-24 15:08:57 -08:00
Moritz 'Morty' Strübe 955fbc3c5a Add missing brace in sky Makefile 2013-02-20 19:50:29 +01:00
Nicolas Tsiftes a7b3e99644 Merge pull request #91 from JelmerT/z1-mac
Added support for motelist and uploading to Z1 motes under Mac OSX
2013-02-17 09:28:49 -08:00
Nicolas Tsiftes ebacb91e57 Merge pull request #98 from JelmerT/hotfix-z1-i2cmaster
Bugfix z1 i2cmaster
2013-02-17 09:21:18 -08:00
Oliver Schmidt 010d495e03 loader.system is now official part of the cc65 Apple II support. 2013-02-17 00:30:55 +01:00
Oliver Schmidt 98060c1eab Moved from last cc65 release (2.13.3) to recent cc65 snapshot (2.13.9).
Relevant cc65 changes...

General:
- The compiler generates "extended" dependency info (like gcc) so there's no need for postprocessing whatsoever :-)
- The linker is very pernickety regarding the ordering of cmdline options so a custom linker rule is necessary :-(

Apple2:
- The various memory usage scenarios aren't specified anymore via separate linker configs but via defines overriding default values in the builtin linker config.

Atari:
- The builtin linker config allows to override the start addr so there no more need for a custom linker config.
- The C library comes with POSIX directory access. So there's no more need for for a custom coding.

CBM:
- The C library comes with POSIX directory access. So there's no more need for for a custom coding.
2013-02-14 15:42:43 +01:00
Oliver Schmidt 19c8f9ffdd Merge pull request #122 from oliverschmidt/master
There's no point in ctk_restore() for standalone GUI builds.
2013-02-09 12:50:37 -08:00
Oliver Schmidt 45c44e23d7 There's no point in ctk_restore() for standalone GUI builds. 2013-02-09 21:49:00 +01:00
Oliver Schmidt c7f986faf5 Merge pull request #121 from oliverschmidt/master
Several minor adjustments.
2013-02-08 17:04:04 -08:00
Oliver Schmidt 21b8be3798 Use plain ASCII chars for lines on Win32 console CTK. 2013-02-09 02:02:46 +01:00
Oliver Schmidt b1eeaf31c9 Fixed Win32 'platform build'. 2013-02-09 02:00:35 +01:00
Jeff Ciesielski 222f93f023 stm32f107_basic: Add support for a simple stm32f107 platform
This platform is a basic waveshare stm32f107 devkit which contains a
USART, USB device port, some buttons and some LEDs.  Unfortunately not
enough to bring up networking, but enough to test building and a
simple contiki shell
2013-02-06 15:43:25 -08:00
Mariano Alvira 299d8c6cbf set the pin defaults properly to reduce current consumption on
sleeping M12s.
2013-02-03 15:15:11 -05:00
Mariano Alvira fb8bbf37cf Use the RTC only as the main timer.
This is a major change to how the main tick interrupt is handled on
the mc1322x platforms. Instead of using two timer resources, TMR0 and
RTC, this patch unifies all the timers to use the RTC. This is enabled by
implementing etimers as scheduled rtimers. The main advantage (aside
from freeing TMR0 for general use) is have the Contiki timebase come
from the same source that will be used for sleeping and wakeup.
2013-02-03 15:15:05 -05:00
Robert Quattlebaum 0ca8a57f39 platform/minimal-net: Print out pseudo LED status. 2013-01-30 09:18:40 -08:00
Robert Quattlebaum a571b663b0 platform/minimal-net: Better, more seamless support for OS X.
This patch enables automatic route setup and cleanup when
starting and stopping the minimal-net target on OS X.

Both IPv4 and IPv6 are supported.

Using the minimal-net target on OS X was absolute hell
before I came up with this patch. Now it is painless.
2013-01-30 09:17:30 -08:00
Robert Quattlebaum 092b6f3baa platform/minimal-net: Implement better idle behavior.
The minimal-net target, as currently written, wakes up the
CPU every millisecond to check for packets, and will only
react in real-time to input from stdin. If you are running
this on a laptop battery, your battery will quickly drain.

This change allows the CPU to idle when there is literally
nothing to do while still being responsive to input from
stein and/or incoming packets. This fix should significantly
improve performance while significantly improving power
usage. Win-win.

Also added `_xassert()` implementation so that the contiki-
provided `assert()` macro will work properly when used
on this platform.
2013-01-30 09:17:29 -08:00
Jelmer Tiete f4976140fc fixed z1 i2c bug where 2 extra bytes were read with every i2c-receive 2013-01-30 14:23:07 +01:00
Jelmer Tiete 12dd138915 fixed z1 i2c bug where 2 extra bytes were read with every i2c-receive 2013-01-30 14:15:16 +01:00
Jelmer Tiete edf4e36094 removed tag from z1 Makefile.common 2013-01-30 11:13:19 +01:00
Oliver Schmidt e88997b71c Minor README updates. 2013-01-29 22:44:37 +01:00
Oliver Schmidt 1a5e20bc5f Remove tab chars from retro C sources. 2013-01-28 23:43:08 +01:00
Jelmer Tiete 7ce2688d84 Added support for motelist and uploading to Z1 motes under Mac OSX 2013-01-23 22:56:43 +01:00
Robert Quattlebaum 5afcbf6fff Makefiles: Allow setting UIP_CONF_IPV6=0 to work as expected.
Setting UIP_CONF_IPV6 to zero from the make build command line is
something that seems like it should ensure that IPv6 is disabled, but in
fact it actually *enables* IPv6. This seems counter intuitive, so this
patch changes the behavior of the makefiles to handle this case
properly.
2013-01-14 22:03:42 -08:00
Giovanni `evilaliv3` Pellerano ee556dcf14 minor corrections to adhere contiki code style guidelines 2012-12-21 12:36:29 +01:00
Giovanni `evilaliv3` Pellerano fdd380e7ca added support for SEED-EYE board (http://rtn.sssup.it/index.php/hardware/seed-eye) 2012-12-20 23:57:47 +01:00
George Oikonomou f5bc1c92ba Update to the new ds6_route API 2012-12-16 19:28:56 +00:00
George Oikonomou 351a4d39b9 Code style fixes: cc2530dk 2012-12-16 19:28:56 +00:00
George Oikonomou b4bb51e811 Code style fixes: sensinode 2012-12-16 19:28:55 +00:00
Moritz 'Morty' Strübe 79aa5dbc01 Get rid of generc ihex-file to allow parallel uploads 2012-12-11 12:40:38 +01:00
Moritz 'Morty' Strübe 7213d36d63 Support MOTEIDS for flashing, etc 2012-12-11 12:40:24 +01:00
Adam Dunkels aaa950ab17 Cooja platform changes to get IPv6/RPL to work better 2012-12-10 01:50:32 +01:00
Adam Dunkels 99f541e8fd Updated to the latest uip-ds6-route API 2012-11-27 23:04:34 +01:00
Adam Dunkels 91206e2249 Avoid multiple definitions of NETSTACK_CONF_MAC. Turn on RPL by default. 2012-11-21 20:11:22 +01:00
Adam Dunkels e178787999 Fixed compilation problems on the micaz and exp5438 platforms due to the node-id change 2012-11-20 21:16:50 +01:00
Adam Dunkels ec8c7e9be0 Cleanup of the node-id.h files. The node-id.h file contains
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
2012-11-20 19:59:46 +01:00
Mariano Alvira 03ab3fe317 Newer and cleaner TARGET=econotag as well as robust mc13224v
configuration system.

(also deprecate TARGET=redbee-econotag)

- mc13224v now automatically probes hardware config for buck converter
and 32kHz crystal as well as automatically monitors battery voltage
and manages the buck accordingly.

- new flashed based config system for mc13224v parameters such has
  radio modes (demod, autoack), nvmtype, mac address, channel and
  power.

- considerably cleaned up econotag platform code (suffered from severe
  case of bit-rot)
2012-11-19 19:16:29 -05:00
Mariano Alvira 2c9a538582 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
2012-11-18 18:27:39 -05:00
Etienne Duble 97da754b1c Fixed login make target repeated in Makefile.mbxxx and Makefile.stm32w108 2012-11-09 15:43:15 +01:00
George Oikonomou 5399fa2b6f cc2530dk: Fixed the startup text for dongle builds
See Pull Request #21
2012-11-04 21:44:34 +00:00
George Oikonomou 53fdb96816 cc2530dk and Sensinode: Local copy of uip-debug.c
Copied this file to the platform directories and
changed it to use putstring(), puthex() etc so
that we can print addresses without linking in
printf

See Pull Request #20
2012-11-04 21:43:57 +00:00
George Oikonomou 1a0f01ccc4 cc253x: Config to swap between UART and USB I/O
See Pull Request #18
2012-11-01 17:41:57 +00:00
George Oikonomou 2cc74c5fd4 cc2530dk: Added a 'Serial over USB' platform process
This is based on a usb-test example by Philippe Retornaz. It has
been moved to platform and modified accordingly. With this in place:

- putchar() can work over USB. So we can use things like
  printf, slip output
- USB input can be redirected to slip or serial input

The example itself is no longer needed in the source tree

See Pull Request #18
2012-11-01 17:41:53 +00:00
George Oikonomou c1d72475d7 cc253x: Renamed P2 interrupt-related files for better consistency
See Pull Request #18
2012-11-01 17:41:38 +00:00
George Oikonomou fea4970142 cc253x: Configurable linkage for the P2 ISR
See Pull Request #18
2012-11-01 17:41:24 +00:00
Philippe Rétornaz ba96408f37 cc253x: Add USB support to the compilation scripts
See Pull Request #18
2012-11-01 17:41:21 +00:00
Philippe Rétornaz ddc8120d7c cc253x: Add p2 interrupt handler
The P2 Interrupt is shared across many periferal (I2C, USB, GPIO).
This adds a generic interrupt handler on which the differents drivers
can register a handler.

See Pull Request #18
2012-11-01 17:41:11 +00:00
George Oikonomou 67bf9ec10e DOS EOL and indentation fixes (platform files)
- Removed some DOS EOLs
- Changed some tabs to spaces
- Removed some trailing whitespaces

Closes #6
2012-10-30 13:44:25 +00:00
Adam Dunkels 944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
George Oikonomou 3b0e92168b Copied cc2530 stack functions to the cc2430 port 2012-09-20 15:09:15 +01:00
George Oikonomou b292e02012 Sensinode putdec() debugging 2012-09-20 15:09:15 +01:00
George Oikonomou 95b9d4ee29 Sensinode/cc2430 stack depth optimisation
This replicates the method used by the cc2530 port
2012-09-20 15:09:15 +01:00
George Oikonomou 067fabe0f9 Sensinode main variable optimsations:
r is now uint8_t, allocated to registers
len is uint16_t for more efficent arithmetic

(Changes replicated from the 253x port, originally
contributed by Philippe Retornaz - EPFL)
2012-09-20 15:09:15 +01:00
George Oikonomou cb168da729 Changed the cc2430 sleep_flag to uint8_t 2012-09-20 15:09:15 +01:00
Niclas Finne 4630945475 Made the stack and heap size configurable when using the IAR compiler on the MSP430 platforms 2012-09-19 22:49:19 +02:00
Niclas Finne 919ddfbf09 Added delay at startup to let things stabilize before writing to the uart 2012-09-19 22:47:48 +02:00
George Oikonomou ee7af77ca9 Reworked the cc2530 stack debugging facilities:
- Moved to their own file
  (so we can later copy the entire thing over to cc2430)
- Renamed the functions
  (for naming convention reasons)
- The entire thing can be enabled/disabled
- Added a couple more macros
- Hooked into main()
2012-09-07 17:40:17 +01:00
Philippe Rétornaz 780e62d7e8 cc253x: add putdec debug function 2012-09-07 17:32:54 +01:00
George Oikonomou c6ec22c4c8 cc2530: Added a method to maximise stack depth
This was oringinally contributed/reported/discussed/patched by
Philippe Retornaz (EPFL) but it's implemented
in a more configurable fashion here.
2012-09-07 17:32:53 +01:00
Philippe Rétornaz a0d2988846 cc253x: Don't force __data usage
SDCC optimize "r" and put it in a register.
Don't force len to be in __data.
2012-09-07 17:32:10 +01:00
Philippe Rétornaz 666ff6ca55 cc253x: use a uint8_t for sleep_flag
__bit variables must be located after the 0x20 address
This force the stack to start after 0x20, thus decrease
the stack size by a considerable amount.
2012-09-07 17:32:10 +01:00
George Oikonomou 8699f7741d Fixed typos and a stray printf. Adjusted comments 2012-09-07 17:31:25 +01:00
Ivan Delamer b43dad00b0 Cleaned up RF230BB, and refactored FRAME_RETRIES and CSMA_RETRIES
#defines.
2012-09-04 11:12:18 -06:00
Antonio Lignan c5e9d688a5 Fixed sht11 driver, now ensures the i2c bus is disabled when initializing 2012-08-16 14:12:27 +02:00
Antonio Lignan 73e7f25cbc Simple phidget-like relay driver for the Z1 mote with basic functionalities 2012-07-30 11:27:13 +02:00
George Oikonomou 62fbd389d8 Renamed a cc253x SFRX to stop namespace conflicts
The TR0 SFRX can not use the name TR0 because it
conflicts with TCON.TR0 on the default 8051.

See SDCC bug 3513300
2012-07-11 10:53:14 +01:00
David Kopf 37c407b177 Patch from Landon Fuller adds const to PROGMEM, required for newer avr-gcc 2012-06-10 12:54:11 -04:00
Niclas Finne d1bef2b68a Bug fix: setup MAC address based on node id if no MAC address was restored from external flash 2012-06-07 10:45:05 +02:00
Adam Dunkels fd2e238d99 The __delay_cycles() function in the latest mspgcc takes an unsigned long argument but does not allow it to be larger than 65536. 2012-06-04 17:41:12 +02:00
Fredrik Osterlind d270e4943d bugfix: slip must be initialized after ctimer, as it uses ctimers 2012-05-30 12:59:42 +02:00
Niclas Finne b6ed988709 Allow node address to be set by COOJA when emulating. 2012-05-29 19:42:35 +02:00
Niclas Finne 2c460090e3 io and signal have been moved into contiki include file 2012-05-29 19:31:16 +02:00
David Kopf e0dab7c2fc Prefer UART0 for stdout; move DEBUFGLOW macro below definition of uint8_t 2012-05-28 13:08:30 -04:00
Fredrik Osterlind 8ebacd1a1a reverted previous patch that broke compiling on Instant Contiki 2012-05-25 11:25:19 +02:00
Fredrik Osterlind 50caa3650c new experimental feature: possibility to change mote types when loading a simulation
made compile dialogs only select mote interfaces specified in the loaded configuration
2012-05-23 14:59:41 +02:00
George Oikonomou 0fc5ec8d5c Fixed an SDCC compile error when UIP_CONF_ROUTER is 0. UIP_CONF_ROUTER can be configured in project-conf.h 2012-05-16 15:22:31 +01:00
George Oikonomou 2f89f41b5a cc2x3x RPL/non-RPL handling:
- Relevant examples explicitly request it in their Makefile
- Removed the definition of UIP_CONF_IPV6_RPL from
  contiki-conf.h. If needed, it's defined through a -D
2012-05-16 15:22:31 +01:00
George Oikonomou 259b497122 Minor Sensinode build cleanup 2012-05-16 15:22:31 +01:00
George Oikonomou 1f7171f943 Adjust cc2x3x ports to the new clock API 2012-05-16 15:22:31 +01:00
George Oikonomou fea95ae088 Easily configure B2 on the cc2531 USB stick as a General-Purpose or Reset button 2012-05-16 15:22:31 +01:00
George Oikonomou cc76c649b1 The cc2530 button driver would fail to compile if the user disabled button support 2012-05-16 15:22:31 +01:00
Antonio Lignan 6df9ffb731 Zolertia's light sensor ziglet 2012-05-11 13:39:59 +02:00
Fredrik Osterlind 4cf4a48592 minor bugfix: did not compile with PROCESS_CONF_NO_PROCESS_NAMES=1 2012-05-09 15:07:51 +02:00
Antonio Lignan 3dde89971c Add disable function to I2C driver 2012-05-09 10:54:21 +02:00
Niclas Finne 40595ad5c7 Support for serialdump on MacOS X. Patch by Laurent Deru. 2012-05-07 13:16:27 +02:00
Laurent Deru cc863e7bd4 Sky motelist support for MacOS X 2012-05-07 11:18:09 +02:00
George Oikonomou 6a808053ce cc2531 Button 2 driver 2012-04-26 16:28:04 +01:00
George Oikonomou 5662b1f37d Platform cc2530dk now uses models.h to configure differences between the SmartRF and the 2531 USB stick 2012-04-26 16:28:04 +01:00
George Oikonomou 38a222e83c Redefined LEDS_ALL for cc2531s 2012-04-26 16:25:04 +01:00
George Oikonomou c95fc4f360 cc2531 B1 support. B2 to come 2012-04-26 15:28:43 +01:00
George Oikonomou 26ae56fcaf cc2531 LED support 2012-04-26 15:28:43 +01:00
George Oikonomou 1db1649b6a The cc2530dk Makefile was adding a source twice
Also, removed an obsolete comment
2012-04-26 15:28:43 +01:00
George Oikonomou dd26accc07 We can now use SDCC's __nonbanked feature
This allows us to reduce CODE footprint of SDCC projects
built with --model-huge. Use carefully!

* Added a facility which allows us to enable/disable the
  feature from the CPU dir (CC_CONF_NON_BANKED_OPTIMIZATION)
* Added the CC_NON_BANKED keyword to some platform files
  (expands to __nonbanked)
* Started using this for some examples
2012-04-26 15:28:43 +01:00
Adam Dunkels b4e7468b12 Set CCA threshold before starting, to make ContikiMAC more efficient. Fix compilation problem with non-IPv6 compiles. Various style fixes. 2012-04-22 20:54:02 +02:00
George Oikonomou e95f94a9a8 Added support for reading MAC from the cc253x flash
We still use the primary location by default (Info Page) but
this is now configurable. This change is useful for users who
wish to specify their own MAC address. Since the Info Page is
read-only, they need to be able to use the secondary location
2012-04-20 16:03:38 +01:00
George Oikonomou 29090a3dda The cc253x Makefile specifies SoC flavor
This will help us slowly add better support for smaller SoCs
instead of just assuming that all cc253x SoCs are F256

- We build for F256 by default but the project Makefile can override this
- We currently ignore this when passing --code-size. This is a ToDo
- The bank allocator always assumes 7 banks. Once we fix --code-size above this will be irrelevant
2012-04-20 16:03:38 +01:00
George Oikonomou 4a78021c62 Simplified the cc2530dk STARTUP_CONF_VERBOSE spaghetti and made it project-configurable 2012-04-20 16:03:37 +01:00
Niclas Finne 1b13b69814 Added support for mspgcc 4.6+ that no longer supports generic MCU identifiers such as msp430x1611 2012-04-10 16:05:10 +02:00
David Kopf cac4e9a222 Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t.
Remove the troublesome avr/dev/delay.* files.
Add PLATFORM_NAME and combine the confusing *_REVISION defines into a single PLATFORM_TYPE
2012-04-09 15:49:53 -04:00
George Oikonomou b3de052e01 Ported the stack-friendly clock ISR code over from cc243x to cc253x 2012-04-03 16:26:10 +01:00
George Oikonomou 11a7f644ac Comment rewording and formatting 2012-04-03 16:26:10 +01:00
George Oikonomou ce17fa131c Stack-friendly cc243x clock ISR enabled by default
This new approach (CLOCK_CONF_ACCURATE=0) was not as inaccurate
as originally thought. In fact, it has pretty much the same
accuracy as the old, stack-hungry version.

* Renamed the define from CLOCK_CONF_ACCURATE (1: old) to
  CLOCK_CONF_STACK_FRIENDLY (1: new) to stop implying
  that one is more accurate than the other.
* Using CLOCK_CONF_STACK_FRIENDLY by default.
2012-04-03 16:26:10 +01:00
simonduq 1fd7dcd2ef mb* pltforms: reduce RAM footprint 2012-04-03 14:29:46 +02:00
simonduq 935460c25e Fixed mbxxx's contiki-conf.h (bug reported by Konstantin Klubnichkin and Michal Krol) 2012-04-03 14:28:11 +02:00
simonduq 930c7c25bc fixes in mb851 and stm32w108: erroneous linking with mpu.o, conf file,
more printouts in main when ipv6 is used, and a target for memory
profiling taking stm's gnu.ld static stack size into account
2012-04-03 11:47:30 +02:00
George Oikonomou 5240519dd9 Renamed a config define to better match contiki's naming philosophy 2012-04-02 11:38:54 +01:00
George Oikonomou 2d0d54c380 Removed obsolete #if config from cc2530dk's main
Unlike cc2430, the cc2530 RF driver never generates interrupts.
This configuration in main() was a remnant of the porting from
the sensinode main, which does in fact need it.
Also updated comments in contiki-conf to reflect that shortcuts
don't influence the RF
2012-04-02 11:22:19 +01:00
George Oikonomou 977bc548f3 Renamed sensinode-debug to debug 2012-04-02 11:22:19 +01:00
George Oikonomou bce34e4b9a For cc2x30, moved CLOCK_CONF_SENCOND to the cpu dir.
The value is not really configurable by the platform so having it
in contiki-conf.h didn't make huge sense.
2012-04-02 11:22:19 +01:00
George Oikonomou e02c287f15 Solved a text encoding issue 2012-04-02 11:22:19 +01:00
George Oikonomou d958ee3125 Deleted the old Sensinode 'read mac from flash' routine.
Since the introduction of a purpose-written routine, the old
generic one (which was written in asm) was never being used.
There was a configuration directive which allowed us to switch
between the two. All references to this configuration directive
have also been removed.
2012-04-02 11:21:32 +01:00
George Oikonomou 4f1e251603 Some uN_t had crept back in cc2530dk and sensinode.
Changed to uintN_t plus a bit of code formatting
2012-03-29 13:10:10 +01:00
Joakim Eriksson 7482fd6962 quick fix for enabling native-border router to run under windows - need to cleanup the arguments 2012-03-27 11:09:54 +02:00
simonduq 946f00bf7b stm32w: added ability to upload and reset all connected boards, and login using MOTE=x 2012-03-26 23:00:44 +02:00
George Oikonomou ad256e5014 New platform: TI cc2530 Development Kit
This commits adds support for TI's SmartRF05 Eval. Board with cc2530 EMs
Some initial support for cc2531 USB dongles
2012-03-23 14:41:07 +00:00
George Oikonomou b7674c3636 Reincarnate the sensinode/cc2430 port 2012-03-23 14:41:07 +00:00
Matthias Kovatsch d716ee55e7 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-21 21:51:03 +01:00
Matthias Kovatsch d57904b289 Fixed bug in IPv6 address print function. 2012-03-21 21:27:52 +01:00
simonduq e4fb360262 stm32w platforms: contikimac support in the Rime case, with EUI-64 2012-03-20 17:30:59 +01:00
simonduq 0eb9a46e3a stm32w platforms: contiki-conf cleanup and added platform-conf 2012-03-20 17:30:57 +01:00
simonduq 762097eb50 stm32w platforms: 64-bit rtimer causes a bug in arm-none-eabi-objcopy 2.18.50, use 32-bit rtimer instead 2012-03-20 17:30:45 +01:00
simonduq 7784cf7827 stm32w platforms: use 2 cca and default contikimac guard time 2012-03-20 17:30:05 +01:00
simonduq 5da4463236 adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La) 2012-03-20 17:29:58 +01:00
Fredrik Osterlind 862452b5b0 removed debugging output, code style 2012-03-13 14:17:43 +01:00
Niclas Finne cf3827829d Added resource definition for button, leds, and battery, and removed obsolete compiler setup 2012-03-09 20:35:49 +01:00
Fredrik Osterlind 97c7a55eea simulating 1 ms turnaround time (before transmissions) by default, and no transmissions on channel busy 2012-03-09 14:58:13 +01:00
Fredrik Osterlind e8294e8699 added objcopy external tools configuration
changed nm command to sort numerically, and changed regexpressions to accept output from newer gcc versions
added more debugging info under help menu
2012-03-09 14:57:21 +01:00
Niclas Finne c2e07c9798 Improved support for the IAR compiler.
io and signal have been moved into contiki include file.
2012-03-08 22:41:55 +01:00
Matthias Kovatsch f67fb672eb Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-08 00:49:25 +01:00
Matthias Kovatsch 87cd18539b Eliminated RPL_CONF_ADJUST_LLH_LEN correction by using uip_l3_icmp_hdr_len instead of uip_l2_l3_icmp_hdr_len. 2012-03-08 00:48:04 +01:00
Niclas Finne ff7a977dc7 Improved support for the IAR compiler for the MSP430 platforms 2012-03-07 23:09:05 +01:00
Niclas Finne 569477b10c contiki-sky-platform is added by Makefile.sky 2012-03-07 23:07:57 +01:00
Niclas Finne 09e45cb12c contiki-z1-platform is added by Makefile.z1 2012-03-07 23:07:47 +01:00
Niclas Finne 11fecd86da Moved i2cmaster and adxl345 to contiki target source files 2012-03-07 23:07:28 +01:00
Niclas Finne a8e8e6f51d io and signal have been moved into contiki include file 2012-03-07 23:05:10 +01:00
Niclas Finne 684c3edfa6 Cross compiler interrupt service routine compatibility definitions for MSP430 based platforms based on isr_compat.h by Steve Underwood. 2012-03-07 23:04:52 +01:00
Ilya Dmitrichenko 1214086f97 Fixed TARGET=minimal-net compilation issues on Darwin. 2012-03-02 15:15:49 -05:00
Ilya Dmitrichenko 499d3052ee Fixed TARGET=native compilation issues on Darwin. 2012-03-02 15:15:42 -05:00
David Kopf 79d65d2adc Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-02-25 10:17:57 -05:00
Ilya Dmitrichenko 4b60851527 Missed ifeq ... 2012-02-25 10:09:35 -05:00
Ilya Dmitrichenko 9c99d46e24 Simplified host OS platform detection in Makefiles 2012-02-25 10:09:33 -05:00
Mariano Alvira 008250afc6 econotag: increase UIP_CONF_RECEIVE_WINDOW to 300 for webserver nano 2012-02-24 12:19:05 -05:00
David Kopf deb75d3d97 Several bugfixes 2012-02-21 11:14:52 -05:00
David Kopf 6e45dfe5ff PROGMEM changes needed for newer avr-gcc compiler 2012-02-21 11:10:57 -05:00
Nicholas J Humfrey 680225e99d Converted u8_t to uint8_t and u16_t to uint16_t in the platforms directory.
Added "These names are deprecated, use C99 names" warnings the contiki-conf.h files that were missing it.
2012-02-21 08:33:25 -05:00
David Kopf 20a5c794dd Move address initialization to after proce_init. Something in that now wiping the address array. 2012-02-11 15:19:28 -05:00
Fredrik Osterlind aecb4b03cc bug fix: rpl was not included correctly 2012-01-31 14:53:52 +01:00
Adam Dunkels acb2c28fdd small code style fixes; removed left-over function call 2012-01-25 06:41:39 -08:00
Adam Dunkels cdfc788967 Increased wait time between main loop polls; cleaned up the code to Contiki code style standards; moved process autostart code to after network setup 2012-01-25 06:34:10 -08:00
Niclas Finne aceb36c66b Replaced SELECT_CALLBACK with an API that supports multiple select callbacks 2012-01-19 17:52:01 +01:00
Adam Dunkels 5e1946276b Removed erroneous character from first line of file. 2012-01-18 12:37:03 -08:00
Adam Dunkels 959096ca67 Contiki port to the TI EXP5438 MSP430x5438a experimenters board 2012-01-18 07:27:59 -08:00
Adam Dunkels 465c401cdc Reduce size of the neighbor table entries to make RPL fit into the Tmote Sky RAM. 2012-01-18 06:15:38 -08:00
Adam Dunkels 6185da7b80 Default to SMALL unless otherwise specified, to get size of binaries smaller so that Contiki with RPL/IPv6 fits on the Tmote Sky again. 2012-01-18 06:13:17 -08:00
Niclas Finne 42a7125ce7 fixed compiler warning 2012-01-17 21:47:48 +01:00
Niclas Finne 9ea5149433 The definitions for PxSEL2 are missing in some versions of mspgcc 2012-01-16 13:00:16 +01:00
Niclas Finne 1c6c4ba2f1 Added resource definition for button and removed obsolete compiler setup (compiler setup is now handled by cpu/msp430/msp430def.h) 2012-01-11 01:54:52 +01:00
David Kopf 58298f59db Add F_CPU=0x800000 option with phase lock to external 32768 Hz crystal
Add MCU_CONF_LOW_WEAR option to avoid eeprom writes during development.
2012-01-10 12:42:27 -05:00
Niclas Finne f3db12c19d MSP430 setup for f2xxx based on Z1 2012-01-09 14:56:03 +01:00
Niclas Finne 9ffcd53868 Fixed compiler warning (with IAR compiler) 2012-01-09 14:56:00 +01:00
Niclas Finne 3daa822f89 Moved configuration of memcpy workaround to cpu (only needed for an older version of mspgcc) 2012-01-09 14:55:57 +01:00
Niclas Finne 8aaa9d14b7 minor code cleanup 2012-01-09 14:55:51 +01:00
Niclas Finne 987b57b015 moved macros to implementation file, end-of-line normalization, code style 2012-01-09 14:55:43 +01:00
Niclas Finne 013571ed3f * Removed __MSP430X__ (already defined by newer mspgcc4)
* Commented out pragma not supported by mspgcc
2012-01-09 14:55:40 +01:00
Niclas Finne 866bc91e5a enabled nullrdc autoack support 2012-01-09 14:55:37 +01:00
Niclas Finne cdfa8708e3 * Added f2xxx for two series (for example z1)
* f1xxx is baseline and always included
* Cleaned up the names of uart and spi (no x in names)
* Updated SPI configuration for WiSMote
2012-01-09 14:54:57 +01:00
Niclas Finne f4f84ffca4 Updated SPI config for faster SPI, split msp430/clock/spi into separate versions for MSP430/MSP430X 2012-01-09 14:54:01 +01:00
Niclas Finne d1b22d40fa leds setup for WiSMote 2012-01-09 14:41:45 +01:00
Niclas Finne 8aa1011c03 Removed explicit specification of data model small for IAR compiler. Data model small is default and this will allow projects to override the data model 2012-01-09 14:41:39 +01:00
Niclas Finne 708f9d77d2 Corrected timing for higher CPU speed 2012-01-09 14:41:36 +01:00
Niclas Finne 6c5379606b Set node_id, disabled watchdog for now 2012-01-09 14:39:32 +01:00
Niclas Finne 05b10eb9ce Initial WiSMote port based on code from Arago Systems. 2012-01-09 12:25:06 +01:00
Niclas Finne 367c82a5ab added compiler flags and macros for IAR and mspgcc 4.4.5 compilers 2012-01-09 12:24:33 +01:00
David Kopf b251619a2f Add wpcap for cygwin/Windows native border router 2012-01-08 13:37:56 -05:00
Joakim Eriksson 5da8a9261b fixed so that it works for non IPv6 applications 2012-01-06 03:59:43 -08:00
Joakim Eriksson c3af79b795 Made native main loop sleep a bit more 2012-01-01 09:29:33 +01:00
Niclas Finne 8b83ffec67 Added native-border-router and slip-radio 2012-01-01 09:29:33 +01:00
Joakim Eriksson 0ea95c21b3 Added api for reading out tmp100 x100 temps 2012-01-01 09:29:10 +01:00
Niclas Finne d14d90ea68 Moved variable definitions from header file 2011-12-20 05:09:31 +01:00
Niclas Finne c0cf69ecbd fixed compiler warnings 2011-12-20 05:09:28 +01:00
Niclas Finne 3661ff242e io, signal and IAR-GCC checks have been moved into contiki include file 2011-12-20 05:09:16 +01:00
Nicolas Tsiftes d0ebeb409e Merge remote-tracking branch 'sf/master' into rpl-patch
Conflicts:
	core/net/tcpip.c
2011-12-08 15:26:11 +01:00
Matthias Kovatsch 36763cabbd Introduced PLATFORM_HAS_LIGHT, _BATTERY, and _SHT11. 2011-12-07 20:47:31 +01:00
Adam Dunkels 66c280039b Removed obsolete platforms 2011-12-05 21:49:38 +01:00
Nicolas Tsiftes 0e32956a63 Merge remote-tracking branch 'sf/master' into rpl-patch 2011-11-21 14:59:31 +01:00
David Kopf fb977cb9ef Better fix for hardware FCS error on JTAG reset
Correct silly error introduced by trying to save two bytes.
2011-11-15 13:24:58 -05:00
David Kopf 3612fdff5b Add params.c to Raven and sync with 128rfa1 contiki-conf.h
Contikimac works with mcu sleep on both platforms.
2011-11-14 11:56:34 -05:00
David Kopf 65032c4d35 Get better random seed on startup 2011-11-14 11:51:54 -05:00
David Kopf bdd164e003 Reverse node_id bytes, patch from Geog von Zengen 2011-11-08 12:23:29 -05:00
Mariano Alvira af4ef9531c Add node_id to econotag 2011-10-25 10:09:28 -04:00
Niclas Finne ed1780f9af Removed quickstart rule for target 'clean' to avoid make warnings 2011-10-24 17:04:45 +02:00
nvt d711887a1b Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-10-10 22:11:52 +02:00
nvt 4f3528f7ed Move compower configuration out of the non-IPv6 conditional clause. 2011-10-10 22:11:29 +02:00
Matthias Kovatsch efeebe953c Enabled UDP checksums for minimal-net 2011-10-10 14:25:03 +02:00
simonduq dd8576830e Added bursts support in CSMA/ContikiMAC, and CFS-swapping in
queuebuf. Exemplified in examples/udp-stream.
2011-09-27 16:47:03 +02:00
Joakim Eriksson 5b1d9617c4 moved io and signal and IAR-GCC checks from driver files into contiki include file 2011-09-26 10:38:41 +02:00
Joakim Eriksson 95dde73618 fixed Sky platform for IAR compiler 2011-09-11 17:18:02 +02:00
David Kopf f721f646fa Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer 2011-09-10 12:44:49 -04:00
Mariano Alvira 3e5afa2b59 replace MAC_CONF_CHANNEL_CHECK_RATE with
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE for redbee-dev and econotag

Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with
NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-06 07:49:23 -04:00
Adam Dunkels eeb25b9667 If no MAC is defined, create one from the node ID 2011-09-05 22:04:06 +02:00
Adam Dunkels 8fee2a507c Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) 2011-09-05 20:43:10 +02:00
Adam Dunkels 0f8145c78b Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) 2011-09-05 20:43:01 +02:00
Adam Dunkels 25c28e06cc Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) 2011-09-05 20:42:12 +02:00
Adam Dunkels a06cf93e4c Made the sky and z1 platform handling of PROJECT_CONF_H the same as the other platforms: the makefile should define PROJECT_CONF_H to be the name of the header file to include. This header file should #undef everything it #defines, as it is included after all the other configuration options in contiki-conf.h 2011-09-05 11:46:15 +02:00
Adam Dunkels ee75ec3ced Be a little more conservative in terms of what headers not to compress 2011-09-05 11:41:41 +02:00
Mariano Alvira 6c0bbc492b change mc1322x rtimers to 32-bit
hardcode a close default value for the RTC
2011-09-02 12:32:47 -04:00
Adam Dunkels 6c607b702a Use the SICSLOWPAN_CONF_COMPRESSION_THRESHOLD to avoid compressing IPv6 packets smaller than 60 bytes. This allows us to use ContikiMAC without its header, making it 802.15.4 compliant again. 2011-09-02 13:52:19 +02:00
Adam Dunkels add8367947 Include stdlib.h for the NULL macro 2011-08-31 21:56:28 +02:00
David Kopf 3520cc0bae flash led on tcp get, fix pingbacks on rpl build, patch web data for params 2011-08-31 12:13:31 -04:00
David Kopf 36b290a1cd Refactor with params.c, h 2011-08-31 11:47:17 -04:00
David Kopf d2aece89ef Add settings manager with program flash defaults, random routine, periodic prints with ENERGEST, node-id. 2011-08-28 16:22:39 -04:00
David Kopf bdec65b889 Fix typos and file endings 2011-08-28 16:04:36 -04:00
David Kopf 9fec648b3e Allow selection of slip port 2011-08-25 14:43:18 -04:00
David Kopf dff77aea61 Correct typo 2011-08-25 14:37:12 -04:00
David Kopf 94fc40f736 Move LEDONPORTE1 define to contiki-conf.h, fixing typo. 2011-08-24 11:35:58 -04:00
David Kopf 3c18372939 Add periodic prints and stack monitor 2011-08-24 10:55:58 -04:00
David Kopf b55dddcd38 Free rtimer for contikimac, add print-stats option 2011-08-15 14:55:18 -04:00
David Kopf 83e3b99d54 Let RPL examples enable platform RPL 2011-08-15 14:45:44 -04:00
David Kopf 50d1086553 Add changes needed for contikimac 2011-08-13 11:38:38 -04:00
David Kopf ea1345d3fe Update to proper webserver define 2011-08-13 11:36:43 -04:00
David Kopf f36c97a9a4 Get random seed from noisy ADC conversion at startup. 2011-08-13 11:31:20 -04:00
Adam Dunkels 40bf585af8 The Z1 platform has LEDs 2011-08-08 22:46:30 +02:00
David Kopf c9b19ce655 Change timer setups for arbitrary CLOCK_CONF_SECOND
Change raven to 128 ticks and enable 32KHz crystal as default.
2011-08-05 15:14:35 -04:00
David Kopf 96c3c1093a Assign aaaa:: prefix if HARD_CODED_ADDRESS not defined 2011-08-03 12:30:20 -04:00