]> rtime.felk.cvut.cz Git - eurobot/public.git/log
eurobot/public.git
14 years agoNew masks' mask (for yellow color only so far).
Petr Kubiznak [Thu, 29 Apr 2010 21:24:12 +0000 (23:24 +0200)]
New masks' mask (for yellow color only so far).

14 years agoSpaces<->Tabs fix.
Petr Kubiznak [Thu, 29 Apr 2010 21:23:07 +0000 (23:23 +0200)]
Spaces<->Tabs fix.
Wait mode debug enabled.
PPC masks pathname prepared (needs to be specified!).

14 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Petr Kubiznak [Mon, 26 Apr 2010 19:46:05 +0000 (21:46 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

14 years ago1. Get team color from orte.
Petr Kubiznak [Mon, 26 Apr 2010 19:45:56 +0000 (21:45 +0200)]
1. Get team color from orte.
2. Do not use camera_control.on condition until it works correctly.

14 years agoadd cornslib to libraries in robofsm/test/Makefile.omk to avoid compilation error
Filip Jares [Mon, 26 Apr 2010 17:24:22 +0000 (19:24 +0200)]
add cornslib to libraries in robofsm/test/Makefile.omk to avoid compilation error

14 years agofsmmove: remove obsolete invalidateAcropolis() and invalidateDown()
Filip Jares [Mon, 26 Apr 2010 17:20:54 +0000 (19:20 +0200)]
fsmmove: remove obsolete invalidateAcropolis() and invalidateDown()

14 years agoRobomon: scaning angle decreased in map_handling so we dont treat samples from the...
Michal Vokac [Mon, 26 Apr 2010 18:46:52 +0000 (20:46 +0200)]
Robomon: scaning angle decreased in map_handling so we dont treat samples from the robot inside.

14 years agoHokuyo: center offset and conversion from indices to angle updated
Michal Vokac [Mon, 26 Apr 2010 18:46:17 +0000 (20:46 +0200)]
Hokuyo: center offset and conversion from indices to angle updated

14 years agorobot.c: fill_in_known_areas_in_map(): add all corns to map
Filip Jares [Mon, 26 Apr 2010 16:34:29 +0000 (18:34 +0200)]
robot.c: fill_in_known_areas_in_map(): add all corns to map

14 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Petr Kubiznak [Mon, 26 Apr 2010 13:16:31 +0000 (15:16 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

14 years agoProcess masks for both team colors.
Petr Kubiznak [Mon, 26 Apr 2010 13:16:20 +0000 (15:16 +0200)]
Process masks for both team colors.

14 years agoCommunication with orte.
Petr Kubiznak [Mon, 26 Apr 2010 13:13:22 +0000 (15:13 +0200)]
Communication with orte.
Separate side and center masks processing.

14 years agoGenerate separate masks for side and center situations.
Petr Kubiznak [Mon, 26 Apr 2010 13:12:16 +0000 (15:12 +0200)]
Generate separate masks for side and center situations.

14 years agoCommon macros for rozkuk and maskgen separated to this header file.
Petr Kubiznak [Mon, 26 Apr 2010 13:11:13 +0000 (15:11 +0200)]
Common macros for rozkuk and maskgen separated to this header file.

14 years agorobomon: Try to fix another compilation error with Qt < 4.6
Michal Sojka [Mon, 26 Apr 2010 09:40:00 +0000 (11:40 +0200)]
robomon: Try to fix another compilation error with Qt < 4.6

Now, I get a warning with 4.6 but it can be hopefully ignored.

14 years agorobomon: Allow switch to OpenGL renderer from menu
Michal Sojka [Mon, 26 Apr 2010 09:08:27 +0000 (11:08 +0200)]
robomon: Allow switch to OpenGL renderer from menu

14 years agorobomon: Add ability to draw map rectangles smaller
Michal Sojka [Mon, 26 Apr 2010 08:47:00 +0000 (10:47 +0200)]
robomon: Add ability to draw map rectangles smaller

This is not used now, but it can be easiliy activated by setting
MAP_RECT_SCALE to a value between 0 and 1.

14 years agorobomon: Publish hokuyo simulation only when new data is really calculated
Michal Sojka [Mon, 26 Apr 2010 08:24:16 +0000 (10:24 +0200)]
robomon: Publish hokuyo simulation only when new data is really calculated

This is an attempt to debug problem with hokuyo and map updating

14 years agorobomon: Fix compilation error with Qt < 4.6
Michal Sojka [Mon, 26 Apr 2010 06:57:15 +0000 (08:57 +0200)]
robomon: Fix compilation error with Qt < 4.6

QGraphicsObject was added to Qt 4.6 but in many distribuions (and on
rtime), only earlier versions are available. I have replaced
QGraphicsObject with multilpe ingeritance from QObject and QGraphicsItem.

14 years agorobomon: Decrease top playground margin (again)
Michal Sojka [Mon, 26 Apr 2010 06:54:54 +0000 (08:54 +0200)]
robomon: Decrease top playground margin (again)

In commit 744f9814, Filip accidentaly reverted my previous change so
I'm chaning it again.

14 years agoMerge branch 'master' of ssh://jaresf1@rtime.felk.cvut.cz/var/git/eurobot
Filip Jares [Mon, 26 Apr 2010 06:34:24 +0000 (08:34 +0200)]
Merge branch 'master' of ssh://jaresf1@rtime.felk.cvut.cz/var/git/eurobot

14 years agolpceurobot: Do not compile eb_lift_90
Michal Sojka [Mon, 26 Apr 2010 05:30:28 +0000 (07:30 +0200)]
lpceurobot: Do not compile eb_lift_90

14 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Sun, 25 Apr 2010 21:17:19 +0000 (23:17 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

14 years agorobomon: Move POST_EVENT macro to .cpp
Michal Sojka [Sun, 25 Apr 2010 21:16:27 +0000 (23:16 +0200)]
robomon: Move POST_EVENT macro to .cpp

It has no sense to export that macro to other places.

14 years agorobodim: correct CORN_NEIGHBOURHOOD_RADIUS value
Filip Jares [Sun, 25 Apr 2010 13:45:09 +0000 (15:45 +0200)]
robodim: correct CORN_NEIGHBOURHOOD_RADIUS value

14 years agoMerge branch 'master' of /var/git/eurobot
kittlmoj [Sun, 25 Apr 2010 09:27:46 +0000 (11:27 +0200)]
Merge branch 'master' of /var/git/eurobot

14 years agodisplayd: Completion work, commenting, cleaning code
kittlmoj [Sun, 25 Apr 2010 09:22:43 +0000 (11:22 +0200)]
displayd: Completion work, commenting, cleaning code

Added sending commands revieved from display to ORTE.
Finalizing work.

14 years agorobomon: Remove annoying deadline miss printf()s
Michal Sojka [Sun, 25 Apr 2010 08:26:55 +0000 (10:26 +0200)]
robomon: Remove annoying deadline miss printf()s

14 years agorobomon: Test OpenGL drawing
Michal Sojka [Sun, 25 Apr 2010 08:26:31 +0000 (10:26 +0200)]
robomon: Test OpenGL drawing

14 years agorobomon: Update hokuyo only when new scan data arrives
Michal Sojka [Sun, 25 Apr 2010 08:21:28 +0000 (10:21 +0200)]
robomon: Update hokuyo only when new scan data arrives

Previously the hokuyo scan was redrawn also when robot's position changes.
This led to "shaking" of hokuyo scan becouse robot's position and scan data
was not delivered in the same time.

Now, the scan is redrawn only when new data arrives. When the robot move
after that instant the scan stays at the same place.

14 years agorobomon: Fixes for obstacle simulation
Michal Sojka [Sat, 24 Apr 2010 21:58:23 +0000 (23:58 +0200)]
robomon: Fixes for obstacle simulation

14 years agorobomon: Robot visibility can be set from menu
Michal Sojka [Sat, 24 Apr 2010 21:44:01 +0000 (23:44 +0200)]
robomon: Robot visibility can be set from menu

14 years agorobomon: Remove unreferenced class SmallRobot
Michal Sojka [Sat, 24 Apr 2010 21:36:58 +0000 (23:36 +0200)]
robomon: Remove unreferenced class SmallRobot

14 years agorobomon: Add a new robot at the best estimated position
Michal Sojka [Sat, 24 Apr 2010 20:50:01 +0000 (22:50 +0200)]
robomon: Add a new robot at the best estimated position

The hokuyo scan diagram is moved together with this robot. This means that
I can test hokuyo and map handling without the real robot.

14 years agorobomon: Rename ActPos to RefPos
Michal Sojka [Sat, 24 Apr 2010 20:43:56 +0000 (22:43 +0200)]
robomon: Rename ActPos to RefPos

14 years agorobofsm: Publish the best available estimated position
Michal Sojka [Sat, 24 Apr 2010 20:19:44 +0000 (22:19 +0200)]
robofsm: Publish the best available estimated position

Robot's motion control algorithms needs estimated position of the robot.
Depending on whether various peripherals work or not, this position is
either the position calculated from independent odometry or calculated from
motors or the reference position.

For robomon, it is useful to know, which estimated position is currently
being used. Therefore, we publish the position under topic est_pos_best.

14 years agocan: Remove unused IDs and add IDs for 'vidle'
Michal Sojka [Sat, 24 Apr 2010 19:56:20 +0000 (21:56 +0200)]
can: Remove unused IDs and add IDs for 'vidle'

14 years agorobomon: avoid segfault when closing the map after an unsuccessfull atempt to open it
Filip Jares [Sat, 24 Apr 2010 12:14:57 +0000 (14:14 +0200)]
robomon: avoid segfault when closing the map after an unsuccessfull atempt to open it

14 years agorobomon: fill map cells marked with MAP_FLAG_PLAN_MARGIN flag with orange color
Filip Jares [Sat, 24 Apr 2010 12:13:19 +0000 (14:13 +0200)]
robomon: fill map cells marked with MAP_FLAG_PLAN_MARGIN flag with orange color

14 years agorobodim: add CORN_NEIGHBOURHOOD_RADIUS and correct CORN_{RADIUS/DIAMETER}
Filip Jares [Sat, 24 Apr 2010 11:10:30 +0000 (13:10 +0200)]
robodim: add CORN_NEIGHBOURHOOD_RADIUS and correct CORN_{RADIUS/DIAMETER}

14 years agoupdate robodim.h: correct slope length!, add corn radius
Filip Jares [Sat, 24 Apr 2010 10:21:18 +0000 (12:21 +0200)]
update robodim.h: correct slope length!, add corn radius

14 years agoshared map documentation: add FIXME cries and update
Filip Jares [Sat, 24 Apr 2010 10:01:47 +0000 (12:01 +0200)]
shared map documentation: add FIXME cries and update

14 years agocorns library: add comments at the beginning of files
Filip Jares [Sat, 24 Apr 2010 10:01:01 +0000 (12:01 +0200)]
corns library: add comments at the beginning of files

14 years agocorn diameter: move the constant from robomon to robodim
Filip Jares [Sat, 24 Apr 2010 09:59:58 +0000 (11:59 +0200)]
corn diameter: move the constant from robomon to robodim

14 years agocorns: check args of interface functions; do not these of helper functions
Filip Jares [Sat, 24 Apr 2010 09:26:25 +0000 (11:26 +0200)]
corns: check args of interface functions; do not these of helper functions

14 years agocorns: choose more appropriate name for key functions of the library
Filip Jares [Sat, 24 Apr 2010 09:25:12 +0000 (11:25 +0200)]
corns: choose more appropriate name for key functions of the library

14 years agocorns: add documentation do the library interface, hide implementation
Filip Jares [Sat, 24 Apr 2010 09:11:43 +0000 (11:11 +0200)]
corns: add documentation do the library interface, hide implementation

(move corn's position definition from the .h to the .c file)

14 years agocorns: check functions arguments
Filip Jares [Sat, 24 Apr 2010 09:06:46 +0000 (11:06 +0200)]
corns: check functions arguments

14 years agorobomon: draw corns using cornslib
Filip Jares [Sat, 24 Apr 2010 08:37:08 +0000 (10:37 +0200)]
robomon: draw corns using cornslib

TODO: choose corns configuratins dynamically

14 years agocorns: compile cornslib (add to Makefile.omk)
Filip Jares [Sat, 24 Apr 2010 08:13:36 +0000 (10:13 +0200)]
corns: compile cornslib (add to Makefile.omk)

14 years agocorns: add print_corn_position()
Filip Jares [Sat, 24 Apr 2010 08:12:52 +0000 (10:12 +0200)]
corns: add print_corn_position()

14 years agocorns: correct bug in get_all_corns_positions; add dispose_corns_group() to header...
Filip Jares [Sat, 24 Apr 2010 08:12:14 +0000 (10:12 +0200)]
corns: correct bug in get_all_corns_positions; add dispose_corns_group() to  header file

14 years agolpceurobot: Add template directory for vidle
Michal Sojka [Fri, 23 Apr 2010 21:49:25 +0000 (23:49 +0200)]
lpceurobot: Add template directory for vidle

14 years agorobomon: Remove toolbar
Michal Sojka [Fri, 23 Apr 2010 21:35:23 +0000 (23:35 +0200)]
robomon: Remove toolbar

The toolbar was not useful and only took screen space.

14 years agorobomon: Decrease top playground margin
Michal Sojka [Fri, 23 Apr 2010 21:32:01 +0000 (23:32 +0200)]
robomon: Decrease top playground margin

14 years agorobomon: right widgets has now fixed width
Michal Sojka [Fri, 23 Apr 2010 21:29:35 +0000 (23:29 +0200)]
robomon: right widgets has now fixed width

14 years agoppc: compile displayd
Michal Sojka [Fri, 23 Apr 2010 16:39:59 +0000 (18:39 +0200)]
ppc: compile displayd

14 years agodisplayd: Fix status handling for ODO and HOK
kittlmoj [Fri, 23 Apr 2010 15:27:33 +0000 (17:27 +0200)]
displayd: Fix status handling for ODO and HOK

14 years agoMerge branch 'master' of /var/git/eurobot
kittlmoj [Fri, 23 Apr 2010 15:20:19 +0000 (17:20 +0200)]
Merge branch 'master' of /var/git/eurobot

14 years agodisplayd: Add functions for reading from sercom
kittlmoj [Fri, 23 Apr 2010 15:19:13 +0000 (17:19 +0200)]
displayd: Add functions for reading from sercom

14 years agodisplayd: Remove unnecessary copying of data
Michal Sojka [Fri, 23 Apr 2010 14:55:56 +0000 (16:55 +0200)]
displayd: Remove unnecessary copying of data

14 years agodisplayd: Show all bytes of message 0x81 (status) in hex
Michal Sojka [Fri, 23 Apr 2010 14:55:19 +0000 (16:55 +0200)]
displayd: Show all bytes of message 0x81 (status) in hex

14 years agodisplayd: Disable signal notification for incomming serial data
Michal Sojka [Fri, 23 Apr 2010 14:53:58 +0000 (16:53 +0200)]
displayd: Disable signal notification for incomming serial data

Displayd was killed by SIGIO since it didn't handle the signal.

14 years agodisplayd: Set baudrate to 115200
Michal Sojka [Fri, 23 Apr 2010 14:51:54 +0000 (16:51 +0200)]
displayd: Set baudrate to 115200

14 years agodisplayd: Add hokuyo subscriber
Michal Sojka [Fri, 23 Apr 2010 14:50:29 +0000 (16:50 +0200)]
displayd: Add hokuyo subscriber

14 years agoMerge branch 'master' of /var/git/eurobot
kittlmoj [Fri, 23 Apr 2010 14:16:43 +0000 (16:16 +0200)]
Merge branch 'master' of /var/git/eurobot

14 years agodisplayd: Add keep-alive prcessing
kittlmoj [Fri, 23 Apr 2010 14:13:30 +0000 (16:13 +0200)]
displayd: Add keep-alive prcessing

Also change status handling in functions.

14 years agorobomon: Display hokuyo scan data
Michal Sojka [Fri, 23 Apr 2010 13:28:48 +0000 (15:28 +0200)]
robomon: Display hokuyo scan data

14 years agorobofsm: Do not link tests with nonexistent uoled, ... libraries
Michal Sojka [Fri, 23 Apr 2010 12:08:19 +0000 (14:08 +0200)]
robofsm: Do not link tests with nonexistent uoled, ... libraries

14 years agodisplayd: Do not include robot.h
Michal Sojka [Fri, 23 Apr 2010 11:20:56 +0000 (13:20 +0200)]
displayd: Do not include robot.h

Display is controlled from a separate process and therefore there is no
need to include robot.h. Moreover, there are some conflicting definitions
which cannot be compiled with displayd.

14 years agorobofsm: New status variable
Michal Sojka [Fri, 23 Apr 2010 11:15:35 +0000 (13:15 +0200)]
robofsm: New status variable

We no longer keep status for display and we do not include the display
header which defined the various status constants. So we must delete the
hw_status in order to compile the code.

But we want to keep some status inside the application and then we will
send an aggregate status to display in APP field (in future patches).

14 years agorobofsm: Remove fsmdisplay - it is unused now
Michal Sojka [Fri, 23 Apr 2010 11:05:23 +0000 (13:05 +0200)]
robofsm: Remove fsmdisplay - it is unused now

14 years agorobofsm: Remove unused sercom structure and some libraries
Michal Sojka [Fri, 23 Apr 2010 11:04:36 +0000 (13:04 +0200)]
robofsm: Remove unused sercom structure and some libraries

14 years agodisplayd: Control concurency when sending data to display
Michal Sojka [Fri, 23 Apr 2010 10:53:48 +0000 (12:53 +0200)]
displayd: Control concurency when sending data to display

Since we write to the display from multiple threads (keep-alive from the
main thread and the rest from orte thread which invokes callbacks), it is
necessary to assure that distinct writes are not interleaved. This is done
by the added mutex.

14 years agodisplayd: Separate HEX debug output from surrounding text
Michal Sojka [Fri, 23 Apr 2010 10:29:23 +0000 (12:29 +0200)]
displayd: Separate HEX debug output from surrounding text

14 years agodisplayd: Do not send more state character that it is necessary
Michal Sojka [Fri, 23 Apr 2010 10:28:49 +0000 (12:28 +0200)]
displayd: Do not send more state character that it is necessary

14 years agodisplay: Remove annoying printf()s on deadline miss
Michal Sojka [Fri, 23 Apr 2010 10:23:38 +0000 (12:23 +0200)]
display: Remove annoying printf()s on deadline miss

14 years agodisplayd: Do not refresh the display too fast
Michal Sojka [Fri, 23 Apr 2010 10:16:12 +0000 (12:16 +0200)]
displayd: Do not refresh the display too fast

TODO do the same change in the other callbacks.

14 years agodisplayd: Add template for keep-alive handling
Michal Sojka [Fri, 23 Apr 2010 09:54:14 +0000 (11:54 +0200)]
displayd: Add template for keep-alive handling

14 years agouoled: Moved to displayd directory
Michal Sojka [Fri, 23 Apr 2010 09:50:23 +0000 (11:50 +0200)]
uoled: Moved to displayd directory

It is not necessary to have a library with this code.

14 years agouoled: Print commands on one line
Michal Sojka [Fri, 23 Apr 2010 09:37:01 +0000 (11:37 +0200)]
uoled: Print commands on one line

14 years agouoled: Comment out debug messages
Michal Sojka [Fri, 23 Apr 2010 09:36:44 +0000 (11:36 +0200)]
uoled: Comment out debug messages

14 years agohokuyo: Switch off laser Ctrl-C
Michal Sojka [Fri, 23 Apr 2010 08:48:38 +0000 (10:48 +0200)]
hokuyo: Switch off laser Ctrl-C

14 years agocorns: avoid one warning and remove forgotten comment
Filip Jares [Fri, 23 Apr 2010 09:19:22 +0000 (11:19 +0200)]
corns: avoid one warning and remove forgotten comment

14 years agodisplayd: Add subscribers for FSM
kittlmoj [Fri, 23 Apr 2010 09:16:08 +0000 (11:16 +0200)]
displayd: Add subscribers for FSM

14 years agouoled: Fix problem with position (computing phi)
kittlmoj [Fri, 23 Apr 2010 08:37:51 +0000 (10:37 +0200)]
uoled: Fix problem with position (computing phi)

14 years agoMerge branch 'master' of /var/git/eurobot
kittlmoj [Fri, 23 Apr 2010 07:52:38 +0000 (09:52 +0200)]
Merge branch 'master' of /var/git/eurobot

14 years agoChange calculation of phi for display position
kittlmoj [Fri, 23 Apr 2010 07:51:49 +0000 (09:51 +0200)]
Change calculation of phi for display position

14 years agoAdd functions for display status of processes
kittlmoj [Fri, 23 Apr 2010 07:03:32 +0000 (09:03 +0200)]
Add functions for display status of processes

14 years agocand: Remove uncompilable publishers
Michal Sojka [Fri, 23 Apr 2010 06:16:18 +0000 (08:16 +0200)]
cand: Remove uncompilable publishers

14 years agocand: Fix warnings
Michal Sojka [Fri, 23 Apr 2010 06:15:43 +0000 (08:15 +0200)]
cand: Fix warnings

- comparsion of signed and unsigned
- return something or nothing

14 years agorobofsm/test/Makefile.omk: remove old (obsolete) display test
Filip Jares [Thu, 22 Apr 2010 21:51:25 +0000 (23:51 +0200)]
robofsm/test/Makefile.omk: remove old (obsolete) display test

14 years agouoled.c: comment out obsolete code referencing deleted variable
Filip Jares [Thu, 22 Apr 2010 21:48:52 +0000 (23:48 +0200)]
uoled.c: comment out obsolete code referencing deleted variable

(new camera result in 2010)

14 years agorobot.h, robot_orte: camera result update
Filip Jares [Thu, 22 Apr 2010 21:44:55 +0000 (23:44 +0200)]
robot.h, robot_orte: camera result update

14 years agocorns: add function that returns all corns' position and (fake/real) information
Filip Jares [Thu, 22 Apr 2010 21:18:10 +0000 (23:18 +0200)]
corns: add function that returns all corns' position and (fake/real) information

14 years agocorns: remove unused function used previously for testing
Filip Jares [Thu, 22 Apr 2010 21:15:51 +0000 (23:15 +0200)]
corns: remove unused function used previously for testing

14 years agocorns: cosmetical changes
Filip Jares [Thu, 22 Apr 2010 05:36:31 +0000 (07:36 +0200)]
corns: cosmetical changes

make the file better organized

14 years agocorns: corn is now structure; set of corns is structure corns_group
Filip Jares [Wed, 21 Apr 2010 20:58:40 +0000 (22:58 +0200)]
corns: corn is now structure; set of corns is structure corns_group

14 years agocorns_configs: introduce get_all_corns() and second parameter to print function ...
Filip Jares [Sat, 17 Apr 2010 05:52:22 +0000 (07:52 +0200)]
corns_configs: introduce get_all_corns() and second parameter to print function (number of corns)

14 years agocorns_configs: rename functions to make them match their purpose
Filip Jares [Fri, 16 Apr 2010 18:59:40 +0000 (20:59 +0200)]
corns_configs: rename functions to make them match their purpose