Commit graph

8369 commits

Author SHA1 Message Date
Oliver Schmidt d5d8de7372 Merge pull request #181 from mmuman/ctk-ncurses-try4
TODOs:
- Check FreeBSD
- Adjust Makefile.target
2013-03-31 14:36:30 -07:00
François Revol 476be8de7e ctk-curses: style fixes
Thanks tools/contiki-indent
2013-03-31 04:07:03 +02:00
François Revol a43601b2fc ctk-curses: WITH_GUI also on ftp example for native platform 2013-03-30 23:45:53 +01:00
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
Oliver Schmidt f1f777e162 Merge pull request #185 from g-oikonomou/bug-fixes/cmd-handler-fix
Fix a mismatch between declaration and definition
2013-03-28 15:11:59 -07: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 5350f36d19 ctk-curses: Revert "ctk-curses: fix build"
This reverts commit 9ffaa96475.

Since we do not include curses.h anymore there shouldn't be any name clash.
2013-03-26 11:40:32 +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 a82746e72a Fix a mismatch between declaration and definition 2013-03-23 15:07:47 +00: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 9ffaa96475 ctk-curses: fix build
Including curses.h in contiki-conf.h (required for COLOR_* defines)
induced a symbol name clash with neighbor-attr.c on "timeout".

Renamed timeout to neighbor_timeout.
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
Nicolas Tsiftes 8c25ed20d9 Merge pull request #175 from adamdunkels/feature-updated-stm32w
Cleanup and refactorization of the STM32w port
2013-03-19 15:30:31 -07:00
François Revol 3d33248eff native: Fix trailing whitespace 2013-03-19 20:00:26 +01:00
François Revol 22bcb07c61 tapdev: Log to stderr; add tracing
Use stderr for logging to avoid polluting stdout.
Add some DEBUG tracing.
2013-03-19 19:41:20 +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
François Revol ba541fd510 shell: Fix GUI build
* Fix shell_exit() signature, it's called without any argument.
2013-03-19 19:23:08 +01:00
Nicolas Tsiftes 199a89bac4 Merge pull request #173 from adamdunkels/feature-ipv6-not-in-makefile
Allow IPv6 to be compiled via #define
2013-03-19 08:17:52 -07:00
Nicolas Tsiftes 7f2a842b71 Merge pull request #174 from adamdunkels/feature-net-improvements
Improvements to the core/net/ code
2013-03-18 17:12:12 -07:00
Nicolas Tsiftes 6a07172662 Merge pull request #176 from adamdunkels/feature-net-bugfixes
Network system bugfixes
2013-03-18 13:38:44 -07:00
Nicolas Tsiftes adf401bbad Merge pull request #172 from adamdunkels/feature-split-collect-regression-test
Regression tests: split the collect test into two, moved armgcc download location
2013-03-18 09:22:07 -07:00
Adam Dunkels 7742b05d8c Major bugfix: when nullrdc is asked to send a list of packets, send the list of packets and not just the first packet - this is essential for retransmissions of fragmented IP packets to work 2013-03-18 13:35:29 +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 f81e4071f1 Merge pull request #135 from darconeous/pull-requests/core-net-bridge-mode
core/net: Added support for "bridge mode".
2013-03-18 04:43:15 -07:00
Adam Dunkels ad28f1b396 Merge pull request #75 from cmorty/mesh_ready
Add mesh_ready() to mesh
2013-03-18 04:42:43 -07:00
Adam Dunkels 2ba293a538 Bugfix: check the size of the outgoing packet to avoid overflowing the output buffer 2013-03-18 11:22:08 +01:00
Adam Dunkels 843d2361dc Include the rimestats variable only if rimestats are enabled by the configuration 2013-03-18 11:22:06 +01:00
Adam Dunkels 4efd570cf9 Minor bugfix: explicitly cast pointer argument in debug printf 2013-03-18 11:22:05 +01:00
Adam Dunkels f2fbb4b49d Defensive programming: make sure that we don't fail completely if we get a callback for a NULL pointer 2013-03-18 11:22:04 +01:00
Adam Dunkels 82b755c017 Bugfix: keep track of receiver being awake as a local variable rather than a global, as it may have changed between invokations 2013-03-18 11:22:02 +01:00
Adam Dunkels 0670a8e1e2 Minor code style fixes to the contikimac and nullrdc code 2013-03-18 11:22:01 +01:00
Adam Dunkels ef25cc6c58 Rimestats bugfix: only compile the rimestats printout if rimestats are enabled 2013-03-18 11:22:00 +01:00