]> rtime.felk.cvut.cz Git - eurobot/public.git/log
eurobot/public.git
11 years agocommon: Add flags for color sensor can messages
Matous Pokorny [Tue, 2 Oct 2012 03:41:58 +0000 (05:41 +0200)]
common: Add flags for color sensor can messages

11 years agocommon: Change CAN_SWITCH_XX values
Matous Pokorny [Tue, 2 Oct 2012 03:40:44 +0000 (05:40 +0200)]
common: Change CAN_SWITCH_XX values

11 years agorobodim: Change sick-tim3xx orientation (screws up)
Matous Pokorny [Mon, 1 Oct 2012 17:12:16 +0000 (19:12 +0200)]
robodim: Change sick-tim3xx orientation (screws up)

11 years agosick-tim3xx: Remove print each sample to console
Matous Pokorny [Mon, 1 Oct 2012 17:07:56 +0000 (19:07 +0200)]
sick-tim3xx: Remove print each sample to console

11 years agoMerge branch 'sick-day' into update
Michal Vokac [Mon, 1 Oct 2012 16:53:28 +0000 (18:53 +0200)]
Merge branch 'sick-day' into update

11 years agorobofsm: Add FSM sub-states for target touch and load.
Michal Vokac [Mon, 1 Oct 2012 16:43:09 +0000 (18:43 +0200)]
robofsm: Add FSM sub-states for target touch and load.

11 years agorobofsm: Start using camera recognition in FSM.
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.

11 years agoeb_jaws_11: recognise three color + home button
cvrcevo1 [Mon, 1 Oct 2012 16:05:12 +0000 (18:05 +0200)]
eb_jaws_11: recognise three color + home button

11 years agocan_msg_def.h: add home button can message
cvrcevo1 [Mon, 1 Oct 2012 16:03:57 +0000 (18:03 +0200)]
can_msg_def.h: add home button can message

11 years agorobofsm/actuators: Send requested target color with control command to camera.
Michal Vokac [Mon, 1 Oct 2012 15:39:02 +0000 (17:39 +0200)]
robofsm/actuators: Send requested target color with control command to camera.

11 years agorobofsm: Update team colors - now we must handle three colors.
Michal Vokac [Mon, 1 Oct 2012 15:30:29 +0000 (17:30 +0200)]
robofsm: Update team colors - now we must handle three colors.

11 years agoeb_jaws_11: adding comments and enhance warning generating part
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

11 years agoeb_jaws_11: remove adc + fsm
cvrcevo1 [Mon, 1 Oct 2012 15:14:35 +0000 (17:14 +0200)]
eb_jaws_11: remove adc + fsm

probably causing servo shaking

11 years agoeb_jaws_11: remove ADC
cvrcevo1 [Mon, 1 Oct 2012 15:12:07 +0000 (17:12 +0200)]
eb_jaws_11: remove ADC

11 years agoMerge branch 'sick-day' into update
Michal Vokac [Mon, 1 Oct 2012 14:01:45 +0000 (16:01 +0200)]
Merge branch 'sick-day' into update

11 years agoMerge branch 'monika' into update
Michal Vokac [Mon, 1 Oct 2012 14:01:40 +0000 (16:01 +0200)]
Merge branch 'monika' into update

11 years agocamera/color-finder: print to orte and add signal stop
Monika Svedirohova [Sun, 30 Sep 2012 17:23:16 +0000 (19:23 +0200)]
camera/color-finder: print to orte and add signal stop

11 years agocamera/color-finder: add result info color
Monika Svedirohova [Sun, 30 Sep 2012 17:22:09 +0000 (19:22 +0200)]
camera/color-finder: add result info color

11 years agorobofsm: Increase match time to 10 minutes.
Michal Vokac [Sun, 30 Sep 2012 16:00:21 +0000 (18:00 +0200)]
robofsm: Increase match time to 10 minutes.

11 years agoMerge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into sick-day
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

11 years agoeb_jaws_11: adding buttons from lift to jaws+adding 3-color mode
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

11 years agocan_msg_def: adding three/four color choice
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

