]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Petr Kubiznak [Thu, 29 Apr 2010 21:24:12 +0000 (23:24 +0200)]
New masks' mask (for yellow color only so far).
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!).
Petr Kubiznak [Mon, 26 Apr 2010 19:46:05 +0000 (21:46 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
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.
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
Filip Jares [Mon, 26 Apr 2010 17:20:54 +0000 (19:20 +0200)]
fsmmove: remove obsolete invalidateAcropolis() and invalidateDown()
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.
Michal Vokac [Mon, 26 Apr 2010 18:46:17 +0000 (20:46 +0200)]
Hokuyo: center offset and conversion from indices to angle updated
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
Petr Kubiznak [Mon, 26 Apr 2010 13:16:31 +0000 (15:16 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Petr Kubiznak [Mon, 26 Apr 2010 13:16:20 +0000 (15:16 +0200)]
Process masks for both team colors.
Petr Kubiznak [Mon, 26 Apr 2010 13:13:22 +0000 (15:13 +0200)]
Communication with orte.
Separate side and center masks processing.
Petr Kubiznak [Mon, 26 Apr 2010 13:12:16 +0000 (15:12 +0200)]
Generate separate masks for side and center situations.
Petr Kubiznak [Mon, 26 Apr 2010 13:11:13 +0000 (15:11 +0200)]
Common macros for rozkuk and maskgen separated to this header file.
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.
Michal Sojka [Mon, 26 Apr 2010 09:08:27 +0000 (11:08 +0200)]
robomon: Allow switch to OpenGL renderer from menu
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.
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
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.
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.
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
Michal Sojka [Mon, 26 Apr 2010 05:30:28 +0000 (07:30 +0200)]
lpceurobot: Do not compile eb_lift_90
Michal Sojka [Sun, 25 Apr 2010 21:17:19 +0000 (23:17 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
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.
Filip Jares [Sun, 25 Apr 2010 13:45:09 +0000 (15:45 +0200)]
robodim: correct CORN_NEIGHBOURHOOD_RADIUS value
kittlmoj [Sun, 25 Apr 2010 09:27:46 +0000 (11:27 +0200)]
Merge branch 'master' of /var/git/eurobot
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.
Michal Sojka [Sun, 25 Apr 2010 08:26:55 +0000 (10:26 +0200)]
robomon: Remove annoying deadline miss printf()s
Michal Sojka [Sun, 25 Apr 2010 08:26:31 +0000 (10:26 +0200)]
robomon: Test OpenGL drawing
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.
Michal Sojka [Sat, 24 Apr 2010 21:58:23 +0000 (23:58 +0200)]
robomon: Fixes for obstacle simulation
Michal Sojka [Sat, 24 Apr 2010 21:44:01 +0000 (23:44 +0200)]
robomon: Robot visibility can be set from menu
Michal Sojka [Sat, 24 Apr 2010 21:36:58 +0000 (23:36 +0200)]
robomon: Remove unreferenced class SmallRobot
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.
Michal Sojka [Sat, 24 Apr 2010 20:43:56 +0000 (22:43 +0200)]
robomon: Rename ActPos to RefPos
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.
Michal Sojka [Sat, 24 Apr 2010 19:56:20 +0000 (21:56 +0200)]
can: Remove unused IDs and add IDs for 'vidle'
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
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
Filip Jares [Sat, 24 Apr 2010 11:10:30 +0000 (13:10 +0200)]
robodim: add CORN_NEIGHBOURHOOD_RADIUS and correct CORN_{RADIUS/DIAMETER}
Filip Jares [Sat, 24 Apr 2010 10:21:18 +0000 (12:21 +0200)]
update robodim.h: correct slope length!, add corn radius
Filip Jares [Sat, 24 Apr 2010 10:01:47 +0000 (12:01 +0200)]
shared map documentation: add FIXME cries and update
Filip Jares [Sat, 24 Apr 2010 10:01:01 +0000 (12:01 +0200)]
corns library: add comments at the beginning of files
Filip Jares [Sat, 24 Apr 2010 09:59:58 +0000 (11:59 +0200)]
corn diameter: move the constant from robomon to robodim
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
Filip Jares [Sat, 24 Apr 2010 09:25:12 +0000 (11:25 +0200)]
corns: choose more appropriate name for key functions of the library
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)
Filip Jares [Sat, 24 Apr 2010 09:06:46 +0000 (11:06 +0200)]
corns: check functions arguments
Filip Jares [Sat, 24 Apr 2010 08:37:08 +0000 (10:37 +0200)]
robomon: draw corns using cornslib
TODO: choose corns configuratins dynamically
Filip Jares [Sat, 24 Apr 2010 08:13:36 +0000 (10:13 +0200)]
corns: compile cornslib (add to Makefile.omk)
Filip Jares [Sat, 24 Apr 2010 08:12:52 +0000 (10:12 +0200)]
corns: add print_corn_position()
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
Michal Sojka [Fri, 23 Apr 2010 21:49:25 +0000 (23:49 +0200)]
lpceurobot: Add template directory for vidle
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.
Michal Sojka [Fri, 23 Apr 2010 21:32:01 +0000 (23:32 +0200)]
robomon: Decrease top playground margin
Michal Sojka [Fri, 23 Apr 2010 21:29:35 +0000 (23:29 +0200)]
robomon: right widgets has now fixed width
Michal Sojka [Fri, 23 Apr 2010 16:39:59 +0000 (18:39 +0200)]
ppc: compile displayd
kittlmoj [Fri, 23 Apr 2010 15:27:33 +0000 (17:27 +0200)]
displayd: Fix status handling for ODO and HOK
kittlmoj [Fri, 23 Apr 2010 15:20:19 +0000 (17:20 +0200)]
Merge branch 'master' of /var/git/eurobot
kittlmoj [Fri, 23 Apr 2010 15:19:13 +0000 (17:19 +0200)]
displayd: Add functions for reading from sercom
Michal Sojka [Fri, 23 Apr 2010 14:55:56 +0000 (16:55 +0200)]
displayd: Remove unnecessary copying of data
Michal Sojka [Fri, 23 Apr 2010 14:55:19 +0000 (16:55 +0200)]
displayd: Show all bytes of message 0x81 (status) in hex
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.
Michal Sojka [Fri, 23 Apr 2010 14:51:54 +0000 (16:51 +0200)]
displayd: Set baudrate to 115200
Michal Sojka [Fri, 23 Apr 2010 14:50:29 +0000 (16:50 +0200)]
displayd: Add hokuyo subscriber
kittlmoj [Fri, 23 Apr 2010 14:16:43 +0000 (16:16 +0200)]
Merge branch 'master' of /var/git/eurobot
kittlmoj [Fri, 23 Apr 2010 14:13:30 +0000 (16:13 +0200)]
displayd: Add keep-alive prcessing
Also change status handling in functions.
Michal Sojka [Fri, 23 Apr 2010 13:28:48 +0000 (15:28 +0200)]
robomon: Display hokuyo scan data
Michal Sojka [Fri, 23 Apr 2010 12:08:19 +0000 (14:08 +0200)]
robofsm: Do not link tests with nonexistent uoled, ... libraries
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.
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).
Michal Sojka [Fri, 23 Apr 2010 11:05:23 +0000 (13:05 +0200)]
robofsm: Remove fsmdisplay - it is unused now
Michal Sojka [Fri, 23 Apr 2010 11:04:36 +0000 (13:04 +0200)]
robofsm: Remove unused sercom structure and some libraries
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.
Michal Sojka [Fri, 23 Apr 2010 10:29:23 +0000 (12:29 +0200)]
displayd: Separate HEX debug output from surrounding text
Michal Sojka [Fri, 23 Apr 2010 10:28:49 +0000 (12:28 +0200)]
displayd: Do not send more state character that it is necessary
Michal Sojka [Fri, 23 Apr 2010 10:23:38 +0000 (12:23 +0200)]
display: Remove annoying printf()s on deadline miss
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.
Michal Sojka [Fri, 23 Apr 2010 09:54:14 +0000 (11:54 +0200)]
displayd: Add template for keep-alive handling
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.
Michal Sojka [Fri, 23 Apr 2010 09:37:01 +0000 (11:37 +0200)]
uoled: Print commands on one line
Michal Sojka [Fri, 23 Apr 2010 09:36:44 +0000 (11:36 +0200)]
uoled: Comment out debug messages
Michal Sojka [Fri, 23 Apr 2010 08:48:38 +0000 (10:48 +0200)]
hokuyo: Switch off laser Ctrl-C
Filip Jares [Fri, 23 Apr 2010 09:19:22 +0000 (11:19 +0200)]
corns: avoid one warning and remove forgotten comment
kittlmoj [Fri, 23 Apr 2010 09:16:08 +0000 (11:16 +0200)]
displayd: Add subscribers for FSM
kittlmoj [Fri, 23 Apr 2010 08:37:51 +0000 (10:37 +0200)]
uoled: Fix problem with position (computing phi)
kittlmoj [Fri, 23 Apr 2010 07:52:38 +0000 (09:52 +0200)]
Merge branch 'master' of /var/git/eurobot
kittlmoj [Fri, 23 Apr 2010 07:51:49 +0000 (09:51 +0200)]
Change calculation of phi for display position
kittlmoj [Fri, 23 Apr 2010 07:03:32 +0000 (09:03 +0200)]
Add functions for display status of processes
Michal Sojka [Fri, 23 Apr 2010 06:16:18 +0000 (08:16 +0200)]
cand: Remove uncompilable publishers
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
Filip Jares [Thu, 22 Apr 2010 21:51:25 +0000 (23:51 +0200)]
robofsm/test/Makefile.omk: remove old (obsolete) display test
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)
Filip Jares [Thu, 22 Apr 2010 21:44:55 +0000 (23:44 +0200)]
robot.h, robot_orte: camera result update
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
Filip Jares [Thu, 22 Apr 2010 21:15:51 +0000 (23:15 +0200)]
corns: remove unused function used previously for testing
Filip Jares [Thu, 22 Apr 2010 05:36:31 +0000 (07:36 +0200)]
corns: cosmetical changes
make the file better organized
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
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)
Filip Jares [Fri, 16 Apr 2010 18:59:40 +0000 (20:59 +0200)]
corns_configs: rename functions to make them match their purpose