]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Michal Sojka [Wed, 28 Apr 2010 23:23:13 +0000 (01:23 +0200)]
lpceurobot: Remove compiler version warning
Michal Sojka [Wed, 28 Apr 2010 23:14:46 +0000 (01:14 +0200)]
displayd: Attempt to fix MOT status
It probably won't help.
Michal Sojka [Wed, 28 Apr 2010 23:12:22 +0000 (01:12 +0200)]
displayd: Show status of STArt plug
Michal Sojka [Wed, 28 Apr 2010 23:06:53 +0000 (01:06 +0200)]
cand: Send only start condition, there is no "stop"
Michal Sojka [Wed, 28 Apr 2010 23:03:27 +0000 (01:03 +0200)]
vidle: Initialize fsm positions in a more understandable way
Michal Sojka [Wed, 28 Apr 2010 23:00:48 +0000 (01:00 +0200)]
vidle: clean up
Michal Sojka [Wed, 28 Apr 2010 22:51:38 +0000 (00:51 +0200)]
vidle: Clean up indentation
Michal Sojka [Wed, 28 Apr 2010 22:50:42 +0000 (00:50 +0200)]
vidle: Simplify start plug handling
Michal Sojka [Wed, 28 Apr 2010 22:50:04 +0000 (00:50 +0200)]
vidle: Ignore out of bound requests
Michal Sojka [Wed, 28 Apr 2010 22:02:55 +0000 (00:02 +0200)]
displayd: Set more appropriate voltage thresholds
Michal Sojka [Wed, 28 Apr 2010 21:37:17 +0000 (23:37 +0200)]
robomon: Show coordinates of mouse cursor
Michal Sojka [Wed, 28 Apr 2010 17:21:26 +0000 (19:21 +0200)]
displayd: Document color change command
Michal Sojka [Wed, 28 Apr 2010 17:06:02 +0000 (19:06 +0200)]
disp-4dg: Show two digits of corn lots
Michal Sojka [Wed, 28 Apr 2010 09:04:06 +0000 (11:04 +0200)]
disp-4dgl: Rename DRESS to COLOR
Michal Sojka [Wed, 28 Apr 2010 08:57:08 +0000 (10:57 +0200)]
disp-4dgl: Remove older versions
Jiri Kubias [Wed, 28 Apr 2010 19:05:33 +0000 (21:05 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 28 Apr 2010 19:04:06 +0000 (21:04 +0200)]
eb-vidle - funguje start tlacitko (pro opetovnou funkci je nutne restarnout ebboard. Nefunguje bumper - mam podezreni ze se vubec nevykonava
IF
Michal Vokac [Wed, 28 Apr 2010 18:54:11 +0000 (20:54 +0200)]
Merge branch 'master' of vokacmic@rtime.felk.cvut.cz:/var/git/eurobot
Michal Vokac [Wed, 28 Apr 2010 18:54:04 +0000 (20:54 +0200)]
homologation: state "wait" deleted
Filip Jares [Wed, 28 Apr 2010 18:49:14 +0000 (20:49 +0200)]
robot.c: remove printf in fill_in_known_areas_in_map
Filip Jares [Wed, 28 Apr 2010 17:52:54 +0000 (19:52 +0200)]
team-members-contacts: add Ondra Suchy's email address and phone
Filip Jares [Wed, 28 Apr 2010 17:51:58 +0000 (19:51 +0200)]
Merge branch 'master' of ssh://jaresf1@rtime.felk.cvut.cz/var/git/eurobot
Filip Jares [Wed, 28 Apr 2010 17:51:43 +0000 (19:51 +0200)]
homologation: add remove_wall_around_corn() function
Michal Vokac [Wed, 28 Apr 2010 17:49:38 +0000 (19:49 +0200)]
Merge branch 'master' of vokacmic@rtime.felk.cvut.cz:/var/git/eurobot
Michal Vokac [Wed, 28 Apr 2010 17:49:21 +0000 (19:49 +0200)]
homolagation: working betaversion
Michal Vokac [Wed, 28 Apr 2010 17:45:00 +0000 (19:45 +0200)]
robodim: robot dimensions updated
Jiri Kubias [Wed, 28 Apr 2010 17:30:37 +0000 (19:30 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 28 Apr 2010 17:29:36 +0000 (19:29 +0200)]
eb-vidle !NETESTOVANO! - posilani stavu START konektoru a BUMPERU
Jiri Kubias [Wed, 28 Apr 2010 17:28:56 +0000 (19:28 +0200)]
can-ids pridana canova definice CAN_BUMPER
Filip Jares [Wed, 28 Apr 2010 16:16:41 +0000 (18:16 +0200)]
homologation: add experiment state
its testing state for the get_corn_approach_position
Jiri Kubias [Wed, 28 Apr 2010 15:54:37 +0000 (17:54 +0200)]
eb-vidle pridano do fsm-init inicializace akt-pos
Jiri Kubias [Wed, 28 Apr 2010 15:34:30 +0000 (17:34 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 28 Apr 2010 15:33:28 +0000 (17:33 +0200)]
eb_vidle odkomentovan CAN (posila can zpravy na 48), nefunkcni inicializace
jarda [Wed, 28 Apr 2010 15:22:09 +0000 (17:22 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
jarda [Wed, 28 Apr 2010 15:18:42 +0000 (17:18 +0200)]
Signed-off-by: jarda <sach.jaroslav@gmail.com>
jarda [Wed, 28 Apr 2010 15:13:34 +0000 (17:13 +0200)]
uprava velikosti stlacne plochy pro navratove tlacitko do hlavni obrazovky
Jiri Kubias [Wed, 28 Apr 2010 15:10:01 +0000 (17:10 +0200)]
eb-vidle funkcni verze bez CAN
Jiri Kubias [Wed, 28 Apr 2010 12:25:26 +0000 (14:25 +0200)]
eb_vidle - dodelano nacitani potaku, pridana deadzone do fsm_control
Filip Jares [Wed, 28 Apr 2010 12:19:25 +0000 (14:19 +0200)]
homologation: "praseni s jizdou na svah u leveho okraje"
Michal Vokac [Wed, 28 Apr 2010 10:41:21 +0000 (12:41 +0200)]
homologation: chnaged maxv, maxacc for beter regulation
Michal Vokac [Wed, 28 Apr 2010 10:40:10 +0000 (12:40 +0200)]
Robot_orte: added condition for hokuo scan ingnoring when climbig slope and sledge down
Filip Jares [Wed, 28 Apr 2010 10:12:03 +0000 (12:12 +0200)]
homologation: use robot.ignore_hokuyo when climbing the slope
Filip Jares [Wed, 28 Apr 2010 10:04:46 +0000 (12:04 +0200)]
add ignore_hokuyo variable to struct robot
Filip Jares [Wed, 28 Apr 2010 09:44:46 +0000 (11:44 +0200)]
homologation: add get_corn_approach_position() function
it returns Point instance containing x and y coords and phi angle defining
position, where the robot could go when it wants to rush the specified corn.
Filip Jares [Wed, 28 Apr 2010 09:42:09 +0000 (11:42 +0200)]
trgen: Point class methods: add const modifiers
want to call them on const objects and for const arguments
Filip Jares [Wed, 28 Apr 2010 09:41:03 +0000 (11:41 +0200)]
robot.c: fill_in_known_areas_in_map(): remove left and right side WALL flags
Filip Jares [Wed, 28 Apr 2010 09:39:39 +0000 (11:39 +0200)]
path planner: tell the goal coords when printing "goal cell is an obstacle"
Filip Jares [Wed, 28 Apr 2010 08:23:01 +0000 (10:23 +0200)]
homologaton: use robot_trajectory_new() instead of robot_move_by()
Filip Jares [Wed, 28 Apr 2010 08:01:34 +0000 (10:01 +0200)]
homologation: make state names shorter
make state names shorter to make them fit on the display
Filip Jares [Wed, 28 Apr 2010 07:04:08 +0000 (09:04 +0200)]
homologation: add get_point_to_line_distance() function
Jarda [Wed, 28 Apr 2010 07:14:52 +0000 (09:14 +0200)]
DISPLAY:
Pridani zmeny barvy dresu, oprava zobrazeni napeti
Michal Sojka [Tue, 27 Apr 2010 23:11:54 +0000 (01:11 +0200)]
eb_vidle: First attempt (template)
Michal Vokac [Tue, 27 Apr 2010 18:03:21 +0000 (20:03 +0200)]
odometry: fsm_state renamed from rectangle to odometry, starting position changed to point located in starting blue sector.
Michal Vokac [Tue, 27 Apr 2010 18:00:41 +0000 (20:00 +0200)]
robodim: hokuyo mount point updated
Michal Sojka [Tue, 27 Apr 2010 12:52:51 +0000 (14:52 +0200)]
hokuyo: move to _compiled/bin
Michal Sojka [Tue, 27 Apr 2010 12:49:56 +0000 (14:49 +0200)]
displayd, hokuyo: Increase error timeouts
to not respawn too fast.
Michal Sojka [Tue, 27 Apr 2010 12:45:39 +0000 (14:45 +0200)]
displayd: Fix error handling when display is not detected
Michal Sojka [Tue, 27 Apr 2010 11:55:22 +0000 (13:55 +0200)]
hokuyo: Print errors to stderr and sleep before exit
Michal Sojka [Tue, 27 Apr 2010 11:51:33 +0000 (13:51 +0200)]
displayd: Print errors to stderr
Also when error is detected wait 1 second so that init doesn't respawn
us too fast.
Michal Sojka [Tue, 27 Apr 2010 11:42:26 +0000 (13:42 +0200)]
mount-robot: Configure for Michal S.
jarda [Tue, 27 Apr 2010 11:24:42 +0000 (13:24 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
jarda [Tue, 27 Apr 2010 11:17:56 +0000 (13:17 +0200)]
indikace vypadku komunikace po 3s, ERR, a zcervenani napeti a komponent
Michal Sojka [Tue, 27 Apr 2010 10:13:33 +0000 (12:13 +0200)]
displayd: Show motor warnings
Michal Sojka [Tue, 27 Apr 2010 09:57:32 +0000 (11:57 +0200)]
displayd: Fix some error and rework throttling
Michal Sojka [Tue, 27 Apr 2010 08:09:49 +0000 (10:09 +0200)]
displayd: Show best estimated position
Michal Sojka [Tue, 27 Apr 2010 08:09:36 +0000 (10:09 +0200)]
vidle: Add skeleton taken from lift_09
Some code is commented because it freezed the CPU. It seems it has
some connetion with CAN.
Matous Pokorny [Tue, 27 Apr 2010 06:39:18 +0000 (08:39 +0200)]
eb_blink: add volatile to work with new compiler (gcc 4.4.3)
Filip Jares [Mon, 26 Apr 2010 21:25:23 +0000 (23:25 +0200)]
fix and update robofsm/test/lineavoid.cc
- the fix lies in replacement of obsolete robot.est_pos_uzv field access
with robot_get_est_pos() call
Filip Jares [Mon, 26 Apr 2010 21:21:22 +0000 (23:21 +0200)]
add corns field (type struct corns_group *) to robot.h
- add choose_next_corn() function to homologation.cc:
this method returns next corn that has not been tried
to collect.
Filip Jares [Mon, 26 Apr 2010 21:18:03 +0000 (23:18 +0200)]
corns: add was_collected field to struct corn type
Filip Jares [Mon, 26 Apr 2010 21:15:04 +0000 (23:15 +0200)]
movehelper: add FIXME cries, mark unused field id struct move_target
Filip Jares [Mon, 26 Apr 2010 21:11:50 +0000 (23:11 +0200)]
trgen.h: add const to Point::distanceTo() parameter
this method does not change its parameter...
Filip Jares [Mon, 26 Apr 2010 20:46:55 +0000 (22:46 +0200)]
robomon: change fake corn color to black
Michal Sojka [Mon, 26 Apr 2010 20:32:47 +0000 (22:32 +0200)]
robomon: Remove motor controls
These controls were never used and only took up screen place.
On some systems (Filip), they made the rest of the screen unreadable.
It was only commented out, because we may add this functionality later
again, but to a different tab.
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
jarda [Mon, 26 Apr 2010 16:47:21 +0000 (18:47 +0200)]
zdrojaky Jarda
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.