]> rtime.felk.cvut.cz Git - eurobot/public.git/log
eurobot/public.git
13 years agodisplayqt: Fix linker error
Michal Sojka [Sun, 24 Apr 2011 06:21:06 +0000 (08:21 +0200)]
displayqt: Fix linker error

13 years agoDo not compile rozkuk this year
Michal Sojka [Sun, 24 Apr 2011 06:20:40 +0000 (08:20 +0200)]
Do not compile rozkuk this year

13 years agoMerge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot
pokormat [Fri, 22 Apr 2011 22:20:09 +0000 (00:20 +0200)]
Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

Conflicts:
src/eb_lift_11/fsm.h
src/eb_lift_11/fsm_lift.c

13 years agoeb_lift_11: add irc and end switches, homing with timeout
pokormat [Fri, 22 Apr 2011 22:14:51 +0000 (00:14 +0200)]
eb_lift_11: add irc and end switches, homing with timeout

13 years agoeb_lift_11: add irc and end switches, homing
pokormat [Fri, 22 Apr 2011 21:54:02 +0000 (23:54 +0200)]
eb_lift_11: add irc and end switches, homing

13 years agoeb_lift_11: function start, color. Todo: read pulses from irc.
pokormat [Fri, 22 Apr 2011 20:44:51 +0000 (22:44 +0200)]
eb_lift_11: function start, color. Todo: read pulses from irc.

13 years agoeb_jaws_11: complete function, need more test - bumpers, jaws
pokormat [Fri, 22 Apr 2011 20:42:19 +0000 (22:42 +0200)]
eb_jaws_11: complete function, need more test - bumpers, jaws

13 years agoeb_jaws_11: first function compilation without fsm, bumpers not work correctly
pokormat [Thu, 14 Apr 2011 06:33:30 +0000 (08:33 +0200)]
eb_jaws_11: first function compilation without fsm, bumpers not work correctly

13 years agoMerge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot
pokormat [Wed, 13 Apr 2011 11:29:37 +0000 (13:29 +0200)]
Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

13 years agoeb_jaws_11: some clearing
pokormat [Wed, 13 Apr 2011 11:27:29 +0000 (13:27 +0200)]
eb_jaws_11: some clearing

13 years agoeb_jaws_11: add left and right variable
pokormat [Wed, 13 Apr 2011 11:19:58 +0000 (13:19 +0200)]
eb_jaws_11: add left and right variable

13 years agocommon: add ids and flags for jaws mechanism
pokormat [Wed, 13 Apr 2011 11:17:23 +0000 (13:17 +0200)]
common: add ids and flags for jaws mechanism

13 years agocommon: Removed unused can IDs.
Michal Vokac [Wed, 13 Apr 2011 11:12:48 +0000 (13:12 +0200)]
common: Removed unused can IDs.

I removed unused IDs of can messages.

13 years agoMerge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot
pokormat [Tue, 12 Apr 2011 07:23:02 +0000 (09:23 +0200)]
Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

13 years agoMerge branch 'pathplan'
pokormat [Mon, 11 Apr 2011 21:51:05 +0000 (23:51 +0200)]
Merge branch 'pathplan'

13 years agoadd bumper can msg def, add bumper funcionality to jaws, not pin to bumper asigment...
ehiker [Mon, 11 Apr 2011 21:36:49 +0000 (23:36 +0200)]
add bumper can msg def, add bumper funcionality to jaws, not pin to bumper asigment, not jaws fsm implementation

13 years agoAdd a simple test for A* algorithm
Michal Sojka [Mon, 11 Apr 2011 21:33:55 +0000 (23:33 +0200)]
Add a simple test for A* algorithm

This is meant for Matous to test his new planning algorithm.

13 years agobarcode: Next testing version, nothing more.
Miroslav Strob [Mon, 11 Apr 2011 19:24:43 +0000 (21:24 +0200)]
barcode: Next testing version, nothing more.