11 years agorobofsm: Receive data from camera recognition.
Michal Vokac [Sun, 30 Sep 2012 14:16:13 +0000 (16:16 +0200)]
robofsm: Receive data from camera recognition.

11 years agoMerge branch 'monika' into update
Michal Vokac [Sun, 30 Sep 2012 13:57:49 +0000 (15:57 +0200)]
Merge branch 'monika' into update

11 years agocamera/color-finder: send data to orte and console
Monika Svedirohova [Sun, 30 Sep 2012 13:57:16 +0000 (15:57 +0200)]
camera/color-finder: send data to orte and console

11 years agorobofsm: Rename EV_CRANE_DONE to EV_JAWS_DONE.
Michal Vokac [Sun, 30 Sep 2012 13:49:27 +0000 (15:49 +0200)]
robofsm: Rename EV_CRANE_DONE to EV_JAWS_DONE.

11 years agocamera/color-finder: fix bug - bad if for recognition
Monika Svedirohova [Sun, 30 Sep 2012 13:48:39 +0000 (15:48 +0200)]
camera/color-finder: fix bug - bad if for recognition

11 years agocamera/color-finder: recognition only mouse event or orte
Monika Svedirohova [Sun, 30 Sep 2012 13:42:24 +0000 (15:42 +0200)]
camera/color-finder: recognition only mouse event or orte

11 years agorobodim: Clear unused variables for Chess-up competition.
Michal Vokac [Sun, 30 Sep 2012 13:27:32 +0000 (15:27 +0200)]
robodim: Clear unused variables for Chess-up competition.

11 years agorobofsm: Add very slow trajectory constraints.
Michal Vokac [Thu, 15 Dec 2011 00:44:30 +0000 (01:44 +0100)]
robofsm: Add very slow trajectory constraints.

11 years agorobofsm: FSM state approach_target tuning.
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.

11 years agocamera/color-finder: add orte comunnactoin and input color
Monika Svedirohova [Sun, 30 Sep 2012 12:59:49 +0000 (14:59 +0200)]
camera/color-finder: add orte comunnactoin and input color

11 years agorobofsm: FSM state survey tuning.
Michal Vokac [Sun, 30 Sep 2012 12:38:34 +0000 (14:38 +0200)]
robofsm: FSM state survey tuning.

11 years agorobofsm: Tune function for target detection.
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).

11 years agorobofsm: Add functions for counting approach point and angle for specified target...
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.

11 years agorobofsm: Obstacle avoidance tuning.
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

11 years agorobofsm: Fix message print - add new line char.
Michal Vokac [Sun, 11 Dec 2011 01:35:25 +0000 (02:35 +0100)]
robofsm: Fix message print - add new line char.

11 years agorobodim: Clear unused parameters.
Michal Vokac [Sun, 30 Sep 2012 11:12:40 +0000 (13:12 +0200)]
robodim: Clear unused parameters.

11 years agorobofsm: Add constant for close target value.
Michal Vokac [Fri, 9 Dec 2011 16:05:56 +0000 (17:05 +0100)]
robofsm: Add constant for close target value.

11 years agorobofsm: Tune detect_target function.
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.

11 years agorobofsm: Decrease hokuyo minimum range initial value.
Michal Vokac [Fri, 9 Dec 2011 16:01:14 +0000 (17:01 +0100)]
robofsm: Decrease hokuyo minimum range initial value.

11 years agorobofsm: Stop robot when obstacle event occur in MOTION FSM.
Michal Vokac [Fri, 9 Dec 2011 15:58:45 +0000 (16:58 +0100)]
robofsm: Stop robot when obstacle event occur in MOTION FSM.

11 years agorobofsm: Generate random positions across whole playground.
Michal Vokac [Sun, 30 Sep 2012 10:52:40 +0000 (12:52 +0200)]
robofsm: Generate random positions across whole playground.

11 years agorobofsm: Allow path planing during rotation.
Michal Vokac [Sun, 30 Sep 2012 10:43:06 +0000 (12:43 +0200)]
robofsm: Allow path planing during rotation.

Using go_to instead of move_by path planing is used.
Path planer clears the map from unnecessary margins and so.

