]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Jiri Kubias [Thu, 23 Apr 2009 19:46:07 +0000 (21:46 +0200)]
eb_sberac added puck sensor detection
Jiri Kubias [Thu, 23 Apr 2009 18:14:29 +0000 (20:14 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Thu, 23 Apr 2009 18:14:05 +0000 (20:14 +0200)]
can_ids added puck
Martin Zidek [Thu, 23 Apr 2009 18:08:01 +0000 (20:08 +0200)]
camera integrated to robofsm
Michal Sojka [Thu, 23 Apr 2009 17:49:50 +0000 (19:49 +0200)]
lift: Fixed all problems :)
Martin Zidek [Thu, 23 Apr 2009 17:26:56 +0000 (19:26 +0200)]
types: added orte types for camera
Michal Sojka [Thu, 23 Apr 2009 16:29:05 +0000 (18:29 +0200)]
lift: Fixes for errors caused probably by low battery oltage
Marek Peca [Thu, 23 Apr 2009 15:15:37 +0000 (17:15 +0200)]
rozpuk: debug image output added
Michal Sojka [Thu, 23 Apr 2009 13:56:11 +0000 (15:56 +0200)]
Updated lineavoid
Michal Sojka [Thu, 23 Apr 2009 13:55:29 +0000 (15:55 +0200)]
robodim: Fixed hokuyo position
Michal Sojka [Thu, 23 Apr 2009 12:47:47 +0000 (14:47 +0200)]
hokyuo: Fixed orientation and several compiler warnings
Martin Zidek [Thu, 23 Apr 2009 12:47:46 +0000 (14:47 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Thu, 23 Apr 2009 12:47:33 +0000 (14:47 +0200)]
lineavoid: added wait for start
Filip Jares [Thu, 23 Apr 2009 12:41:34 +0000 (14:41 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Thu, 23 Apr 2009 12:41:27 +0000 (14:41 +0200)]
robofsm/robot.c, robodim: acropolis diameter moved to robodim.h
Michal Sojka [Thu, 23 Apr 2009 12:29:57 +0000 (14:29 +0200)]
robomon: Fixed position of free pucks
Filip Jares [Thu, 23 Apr 2009 12:23:08 +0000 (14:23 +0200)]
robofsm/robot.c: acropolis radius increased in map definition
Martin Zidek [Thu, 23 Apr 2009 11:45:54 +0000 (13:45 +0200)]
robofsm: removed hokuyo debug messages
Filip Jares [Thu, 23 Apr 2009 10:58:34 +0000 (12:58 +0200)]
FMSs: grasp_the_puck actions removed, tuning the sharp treatment in automata and its physical surroundings
Marek Peca [Thu, 23 Apr 2009 08:39:52 +0000 (10:39 +0200)]
rozpuk: different spot pdfs supported (green & red)
Marek Peca [Thu, 23 Apr 2009 08:39:07 +0000 (10:39 +0200)]
rozpuk: robodim added + cleanup
Filip Jares [Wed, 22 Apr 2009 21:14:15 +0000 (23:14 +0200)]
MAIN FSM: prepare for load state added, ...
Michal Sojka [Wed, 22 Apr 2009 21:04:50 +0000 (23:04 +0200)]
motion.log uses absolute times
This is to plot multiple trajectories one after another
Michal Sojka [Wed, 22 Apr 2009 21:03:21 +0000 (23:03 +0200)]
Added motion.log plotting script
Jiri Kubias [Wed, 22 Apr 2009 20:22:15 +0000 (22:22 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 22 Apr 2009 20:20:35 +0000 (22:20 +0200)]
eb_pwr totalne rozesrano nefunguje posilani po canu....
Michal Sojka [Wed, 22 Apr 2009 18:15:06 +0000 (20:15 +0200)]
OMK: added -Wall to CFLAGS
and removed useless no-strict-aliasing
Michal Sojka [Wed, 22 Apr 2009 18:03:34 +0000 (20:03 +0200)]
robomon shows free puck positions and dispensers
Michal Sojka [Wed, 22 Apr 2009 17:14:00 +0000 (19:14 +0200)]
robomon: Changed color of estimated and reference robots
Michal Sojka [Wed, 22 Apr 2009 17:04:59 +0000 (19:04 +0200)]
robofsm: Tiny fixes
Michal Sojka [Wed, 22 Apr 2009 17:03:57 +0000 (19:03 +0200)]
robofsm: Display shows correctly warning on LFT (lift)
Michal Sojka [Wed, 22 Apr 2009 16:46:41 +0000 (18:46 +0200)]
robofsm: Fixed start plug handling
Michal Sojka [Wed, 22 Apr 2009 16:39:55 +0000 (18:39 +0200)]
robofsm: Implemented some actions
Michal Sojka [Wed, 22 Apr 2009 16:32:26 +0000 (18:32 +0200)]
lift: Implemented P controller
Filip Jares [Wed, 22 Apr 2009 16:00:48 +0000 (18:00 +0200)]
MAIN FSM: collect_free_pucks: variable name changed to something more meaningful, puck indexing variable made global
Filip Jares [Wed, 22 Apr 2009 15:54:31 +0000 (17:54 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Martin Zidek [Wed, 22 Apr 2009 15:46:15 +0000 (17:46 +0200)]
disp: removed old 4dg display source
Martin Zidek [Wed, 22 Apr 2009 15:42:58 +0000 (17:42 +0200)]
ppc build config: correct uoled display device file
Martin Zidek [Wed, 22 Apr 2009 15:42:13 +0000 (17:42 +0200)]
robot-root update
Filip Jares [Wed, 22 Apr 2009 15:28:55 +0000 (17:28 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Wed, 22 Apr 2009 15:28:48 +0000 (17:28 +0200)]
MAIN FSM: free puck sequence updated
Filip Jares [Wed, 22 Apr 2009 15:27:44 +0000 (17:27 +0200)]
ACT FSM: first version of puck unloading procedure
Martin Zidek [Wed, 22 Apr 2009 15:24:08 +0000 (17:24 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Wed, 22 Apr 2009 15:23:15 +0000 (17:23 +0200)]
updated robot-root (cand)
Michal Sojka [Wed, 22 Apr 2009 14:40:40 +0000 (16:40 +0200)]
eb_lift: Better endswitch reporting in can massage
Endswitch information is available all the time, not depending on FSM
state.
Michal Sojka [Wed, 22 Apr 2009 14:03:06 +0000 (16:03 +0200)]
eb_lift: Do not move lift until pusher in fully initialized
Jiri Kubias [Wed, 22 Apr 2009 14:05:16 +0000 (16:05 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 22 Apr 2009 14:03:42 +0000 (16:03 +0200)]
eb_sberac added starting cable support
removed can timeout
Michal Sojka [Wed, 22 Apr 2009 14:00:13 +0000 (16:00 +0200)]
robomon shows lift and pusher positions
Michal Sojka [Wed, 22 Apr 2009 13:58:44 +0000 (15:58 +0200)]
eb_lift: Send real position of the lift after it reaches its target state
Michal Sojka [Wed, 22 Apr 2009 12:40:21 +0000 (14:40 +0200)]
Removed eb_vytah (Jarda's obsolete program)
Michal Sojka [Wed, 22 Apr 2009 12:38:10 +0000 (14:38 +0200)]
Removed eb_vytah (Jarda's obsolete program)
Michal Sojka [Wed, 22 Apr 2009 12:36:47 +0000 (14:36 +0200)]
robofsm: Tiny fixes
Michal Sojka [Wed, 22 Apr 2009 12:35:47 +0000 (14:35 +0200)]
robofsm: Adapted start plug handling
Jiri Kubias [Wed, 22 Apr 2009 12:24:23 +0000 (14:24 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 22 Apr 2009 12:23:09 +0000 (14:23 +0200)]
eb_lift added pusher protection on top position
fixed doxygen commentar
Michal Sojka [Wed, 22 Apr 2009 11:55:24 +0000 (13:55 +0200)]
robomon: Fixed resizing of widgets
Benes Petr [Wed, 22 Apr 2009 10:52:03 +0000 (12:52 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 22 Apr 2009 10:33:52 +0000 (12:33 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Wed, 22 Apr 2009 10:32:30 +0000 (12:32 +0200)]
eb_lift added door avoidance control
added sharp protection
Benes Petr [Wed, 22 Apr 2009 10:23:01 +0000 (12:23 +0200)]
Motion: resolved bugs with trajectory appending
Now it takes into account that spline parameter does not have to be only from 0 to 1
According to the motion test, it works properly and makes no discontinuities
Needs to be tested in robomon and real
Michal Sojka [Wed, 22 Apr 2009 08:56:34 +0000 (10:56 +0200)]
robomon: Fixed layout
Filip Jares [Wed, 22 Apr 2009 08:55:56 +0000 (10:55 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Michal Sojka [Wed, 22 Apr 2009 08:47:08 +0000 (10:47 +0200)]
robomon: Set correct maximal distance for sharp
Filip Jares [Wed, 22 Apr 2009 08:30:27 +0000 (10:30 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Michal Sojka [Wed, 22 Apr 2009 08:30:22 +0000 (10:30 +0200)]
robomon shows puck distance
Not tested on real robot!
Filip Jares [Wed, 22 Apr 2009 08:30:19 +0000 (10:30 +0200)]
robofsm/fsmact.c: first version of load_the_puck sequence; test_actuators utility updated
Filip Jares [Wed, 22 Apr 2009 08:19:17 +0000 (10:19 +0200)]
robot_orte: actuator_status changed to generate EV_LIFT_IN_POS and EV_PUSHER_IN_POS events only once
Filip Jares [Wed, 22 Apr 2009 08:17:36 +0000 (10:17 +0200)]
aclib: two holder and lift positions constants added
Filip Jares [Wed, 22 Apr 2009 08:16:37 +0000 (10:16 +0200)]
joyd: small change to avoid chelae and holder colision
Michal Sojka [Wed, 22 Apr 2009 07:59:18 +0000 (09:59 +0200)]
robomon: Checkboxes moved to Misc group box
Michal Sojka [Wed, 22 Apr 2009 07:54:24 +0000 (09:54 +0200)]
robomon displays actual FSM states
Michal Sojka [Wed, 22 Apr 2009 07:53:56 +0000 (09:53 +0200)]
roboortegen: Fixed registration of subscribers with type != topic
Marek Peca [Tue, 21 Apr 2009 19:42:46 +0000 (21:42 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Marek Peca [Tue, 21 Apr 2009 19:42:30 +0000 (21:42 +0200)]
camera: single image grab utility
Jiri Kubias [Tue, 21 Apr 2009 17:52:01 +0000 (19:52 +0200)]
eb_lift doxygen
Jiri Kubias [Tue, 21 Apr 2009 17:47:52 +0000 (19:47 +0200)]
eb_lift updated homing cycle
fixed CAN ISR
added doxygen documentation
Martin Zidek [Tue, 21 Apr 2009 17:29:23 +0000 (19:29 +0200)]
display and hokuyo working on ppc
Michal Sojka [Tue, 21 Apr 2009 14:42:12 +0000 (16:42 +0200)]
motion: Tuning of controller and constraints (IT WORKS!!!!:-)
Michal Sojka [Tue, 21 Apr 2009 14:03:48 +0000 (16:03 +0200)]
cand: Updated to arrays in IDL
Michal Sojka [Tue, 21 Apr 2009 14:02:23 +0000 (16:02 +0200)]
OMK: PPC uses correct version of orte-idl
Michal Sojka [Tue, 21 Apr 2009 13:45:50 +0000 (15:45 +0200)]
types: Added arrays to .idl (ORTE already supports them)
Michal Sojka [Tue, 21 Apr 2009 12:46:56 +0000 (14:46 +0200)]
robofsm: FSM states are published over ORTE
Michal Sojka [Tue, 21 Apr 2009 12:40:53 +0000 (14:40 +0200)]
ORTE IDL learned how to handle arrays
Michal Sojka [Tue, 21 Apr 2009 12:33:54 +0000 (14:33 +0200)]
roboortegen: Fixed for the case when topic is different from type
Michal Sojka [Tue, 21 Apr 2009 06:40:34 +0000 (08:40 +0200)]
robofsm: Display's FSM debug messages are enabled on if DISPLAY_DEBUG is defined
Benes Petr [Tue, 21 Apr 2009 11:16:49 +0000 (13:16 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Benes Petr [Tue, 21 Apr 2009 11:16:03 +0000 (13:16 +0200)]
Motion: Resolved some problems with trajectory appending
Modified system of spline cutting, added cutting by time
Modified system of copying segments between trajectories
Filip Jares [Tue, 21 Apr 2009 11:00:59 +0000 (13:00 +0200)]
MAIN FSM: free puck pick up sequence corrected
Filip Jares [Tue, 21 Apr 2009 09:08:37 +0000 (11:08 +0200)]
MAIN FSM: tuning the collect_free_pucks state
now the robot looks for the puck if "he" does not see it
Filip Jares [Tue, 21 Apr 2009 09:04:31 +0000 (11:04 +0200)]
ACT FSM: added hokuyo initialization (temporarily)
Filip Jares [Tue, 21 Apr 2009 06:18:35 +0000 (08:18 +0200)]
joyd: hokuyo angle now handled sequentially
Button10: set hokuyo to horizontal position
Button12 & Button8: increment & decrement hokuyo angle in steps
Filip Jares [Tue, 21 Apr 2009 06:16:03 +0000 (08:16 +0200)]
actlib: few predefined actuator positions were added as constants, one was changed
Jiri Kubias [Tue, 21 Apr 2009 05:08:28 +0000 (07:08 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Tue, 21 Apr 2009 05:07:30 +0000 (07:07 +0200)]
eb_lift: added one more state to homing
added wait state between fms_move and fsm stop
Michal Sojka [Mon, 20 Apr 2009 23:29:21 +0000 (01:29 +0200)]
goto and rectangle: suppressed main FSM debugging
The reason of these tests is to debug movement, so only movement
FSM print debug messages. The output is now more understandable.
Michal Sojka [Mon, 20 Apr 2009 23:23:06 +0000 (01:23 +0200)]
pathplan: Fixed removing of safety margin
If there was a safety margin flag at goal position, it was never removed
causing a robot movement deadlock. The reason is that safety margin was
updated (and removed) inside aalgorithm() but the goal is checked for
obstacles in path_planner().
This problem was solved by moving safety margin update to path_planner().
Michal Sojka [Mon, 20 Apr 2009 22:44:50 +0000 (00:44 +0200)]
motion: Removed my annoying printf()
Michal Sojka [Mon, 20 Apr 2009 22:28:25 +0000 (00:28 +0200)]
motion-control: Fixed segfault
Michal Sojka [Mon, 20 Apr 2009 18:46:54 +0000 (20:46 +0200)]
fsmmove: Updated for eb2009
- cleanup
- trajectory is recalculated in FSM and not in a separate thread
(simpler and less error prone solution)
- close_to_target state is not used (robot often turn at the end
of trajectory, which was caused by the balet() controller with
zero speed on input.
- In case of lost position the robot stops, waits one second and then
it tries to plan movement again.