13 years agobarcode: Solve problem with ebboard reset.
Michal Vokac [Fri, 8 Apr 2011 14:55:08 +0000 (16:55 +0200)]
barcode: Solve problem with ebboard reset.

Toogle DTR and RTS signal and drive the ebboard from reset state.
Problem printing position chars from eb_vidle app. with printf() fnc. - there are some bad "tea chars".
Putchar works OK, why is that?

13 years agoMerge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot
Miroslav Strob [Fri, 8 Apr 2011 09:04:07 +0000 (11:04 +0200)]
Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

13 years agobarcode: Testing version of barcode app.
Miroslav Strob [Fri, 8 Apr 2011 09:03:49 +0000 (11:03 +0200)]
barcode: Testing version of barcode app.

The program is not working properly. It resets the arm board connected via USB.

13 years agodoc: Add the list of prerequisites needed to compile the whole thing
Michal Sojka [Fri, 8 Apr 2011 05:12:43 +0000 (07:12 +0200)]
doc: Add the list of prerequisites needed to compile the whole thing

13 years agoMerge branch 'pathplan' of ssh://rtime.felk.cvut.cz/eurobot into pathplan
ehiker [Thu, 7 Apr 2011 20:12:21 +0000 (22:12 +0200)]
Merge branch 'pathplan' of ssh://rtime.felk.cvut.cz/eurobot into pathplan

13 years agoCheckout pxmc sources automatically when prepare_infrastructure is run
Michal Sojka [Thu, 7 Apr 2011 17:47:25 +0000 (19:47 +0200)]
Checkout pxmc sources automatically when prepare_infrastructure is run

13 years agoUpdate to a new version of PXMC kindly provided by P. Pisa
Michal Sojka [Thu, 7 Apr 2011 17:37:10 +0000 (19:37 +0200)]
Update to a new version of PXMC kindly provided by P. Pisa

Also add comments with license information and make the PXMC based
applications print the required (by GPL) copyright notice and no warranty
message.

13 years agoMerge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot
Michal Vokac [Thu, 7 Apr 2011 14:01:44 +0000 (16:01 +0200)]
Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

Conflicts:
src/barcode/Makefile.omk

13 years agobarcode: Add file structure for barcode reader program.
Michal Vokac [Thu, 7 Apr 2011 13:42:38 +0000 (15:42 +0200)]
barcode: Add file structure for barcode reader program.

13 years agobuild: Fix forgotten rename linux -> host.
Michal Vokac [Thu, 31 Mar 2011 11:58:02 +0000 (13:58 +0200)]
build: Fix forgotten rename linux -> host.

13 years agobarcode: Add file structure for barcode reader program.
Michal Vokac [Wed, 6 Apr 2011 09:55:37 +0000 (11:55 +0200)]
barcode: Add file structure for barcode reader program.

13 years agodisplay-qt: Hiding the cursor.
Miroslav Strob [Tue, 5 Apr 2011 13:19:00 +0000 (15:19 +0200)]
display-qt: Hiding the cursor.

Hiding the cursor from the screen.

13 years agodisplay-qt: Widget dimensions changed
Miroslav Strob [Sun, 3 Apr 2011 07:15:52 +0000 (09:15 +0200)]
display-qt: Widget dimensions changed

Widged height changed to 272px. One variable was changed to static.

13 years agodisplay-qt: Create the window without the title bar.
Michal Vokac [Fri, 1 Apr 2011 13:50:20 +0000 (15:50 +0200)]
display-qt: Create the window without the title bar.

13 years agogumstix: Compilation of display-qt now works
Michal Sojka [Thu, 31 Mar 2011 17:43:34 +0000 (19:43 +0200)]
gumstix: Compilation of display-qt now works

13 years agogumstix: Compile QT automatically
Michal Sojka [Thu, 31 Mar 2011 17:31:56 +0000 (19:31 +0200)]
gumstix: Compile QT automatically

13 years agogumstix: Add preliminary configuration for QT compilation
Michal Sojka [Thu, 31 Mar 2011 13:03:08 +0000 (15:03 +0200)]
gumstix: Add preliminary configuration for QT compilation

