]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Michal Vokac [Sat, 25 May 2013 17:46:22 +0000 (19:46 +0200)]
robofsm: Approach arena with lost bear
Add obstacle walls in the maze part.
Just go through the maze to arena and return back. Movement tuning is necessary.
Michal Vokac [Sat, 25 May 2013 11:57:45 +0000 (13:57 +0200)]
robofsm: preparation for bear-rescue strategy
Michal Vokac [Sat, 25 May 2013 11:56:42 +0000 (13:56 +0200)]
robofsm: remove old competitions files
Michal Vokac [Sat, 25 May 2013 11:49:47 +0000 (13:49 +0200)]
pathplan: Decrease map cell size
Michal Vokac [Sat, 25 May 2013 11:46:16 +0000 (13:46 +0200)]
robodin: Update playground dimensions and robot starting position
Michal Vokac [Sat, 25 May 2013 11:44:39 +0000 (13:44 +0200)]
robomon: Show bear-rescue playground image in robomon
Michal Vokac [Sat, 25 May 2013 11:42:49 +0000 (13:42 +0200)]
robomon: No grid needed on playground
cv [Fri, 23 Nov 2012 15:59:04 +0000 (16:59 +0100)]
robofsm: repair joystick CATCH/OPEN/CLOSE constant
TODO: CATCH has same value as CLOSE, some difference might be in order
Martin Vajnar [Tue, 16 Oct 2012 21:10:51 +0000 (23:10 +0200)]
opencv: fix commit checkout
Michal Sojka [Tue, 16 Oct 2012 02:43:51 +0000 (04:43 +0200)]
Merge branch 'omk-fix' into sick-day
Michal Sojka [Tue, 16 Oct 2012 02:39:51 +0000 (04:39 +0200)]
Update OMK - fix CXXFLAGS bug
Martin Vajnar [Mon, 15 Oct 2012 21:20:27 +0000 (23:20 +0200)]
Revert ".gitignore: add build/gumstix/qt/.installjammerinfo and mkspecs/qws/linux-omap3-g++"
This reverts commit
4e949915f60a3b35bad48bafa4b291f1766c725a .
Martin Vajnar [Mon, 15 Oct 2012 13:31:03 +0000 (15:31 +0200)]
.gitignore: add build/gumstix/qt/.installjammerinfo and mkspecs/qws/linux-omap3-g++
Martin Vajnar [Mon, 15 Oct 2012 12:41:33 +0000 (14:41 +0200)]
gumstix: add target optimizations to CXXFLAGS and CFLAGS
Michal Vokac [Fri, 12 Oct 2012 07:53:04 +0000 (09:53 +0200)]
Merge remote-tracking branch 'origin/sick-day' into sick-day
Solved conflicts:
build/gumstix/config.target
build/gumstix/qt/linux-omap3-g++/qmake.conf
src/camera/color-finder/main/Makefile.omk
Martin Vajnar [Wed, 10 Oct 2012 19:12:24 +0000 (21:12 +0200)]
prepare_infrastructure: checkout Qt submodule and execute default-config pass in build/gumstix
Martin Vajnar [Wed, 10 Oct 2012 05:30:49 +0000 (07:30 +0200)]
gumstix: remove unneeded 'sed' from Makefile.omk for Qt
Since we are only using OpenGL ES 2.x we can hard-code it into qmake.conf.
Martin Vajnar [Tue, 9 Oct 2012 21:30:07 +0000 (23:30 +0200)]
gumstix: remove INSTALL
Martin Vajnar [Tue, 9 Oct 2012 21:27:03 +0000 (23:27 +0200)]
Set Qt branch to 4.6.0
Martin Vajnar [Tue, 9 Oct 2012 20:52:19 +0000 (22:52 +0200)]
gumstix: copy required OpenGL ES libraries to _compiled/lib during build
Martin Vajnar [Tue, 9 Oct 2012 19:17:14 +0000 (21:17 +0200)]
Compile color-finder for gumstix
Martin Vajnar [Tue, 9 Oct 2012 19:00:57 +0000 (21:00 +0200)]
Modify Makefiles to download CodeSourcery toolchain and the TI graphics binaries for Gumstix
To compile for gumstix:
1. go to soft/build/gumstix
2. run 'make distclean'
'make default-config'
'make'
During the installation of TI binaries the installer requires you
to interact several times to confirm that you wish to proceed
with the installation and to accept the EULA. When it asks you to
specify the destination folder just press Enter.
Martin Vajnar [Mon, 8 Oct 2012 16:33:23 +0000 (18:33 +0200)]
Fix compilation of color-finder and includes
Add pthread library and fix includes.
Martin Vajnar [Sat, 6 Oct 2012 11:11:56 +0000 (13:11 +0200)]
Merge branch 'personal/svedimon/color-finder' into sick-day
Michal Vokac [Sat, 6 Oct 2012 10:08:23 +0000 (12:08 +0200)]
camera/color-finder: Fix color-finder compilation for PPC and Gumstix.
Michal Vokac [Sat, 6 Oct 2012 10:04:48 +0000 (12:04 +0200)]
robofsm/robot_orte: Receive result from OMRON color sensor.
Michal Vokac [Sat, 6 Oct 2012 10:04:06 +0000 (12:04 +0200)]
robofsm/robot_orte: Receive angle to target from camera.
Michal Vokac [Sat, 6 Oct 2012 10:03:17 +0000 (12:03 +0200)]
robofsm/actuators: Update jaws positions.
Michal Vokac [Sat, 6 Oct 2012 10:02:26 +0000 (12:02 +0200)]
robodim: Update target radius.
Michal Vokac [Sat, 6 Oct 2012 10:02:04 +0000 (12:02 +0200)]
robofsm: Init jaws to open state before start.
Michal Vokac [Sat, 6 Oct 2012 10:01:35 +0000 (12:01 +0200)]
robofsm: Update competition time on display.
Michal Vokac [Sat, 6 Oct 2012 10:01:00 +0000 (12:01 +0200)]
robofsm: Increase movement speed.
Michal Vokac [Sat, 6 Oct 2012 10:00:09 +0000 (12:00 +0200)]
robofsm: Never use angle from camera.
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.