Commit Graph

1902 Commits

Author SHA1 Message Date
François Revol
3633c52bcb ctk-curses: whitespace fixes 2013-03-30 23:34:18 +01:00
François Revol
a03334a59d ctk-curses: style fixes 2013-03-30 23:26:22 +01:00
François Revol
8daf2b6659 ctk-curses: remove unused code
The setupterm() call is not needed when using curses.
2013-03-30 23:15:08 +01:00
François Revol
976746f97f ctk-curses: cleanup 2013-03-30 23:07:38 +01:00
François Revol
5a4382a996 ctk-curses: uncomment refresh() calls
I'm not yet sure they are required there but it shouldn't hurt.
2013-03-30 23:03:04 +01:00
François Revol
065c25cfc5 ctk-curses: uncomment nonl() call and fix return key handling 2013-03-30 23:00:44 +01:00
François Revol
f63aada8b6 ctk-curses: make sure gcc finds ncurses headers on cygwin
They are located in /usr/include/ncurses
2013-03-30 18:11:17 +01:00
François Revol
45662ac1ef ctk-curses: add some comments for clarity 2013-03-30 17:57:01 +01:00
Rémy Léone
e6bd4f1dde Rename to md 2013-03-26 23:15:37 +01:00
Rémy Léone
7b40a568a6 Update to markdown
- Spellchecking
- Update plain text to github markdown
2013-03-26 16:55:19 +01:00
François Revol
9372a153dd win32: Prefix color names with CTK_
For consistency with ctk-curses, prefix CTK colors with CTK_.

Also introduce COLOR_BG to make it easier to change the widgets
background at once.
2013-03-26 11:51:58 +01:00
François Revol
ada305a3be ctk-curses: Introduce CTK-specific color names
Since ncurses also defines COLOR_BLACK and friends, and we want
to avoid including curses.h in contiki-conf.h, define CTK_COLOR_*
constants and map them to curses colors in ctk-curses.c.
2013-03-26 11:37:10 +01:00
François Revol
56f11e7524 ctk-curses: C89
At least Haiku still uses gcc2 by default.
2013-03-26 08:51:37 +01:00
François Revol
54199d7121 ctk-curses: add CURSES_LIB to TARGET_LIBFILES, not LDFLAGS
It seems TARGET_LIBFILES is used at the end of the link command,
unlike LDFLAGS, which should help when only a static curses lib is
available, like on Haiku.
2013-03-26 08:10:59 +01:00
Nicolas Tsiftes
f8edbbb8d2 Merge pull request #178 from adamdunkels/feature-contiki-default-conf
A first stab at a default configuration system
2013-03-25 20:13:15 -07:00
François Revol
2bb9ced3d6 ctk-curses: Guard ncurses-specific mouse function calls
The mouse support is ncurses-specific so guard it with proper #ifdef.
2013-03-26 02:01:28 +01:00
François Revol
86cb1769f6 ctk-curses: Remove extra mouse events pumping loop
It was added to avoid getting garbage keyboard input in some cases,
however it seems not to happen very often and might be the cause
of hang in OSX. If garbage input happens again we can always try
to pump a single event each time instead of looping anyway.
2013-03-26 01:49:05 +01:00
François Revol
343a7643b7 ctk-curses: Introduce CURSES_LIB makefile variable
This should allow overriding it depending on $(HOST_OS).
2013-03-26 01:12:09 +01:00
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