13 years agoMerge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot
Michal Vokac [Thu, 31 Mar 2011 11:59:59 +0000 (13:59 +0200)]
Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

13 years agobuild/gumstix: Add directory for cross-compilation for gumstix.
Michal Vokac [Thu, 31 Mar 2011 11:59:27 +0000 (13:59 +0200)]
build/gumstix: Add directory for cross-compilation for gumstix.

13 years agobuild: Fix forgotten rename linux -> host.
Michal Vokac [Thu, 31 Mar 2011 11:58:02 +0000 (13:58 +0200)]
build: Fix forgotten rename linux -> host.

13 years agodisplay-qt : Some files and function were renamed (only).
Miroslav Strob [Wed, 30 Mar 2011 15:30:13 +0000 (17:30 +0200)]
display-qt : Some files and function were renamed (only).

Classes names changed.
Functions names changed.
GUI was updated.

13 years agodisplay-qt: Second version with Orte.
Miroslav Strob [Wed, 30 Mar 2011 10:57:20 +0000 (12:57 +0200)]
display-qt: Second version with Orte.

Removed GUI Form.
Added Orte.

13 years agodisplay-qt: Fix build failures by linking with proper libraries
Miroslav Strob [Tue, 29 Mar 2011 08:31:53 +0000 (10:31 +0200)]
display-qt: Fix build failures by linking with proper libraries

13 years agodisplay-qt: First version
Miroslav Strob [Tue, 29 Mar 2011 08:25:19 +0000 (10:25 +0200)]
display-qt: First version

13 years agoPreparation for display application in QT
Miroslav Strob [Fri, 18 Mar 2011 12:13:51 +0000 (13:13 +0100)]
Preparation for display application in QT

13 years agoshapedet: Allow better testing
Michal Sojka [Thu, 17 Mar 2011 09:53:45 +0000 (10:53 +0100)]
shapedet: Allow better testing

To test shapedet behaviour, the following steps were done:
- gnuplot support was removed from shape_det library
- gnuplot support was added to shape_detect_offline test program and
  plotting is catvated by -g switch.
- shape_detect_offline prints the detected objects to stdout

With these changes, it is possible to test shape detector with
individual data sets and tune the results based on this.

13 years agoMerge branch 'master' into shapedet
Michal Sojka [Thu, 17 Mar 2011 08:20:43 +0000 (09:20 +0100)]
Merge branch 'master' into shapedet

13 years agoUpdate Makefile.rules to the latest version
Michal Sojka [Thu, 17 Mar 2011 08:19:48 +0000 (09:19 +0100)]
Update Makefile.rules to the latest version

13 years agoshapedet: Include examples in documentation directly from sources
Michal Sojka [Thu, 17 Mar 2011 07:57:01 +0000 (08:57 +0100)]
shapedet: Include examples in documentation directly from sources

This ensures that the documentation is up-to-date and in a compilable
state.

13 years agoshapedet: Split text program into two versions - online and offline
Michal Sojka [Thu, 17 Mar 2011 07:35:59 +0000 (08:35 +0100)]
shapedet: Split text program into two versions - online and offline

The use if #ifdef inside the code is not good. The online version was
in a uncompilable state, because it was not compiled at all.

13 years agoshapedet: Documentation overhaul
Michal Sojka [Thu, 17 Mar 2011 07:02:51 +0000 (08:02 +0100)]
shapedet: Documentation overhaul

13 years agoshape_detect: optimalization detection of obstacle (diameter 20cm).
Martin Synek [Wed, 16 Mar 2011 20:07:21 +0000 (21:07 +0100)]
shape_detect: optimalization detection of obstacle (diameter 20cm).

13 years agoAdd USB loader for LPC17xx from ulan
Michal Sojka [Tue, 15 Mar 2011 16:21:51 +0000 (17:21 +0100)]
Add USB loader for LPC17xx from ulan