11 years agorobodim: Add robot diagonal radius.
Michal Vokac [Sun, 30 Sep 2012 10:40:34 +0000 (12:40 +0200)]
robodim: Add robot diagonal radius.

11 years agoRemove unused map flags and related functions.
Michal Vokac [Sun, 30 Sep 2012 10:38:15 +0000 (12:38 +0200)]
Remove unused map flags and related functions.

- MAP_FLAG_INVALIDATE_WALL
- MAP_FLAG_TARGET

11 years agorobofsm: Remove unused flag.
Michal Vokac [Sun, 30 Sep 2012 10:30:11 +0000 (12:30 +0200)]
robofsm: Remove unused flag.

11 years agocamera: Compile color-finder sources.
Michal Vokac [Sun, 30 Sep 2012 10:10:28 +0000 (12:10 +0200)]
camera: Compile color-finder sources.

11 years agoMerge branch 'sick-day' into monika
Michal Vokac [Sun, 30 Sep 2012 10:05:38 +0000 (12:05 +0200)]
Merge branch 'sick-day' into monika

11 years agocamera/color-finrer: Indentation correction.
Michal Vokac [Sun, 30 Sep 2012 10:05:07 +0000 (12:05 +0200)]
camera/color-finrer: Indentation correction.

11 years agorobofsm: Preliminary version of sick-day application.
Michal Vokac [Sun, 27 Nov 2011 16:07:20 +0000 (17:07 +0100)]
robofsm: Preliminary version of sick-day application.

This is almost copy of demo application.

After power-up it waits for start signal.

After start signal:

1. Uses shape_detect lib for target detection from hokuyo data.
2. Turns on the same point by 120deg and detect - max. three times.
3. When no detection - generates new random point max 2 meters far.
4. TODO - On detection - approach the target.
- Find cross-section point between path to the point and circle of some radius around the target.
- Map handling needs lots of changes and improvements.
  Actual type of map handling is not suitable for large spaces.

Solved conflicts:

src/robofsm/common-states.cc
src/robofsm/common-states.h
src/robofsm/sick-day.cc

11 years agocamera/color-finder: Add recognition on robot color
Monika Svedirohova [Sun, 30 Sep 2012 09:27:10 +0000 (11:27 +0200)]
camera/color-finder: Add recognition on robot color

11 years agocamera/color-finder: Add message to robot
Monika Svedirohova [Sun, 30 Sep 2012 09:25:35 +0000 (11:25 +0200)]
camera/color-finder: Add message to robot

11 years agocamera/color-finder: block control message
Monika Svedirohova [Sun, 30 Sep 2012 09:24:23 +0000 (11:24 +0200)]
camera/color-finder: block control message

11 years agocamera/color-finder: declaration info of color
Monika Svedirohova [Sun, 30 Sep 2012 09:21:31 +0000 (11:21 +0200)]
camera/color-finder: declaration info of color

11 years agocand: Update comments - now it is clear what is what.
Michal Vokac [Fri, 25 Nov 2011 10:10:12 +0000 (11:10 +0100)]
cand: Update comments - now it is clear what is what.

11 years agotypes: Remove unused type from ORTE.
Michal Vokac [Fri, 25 Nov 2011 09:47:32 +0000 (10:47 +0100)]
types: Remove unused type from ORTE.

11 years agoMerge branch 'sick-day' into update
Michal Vokac [Sun, 30 Sep 2012 07:49:33 +0000 (09:49 +0200)]
Merge branch 'sick-day' into update

11 years agoBuild sick library for PPC
Michal Sojka [Sat, 29 Sep 2012 18:44:07 +0000 (20:44 +0200)]
Build sick library for PPC

11 years agoMerge branch 'libusb' into sick-day
Michal Sojka [Sat, 29 Sep 2012 19:09:59 +0000 (21:09 +0200)]
Merge branch 'libusb' into sick-day

11 years agoAdd _compiled to search patch for .pc (pkg-config) files
Michal Sojka [Sat, 29 Sep 2012 18:43:27 +0000 (20:43 +0200)]
Add _compiled to search patch for .pc (pkg-config) files

This allows to link against recently added libusb as well as libraries
added in a similar way in future.

11 years agoTeach our make system how to build libusb for PowerPC
Michal Sojka [Sat, 29 Sep 2012 18:41:42 +0000 (20:41 +0200)]
Teach our make system how to build libusb for PowerPC

11 years agocamera/color-finder: Fix indentation.
Michal Vokac [Sat, 29 Sep 2012 16:40:27 +0000 (18:40 +0200)]
camera/color-finder: Fix indentation.

11 years agorobofsm: Preparation for camera revue recogniton program.
Michal Vokac [Sat, 29 Sep 2012 16:39:26 +0000 (18:39 +0200)]
robofsm: Preparation for camera revue recogniton program.

11 years agocamera/color-finder: Add ORTE communication functionality.
Michal Vokac [Sat, 29 Sep 2012 16:38:46 +0000 (18:38 +0200)]
camera/color-finder: Add ORTE communication functionality.

11 years agoMerge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into sick-day
cvrcevo1 [Sat, 29 Sep 2012 15:16:04 +0000 (17:16 +0200)]
Merge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into sick-day

11 years agoeb_jaws_11: moving buttons from eb_lift to eb_jaws_11
cvrcevo1 [Sat, 29 Sep 2012 15:11:49 +0000 (17:11 +0200)]
eb_jaws_11: moving buttons from eb_lift to eb_jaws_11

buttons are on GPIO port

11 years agocamera/color-finder: method for signal interrupt
Monika Svedirohova [Sat, 29 Sep 2012 14:55:45 +0000 (16:55 +0200)]
camera/color-finder: method for signal interrupt

11 years agocamera/color-finder: system on/off
Monika Svedirohova [Sat, 29 Sep 2012 14:54:13 +0000 (16:54 +0200)]
camera/color-finder: system on/off

11 years agocamera/color-finder: block control message
Monika Svedirohova [Sat, 29 Sep 2012 23:27:13 +0000 (01:27 +0200)]
camera/color-finder: block control message

11 years agocamera/color-finder: add debug for possition
Monika Svedirohova [Sat, 29 Sep 2012 22:44:48 +0000 (00:44 +0200)]
camera/color-finder: add debug for possition

11 years agocamera/color-finder: picture recognition on/off
Monika Svedirohova [Sat, 29 Sep 2012 22:43:39 +0000 (00:43 +0200)]
camera/color-finder: picture recognition on/off

11 years agocamera/color-finder: Add system version
Monika Svedirohova [Sat, 29 Sep 2012 22:42:17 +0000 (00:42 +0200)]
camera/color-finder: Add system version

11 years agocamer/color-finder: add hot keys
Monika Svedirohova [Sat, 29 Sep 2012 22:41:07 +0000 (00:41 +0200)]
camer/color-finder: add hot keys

11 years agocamera/color-finder: deleted robot initialized
Monika Svedirohova [Sat, 29 Sep 2012 21:48:47 +0000 (23:48 +0200)]
camera/color-finder: deleted robot initialized

11 years agocamera/color-finder: videodev2 - new system
Monika Svedirohova [Sat, 29 Sep 2012 21:48:04 +0000 (23:48 +0200)]
camera/color-finder: videodev2 - new system

11 years agocamera/color-finder: deleted number save images
Monika Svedirohova [Sat, 29 Sep 2012 21:45:41 +0000 (23:45 +0200)]
camera/color-finder: deleted number save images

11 years agocamera/color-finder: deleted hot keys
Monika Svedirohova [Sat, 29 Sep 2012 21:40:46 +0000 (23:40 +0200)]
camera/color-finder: deleted hot keys

11 years agocamera/color-finder: limited GUI for computer
Monika Svedirohova [Sat, 29 Sep 2012 21:31:23 +0000 (23:31 +0200)]
camera/color-finder: limited GUI for computer

11 years agocamera/color-finder: deleted message camera conttol and save images
Monika Svedirohova [Sat, 29 Sep 2012 21:29:16 +0000 (23:29 +0200)]
camera/color-finder: deleted message camera conttol and save images

11 years agocamera/color-finder: delete control message
Monika Svedirohova [Sat, 29 Sep 2012 21:23:08 +0000 (23:23 +0200)]
camera/color-finder: delete control message

