]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
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.
Benes Petr [Mon, 20 Apr 2009 19:34:56 +0000 (21:34 +0200)]
Merge branch 'master' into trajectory
Michal Sojka [Mon, 20 Apr 2009 18:07:01 +0000 (20:07 +0200)]
robofsm: Removed global DBG macro
Sometimes it caused redefinition warnings if another DBG was defined locally.
Filip Jares [Mon, 20 Apr 2009 16:04:51 +0000 (18:04 +0200)]
actlib: lift: floor position constants added
Filip Jares [Mon, 20 Apr 2009 14:24:26 +0000 (16:24 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Mon, 20 Apr 2009 12:11:49 +0000 (14:11 +0200)]
FSMs: lift messages handling, lift related events added
Benes Petr [Mon, 20 Apr 2009 11:59:28 +0000 (13:59 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Marek Peca [Mon, 20 Apr 2009 10:51:43 +0000 (12:51 +0200)]
ULoPoS: dump2dat adapted to new odo format & watchtower cleaned up
Marek Peca [Mon, 20 Apr 2009 10:51:12 +0000 (12:51 +0200)]
ULoPoS: faster angle estimate by odo covariance tuning
now we trust much more in odometry
Marek Peca [Mon, 20 Apr 2009 10:05:40 +0000 (12:05 +0200)]
camera: ROZPUK OMKized
Marek Peca [Mon, 20 Apr 2009 10:03:42 +0000 (12:03 +0200)]
camera: added libjpeg
Independent JPEG Group's software (c) 1991-1997, Thomas G. Lane
Michal Sojka [Mon, 20 Apr 2009 09:10:12 +0000 (11:10 +0200)]
robofsm: motion: Angle P canstant lowered
Benes Petr [Mon, 20 Apr 2009 09:05:46 +0000 (11:05 +0200)]
Motion: resolved problem with strange trajectory generation
Two identical way points after each other confused the algorithm
Michal Sojka [Mon, 20 Apr 2009 08:44:56 +0000 (10:44 +0200)]
motor-control: Fixed can receive
All messages are received in one invocation of handle_can_received().
Previously only one message was received which leaded to problems caused
by receive delays.
Michal Sojka [Mon, 20 Apr 2009 08:43:10 +0000 (10:43 +0200)]
Joyd publishes periodically
Michal Sojka [Mon, 20 Apr 2009 07:57:17 +0000 (09:57 +0200)]
types: Added correct deadlines to some ORTE variables
Michal Sojka [Mon, 20 Apr 2009 07:53:30 +0000 (09:53 +0200)]
cand: Odometry message contains sequence number
Michal Sojka [Mon, 20 Apr 2009 07:46:41 +0000 (09:46 +0200)]
h8c can: added option to filter received messages
Motor-control now receives only necessary messages.
Michal Sojka [Mon, 20 Apr 2009 06:20:59 +0000 (08:20 +0200)]
h8s can: Use HCAN_MC and HCAN_MD macros everywhere
Benes Petr [Mon, 20 Apr 2009 08:02:54 +0000 (10:02 +0200)]
Motion: work in progress 2
Filip Jares [Mon, 20 Apr 2009 07:35:27 +0000 (09:35 +0200)]
cand: CAN_LP_STATUS handling added
Marek Peca [Sun, 19 Apr 2009 18:44:07 +0000 (20:44 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Sun, 19 Apr 2009 19:16:36 +0000 (21:16 +0200)]
h8s can: removed unsafe typecast of registers to non-volitile variables
Double transmission of CAN frames still occurs.
Michal Sojka [Sun, 19 Apr 2009 12:57:31 +0000 (14:57 +0200)]
h8s can: Removed useless semicolons
Michal Sojka [Sun, 19 Apr 2009 12:13:32 +0000 (14:13 +0200)]
h8s: Added function to print CAN controler status
Michal Sojka [Sun, 19 Apr 2009 12:03:13 +0000 (14:03 +0200)]
h8s can: Debug messages DBG() instead of #ifdefs and printf
Michal Sojka [Sun, 19 Apr 2009 05:31:14 +0000 (07:31 +0200)]
h8s: Access to HCAN registers replaced by a nice macro
Michal Sojka [Sun, 19 Apr 2009 19:13:07 +0000 (21:13 +0200)]
lift: Slower speed when closer to the target position
This is necessary for precise positioning needed for Sharp sensor
not to see reflections from elevator.
Marek Peca [Sun, 19 Apr 2009 18:43:24 +0000 (20:43 +0200)]
camera: libjpeg warning output suppressed
Filip Jares [Sun, 19 Apr 2009 18:41:31 +0000 (20:41 +0200)]
sharp: show_puck_distance utility: units in output corrected
was incorrectly displayed in meters and units were stated to be cm
Filip Jares [Sun, 19 Apr 2009 18:22:18 +0000 (20:22 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Sun, 19 Apr 2009 18:22:10 +0000 (20:22 +0200)]
robofsm/robot_orte.c: typo that caused compilation error corrected
Michal Sojka [Sun, 19 Apr 2009 18:17:27 +0000 (20:17 +0200)]
joyd: Lift support
Filip Jares [Sun, 19 Apr 2009 18:16:07 +0000 (20:16 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Sun, 19 Apr 2009 18:16:01 +0000 (20:16 +0200)]
MAIN and ACT fsms: defined events changed; different puck_distance message handling
actual puck_distance is now stored in robot.puck_distance
EV_PUCK_REACHABLE is now received by the MAIN FSM instead of ACT FSM
Filip Jares [Sun, 19 Apr 2009 18:10:27 +0000 (20:10 +0200)]
fsm/fsm.h: missing function prototype added
Michal Sojka [Sun, 19 Apr 2009 18:06:48 +0000 (20:06 +0200)]
lift: Lift works perfectly :)
Filip Jares [Sun, 19 Apr 2009 18:04:57 +0000 (20:04 +0200)]
sharplib: puckSharp_ir2mm function now returns double to achieve bigger resolution
Benes Petr [Sun, 19 Apr 2009 17:41:34 +0000 (19:41 +0200)]
Motion: updated logging prepared for gnuplot
Marek Peca [Sun, 19 Apr 2009 16:42:06 +0000 (18:42 +0200)]
camera: puck recognition standalone program added
TODO:
- camera calibration routine, producing pdfmask.bin, written in MATLAB should be included
- to be incorporated into robotic sw
Martin Zidek [Sun, 19 Apr 2009 17:02:14 +0000 (19:02 +0200)]
robot_orte: start cable status indication
Martin Zidek [Sun, 19 Apr 2009 16:49:50 +0000 (18:49 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Sun, 19 Apr 2009 16:49:10 +0000 (18:49 +0200)]
disp: actuator_status status byte indication
Martin Zidek [Sun, 19 Apr 2009 16:48:43 +0000 (18:48 +0200)]
fsmdisplay: removed some printfs
Benes Petr [Sun, 19 Apr 2009 15:41:06 +0000 (17:41 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Benes Petr [Sun, 19 Apr 2009 15:40:55 +0000 (17:40 +0200)]
Motion: added a simple logging system for trajectory observation
Marek Peca [Sun, 19 Apr 2009 15:34:24 +0000 (17:34 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Sun, 19 Apr 2009 16:14:29 +0000 (18:14 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Sun, 19 Apr 2009 16:12:07 +0000 (18:12 +0200)]
eb_lift updated vhn motor driver
changed end switchs
Marek Peca [Sun, 19 Apr 2009 15:34:15 +0000 (17:34 +0200)]
camera: likelimg: bit endian justified to match Portable BitMap and hue.c convention
Marek Peca [Sun, 19 Apr 2009 14:43:44 +0000 (16:43 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Sun, 19 Apr 2009 15:35:16 +0000 (17:35 +0200)]
linux-shark: Added USB camera support
Michal Sojka [Sun, 19 Apr 2009 15:33:24 +0000 (17:33 +0200)]
robot-root: Today's backup
It was necessary to create /dev/ttyPSC* manually and these are unfortunately
not present the backup. They was created by:
for i in `seq 5`; do mknod ttyPSC$i c 204 $((148+i)); done
Marek Peca [Sun, 19 Apr 2009 14:43:35 +0000 (16:43 +0200)]
camera: added image hue & threshold computation
Benes Petr [Sun, 19 Apr 2009 13:44:23 +0000 (15:44 +0200)]
Merge branch 'master' into trajectory
Benes Petr [Sun, 19 Apr 2009 13:38:42 +0000 (15:38 +0200)]
trajectory: work in progress
Michal Sojka [Sun, 19 Apr 2009 12:50:37 +0000 (14:50 +0200)]
fsm: Fixed bug in FSM_TIMER_STOP()
The problem was, that the timer was invalidated, but loop->first was not.
Michal Sojka [Sun, 19 Apr 2009 12:49:27 +0000 (14:49 +0200)]
fsm: Fixed warning on 32bit systems
Martin Zidek [Sun, 19 Apr 2009 12:41:58 +0000 (14:41 +0200)]
disp: final version
Martin Zidek [Sun, 19 Apr 2009 09:34:27 +0000 (11:34 +0200)]
disp: game configuration indication now working
robot: added game_conf to robot structure (pucks configuration)
uoled: communication speed set to 19200
Filip Jares [Sat, 18 Apr 2009 20:16:11 +0000 (22:16 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Sat, 18 Apr 2009 20:16:01 +0000 (22:16 +0200)]
MAIN FSM: free puck pick up sequences added; collect_free_pucks state added
... jinak kosmeticke zmeny na ruznych mistech
Marek Peca [Sat, 18 Apr 2009 18:06:20 +0000 (20:06 +0200)]
camera: added bitmap image likelihood against probability density map
Jiri Kubias [Sat, 18 Apr 2009 16:36:18 +0000 (18:36 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Sat, 18 Apr 2009 16:35:38 +0000 (18:35 +0200)]
eb_lift fixed door positions