13 years agorobomon: Set no brash for drawing detected shapes
Michal Sojka [Tue, 15 Mar 2011 10:06:43 +0000 (11:06 +0100)]
robomon: Set no brash for drawing detected shapes

13 years agorobomon: Randomize hokuyo simulation
Michal Sojka [Tue, 15 Mar 2011 10:06:14 +0000 (11:06 +0100)]
robomon: Randomize hokuyo simulation

13 years agorobomon: More error prone hokuyo simulation
Michal Sojka [Tue, 15 Mar 2011 09:58:03 +0000 (10:58 +0100)]
robomon: More error prone hokuyo simulation

13 years agorobomon: Draw detected arcs as circles
Michal Sojka [Tue, 15 Mar 2011 09:41:53 +0000 (10:41 +0100)]
robomon: Draw detected arcs as circles

13 years agoshape_detect: Correct calculation of arc radius.
Martin Synek [Tue, 15 Mar 2011 09:37:09 +0000 (10:37 +0100)]
shape_detect: Correct calculation of arc radius.

13 years agohokuyoscan/shape_detect: Add drawing arc center (green point).
Martin Synek [Tue, 15 Mar 2011 06:55:01 +0000 (07:55 +0100)]
hokuyoscan/shape_detect: Add drawing arc center (green point).
shape_detect: Correct calculation of arc center.

13 years agorobomon/hokuyoscan: add visualization detect arc in window robomon.
Martin Synek [Sat, 12 Mar 2011 16:36:45 +0000 (17:36 +0100)]
robomon/hokuyoscan: add visualization detect arc in window robomon.
green line: detected arc
yellow line: detected line

13 years agoShape_detect:
Martin Synek [Sat, 12 Mar 2011 16:25:30 +0000 (17:25 +0100)]
Shape_detect:
Create data type Arc.
Modification function fit_arc, shape_detect -> prepare.
Modification Software Documentation.

13 years agorobomon: add function to calculate the real distance to the simulated cylinder
Martin Synek [Sat, 12 Mar 2011 15:56:52 +0000 (16:56 +0100)]
robomon: add function to calculate the real distance to the simulated cylinder

13 years agoMerge branch 'shapedet' of ssh://rtime.felk.cvut.cz/eurobot into shapedet
Martin Synek [Wed, 9 Mar 2011 16:22:03 +0000 (17:22 +0100)]
Merge branch 'shapedet' of ssh://rtime.felk.cvut.cz/eurobot into shapedet

13 years agorobomon: Add TODO for intersection calculation
Michal Sojka [Wed, 9 Mar 2011 13:47:29 +0000 (14:47 +0100)]
robomon: Add TODO for intersection calculation

13 years agoshapedet: Better API
Michal Sojka [Wed, 9 Mar 2011 13:40:25 +0000 (14:40 +0100)]
shapedet: Better API

This needs to be implemented later.

13 years agohokuyo: Show more information in error message
Michal Sojka [Wed, 9 Mar 2011 11:56:36 +0000 (12:56 +0100)]
hokuyo: Show more information in error message

13 years agoMerge remote branch 'origin/master' into shapedet
Martin Synek [Wed, 9 Mar 2011 11:05:16 +0000 (12:05 +0100)]
Merge remote branch 'origin/master' into shapedet

13 years agoShape_detect: First version arc detection from laser scan data.
Martin Synek [Wed, 9 Mar 2011 05:16:35 +0000 (06:16 +0100)]
Shape_detect: First version arc detection from laser scan data.

13 years agoMerge remote branch 'origin/shapedet'
Michal Sojka [Tue, 1 Mar 2011 22:21:37 +0000 (23:21 +0100)]
Merge remote branch 'origin/shapedet'

13 years agoAdd hokuyo-dump program
Michal Sojka [Tue, 1 Mar 2011 22:20:48 +0000 (23:20 +0100)]
Add hokuyo-dump program

This dumps data from one hokuyo scan in text format to stdout.