11 years agocamera/color-finder: Add position x,y
Monika Svedirohova [Sat, 29 Sep 2012 17:44:30 +0000 (19:44 +0200)]
camera/color-finder: Add position x,y

11 years agorobofsm: Restrict playground space to circle
Matous Pokorny [Sat, 29 Sep 2012 10:25:14 +0000 (12:25 +0200)]
robofsm: Restrict playground space to circle

11 years agoeb_ebb: correcting comment error
cvrcevo1 [Sat, 29 Sep 2012 10:22:54 +0000 (12:22 +0200)]
eb_ebb: correcting comment error

11 years agoeb_jaws_11: add simple memory, missing CAN response!
cvrcevo1 [Sat, 29 Sep 2012 10:15:44 +0000 (12:15 +0200)]
eb_jaws_11: add simple memory, missing CAN response!

+tested with CAN command

11 years agocommon: add color sensor CAN message id
cvrcevo1 [Sat, 29 Sep 2012 10:13:24 +0000 (12:13 +0200)]
common: add color sensor CAN message id

11 years agoMerge branches 'update' and 'sick-day' into update
Michal Vokac [Sat, 29 Sep 2012 10:01:49 +0000 (12:01 +0200)]
Merge branches 'update' and 'sick-day' into update

11 years agohokuyo: Fix bug in hokuyo transformation
Matous Pokorny [Fri, 28 Sep 2012 19:43:41 +0000 (21:43 +0200)]
hokuyo: Fix bug in hokuyo transformation

11 years agosick-tim3xx: Fix bug in sick transformation
Matous Pokorny [Fri, 28 Sep 2012 19:42:56 +0000 (21:42 +0200)]
sick-tim3xx: Fix bug in sick transformation

11 years agoMerge branch 'update' into sick-day
Michal Vokac [Fri, 28 Sep 2012 17:08:37 +0000 (19:08 +0200)]
Merge branch 'update' into sick-day

11 years agoMerge branch 'sick-day' into merge_sick
Matous Pokorny [Fri, 28 Sep 2012 17:08:14 +0000 (19:08 +0200)]
Merge branch 'sick-day' into merge_sick

11 years agoMerge branch 'sickd' into sick-day
Matous Pokorny [Fri, 28 Sep 2012 16:56:08 +0000 (18:56 +0200)]
Merge branch 'sickd' into sick-day

11 years agorobofsm: Remove shape detecting from map handling
Matous Pokorny [Fri, 28 Sep 2012 16:54:14 +0000 (18:54 +0200)]
robofsm: Remove shape detecting from map handling

11 years agorobofsm: Add variable init
Matous Pokorny [Fri, 28 Sep 2012 16:53:28 +0000 (18:53 +0200)]
robofsm: Add variable init

11 years agosick-tim3xx: Fix stupid bug:)
Matous Pokorny [Fri, 28 Sep 2012 16:51:43 +0000 (18:51 +0200)]
sick-tim3xx: Fix stupid bug:)

11 years agosick-tim3xx: Add udev rule file and readme file
Matous Pokorny [Fri, 28 Sep 2012 14:30:10 +0000 (16:30 +0200)]
sick-tim3xx: Add udev rule file and readme file

11 years agorobomon: Change event name and orte subsriber/publisher
Matous Pokorny [Fri, 28 Sep 2012 14:05:46 +0000 (16:05 +0200)]
robomon: Change event name and orte subsriber/publisher

11 years agorobofsm: Demo FSM machine testing.
Michal Vokac [Thu, 3 Mar 2011 12:11:50 +0000 (13:11 +0100)]
robofsm: Demo FSM machine testing.

11 years agorobomon: Replace hokuyo with sick for opponent detection, hokuyo is used for shape...
Matous Pokorny [Fri, 28 Sep 2012 13:13:23 +0000 (15:13 +0200)]
robomon: Replace hokuyo with sick for opponent detection, hokuyo is used for shape detect

11 years agorobofsm: Replace hokuyo with sick in map handling
Matous Pokorny [Fri, 28 Sep 2012 13:11:06 +0000 (15:11 +0200)]
robofsm: Replace hokuyo with sick in map handling