]> rtime.felk.cvut.cz Git - eurobot/public.git/log
eurobot/public.git
14 years agoAdded license to trgen eb2009/master
Michal Sojka [Thu, 4 Jun 2009 12:07:58 +0000 (14:07 +0200)]
Added license to trgen

14 years agoORTE updated to the current CVS
Michal Sojka [Wed, 20 May 2009 14:15:17 +0000 (16:15 +0200)]
ORTE updated to the current CVS

14 years agopusher constant changed back to 20
Benes Petr [Fri, 15 May 2009 08:08:25 +0000 (10:08 +0200)]
pusher constant changed back to 20

14 years agoMerge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Benes Petr [Fri, 15 May 2009 07:32:05 +0000 (09:32 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot

14 years agopusher constant modified 20 to 30
Benes Petr [Fri, 15 May 2009 07:31:51 +0000 (09:31 +0200)]
pusher constant modified 20 to 30

14 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 15 May 2009 06:52:00 +0000 (08:52 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

14 years agorobofsm/competition: short_time_to_end handling added; (boolean variable added)
Filip Jares [Fri, 15 May 2009 06:51:38 +0000 (08:51 +0200)]
robofsm/competition: short_time_to_end handling added; (boolean variable added)

14 years agorobofsm/fsmact: puck unloading sequenc slightly changed
Filip Jares [Fri, 15 May 2009 06:49:52 +0000 (08:49 +0200)]
robofsm/fsmact: puck unloading sequenc slightly changed

approach the acropolis with the lift in higher position

14 years agoPuck pickup sequence updated
Benes Petr [Fri, 15 May 2009 06:49:38 +0000 (08:49 +0200)]
Puck pickup sequence updated

14 years agofsmact: cosmetical change and removal of unnecessary act_lift() call
Filip Jares [Thu, 14 May 2009 16:18:27 +0000 (18:18 +0200)]
fsmact: cosmetical change and removal of unnecessary act_lift() call

14 years agocompetition: number of attempts to load the puck decreased to only two
Filip Jares [Thu, 14 May 2009 16:16:07 +0000 (18:16 +0200)]
competition: number of attempts to load the puck decreased to only two

14 years agocompetition: typo corrected; thinking of an "universal strategy"
Filip Jares [Thu, 14 May 2009 13:46:07 +0000 (15:46 +0200)]
competition: typo corrected; thinking of an "universal strategy"

camera does not work all the time, thinking of an universal approach

14 years agorobofsm/{competition.cc,homologation.cc,roboevent.py}: EV_SHORT_TIME_TO_END event...
Filip Jares [Thu, 14 May 2009 13:06:20 +0000 (15:06 +0200)]
robofsm/{competition.cc,homologation.cc,roboevent.py}: EV_SHORT_TIME_TO_END event removed

have to implement behavior corresponding to arrival of this event differently

14 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Thu, 14 May 2009 12:35:26 +0000 (14:35 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

14 years agorobofsm/competition: correcting EV_SHORT_TIME_TO_END handling added in hurry by Michal
Filip Jares [Thu, 14 May 2009 12:34:33 +0000 (14:34 +0200)]
robofsm/competition: correcting EV_SHORT_TIME_TO_END handling added in hurry by Michal

- EV_SHORT_TIME_TO_END: absence of 'break' statements was ignored
- EV_GOAL_NOT_REACHABLE: comment added (this event is currently not used
 and not sent from anywhere)

14 years agoMerge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Benes Petr [Thu, 14 May 2009 11:33:47 +0000 (13:33 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot

14 years agoPusher constant editet from 200 to 90
Benes Petr [Thu, 14 May 2009 11:33:34 +0000 (13:33 +0200)]
Pusher constant editet from 200 to 90

Motion constraints changed

14 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Thu, 14 May 2009 10:26:25 +0000 (12:26 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

14 years agorobofsm/competition: obsolete code from previous years removed
Filip Jares [Thu, 14 May 2009 10:26:15 +0000 (12:26 +0200)]
robofsm/competition: obsolete code from previous years removed

14 years agorobofsm/fsmact: belts related timeout diminished
Filip Jares [Thu, 14 May 2009 10:25:12 +0000 (12:25 +0200)]
robofsm/fsmact: belts related timeout diminished

(timeout defining how long should the belts rotate in the
'out' direction after an unsuccessful attempt to suck the puck
happens)

14 years agorobofsm:test_actuators: Scrabble action added ('s' keypress handling)
Filip Jares [Thu, 14 May 2009 10:22:04 +0000 (12:22 +0200)]
robofsm:test_actuators: Scrabble action added ('s' keypress handling)

14 years agorobofsm: Fixed race condition in setting of estimated position (UZV)
Michal Sojka [Thu, 14 May 2009 10:20:12 +0000 (12:20 +0200)]
robofsm: Fixed race condition in setting of estimated position (UZV)

14 years agorobofsm: Removed forcing of team_color
Michal Sojka [Thu, 14 May 2009 10:20:03 +0000 (12:20 +0200)]
robofsm: Removed forcing of team_color

The team color was forced in order to the color for which the app is
compiled on display event if an attempted to change the color by using
touchscreen is made.

14 years agomotion-control, do_estimation(): beacon coordinates set according to team color
Marek Peca [Thu, 14 May 2009 07:30:19 +0000 (09:30 +0200)]
motion-control, do_estimation(): beacon coordinates set according to team color

14 years agorobofsm: Removed obsolete obstacle detection code
Michal Sojka [Wed, 13 May 2009 20:08:03 +0000 (22:08 +0200)]
robofsm: Removed obsolete obstacle detection code

14 years agorobofsm: Unified access to estimated position
Michal Sojka [Wed, 13 May 2009 20:02:31 +0000 (22:02 +0200)]
robofsm: Unified access to estimated position

Because of changes in estimated position, there were many errors in
determining robot's estimated position. At some places, est_pos_uzv was
hardcoded, at some places est_pos_odo etc. Depending on whether
localization worked, the robot behave correctly or not, which was not
good.

This was solved by introducing robot_get_est_pos() which is used at all
places in the program to determine robot's current position. By changing
this function, one can easily change the localization of the whole
robot.

14 years agorozpuk: new experimental colorspace&threshold inspired by MFF
Marek Peca [Wed, 13 May 2009 15:39:26 +0000 (17:39 +0200)]
rozpuk: new experimental colorspace&threshold inspired by MFF

14 years agorobofsm: Fix problem with movement based only odometry
Michal Sojka [Wed, 13 May 2009 14:13:11 +0000 (16:13 +0200)]
robofsm: Fix problem with movement based only odometry

Every new movement was started at est_pos_uzv, which was not correct
since localization was switched off.
o Changes to be committed:

14 years agorobofsm: Return of automatically detected feed forward mode
Michal Sojka [Wed, 13 May 2009 13:55:52 +0000 (15:55 +0200)]
robofsm: Return of automatically detected feed forward mode

If there are no odometry data received, robot operates in feed forward
mode. This is useful when testing programs on PC.

14 years agoUse correct start position for trajectory planning without uzv
Michal Sojka [Wed, 13 May 2009 11:04:48 +0000 (13:04 +0200)]
Use correct start position for trajectory planning without uzv

15 years agoMerge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Marek Peca [Wed, 6 May 2009 13:00:51 +0000 (15:00 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot

15 years agorozpuk: rozporte.h added
Marek Peca [Wed, 6 May 2009 13:00:47 +0000 (15:00 +0200)]
rozpuk: rozporte.h added

15 years agorozpuk: rozporte.c added
Marek Peca [Wed, 6 May 2009 13:00:24 +0000 (15:00 +0200)]
rozpuk: rozporte.c added

15 years agoRobot physical parameters updated
Benes Petr [Mon, 4 May 2009 11:13:12 +0000 (13:13 +0200)]
Robot physical parameters updated

Edited wheel perimeter and rotation radius
Now odometry inaccuracy should be 0.2% while straight motion and rotation

15 years agoMotion: Created plotting trajectory from motion.log
Benes Petr [Mon, 4 May 2009 09:17:27 +0000 (11:17 +0200)]
Motion: Created plotting trajectory from motion.log

Plotting using gnuplot, needs upgrade for more information
In file plot_motion_log.sh

15 years agoAdded PXMC submodule accidentally deleted by Filip
Michal Sojka [Sat, 2 May 2009 21:56:00 +0000 (23:56 +0200)]
Added PXMC submodule accidentally deleted by Filip

See the commit f3ca0058b0794b97971e4a35b0e9ecf78b62b79a

15 years agorobofsm: When localization doesn't work, use only odometry feedback
Michal Sojka [Sat, 2 May 2009 09:25:23 +0000 (11:25 +0200)]
robofsm: When localization doesn't work, use only odometry feedback

15 years agoTrajectory controller uses odometry and uzv only just before movement start
Michal Sojka [Thu, 30 Apr 2009 13:31:48 +0000 (15:31 +0200)]
Trajectory controller uses odometry and uzv only just before movement start

15 years agorobomon: Fixed uzv trail
Michal Sojka [Thu, 30 Apr 2009 14:22:42 +0000 (16:22 +0200)]
robomon: Fixed uzv trail

15 years agorobomon: Changed to be compilable under QT 4.3
Michal Sojka [Thu, 30 Apr 2009 13:46:50 +0000 (15:46 +0200)]
robomon: Changed to be compilable under QT 4.3

15 years agorobomon: Added forgotten Trail files
Michal Sojka [Thu, 30 Apr 2009 13:36:09 +0000 (15:36 +0200)]
robomon: Added forgotten Trail files

15 years agorobomon controls map and trail visibility from the new View menu
Michal Sojka [Thu, 30 Apr 2009 00:09:26 +0000 (02:09 +0200)]
robomon controls map and trail visibility from the new View menu

15 years agorobomon displays text on robots to distinguish them
Michal Sojka [Wed, 29 Apr 2009 23:05:02 +0000 (01:05 +0200)]
robomon displays text on robots to distinguish them

15 years agorobomon displays motion trails
Michal Sojka [Wed, 29 Apr 2009 23:04:24 +0000 (01:04 +0200)]
robomon displays motion trails

15 years agoMerge branch 'master' of rtime:/var/git/eurobot
Michal Sojka [Wed, 29 Apr 2009 19:13:53 +0000 (21:13 +0200)]
Merge branch 'master' of rtime:/var/git/eurobot

15 years agorobofsm: Do not kill other programs on deadline
Michal Sojka [Wed, 29 Apr 2009 14:19:46 +0000 (16:19 +0200)]
robofsm: Do not kill other programs on deadline

15 years agorobomon shows estimated position based on odometry
Michal Sojka [Wed, 29 Apr 2009 14:00:02 +0000 (16:00 +0200)]
robomon shows estimated position based on odometry

15 years agorobomon: Display all estimated positions - buggy!!!
Michal Sojka [Wed, 29 Apr 2009 13:23:35 +0000 (15:23 +0200)]
robomon: Display all estimated positions - buggy!!!

15 years agorobofsm: Initialize test-actators correctly
Michal Sojka [Wed, 29 Apr 2009 13:26:41 +0000 (15:26 +0200)]
robofsm: Initialize test-actators correctly

15 years agorobofsm: Added estimated position based on odometry
Michal Sojka [Wed, 29 Apr 2009 13:22:48 +0000 (15:22 +0200)]
robofsm: Added estimated position based on odometry

15 years agolift: Avoid unnecessary delays when loading pucks
Michal Sojka [Wed, 29 Apr 2009 11:22:26 +0000 (13:22 +0200)]
lift: Avoid unnecessary delays when loading pucks

15 years agocommit-graph: Legend is displayed correctly if some people are missing
Michal Sojka [Wed, 29 Apr 2009 09:19:42 +0000 (11:19 +0200)]
commit-graph: Legend is displayed correctly if some people are missing

This is useful, when called like:
  commit-graph.pl <some-directory>
To see how people worked on a particular directory

15 years agocommit-graph: Show day on horizontal axis
Michal Sojka [Wed, 29 Apr 2009 09:01:26 +0000 (11:01 +0200)]
commit-graph: Show day on horizontal axis

15 years agocommit graph
Martin Zidek [Tue, 28 Apr 2009 20:29:41 +0000 (22:29 +0200)]
commit graph
returned -persist option to gnuplot call, to make the graph remain on
the screen after the script exits

15 years agocommit-graph.pl: Enhancements
Michal Sojka [Tue, 28 Apr 2009 12:55:42 +0000 (14:55 +0200)]
commit-graph.pl: Enhancements

- can show the number of added lines
- accept git-log options to limit commits, etc.

15 years agodisp: removed status screen "hacked branch"
Martin Zidek [Sun, 26 Apr 2009 14:31:46 +0000 (16:31 +0200)]
disp: removed status screen "hacked branch"

15 years agodisp: final version of 4DG source of status screen
Martin Zidek [Sun, 26 Apr 2009 14:30:50 +0000 (16:30 +0200)]
disp: final version of 4DG source of status screen

15 years agoFix angle sign on display eb2009
Michal Sojka [Sat, 25 Apr 2009 10:47:50 +0000 (12:47 +0200)]
Fix angle sign on display

15 years agoKill other processes on orte deadline
Michal Sojka [Sat, 25 Apr 2009 10:47:21 +0000 (12:47 +0200)]
Kill other processes on orte deadline

15 years agoRED team color has a separate binary
Michal Sojka [Sat, 25 Apr 2009 10:38:57 +0000 (12:38 +0200)]
RED team color has a separate binary

15 years agoFixed joyd compilation error
Michal Sojka [Sat, 25 Apr 2009 07:28:22 +0000 (09:28 +0200)]
Fixed joyd compilation error

15 years agofinal version before departure to RETRO MUSIC HALL
Filip Jares [Sat, 25 Apr 2009 06:17:05 +0000 (08:17 +0200)]
final version before departure to RETRO MUSIC HALL

bugfix: forgotten EV_FREE_SPACE signal send

15 years agotcVerySlow acc decreased
Filip Jares [Sat, 25 Apr 2009 05:59:13 +0000 (07:59 +0200)]
tcVerySlow acc decreased

15 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Sat, 25 Apr 2009 05:51:50 +0000 (07:51 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

15 years agocompetition trajectory Constraints changed,
Filip Jares [Sat, 25 Apr 2009 05:51:44 +0000 (07:51 +0200)]
competition trajectory Constraints changed,

15 years agorobofsm: go to deposit if short time to end
Michal Sojka [Sat, 25 Apr 2009 05:50:34 +0000 (07:50 +0200)]
robofsm: go to deposit if short time to end

15 years agorobofsm: Lift ...
Michal Sojka [Sat, 25 Apr 2009 05:34:59 +0000 (07:34 +0200)]
robofsm: Lift ...

15 years agoact: store_puck_in_holder slightly changed
Filip Jares [Sat, 25 Apr 2009 05:29:58 +0000 (07:29 +0200)]
act: store_puck_in_holder slightly changed

15 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Sat, 25 Apr 2009 05:20:12 +0000 (07:20 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

15 years agoMerge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Sat, 25 Apr 2009 05:20:35 +0000 (07:20 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot

15 years agoMerge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Sat, 25 Apr 2009 05:20:26 +0000 (07:20 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot

15 years agorobomon: Added Puck inside checkbox
Michal Sojka [Sat, 25 Apr 2009 05:20:09 +0000 (07:20 +0200)]
robomon: Added Puck inside checkbox

15 years agodisp: added angle visualization
Martin Zidek [Sat, 25 Apr 2009 05:18:58 +0000 (07:18 +0200)]
disp: added angle visualization

15 years agocompetition: slow and very slow trajectory constraints acceleration changed
Filip Jares [Sat, 25 Apr 2009 05:13:32 +0000 (07:13 +0200)]
competition: slow and very slow trajectory constraints acceleration changed

15 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Sat, 25 Apr 2009 04:27:53 +0000 (06:27 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

15 years agocompetition.cc: collecting four pucks sequence; automaton works somehow
Filip Jares [Sat, 25 Apr 2009 04:27:46 +0000 (06:27 +0200)]
competition.cc: collecting four pucks sequence; automaton works somehow

15 years agoactuators.h: LIFT_SHIFT increased
Filip Jares [Sat, 25 Apr 2009 04:26:46 +0000 (06:26 +0200)]
actuators.h: LIFT_SHIFT increased

15 years agolift: added pusher endswitch histeresis
Michal Sojka [Sat, 25 Apr 2009 04:24:34 +0000 (06:24 +0200)]
lift: added pusher endswitch histeresis

15 years agoMerge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Benes Petr [Sat, 25 Apr 2009 02:48:12 +0000 (04:48 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot

15 years agoCompetetion layout strategies modified
Benes Petr [Sat, 25 Apr 2009 02:47:42 +0000 (04:47 +0200)]
Competetion layout strategies modified

15 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Sat, 25 Apr 2009 02:45:21 +0000 (04:45 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

15 years agosending camera on and camera off from MAIN automaton; deposit_at_acropolis state...
Filip Jares [Sat, 25 Apr 2009 02:45:13 +0000 (04:45 +0200)]
sending camera on and camera off from MAIN automaton; deposit_at_acropolis state tuning

15 years agoeb_lift opravene zajizdeni na nulovou pozici. Asci by t ochtelo nejak v budoucnu...
Jiri Kubias [Sat, 25 Apr 2009 01:29:14 +0000 (03:29 +0200)]
eb_lift opravene zajizdeni na nulovou pozici. Asci by t ochtelo nejak v budoucnu opravit.

15 years agoeb_lift: pridal jsem vopras do regulatoru - pri pozadavku na nulovou
Jiri Kubias [Sat, 25 Apr 2009 00:54:29 +0000 (02:54 +0200)]
eb_lift: pridal jsem vopras do regulatoru - pri pozadavku na nulovou
pozici to musi dojet vzdy do nulove pozice.
Musi se opravit, porad to sebou cuka pri dojezdu

15 years agoMerge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Sat, 25 Apr 2009 00:30:09 +0000 (02:30 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot

15 years agorobot: added ShmapFree to robot_destroy
Martin Zidek [Sat, 25 Apr 2009 00:29:02 +0000 (02:29 +0200)]
robot: added ShmapFree to robot_destroy

15 years agoeb_pwr fixed can messages
Jiri Kubias [Fri, 24 Apr 2009 23:32:36 +0000 (01:32 +0200)]
eb_pwr fixed can messages

15 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 23:22:12 +0000 (01:22 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

Conflicts:

src/robofsm/competition.cc

15 years agoMAIN FSM: implementing acropolis approach
Filip Jares [Fri, 24 Apr 2009 23:16:32 +0000 (01:16 +0200)]
MAIN FSM: implementing acropolis approach

- approach_acropolis state
- robot_goto_acropolis() using robot_moveto_trans;
- newly defined acropolis approach angles array

15 years agoeb_sberac: added back switch
Jiri Kubias [Fri, 24 Apr 2009 23:16:21 +0000 (01:16 +0200)]
eb_sberac:  added back switch

15 years agoactuators: added camera control functions
Martin Zidek [Fri, 24 Apr 2009 22:40:33 +0000 (00:40 +0200)]
actuators: added camera control functions

15 years agoMerge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Fri, 24 Apr 2009 22:36:24 +0000 (00:36 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot

15 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 22:33:30 +0000 (00:33 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot

15 years agoAdded puck inside switch handling
Michal Sojka [Fri, 24 Apr 2009 22:32:54 +0000 (00:32 +0200)]
Added puck inside switch handling

15 years agorobofsm: Added wall invalidation when moving to certain targets
Michal Sojka [Fri, 24 Apr 2009 22:25:04 +0000 (00:25 +0200)]
robofsm: Added wall invalidation when moving to certain targets

15 years agomap: Fixed detection of free obstacles
Michal Sojka [Fri, 24 Apr 2009 22:22:46 +0000 (00:22 +0200)]
map: Fixed detection of free obstacles

15 years agorobodim.h: ACROPOLIS_RADIUS redefined correctly, ACROPOLIS_DIAMETER defined
Filip Jares [Fri, 24 Apr 2009 22:04:26 +0000 (00:04 +0200)]
robodim.h: ACROPOLIS_RADIUS redefined correctly, ACROPOLIS_DIAMETER defined

15 years agorobodim.h: ACROPOLIS_RADIUS redefined correctly, ACROPOLIS_DIAMETER defined
Filip Jares [Fri, 24 Apr 2009 22:04:05 +0000 (00:04 +0200)]
robodim.h: ACROPOLIS_RADIUS redefined correctly, ACROPOLIS_DIAMETER defined

15 years agorobodim.h: ACROPOLIS_CENTER_X, resp ..._Y coords defined
Filip Jares [Fri, 24 Apr 2009 21:59:34 +0000 (23:59 +0200)]
robodim.h: ACROPOLIS_CENTER_X, resp ..._Y coords defined

15 years agoMerge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 21:45:47 +0000 (23:45 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot