]> rtime.felk.cvut.cz Git - eurobot/public.git/log
eurobot/public.git
11 years agoMerge branch 'libusb' ms-test
Michal Sojka [Sat, 29 Sep 2012 19:15:45 +0000 (21:15 +0200)]
Merge branch 'libusb'

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 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 agoFix compilation errors on recent Linux distributions
Michal Sojka [Wed, 19 Sep 2012 15:11:17 +0000 (17:11 +0200)]
Fix compilation errors on recent Linux distributions

Note: This fix is not needed for master branch because it includes
stdio.h which provides NULL. However, to keep the differences between
master and demo branches minimal, I apply this change also to master.

11 years agoPrekopirovani linux.conf do adresare qt a uprava Makefile.omk.
Martin Vajnar [Fri, 3 Aug 2012 14:02:55 +0000 (16:02 +0200)]
Prekopirovani linux.conf do adresare qt a uprava Makefile.omk.

11 years agoCommitter: Martin Vajnar <martin.vajnar@gmail.com>
Martin Vajnar [Fri, 3 Aug 2012 13:37:01 +0000 (15:37 +0200)]
Committer: Martin Vajnar <martin.vajnar@gmail.com>

Podpora TS a OpenGL akcelerace v Qt4 pro Gumstix. Dalsi info v /soft/build/gumstix/INSTALL.

11 years agoFix grammar in documentation
Michal Sojka [Mon, 30 Jul 2012 12:46:33 +0000 (14:46 +0200)]
Fix grammar in documentation

11 years agoUpdate Makefile.rules to support .cpp extension of C++ sources
Michal Sojka [Mon, 9 Jul 2012 17:07:42 +0000 (19:07 +0200)]
Update Makefile.rules to support .cpp extension of C++ sources

11 years agodoc: Update team members contact list
pokormat [Mon, 9 Jul 2012 16:09:14 +0000 (18:09 +0200)]
doc: Update team members contact list

11 years agoFix MCL compilation for Simulink
Michal Sojka [Mon, 2 Jul 2012 15:44:06 +0000 (17:44 +0200)]
Fix MCL compilation for Simulink

11 years agorobofsm: Competition strategy tuning.
Michal Vokac [Fri, 25 May 2012 16:46:57 +0000 (18:46 +0200)]
robofsm: Competition strategy tuning.

11 years agorobofsm: Move odometry calibration function to special file.
Michal Vokac [Fri, 25 May 2012 16:42:34 +0000 (18:42 +0200)]
robofsm: Move odometry calibration function to special file.

11 years agorobofsm: Do not calibrate odometery right after robot init.
Michal Vokac [Fri, 25 May 2012 16:35:15 +0000 (18:35 +0200)]
robofsm: Do not calibrate odometery right after robot init.

11 years agorobofsm: Add flags into map.
Michal Vokac [Fri, 25 May 2012 16:34:27 +0000 (18:34 +0200)]
robofsm: Add flags into map.

Increase ignore obstacle area around playground borders.
Add flag wall around totems.

11 years agorobofsm: Match time decreased.
Michal Vokac [Fri, 25 May 2012 16:24:36 +0000 (18:24 +0200)]
robofsm: Match time decreased.

We got warning for being moving with actuators after match time elapsed.
This is caused by the competition program restart so we simply decrease the timer.

11 years agorobofsm: Update jaws and lift positions.
Michal Vokac [Fri, 25 May 2012 15:57:17 +0000 (17:57 +0200)]
robofsm: Update jaws and lift positions.

Added delay between left and right jaw for better closing/opening.

11 years agorobodim: Hokuyo returned back to original position.
Michal Vokac [Fri, 25 May 2012 15:32:39 +0000 (17:32 +0200)]
robodim: Hokuyo returned back to original position.

11 years agorobomon: Add button for strategy switching.
Michal Vokac [Sat, 12 May 2012 00:11:14 +0000 (02:11 +0200)]
robomon: Add button for strategy switching.

How to use only one function for this purpose?
I do not want to use func_1 for sending value 1 and func_0 for sending value 0.

11 years agorobofsm: Separation of homologation, calibration and competition states.
Michal Vokac [Fri, 11 May 2012 22:49:29 +0000 (00:49 +0200)]
robofsm: Separation of homologation, calibration and competition states.

11 years agodisplay-gt: Display mouse cursor and title bar on PC.
Michal Vokac [Fri, 11 May 2012 22:48:04 +0000 (00:48 +0200)]
display-gt: Display mouse cursor and title bar on PC.

11 years agohokuyo: Add hokuyo orientation parameter.
Michal Vokac [Tue, 8 May 2012 15:54:05 +0000 (17:54 +0200)]
hokuyo: Add hokuyo orientation parameter.

It is possible to change hokuyo mounting orientation (normal/upside-down) using one flag.

11 years agorobodim: Add decimal part to all dimension definitions.
Michal Vokac [Tue, 8 May 2012 15:52:11 +0000 (17:52 +0200)]
robodim: Add decimal part to all dimension definitions.

11 years agorobodim: Update hokuyo range + add hokuyo orientation definition.
Michal Vokac [Tue, 8 May 2012 15:50:57 +0000 (17:50 +0200)]
robodim: Update hokuyo range + add hokuyo orientation definition.

11 years agoeb_lift: Use expansion pot number defines.
Michal Vokac [Tue, 8 May 2012 15:49:22 +0000 (17:49 +0200)]
eb_lift: Use expansion pot number defines.

11 years agoeb_jaws: Use expansion port number defines + do not use FSM for servo control.
Michal Vokac [Tue, 8 May 2012 15:48:43 +0000 (17:48 +0200)]
eb_jaws: Use expansion port number defines + do not use FSM for servo control.

11 years agodisplay-qt: Update color names for actual playground.
Michal Vokac [Tue, 8 May 2012 15:47:10 +0000 (17:47 +0200)]
display-qt: Update color names for actual playground.

11 years agorobofsm: Strategy
petr [Tue, 8 May 2012 10:17:44 +0000 (12:17 +0200)]
robofsm: Strategy

Include homologation as strategy into competition machine.

11 years agorobofsm: Strategy
petr [Tue, 8 May 2012 09:51:58 +0000 (11:51 +0200)]
robofsm: Strategy

Implicitly wait for start plug.

Correction of odo calibration in robomon.

11 years agoTeam color
petr [Tue, 8 May 2012 08:21:02 +0000 (10:21 +0200)]
Team color

Change team colors for this year competition.

11 years agoOdometry autocalibration
petr [Mon, 7 May 2012 21:48:20 +0000 (23:48 +0200)]
Odometry autocalibration

Updated saving calibration data for better reading. Left column for left odometry wheel and right for right odometry wheel.

11 years agoOdometry autocalibration
petr [Mon, 7 May 2012 21:29:17 +0000 (23:29 +0200)]
Odometry autocalibration

Correction of mean calculation and shorten time for testing traversed distance.

12 years agoOdometry calibration
petr [Fri, 4 May 2012 15:16:29 +0000 (17:16 +0200)]
Odometry calibration

Correct measured distance.

12 years agoOdometry autocalibration
petr [Fri, 4 May 2012 13:43:52 +0000 (15:43 +0200)]
Odometry autocalibration

Change sign for writing into file.

Update output for user. (show traveled distance)

12 years agoOdometry autocalibration
petr [Fri, 4 May 2012 13:25:54 +0000 (15:25 +0200)]
Odometry autocalibration

Correction of wrong calibration when using cal data.

12 years agoOdometry autocalibration
petr [Sat, 28 Apr 2012 18:51:45 +0000 (20:51 +0200)]
Odometry autocalibration

Remove calculation of distance using motor irc.

12 years agoeb_lift: Add new project that is common lift ccntroler for year 2012 and the future...
Matous Pokorny [Fri, 27 Apr 2012 15:27:44 +0000 (17:27 +0200)]
eb_lift: Add new project that is common lift ccntroler for year 2012 and the future using.

12 years agoAutocalibration odometry
petr [Fri, 27 Apr 2012 13:57:59 +0000 (15:57 +0200)]
Autocalibration odometry

Update length of trajectory.

12 years agorobofsm: Strategy
petr [Fri, 27 Apr 2012 13:46:23 +0000 (15:46 +0200)]
robofsm: Strategy

New strategy for odometry autocalibration. Robot goes back and calibrate its odometry.

12 years agorobofsm: Odometry autocalibration
petr [Fri, 27 Apr 2012 13:45:37 +0000 (15:45 +0200)]
robofsm: Odometry autocalibration

Prepare functions for odometry autocalibration.

12 years agorobofsm: Strategy
petr [Fri, 27 Apr 2012 13:44:13 +0000 (15:44 +0200)]
robofsm: Strategy

Add event for strategy switching

12 years agorobofsm: Competition strategy
petr [Wed, 18 Apr 2012 17:46:48 +0000 (19:46 +0200)]
robofsm: Competition strategy

Finished first strategy for competition.

12 years agorobofsm: Strategy pick central buillon
petr [Mon, 16 Apr 2012 19:55:08 +0000 (21:55 +0200)]
robofsm: Strategy pick central buillon

Prepare new strategy for competition. (Removed from file competition2012)

Update Makefile for correct compilation

12 years agorobofsm: Prepare state files for strategies
petr [Mon, 16 Apr 2012 19:53:40 +0000 (21:53 +0200)]
robofsm: Prepare state files for strategies

Remove file content from last year and prepare for this year competitions.

12 years agorobofsm: Map 2012
petr [Fri, 13 Apr 2012 13:57:04 +0000 (15:57 +0200)]
robofsm: Map 2012

Update dimensions.

12 years agorobofsm: Map
petr [Thu, 12 Apr 2012 06:39:39 +0000 (08:39 +0200)]
robofsm: Map

Correction of palm tree radius.

12 years agorobofsm: Map for this year
petr [Wed, 11 Apr 2012 20:25:10 +0000 (22:25 +0200)]
robofsm: Map for this year

Remove old map definition from file. Add new obstacle description for this year.

12 years agorobofsm: Competition2012
petr [Thu, 29 Mar 2012 11:46:53 +0000 (13:46 +0200)]
robofsm: Competition2012

Add new state for returning back on the board.

12 years agorobofsm: Competition
petr [Sun, 25 Mar 2012 14:34:02 +0000 (16:34 +0200)]
robofsm: Competition

Different strategy implemented.

The bottle is now pushed using backward.

12 years agorobofsm: Homologation
petr [Sun, 25 Mar 2012 14:32:38 +0000 (16:32 +0200)]
robofsm: Homologation

More elegant version of homologation with no backward.

12 years agorobofsm: competition2012
petr [Sun, 18 Mar 2012 14:36:08 +0000 (15:36 +0100)]
robofsm: competition2012

Finished first idea of competition trajectory.

Homologation + collecting the buillons from the nearest totem. After the buillons are collected, they are transported into captain's cabin.

12 years agorobofsm: Competition 2012
petr [Thu, 15 Mar 2012 20:40:13 +0000 (21:40 +0100)]
robofsm: Competition 2012

Simple competition state machine. Go to the nearest totem and go back on the boat.

12 years agorobofsm: Homologation 2012
petr [Sat, 10 Mar 2012 10:20:32 +0000 (11:20 +0100)]
robofsm: Homologation 2012

Removed timers and trajectory simplification.

12 years agorobofsm: Makefile.omk
Vojtech Cvrcek [Wed, 7 Mar 2012 20:05:25 +0000 (21:05 +0100)]
robofsm: Makefile.omk

make Makefile accepting homologation change

12 years agorobofsm: Homologation 2012
petr [Tue, 28 Feb 2012 19:28:10 +0000 (20:28 +0100)]
robofsm: Homologation 2012

Remove commentaries from the jaws action. Working correctly in Robomon.

12 years agorobofsm: Homologation 2012
petr [Sat, 25 Feb 2012 10:33:49 +0000 (11:33 +0100)]
robofsm: Homologation 2012

Update positions of waypoints.

12 years agorobofsm: Homologation 2012
petr [Tue, 21 Feb 2012 14:59:13 +0000 (15:59 +0100)]
robofsm: Homologation 2012
Add file with homologation state automaton. All actions with jaws are commented.

What it does:
Robot goes to the nearest buillon put it on the board and go to push the nearest bottle.

12 years agorobofsm: Prepare for 2012.
Vitek Ruzicka [Thu, 8 Dec 2011 11:42:31 +0000 (12:42 +0100)]
robofsm: Prepare for 2012.

No strategy_* to be included, cleaning Makefile.
Don't compile competition, not working yet.

12 years agorobomon: No corns!
Vitek Ruzicka [Thu, 8 Dec 2011 11:38:50 +0000 (12:38 +0100)]
robomon: No corns!

12 years agorobofsm: Move old files from Eurobot 2010.
Vitek Ruzicka [Thu, 8 Dec 2011 11:38:26 +0000 (12:38 +0100)]
robofsm: Move old files from Eurobot 2010.

12 years agorobofsm: Moved old files from Eurobot 2011.
Vitek Ruzicka [Thu, 8 Dec 2011 11:15:36 +0000 (12:15 +0100)]
robofsm: Moved old files from Eurobot 2011.

12 years agoeb_test: converting latch to fsm
Vojtech Cvrcek [Wed, 7 Dec 2011 20:35:31 +0000 (21:35 +0100)]
eb_test: converting latch to fsm

I return fsm_vidle.c back to Makefile and make very simple fsm latch
controlled by button.

12 years agoeb_test: button working
Vojtech Cvrcek [Wed, 7 Dec 2011 18:48:13 +0000 (19:48 +0100)]
eb_test: button working

testing easy button reading(beginner friendly)

12 years agoeb_test: making things easier
Vojtech Cvrcek [Thu, 1 Dec 2011 11:28:15 +0000 (12:28 +0100)]
eb_test: making things easier

12 years agodoc: update contacts
Vojtech Cvrcek [Thu, 1 Dec 2011 11:18:09 +0000 (12:18 +0100)]
doc: update contacts

12 years agosysless: eb_ebb lib removed from sysless
Michal Vokac [Thu, 1 Dec 2011 09:05:18 +0000 (10:05 +0100)]
sysless: eb_ebb lib removed from sysless

12 years agoAdded the image :-)
Adam Heinrich [Thu, 1 Dec 2011 07:55:44 +0000 (08:55 +0100)]
Added the image :-)

12 years agoChanged the image for Eurobot 2012 playground (now we have playground_eurobot2012...
Adam Heinrich [Thu, 1 Dec 2011 07:53:07 +0000 (08:53 +0100)]
Changed the image for Eurobot 2012 playground (now we have playground_eurobot2012.png and playground_eurobot2012_1024.png)

12 years agoUpdated my contacts
Adam Heinrich [Thu, 1 Dec 2011 07:44:25 +0000 (08:44 +0100)]
Updated my contacts

12 years agobuild: Update link to eb_ebb lib.
Michal Vokac [Wed, 30 Nov 2011 16:34:20 +0000 (17:34 +0100)]
build: Update link to eb_ebb lib.

12 years agoeb_ebb: Move eb_ebb lib from sysless submodule to standard eurobot src tree.
Michal Vokac [Wed, 30 Nov 2011 16:34:02 +0000 (17:34 +0100)]
eb_ebb: Move eb_ebb lib from sysless submodule to standard eurobot src tree.

12 years agoeb_test: Fix compile error.
Michal Vokac [Wed, 30 Nov 2011 13:13:28 +0000 (14:13 +0100)]
eb_test: Fix compile error.

12 years agodoc: Update team members contacts.
Michal Vokac [Wed, 30 Nov 2011 11:03:13 +0000 (12:03 +0100)]
doc: Update team members contacts.

12 years agoAdd my contact details
petr [Sun, 27 Nov 2011 21:48:34 +0000 (22:48 +0100)]
Add my contact details

12 years agodoc: Update team members contact list.
Michal Vokac [Sun, 27 Nov 2011 21:23:16 +0000 (22:23 +0100)]
doc: Update team members contact list.

12 years agoImage eurobot_playground2012.png added to the resources sectionm.
Adam Heinrich [Wed, 23 Nov 2011 18:48:16 +0000 (19:48 +0100)]
Image eurobot_playground2012.png added to the resources sectionm.

12 years agoUpdate submodule URLs to absolute ones
Michal Sojka [Mon, 21 Nov 2011 08:58:20 +0000 (09:58 +0100)]
Update submodule URLs to absolute ones

This is necessary for submodules to stay working after I moved the repo
from /eurobot to /eurobot/soft. The old URL is a symlink to the new one
and thanks to absolute URLs, now, submodules should work the same
independently of which URL is used to clone the main repository.

12 years agoMerge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot
Vojtech [Thu, 10 Nov 2011 11:56:38 +0000 (12:56 +0100)]
Merge branch 'master' of ssh://rtime.felk.cvut.cz/eurobot

12 years agoeb_test: add eb_test dir
Vojtech [Thu, 10 Nov 2011 11:40:56 +0000 (12:40 +0100)]
eb_test: add eb_test dir

12 years agoUpdated scene to match Eutobot 2012 theme. I used PNG image instead of coding.
Adam Heinrich [Wed, 9 Nov 2011 19:59:37 +0000 (20:59 +0100)]
Updated scene to match Eutobot 2012 theme. I used PNG image instead of coding.

12 years agoUpdated scene to match Eutobot 2012 theme. I used PNG image instead of coding.
Adam Heinrich [Wed, 9 Nov 2011 19:58:32 +0000 (20:58 +0100)]
Updated scene to match Eutobot 2012 theme. I used PNG image instead of coding.

12 years agomotion: Fix compile error.
Michal Vokac [Thu, 20 Oct 2011 12:10:38 +0000 (14:10 +0200)]
motion: Fix compile error.

There was problem with NULL definition, adding the stdio header solved the problem.

12 years agocand: Forgot remove this line when merging pre-previous commit from demo branch.
Michal Vokac [Fri, 14 Oct 2011 11:30:40 +0000 (13:30 +0200)]
cand: Forgot remove this line when merging pre-previous commit from demo branch.

12 years agotypes: Variables in pwr_alert structure renamed to more clear names.
Michal Vokac [Fri, 14 Oct 2011 09:02:08 +0000 (11:02 +0200)]
types: Variables in pwr_alert structure renamed to more clear names.

12 years agocand: Fix bug with power alert handling.
Michal Vokac [Fri, 14 Oct 2011 09:24:54 +0000 (10:24 +0100)]
cand: Fix bug with power alert handling.

I think the previous version is wrong - PWR board sends CAN msgs when voltages are out of limits.
But CAN daemon do not receive and parse msgs with this alert ID.
Instead can daemon received alert msgs from ORTE and forwarded them to CAN.

Now I fixed this and alert msgs from PWR board are parsed and forwarded to ORTE.

12 years agoeb_pwr: New version of power management.
Michal Vokac [Thu, 13 Oct 2011 14:19:00 +0000 (15:19 +0100)]
eb_pwr: New version of power management.

- time measurement using global variable with time
Now time is measured in the same manner as in the other modules (ie. eb_vidle atc).
The code is more clear ant later improvements are easier.

- I have moved all the definitions to header files, add def.h file.
This improves clarity and readability.

- Now 5V and 3.3V power supply is switched off only when battery is in critical state.
Prevents cyclic on/off switching of all the boards in the robot.

Still this algorithm needs improvements, but now CAN communication is more reliable.

12 years agoUpdated reference to actual Rtime PXMC version cloned from PiKRON repository.
Pavel Pisa [Sat, 2 Jul 2011 10:15:13 +0000 (12:15 +0200)]
Updated reference to actual Rtime PXMC version cloned from PiKRON repository.

Alternate history has been kept under eurobot-2011 branch
to allow submodule updates for older Eurobot code revisions.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
12 years agoAll gumstix binaries are included now
Michal Sojka [Thu, 23 Jun 2011 17:12:30 +0000 (19:12 +0200)]
All gumstix binaries are included now

12 years agoAdd gumstix binaries (root image etc.) as a git submodule
Michal Sojka [Wed, 22 Jun 2011 22:06:28 +0000 (00:06 +0200)]
Add gumstix binaries (root image etc.) as a git submodule

The history of the repository was rewritten to not contain these binaries.
It was about 500 MB of data that was not useful for most people. Now,
the data can only be checkout if needed by

  git submodule update --init bin/gumstix

(note: The rest of the binaries will be uploaded laster when I have a
better connection.)

12 years agoMerge branch 'shapedet'
Michal Sojka [Wed, 22 Jun 2011 19:57:22 +0000 (21:57 +0200)]
Merge branch 'shapedet'

12 years agorobofsm: common-states tuning
Michal Vokac [Fri, 3 Jun 2011 10:31:11 +0000 (12:31 +0200)]
robofsm: common-states tuning

This is states after Germany competition.
I am is not able to separate and describe this changes.

12 years agorobofsm: Removes some old unused code.
Michal Vokac [Fri, 3 Jun 2011 10:10:40 +0000 (12:10 +0200)]
robofsm: Removes some old unused code.

12 years agorobofsm: Add function for royal figures recognition.
Michal Vokac [Fri, 3 Jun 2011 10:09:46 +0000 (12:09 +0200)]
robofsm: Add function for royal figures recognition.

Function reads distance from front sharp connected to ebBoard ADC input
previously used for left jaw potentiometer reading.
If distance is smaller than limit we say figure is royal = return true, if greater, it is pawn = return false.

12 years agorobofsm: Add new states.
Michal Vokac [Fri, 3 Jun 2011 10:03:56 +0000 (12:03 +0200)]
robofsm: Add new states.

Added pick opponent bonus figure FSM.
Added pick fifth figure FSM.
Added pick center figure FSM.
Added new common states for placing third figure on another square when bonus square is full.

12 years agorobofsm: Go to appropriate strategy on strategy switch event.
Michal Vokac [Fri, 3 Jun 2011 09:57:53 +0000 (11:57 +0200)]
robofsm: Go to appropriate strategy on strategy switch event.

12 years agorobofsm: Competition movement speeds tuning.
Michal Vokac [Fri, 3 Jun 2011 09:56:42 +0000 (11:56 +0200)]
robofsm: Competition movement speeds tuning.

12 years agorobofsm: Fix problem with timespec_substract function.
Michal Vokac [Fri, 3 Jun 2011 09:37:56 +0000 (11:37 +0200)]
robofsm: Fix problem with timespec_substract function.

timespec_substract function slightly changed value in start time structure,
(it puts negative value in start time nsec variable) which causes problem when WAIT macro (clock_nanosleep function) was called again.

12 years agorobofsm: Enable timer for short time to end measurement.
Michal Vokac [Fri, 3 Jun 2011 09:30:56 +0000 (11:30 +0200)]
robofsm: Enable timer for short time to end measurement.

12 years agorobofsm: Match timing tuning.
Michal Vokac [Fri, 3 Jun 2011 09:29:35 +0000 (11:29 +0200)]
robofsm: Match timing tuning.

Time to deposite = short time to end increased.

12 years agojoyd: Lift actuator control uses position definitions instead of hard coded values.
Michal Vokac [Fri, 3 Jun 2011 09:26:49 +0000 (11:26 +0200)]
joyd: Lift actuator control uses position definitions instead of hard coded values.