13 years agoMerge branch 'shapedet' of ssh://rtime.felk.cvut.cz/eurobot into shapedet
Martin Synek [Mon, 28 Feb 2011 17:36:30 +0000 (18:36 +0100)]
Merge branch 'shapedet' of ssh://rtime.felk.cvut.cz/eurobot into shapedet

13 years agoshape_detect.h: midified flag GNUPLOT, can't open window Gnuplot in application robomon.
Martin Synek [Mon, 28 Feb 2011 17:30:04 +0000 (18:30 +0100)]
shape_detect.h: midified flag GNUPLOT, can't open window Gnuplot in application robomon.

13 years agorobomon: Remove shapedet debugging output
Michal Sojka [Mon, 28 Feb 2011 13:16:21 +0000 (14:16 +0100)]
robomon: Remove shapedet debugging output

13 years agoshape_detect: create documentation class Shape_detect
Martin Synek [Fri, 25 Feb 2011 14:24:04 +0000 (15:24 +0100)]
shape_detect: create documentation class Shape_detect

13 years ago1. Added two constructors -> default (settings for Hokuyo) and with parameters for...
Martin Synek [Thu, 24 Feb 2011 07:53:34 +0000 (08:53 +0100)]
1. Added two constructors -> default (settings for Hokuyo) and with parameters for setting property detection.
2. Input parameter method shape_detect is laser scan data (type unsigned short).

13 years agoAdd local copy of c2gnuplot.h
Michal Sojka [Wed, 16 Feb 2011 11:40:02 +0000 (12:40 +0100)]
Add local copy of c2gnuplot.h

The is needed to compile barcam correctly on systems without c2gnuplot
installed.

13 years agorobot: Add wall flag to the map for known obsatcles = start block, protected area.
Michal Vokac [Sun, 13 Feb 2011 12:21:02 +0000 (13:21 +0100)]
robot: Add wall flag to the map for known obsatcles = start block, protected area.

13 years agorobomon: Move the map image to the upper layer, there was conflict with start blocks.
Michal Vokac [Sun, 13 Feb 2011 11:58:41 +0000 (12:58 +0100)]
robomon: Move the map image to the upper layer, there was conflict with start blocks.

13 years agorobofsm: Fix bug (wrong commit) in map handling.
Michal Vokac [Fri, 11 Feb 2011 15:33:28 +0000 (16:33 +0100)]
robofsm: Fix bug (wrong commit) in map handling.

Ignore obstacles further than hokuyo maximum range.

13 years agorobomon: Map transformation changes.
Michal Vokac [Fri, 11 Feb 2011 15:23:47 +0000 (16:23 +0100)]
robomon: Map transformation changes.

Transformation of map image from bitmap coordinates to playground coordinates changed. now it is done in map painting method. Added trasnparency.

13 years agomap handling: Ignore obstacles further than hokuyo maximum range.
Michal Vokac [Fri, 4 Feb 2011 15:06:33 +0000 (16:06 +0100)]
map handling: Ignore obstacles further than hokuyo maximum range.

13 years agoall: Fix error with cornslib.
Michal Vokac [Mon, 31 Jan 2011 23:46:59 +0000 (00:46 +0100)]
all: Fix error with cornslib.

13 years agorobomon: Problem with map scale solved. Map repainting is realtively fast now.
Michal Vokac [Mon, 31 Jan 2011 22:56:05 +0000 (23:56 +0100)]
robomon: Problem with map scale solved. Map repainting is realtively fast now.

Conflicts:

src/robomon/PlaygroundScene.cpp

13 years agorobodim + map: Better connection between robodim.h and map.h
Michal Sojka [Fri, 11 Feb 2011 16:31:41 +0000 (17:31 +0100)]
robodim + map: Better connection between robodim.h and map.h

When changing playground dimensions, robodim.h is the only place whre you
have to do that.

13 years agoI got rid of ultrasound localization and corns-config in demo.
Michal Sojka [Fri, 11 Feb 2011 16:11:08 +0000 (17:11 +0100)]
I got rid of ultrasound localization and corns-config in demo.

