]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Michal Sojka [Wed, 26 May 2010 19:32:02 +0000 (21:32 +0200)]
Print 60 time interval
Michal Sojka [Wed, 26 May 2010 19:31:53 +0000 (21:31 +0200)]
Rush the conrs slowly
Michal Sojka [Wed, 26 May 2010 19:18:20 +0000 (21:18 +0200)]
Fine tune loading
Michal Sojka [Wed, 26 May 2010 19:15:16 +0000 (21:15 +0200)]
Faster acceleration at start
Michal Sojka [Wed, 26 May 2010 19:11:44 +0000 (21:11 +0200)]
load_oranges OK
Michal Sojka [Wed, 26 May 2010 19:09:21 +0000 (21:09 +0200)]
vidle: Perform a new command even if the previous one was not finished
Michal Sojka [Wed, 26 May 2010 18:31:26 +0000 (20:31 +0200)]
Fix VIDLE_DONE generation
Michal Sojka [Wed, 26 May 2010 18:26:11 +0000 (20:26 +0200)]
Tune loading oranges
Michal Sojka [Wed, 26 May 2010 18:25:56 +0000 (20:25 +0200)]
Display competition time for some states
Michal Sojka [Wed, 26 May 2010 17:55:50 +0000 (19:55 +0200)]
bugfix - Do not enable switches earlier than necessary
Petr Kubiznak [Wed, 26 May 2010 17:52:30 +0000 (19:52 +0200)]
If the game_color is changed during recognition, load appropriate masks.
Michal Sojka [Wed, 26 May 2010 17:47:37 +0000 (19:47 +0200)]
Fine tune vidle
Petr Kubiznak [Wed, 26 May 2010 17:16:50 +0000 (19:16 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Petr Kubiznak [Wed, 26 May 2010 17:16:41 +0000 (19:16 +0200)]
"Averaging" results - rozkuk now keeps a number of results in memory, finds the most supported one, which publishes through orte.
Michal Sojka [Wed, 26 May 2010 17:11:00 +0000 (19:11 +0200)]
Fine tune sledge_down to not touch the rim by bumpers
Petr Kubiznak [Wed, 26 May 2010 17:10:48 +0000 (19:10 +0200)]
Unused files removal.
Michal Sojka [Wed, 26 May 2010 17:10:39 +0000 (19:10 +0200)]
add load_oranges timeouts
Michal Sojka [Wed, 26 May 2010 16:27:27 +0000 (18:27 +0200)]
opp_corn is the default - we are testing this now
Michal Sojka [Wed, 26 May 2010 16:27:09 +0000 (18:27 +0200)]
Tune vidle constants
Michal Sojka [Wed, 26 May 2010 16:01:00 +0000 (18:01 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Wed, 26 May 2010 15:51:18 +0000 (17:51 +0200)]
robofsm: Remove debug printf
Michal Sojka [Wed, 26 May 2010 15:48:28 +0000 (17:48 +0200)]
robofsm: actuators_home moves vidle +-1
This to force the movement. LPC program only react when the requested
position changes.
Michal Sojka [Wed, 26 May 2010 15:47:05 +0000 (17:47 +0200)]
robofsm: Update VIDLE_DONE reporting to match changed LPC firmware
Michal Sojka [Wed, 26 May 2010 15:46:00 +0000 (17:46 +0200)]
robofsm: Lower VIDLE_UP
Michal Sojka [Wed, 26 May 2010 15:45:41 +0000 (17:45 +0200)]
vidle: Fix a possible error in reporting of completed command
Filip Jares [Wed, 26 May 2010 15:01:03 +0000 (17:01 +0200)]
robofsm: add forgotten strategy_six_oranges.cc file
i forgot it in previous commit
Michal Sojka [Wed, 26 May 2010 14:54:01 +0000 (16:54 +0200)]
robofsm: Attempt to fix two-phase orange loading
Filip Jares [Wed, 26 May 2010 14:53:46 +0000 (16:53 +0200)]
robofsm: add EV_SWITCH_STRATEGY to unhandled events to avoid warnings
Michal Sojka [Wed, 26 May 2010 14:53:39 +0000 (16:53 +0200)]
robofsm: Fix unhandled event warnings
Filip Jares [Wed, 26 May 2010 14:49:12 +0000 (16:49 +0200)]
robofsm: add new "six oranges" strategy
- add six_oranges strategy
- delete data passed to "pick oranges" subautomaton
when they are not needed any more
Michal Sojka [Wed, 26 May 2010 14:45:01 +0000 (16:45 +0200)]
robofsm: Don't move vidle so down after start
Michal Sojka [Wed, 26 May 2010 14:44:18 +0000 (16:44 +0200)]
robofsm: Switch off camera after start
Michal Sojka [Wed, 26 May 2010 14:31:52 +0000 (16:31 +0200)]
robofsm: Remove unnecessary new/delete pair
Michal Sojka [Wed, 26 May 2010 13:46:59 +0000 (15:46 +0200)]
robofsm: Do not send EV_VIDLE_DONE multiple times
If vidle reports timeout, EV_VIDLE_DONE was sent with every received
message. Now we send the event only when timeout changes from 0 to 1.
Michal Sojka [Wed, 26 May 2010 13:41:22 +0000 (15:41 +0200)]
robofsm: Implement strategy switching by side bumpers
Petr Kubiznak [Wed, 26 May 2010 13:34:33 +0000 (15:34 +0200)]
All debug messages to error output.
Michal Sojka [Wed, 26 May 2010 13:03:19 +0000 (15:03 +0200)]
robofsm: Generate EV_VIDLE_DONE
Also remove not used EV_ACTION* events.
Petr Kubiznak [Wed, 26 May 2010 12:53:09 +0000 (14:53 +0200)]
Debug info improvement.
Petr Kubiznak [Wed, 26 May 2010 12:52:44 +0000 (14:52 +0200)]
New masks.
Michal Sojka [Wed, 26 May 2010 10:36:21 +0000 (12:36 +0200)]
Update backup-robot script
It works even when /dev/tty* is not excluded.
Michal Sojka [Wed, 26 May 2010 10:08:47 +0000 (12:08 +0200)]
Add restore-robot script
Filip Jares [Wed, 26 May 2010 10:33:27 +0000 (12:33 +0200)]
robofsm: introduce new struct to define which oranges to collect
struct slope_approach_style will is meant to be passed as data when calling
the "oranges collecting subautomaton" (SUBFSM_TRANS(approach_the_slope, data))
only the slope_approach_style.which_side field is now taken into account
Filip Jares [Wed, 26 May 2010 09:18:17 +0000 (11:18 +0200)]
robofsm: fix compile-time error
remove now nonexistent ACT fsm initialization
Michal Sojka [Wed, 26 May 2010 08:15:11 +0000 (10:15 +0200)]
robofsm: Replace EV_GOAL_NOT_REACHABLE with EV_MOTION_ERROR
The event "goal not reached" was not used in the current software. It is
not replaced with "motion error", which is also not used now, but it is
intended to have a different meaning i.e. it will be signalized if the
motion FSM cannot finish the command even after several tries.
Michal Sojka [Wed, 26 May 2010 08:07:03 +0000 (10:07 +0200)]
robofsm: Remove fsmact and other unused stuff
Filip Jares [Wed, 26 May 2010 07:09:35 +0000 (09:09 +0200)]
robofsm: hopefully better approach to the slope
in case when not ready_to_climb_the_slope, arrive to the
slope in the same way as in the "opp_corns" strategy used
in the czech tournament
Petr Kubiznak [Tue, 25 May 2010 16:51:52 +0000 (18:51 +0200)]
Program output messages correction.
Filip Jares [Tue, 25 May 2010 16:41:21 +0000 (18:41 +0200)]
competition: improve slope approach position
when using the approach_the_slope state (and not ready_to_climb_the_slope),
use better goal position.
Filip Jares [Tue, 25 May 2010 16:40:19 +0000 (18:40 +0200)]
competition: add state for oranges loading
load oranges (move with vidle) in two stages
Filip Jares [Tue, 25 May 2010 16:29:28 +0000 (18:29 +0200)]
robofsm: fix error in previous commit
Filip Jares [Tue, 25 May 2010 16:27:46 +0000 (18:27 +0200)]
robofsm actuators: support for speed choice when calling act_vidle()
- update vidle positions constants
- add vidle speed constants
Michal Vokac [Tue, 25 May 2010 07:23:18 +0000 (09:23 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Michal Vokac [Tue, 25 May 2010 07:22:40 +0000 (09:22 +0200)]
Support for moving continuosly with fork. CAN message expanded for sending req. speed.
Michal Vokac [Tue, 25 May 2010 07:20:14 +0000 (09:20 +0200)]
cand: set_vidle_cmd expanded for sending movement speed
Michal Vokac [Tue, 25 May 2010 07:16:59 +0000 (09:16 +0200)]
vidle: now the fork is moving continuously and it is possible to change speed of movement
Filip Jares [Sat, 22 May 2010 11:47:21 +0000 (13:47 +0200)]
robofsm: basic strategy rewrite (using the skeleton created by Michal in commit
e3afcb31b37 )
- common-states.{cc,h}: prepare states for three subautomatons which do
- oranges collecting
- unloading the oranges
- rushing particular corns one by one
- the strategy_opp_oranges is now "almost" usable
Michal Sojka [Fri, 21 May 2010 20:36:16 +0000 (22:36 +0200)]
robofsm: Remove debugging printf()s
Michal Sojka [Fri, 21 May 2010 20:33:56 +0000 (22:33 +0200)]
robomon: Zero orte variables
This is to suppress random EV_OBSTACLE_BEHIND generation because of
robomon uninitialized data sent as bumper swicthes over ORTE.
Michal Sojka [Fri, 21 May 2010 20:32:39 +0000 (22:32 +0200)]
robomon: Draw vidle based on ORTE message "vidle_cmd"
Michal Sojka [Fri, 21 May 2010 20:18:21 +0000 (22:18 +0200)]
robomon: Comment out vidle dial widget
Jiri Kubias [Fri, 21 May 2010 14:36:39 +0000 (16:36 +0200)]
eb_vidle - opraveno nacitani z pinu + nastaveni GPIO DIR
Michal Sojka [Fri, 21 May 2010 11:21:19 +0000 (13:21 +0200)]
displayd: Display camera status
Michal Sojka [Fri, 21 May 2010 10:51:10 +0000 (12:51 +0200)]
types: Move camera constrants from .h to .idl
Also, all camera related stuff was moved to a "module" to share the common
namespace.
Michal Sojka [Fri, 21 May 2010 10:40:35 +0000 (12:40 +0200)]
Fix one bug in ORTE IDL compiler
Petr Kubiznak [Fri, 21 May 2010 09:40:34 +0000 (11:40 +0200)]
Orte integrated to rozkuk, but it does not work properly yet - needs revision.
Now orte "provides" still the same (and probably incorrect) values.
Petr Kubiznak [Fri, 21 May 2010 09:38:35 +0000 (11:38 +0200)]
camera_result structure expansion (to keep also best results distances and error states)
Matous Pokorny [Fri, 21 May 2010 09:29:42 +0000 (11:29 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
ehiker [Thu, 20 May 2010 22:00:25 +0000 (00:00 +0200)]
make change, define input gpio, not work
Michal Sojka [Thu, 20 May 2010 20:37:47 +0000 (22:37 +0200)]
Add camera_onoff test program
Filip Jares [Wed, 19 May 2010 21:04:32 +0000 (23:04 +0200)]
robofsm: add ..._trans version to robot_get_est_pos() function
Petr Kubiznak [Wed, 19 May 2010 18:23:16 +0000 (20:23 +0200)]
Comments alignment.
Petr Kubiznak [Wed, 19 May 2010 17:39:45 +0000 (19:39 +0200)]
Do not use this program anymore, the mask processing pipeline has been shorten from:
maskgen: mask???.png | clr2float_conv: mask???.bin | rozkuk
to:
maskgen: mask???.pnm | rozkuk
Petr Kubiznak [Wed, 19 May 2010 17:39:27 +0000 (19:39 +0200)]
Load gray pnm masks instead of binary (*.bin) float arrays - they don't work on ppc, maybe because of endianity.
Provide information about the distance between the best and second best fitting recognition.
Save every grabbed image to file if PPC_DEBUG macro defined.
Comments alignment.
Petr Kubiznak [Wed, 19 May 2010 17:30:30 +0000 (19:30 +0200)]
Extract a gray2float function part from the clr2float function. Keep the new function private, but separate for prospective future usage.
Recognize image color format (GRAY/BGR) and process pictures suitably.
Petr Kubiznak [Wed, 19 May 2010 17:27:02 +0000 (19:27 +0200)]
Produce grayscale pnm masks instead of "color" png masks.
Filip Jares [Wed, 19 May 2010 17:08:08 +0000 (19:08 +0200)]
robofsm: trgen.h header file include moved to eb2010misc.h
...which is included everywhere
Filip Jares [Wed, 19 May 2010 15:03:36 +0000 (17:03 +0200)]
robomon: allow using keyboard shorcuts with "&Start plug" and "&Team color" actions
Petr Kubiznak [Fri, 14 May 2010 14:28:33 +0000 (16:28 +0200)]
Jpeg library added to rozkuk to allow OpenCV process data from camera on ppc, too.
(Commented parts are useful for debugging only - needs additional files from xawtv.)
Michal Sojka [Fri, 14 May 2010 13:42:50 +0000 (15:42 +0200)]
fsm: Whitespace fix
Michal Sojka [Fri, 14 May 2010 13:42:35 +0000 (15:42 +0200)]
fsm: Let g++ produce more meaningfull error messages
Michal Sojka [Fri, 14 May 2010 12:56:09 +0000 (14:56 +0200)]
robofsm: Skeleton for multiple game strategies
Michal Sojka [Fri, 14 May 2010 12:55:07 +0000 (14:55 +0200)]
fsm: Allow specifying state function visibility
This is to allow declaration of some states as static and therefore
the same state name can be used in multiple files.
We use this to implement different strategies in different files and we
want to have less work inventing state names :-)
Michal Sojka [Thu, 13 May 2010 14:26:39 +0000 (16:26 +0200)]
opencv: Another attempt to build OpenCV
It seems that my problem with dash caused opencv compilation failure.
I switched /bin/sh to /bin/bash and built the whole opencv again.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581351
Michal Sojka [Thu, 13 May 2010 14:06:08 +0000 (16:06 +0200)]
opencv: Run configure with bash
It seems that my recently upgraded dash (linked from /bin/sh) has
problems running the configure script. It produces:
../../../../src/3rdparty/opencv/opencv/configure: 16175: arithmetic expression: expecting EOF: "0x>>26&0x01"
Michal Sojka [Thu, 13 May 2010 14:00:46 +0000 (16:00 +0200)]
opencv: Compile with JPEG support
Michal Sojka [Mon, 10 May 2010 13:38:53 +0000 (15:38 +0200)]
Robot backup
Michal Sojka [Mon, 10 May 2010 13:36:14 +0000 (15:36 +0200)]
Add backup-robot script
Michal Sojka [Sat, 1 May 2010 14:57:06 +0000 (16:57 +0200)]
robomon: Zacatek zobrazovani uhlu vidli
Filip Jares [Sat, 1 May 2010 10:32:33 +0000 (12:32 +0200)]
competition: rename wait_for_start to wts_opponents_corns on the master branch
Filip Jares [Sat, 1 May 2010 10:23:53 +0000 (12:23 +0200)]
competition: add important wall on the raised area
without this wall, robot could replan the trajectory to cross the raised area
Michal Sojka [Sat, 1 May 2010 09:45:24 +0000 (11:45 +0200)]
robomon: Add color chooser
Michal Sojka [Sat, 1 May 2010 08:38:13 +0000 (10:38 +0200)]
vidle constants tuning
Filip Jares [Sat, 1 May 2010 08:23:49 +0000 (10:23 +0200)]
VIDLE_DOWN: change from 0x1e0 to 0x170
Filip Jares [Sat, 1 May 2010 08:16:57 +0000 (10:16 +0200)]
competition: choose OPPONENTS_ORAGES_TOO (for the Izro team)
Michal Sojka [Sat, 1 May 2010 08:03:29 +0000 (10:03 +0200)]
sw for cooled vidle
Michal Sojka [Sat, 1 May 2010 07:49:56 +0000 (09:49 +0200)]
Merge branch 'master' of localhost:/home/eurobot/git
Michal Sojka [Sat, 1 May 2010 07:47:33 +0000 (09:47 +0200)]
displayd: exit when display is disconnected
init respawn as automatically
Filip Jares [Sat, 1 May 2010 07:40:28 +0000 (09:40 +0200)]
comp: climb_the_slope: go 2cm further
Filip Jares [Sat, 1 May 2010 07:39:37 +0000 (09:39 +0200)]
comp: use same (I hope!) trajectoryConstraints as on yesterday's homologation
Filip Jares [Sat, 1 May 2010 07:31:16 +0000 (09:31 +0200)]
competition: don't use back_switch when doing climb_the_slope and sledge_down