]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Michal Vokac [Sat, 6 Oct 2012 09:59:28 +0000 (11:59 +0200)]
robofsm: Set target RGB color for camera recognition.
Michal Vokac [Fri, 5 Oct 2012 23:04:21 +0000 (01:04 +0200)]
robofsm: Increase movement speed.
Michal Vokac [Fri, 5 Oct 2012 23:03:43 +0000 (01:03 +0200)]
robofsm: Strategy automaton tuning.
Michal Vokac [Fri, 5 Oct 2012 22:57:00 +0000 (00:57 +0200)]
robofsm: All targets are within playground.
Michal Vokac [Fri, 5 Oct 2012 22:54:53 +0000 (00:54 +0200)]
robofsm: Add function for OMRON color sensor control.
Michal Vokac [Fri, 5 Oct 2012 22:53:54 +0000 (00:53 +0200)]
shape-detect: Update target radius.
Michal Vokac [Fri, 5 Oct 2012 17:38:35 +0000 (19:38 +0200)]
Merge remote-tracking branch 'origin/personal/svedimon/color-finder' into update
Michal Vokac [Fri, 5 Oct 2012 16:40:55 +0000 (18:40 +0200)]
robofsm: Target detection and approach testing.
Michal Vokac [Fri, 5 Oct 2012 16:37:07 +0000 (18:37 +0200)]
robofsm: Strategy automaton tunning.
- remove unused events
- debug messages update
Michal Vokac [Fri, 5 Oct 2012 16:18:03 +0000 (18:18 +0200)]
Ignore gumstix toolchain build files and binaries.
Michal Vokac [Fri, 5 Oct 2012 16:16:50 +0000 (18:16 +0200)]
build/gumstix: Update path to my toolchain.
Matous Pokorny [Fri, 5 Oct 2012 14:01:03 +0000 (16:01 +0200)]
camera/color-finder: Remove libsdl from cross compilation
Monika Svedirohova [Thu, 4 Oct 2012 20:13:15 +0000 (22:13 +0200)]
camera/color-finder: add angle
Monika Svedirohova [Thu, 4 Oct 2012 20:11:35 +0000 (22:11 +0200)]
camera/colorfinder: add recognition white color
Martin Vajnar [Wed, 3 Oct 2012 12:12:21 +0000 (14:12 +0200)]
gumstix: update INSTALL
Matous Pokorny [Wed, 3 Oct 2012 11:53:58 +0000 (13:53 +0200)]
Merge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into sick-day
Matous Pokorny [Wed, 3 Oct 2012 11:43:43 +0000 (13:43 +0200)]
cand: Fix compilation error
No sharp sensor is used in Sick robot day competition.
Martin Vajnar [Tue, 2 Oct 2012 21:39:13 +0000 (23:39 +0200)]
gumstix: update INSTALL
Martin Vajnar [Tue, 2 Oct 2012 21:06:08 +0000 (23:06 +0200)]
host: compile libusb
Compile libusb for host.
Martin Vajnar [Tue, 2 Oct 2012 21:01:43 +0000 (23:01 +0200)]
gumstix: compile libusb and Qt
Second try to compile Qt for gumstix.
Michal Vokac [Tue, 2 Oct 2012 18:03:00 +0000 (20:03 +0200)]
cand: Fix compilation error.
Michal Vokac [Tue, 2 Oct 2012 17:51:38 +0000 (19:51 +0200)]
Merge branch 'sick-day' into update
Michal Vokac [Tue, 2 Oct 2012 17:51:23 +0000 (19:51 +0200)]
Merge remote-tracking branch 'origin/personal/pokormat/moniky_color-finder' into update
Martin Vajnar [Tue, 2 Oct 2012 13:41:46 +0000 (15:41 +0200)]
Fixed display-qt compilation for gumstix.
Matous Pokorny [Tue, 2 Oct 2012 12:01:59 +0000 (14:01 +0200)]
Merge branch 'sick-day' into moniky_color-finder
Conflicts:
src/types/robottype.idl
Matous Pokorny [Tue, 2 Oct 2012 11:10:35 +0000 (13:10 +0200)]
display-qt: Replace lift status on display by Sick sensor status
Matous Pokorny [Tue, 2 Oct 2012 10:55:29 +0000 (12:55 +0200)]
display-qt: Change names in hw status enum
I change names in hw status enum to remove collision with other declaration.
Matous Pokorny [Tue, 2 Oct 2012 10:36:30 +0000 (12:36 +0200)]
display-qt: Change displayed team color for Sick robot day competition
Matous Pokorny [Tue, 2 Oct 2012 09:20:39 +0000 (11:20 +0200)]
robofsm: Change names of team color enum
I change names in team color enum to remove collision with other declaration.
Matous Pokorny [Tue, 2 Oct 2012 04:12:14 +0000 (06:12 +0200)]
cand: Add color sensor command subscriber
Color sensor command message is send to CAN.
Matous Pokorny [Tue, 2 Oct 2012 04:10:10 +0000 (06:10 +0200)]
cand: Add color sensor status publisher
Matous Pokorny [Tue, 2 Oct 2012 04:08:15 +0000 (06:08 +0200)]
cand: Add second color switch
Raw value from CAN is send to ORTE.
Matous Pokorny [Tue, 2 Oct 2012 04:04:12 +0000 (06:04 +0200)]
cand: Add home button (switches mess.)
Matous Pokorny [Tue, 2 Oct 2012 04:00:02 +0000 (06:00 +0200)]
types: Add color sensor status and command messages in to ORTE
Matous Pokorny [Tue, 2 Oct 2012 03:58:42 +0000 (05:58 +0200)]
types: Add home button to switches message in ORTE
Matous Pokorny [Tue, 2 Oct 2012 03:52:00 +0000 (05:52 +0200)]
eb_jaws_11: Use can message define in color sensor status message
Matous Pokorny [Tue, 2 Oct 2012 03:48:11 +0000 (05:48 +0200)]
eb_jaws_11: Color sensor command (bank number) is one byte can mess.
Matous Pokorny [Tue, 2 Oct 2012 03:45:25 +0000 (05:45 +0200)]
eb_jaws_11: Team color value like in robot.h
Matous Pokorny [Tue, 2 Oct 2012 03:41:58 +0000 (05:41 +0200)]
common: Add flags for color sensor can messages
Matous Pokorny [Tue, 2 Oct 2012 03:40:44 +0000 (05:40 +0200)]
common: Change CAN_SWITCH_XX values
Michal Vokac [Fri, 30 Dec 2011 15:09:01 +0000 (16:09 +0100)]
robofsm: Try mac 3 times approach target.
If five times obstacle event occurs, send motion error signal.
Michal Vokac [Mon, 1 Oct 2012 22:45:57 +0000 (00:45 +0200)]
robofsm: Wait max 10 seconds for camera recognition.
Michal Vokac [Fri, 30 Dec 2011 14:34:50 +0000 (15:34 +0100)]
robofsm: Change close approach target style.
First turn head to target.
Than approach it and at the end turn head to the target.
Michal Vokac [Mon, 1 Oct 2012 22:30:14 +0000 (00:30 +0200)]
Merge branch 'monika' into update
Michal Vokac [Mon, 1 Oct 2012 22:27:28 +0000 (00:27 +0200)]
Merge branch 'sick-day' into update
Michal Vokac [Mon, 1 Oct 2012 22:21:50 +0000 (00:21 +0200)]
robofsm: Jaws movement tuning.
Monika Svedirohova [Mon, 1 Oct 2012 17:54:16 +0000 (19:54 +0200)]
camera/color-finder: correct print of camera
Monika Svedirohova [Mon, 1 Oct 2012 17:53:24 +0000 (19:53 +0200)]
camera/color-finder: add teamcolor to recognition
Monika Svedirohova [Mon, 1 Oct 2012 17:52:01 +0000 (19:52 +0200)]
camera/color-finder: add data_target, data_valit to orte and receive team_color from orte
Michal Vokac [Fri, 16 Dec 2011 18:09:47 +0000 (19:09 +0100)]
robofsm: Disable camera at start-up.
Michal Vokac [Fri, 16 Dec 2011 18:08:23 +0000 (19:08 +0100)]
robofsm: Target detection
Do not return true when target detected but out of range!
Simply return number of detected targets inside playground.
Michal Vokac [Thu, 15 Dec 2011 19:38:24 +0000 (20:38 +0100)]
robofsm: Better move_around error handling.
When can not reach new point for survey, stay where you are and survey.
Michal Vokac [Thu, 15 Dec 2011 18:43:08 +0000 (19:43 +0100)]
robofsm: Better approach target function.
do:
- turn head to target
- go forward small step
while: hokuyo minimum is greater then close to target
Michal Vokac [Thu, 15 Dec 2011 18:37:29 +0000 (19:37 +0100)]
robofsm: Decrease hokuyo range when touching target.
Michal Vokac [Thu, 15 Dec 2011 18:35:41 +0000 (19:35 +0100)]
robofsm: Fix homing position bug - wrong units.
Michal Vokac [Thu, 15 Dec 2011 18:34:15 +0000 (19:34 +0100)]
robofsm: Obstacle avoidance controlled with one function.
Michal Vokac [Mon, 1 Oct 2012 17:24:43 +0000 (19:24 +0200)]
robofsm: Add debugging printouts.
Michal Vokac [Thu, 15 Dec 2011 00:56:18 +0000 (01:56 +0100)]
robofsm: Add condition for target valid but not loaded.
What to do then?
Michal Vokac [Mon, 1 Oct 2012 17:20:36 +0000 (19:20 +0200)]
Remove NOP :)
Matous Pokorny [Mon, 1 Oct 2012 17:12:16 +0000 (19:12 +0200)]
robodim: Change sick-tim3xx orientation (screws up)
Matous Pokorny [Mon, 1 Oct 2012 17:07:56 +0000 (19:07 +0200)]
sick-tim3xx: Remove print each sample to console
Michal Vokac [Mon, 1 Oct 2012 16:53:28 +0000 (18:53 +0200)]
Merge branch 'sick-day' into update
Michal Vokac [Mon, 1 Oct 2012 16:43:09 +0000 (18:43 +0200)]
robofsm: Add FSM sub-states for target touch and load.
Michal Vokac [Mon, 1 Oct 2012 16:41:02 +0000 (18:41 +0200)]
robofsm: Start using camera recognition in FSM.
Add new FSM event on camera recognition done.
cvrcevo1 [Mon, 1 Oct 2012 16:05:12 +0000 (18:05 +0200)]
eb_jaws_11: recognise three color + home button
cvrcevo1 [Mon, 1 Oct 2012 16:03:57 +0000 (18:03 +0200)]
can_msg_def.h: add home button can message
Michal Vokac [Mon, 1 Oct 2012 15:39:02 +0000 (17:39 +0200)]
robofsm/actuators: Send requested target color with control command to camera.
Michal Vokac [Mon, 1 Oct 2012 15:30:29 +0000 (17:30 +0200)]
robofsm: Update team colors - now we must handle three colors.
cvrcevo1 [Mon, 1 Oct 2012 15:21:19 +0000 (17:21 +0200)]
eb_jaws_11: adding comments and enhance warning generating part
in function SET_MIN when using "-" the argument should be in parenthesis
cvrcevo1 [Mon, 1 Oct 2012 15:14:35 +0000 (17:14 +0200)]
eb_jaws_11: remove adc + fsm
probably causing servo shaking
cvrcevo1 [Mon, 1 Oct 2012 15:12:07 +0000 (17:12 +0200)]
eb_jaws_11: remove ADC
Michal Vokac [Mon, 1 Oct 2012 14:01:45 +0000 (16:01 +0200)]
Merge branch 'sick-day' into update
Michal Vokac [Mon, 1 Oct 2012 14:01:40 +0000 (16:01 +0200)]
Merge branch 'monika' into update
Monika Svedirohova [Sun, 30 Sep 2012 17:23:16 +0000 (19:23 +0200)]
camera/color-finder: print to orte and add signal stop
Monika Svedirohova [Sun, 30 Sep 2012 17:22:09 +0000 (19:22 +0200)]
camera/color-finder: add result info color
Michal Vokac [Sun, 30 Sep 2012 16:00:21 +0000 (18:00 +0200)]
robofsm: Increase match time to 10 minutes.
cvrcevo1 [Sun, 30 Sep 2012 15:19:59 +0000 (17:19 +0200)]
Merge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into sick-day
cvrcevo1 [Sun, 30 Sep 2012 15:19:44 +0000 (17:19 +0200)]
eb_jaws_11: adding buttons from lift to jaws+adding 3-color mode
cvrcevo1 [Sun, 30 Sep 2012 15:02:42 +0000 (17:02 +0200)]
can_msg_def: adding three/four color choice
expand color to color_0 and color_1
Michal Vokac [Sun, 30 Sep 2012 14:16:13 +0000 (16:16 +0200)]
robofsm: Receive data from camera recognition.
Michal Vokac [Sun, 30 Sep 2012 13:57:49 +0000 (15:57 +0200)]
Merge branch 'monika' into update
Monika Svedirohova [Sun, 30 Sep 2012 13:57:16 +0000 (15:57 +0200)]
camera/color-finder: send data to orte and console
Michal Vokac [Sun, 30 Sep 2012 13:49:27 +0000 (15:49 +0200)]
robofsm: Rename EV_CRANE_DONE to EV_JAWS_DONE.
Monika Svedirohova [Sun, 30 Sep 2012 13:48:39 +0000 (15:48 +0200)]
camera/color-finder: fix bug - bad if for recognition
Monika Svedirohova [Sun, 30 Sep 2012 13:42:24 +0000 (15:42 +0200)]
camera/color-finder: recognition only mouse event or orte
Michal Vokac [Sun, 30 Sep 2012 13:27:32 +0000 (15:27 +0200)]
robodim: Clear unused variables for Chess-up competition.
Michal Vokac [Thu, 15 Dec 2011 00:44:30 +0000 (01:44 +0100)]
robofsm: Add very slow trajectory constraints.
Michal Vokac [Sun, 30 Sep 2012 13:00:53 +0000 (15:00 +0200)]
robofsm: FSM state approach_target tuning.
Cycle over all detected targets and approach them.
After successful approach go to sub automaton and do recognition.
If target loaded, go home.
Monika Svedirohova [Sun, 30 Sep 2012 12:59:49 +0000 (14:59 +0200)]
camera/color-finder: add orte comunnactoin and input color
Michal Vokac [Sun, 30 Sep 2012 12:38:34 +0000 (14:38 +0200)]
robofsm: FSM state survey tuning.
Michal Vokac [Sun, 11 Dec 2011 12:55:54 +0000 (13:55 +0100)]
robofsm: Tune function for target detection.
Run shape detection and store centers of all detected targets in a global variable (vector).
Michal Vokac [Sun, 30 Sep 2012 11:18:14 +0000 (13:18 +0200)]
robofsm: Add functions for counting approach point and angle for specified target position.
Michal Vokac [Sun, 30 Sep 2012 11:16:26 +0000 (13:16 +0200)]
robofsm: Obstacle avoidance tuning.
motion-control:
- count only with the center of the robot
fsmmove:
- count a real free space in front of the robot
Michal Vokac [Sun, 11 Dec 2011 01:35:25 +0000 (02:35 +0100)]
robofsm: Fix message print - add new line char.
Michal Vokac [Sun, 30 Sep 2012 11:12:40 +0000 (13:12 +0200)]
robodim: Clear unused parameters.
Michal Vokac [Fri, 9 Dec 2011 16:05:56 +0000 (17:05 +0100)]
robofsm: Add constant for close target value.
Michal Vokac [Fri, 9 Dec 2011 16:05:17 +0000 (17:05 +0100)]
robofsm: Tune detect_target function.
Check if any target detected first and then do other things.
Michal Vokac [Fri, 9 Dec 2011 16:01:14 +0000 (17:01 +0100)]
robofsm: Decrease hokuyo minimum range initial value.
Michal Vokac [Fri, 9 Dec 2011 15:58:45 +0000 (16:58 +0100)]
robofsm: Stop robot when obstacle event occur in MOTION FSM.
Michal Vokac [Sun, 30 Sep 2012 10:52:40 +0000 (12:52 +0200)]
robofsm: Generate random positions across whole playground.