13 years agorobomon: Map changed from rectangles to bitmap.
Michal Sojka [Fri, 11 Feb 2011 16:26:41 +0000 (17:26 +0100)]
robomon: Map changed from rectangles to bitmap.

This should be faster. The map is not showed in appropriate scale now. Why??

Conflicts:

src/robomon/PlaygroundScene.cpp

13 years agoMerge branch 'master' of rtime.felk.cvut.cz:/eurobot
Michal Sojka [Fri, 11 Feb 2011 14:00:33 +0000 (15:00 +0100)]
Merge branch 'master' of rtime.felk.cvut.cz:/eurobot

13 years agoUpdate Makefile.rules to fix problems with robomon dependecies
Michal Sojka [Fri, 11 Feb 2011 14:00:25 +0000 (15:00 +0100)]
Update Makefile.rules to fix problems with robomon dependecies

13 years agoAdd Mirek and move out former members
Michal Sojka [Wed, 26 Jan 2011 12:48:37 +0000 (13:48 +0100)]
Add Mirek and move out former members

13 years agobarcam: changes in fft abs value calculation.
Michal Vokac [Tue, 25 Jan 2011 12:11:27 +0000 (13:11 +0100)]
barcam: changes in fft abs value calculation.

13 years agorobomon: Allow shape-detect to be switched on/off from menu
Michal Sojka [Tue, 18 Jan 2011 12:24:08 +0000 (13:24 +0100)]
robomon: Allow shape-detect to be switched on/off from menu

13 years agorobomon: Whitespace fixes
Michal Sojka [Tue, 18 Jan 2011 12:23:14 +0000 (13:23 +0100)]
robomon: Whitespace fixes

13 years agorobomon: Fix drawing of detected lines
Michal Sojka [Tue, 18 Jan 2011 12:10:12 +0000 (13:10 +0100)]
robomon: Fix drawing of detected lines

13 years agoFix a QT warning
Michal Sojka [Tue, 18 Jan 2011 11:48:50 +0000 (12:48 +0100)]
Fix a QT warning

13 years agoFix Makefiles to compile shape-detect with robomon
Michal Sojka [Tue, 18 Jan 2011 11:48:37 +0000 (12:48 +0100)]
Fix Makefiles to compile shape-detect with robomon

13 years agoFix inclusion of robodata.h
Michal Sojka [Tue, 18 Jan 2011 11:48:15 +0000 (12:48 +0100)]
Fix inclusion of robodata.h

13 years agoMerge branch 'master' into shapedet
Michal Sojka [Tue, 18 Jan 2011 11:37:19 +0000 (12:37 +0100)]
Merge branch 'master' into shapedet

Conflicts:
src/robomon/robomon.pro

13 years agoMainWindow: add menu item (robomon): View -> Show shape detect
Martin Synek [Tue, 18 Jan 2011 07:33:31 +0000 (08:33 +0100)]
MainWindow: add menu item (robomon): View -> Show shape detect
hokuyoscan: add method drawShapeDetect
robomon.pro: add library lshape_detect

13 years agoMerge branch 'strobmir'
Michal Sojka [Fri, 14 Jan 2011 13:18:25 +0000 (14:18 +0100)]
Merge branch 'strobmir'

13 years agoFix robomon after conversion from printf's to ul_log
Michal Sojka [Fri, 14 Jan 2011 13:18:10 +0000 (14:18 +0100)]
Fix robomon after conversion from printf's to ul_log

13 years agoCreate library "shape_detect". Renamed "main.cc" to "shape_detect.cc". File "main...
Martin Synek [Thu, 13 Jan 2011 11:02:36 +0000 (12:02 +0100)]
Create library "shape_detect". Renamed "main.cc" to "shape_detect.cc". File "main.cc" is designed for debug.

13 years agoRobofsm files were rewrited to ul_log
Miroslav [Thu, 6 Jan 2011 21:47:31 +0000 (22:47 +0100)]
Robofsm files were rewrited to ul_log