]> rtime.felk.cvut.cz Git - eurobot/public.git/log
eurobot/public.git
13 years agoNew masks (why only the shape of the robot changes so often??! :-P).
Petr Kubiznak [Sat, 29 May 2010 10:24:55 +0000 (12:24 +0200)]
New masks (why only the shape of the robot changes so often??! :-P).

13 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Petr Kubiznak [Fri, 28 May 2010 22:45:00 +0000 (00:45 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

13 years agoThreshold manual shift (to corigate unsuitable autothreshold).
Petr Kubiznak [Fri, 28 May 2010 22:44:40 +0000 (00:44 +0200)]
Threshold manual shift (to corigate unsuitable autothreshold).
Log improvement - print every CHANGE incoming from orte.

13 years agoMerge branch 'master' of ssh://jaresf1@rtime.felk.cvut.cz/var/git/eurobot
Filip Jares [Fri, 28 May 2010 22:34:42 +0000 (00:34 +0200)]
Merge branch 'master' of ssh://jaresf1@rtime.felk.cvut.cz/var/git/eurobot

13 years agorobofsm (tests): add simple automaton for testing of the oranges loading procedure
Filip Jares [Fri, 28 May 2010 22:19:49 +0000 (00:19 +0200)]
robofsm (tests): add simple automaton for testing of the oranges loading procedure

13 years agorobofsm: tune vidle: lower LOAD_PREPARE position and open them a little bit sooner
Filip Jares [Fri, 28 May 2010 22:18:47 +0000 (00:18 +0200)]
robofsm: tune vidle: lower LOAD_PREPARE position and open them a little bit sooner

(open them sooner when approaching the oranges "NEAR_PLAYGROUND_CENTER"

13 years agorobofsm: improve approach to the "NEAR_PLAYGROUND_CENTER" oranges
Filip Jares [Fri, 28 May 2010 22:16:06 +0000 (00:16 +0200)]
robofsm: improve approach to the "NEAR_PLAYGROUND_CENTER" oranges

13 years agoPublish camera commands once per second
Michal Sojka [Fri, 28 May 2010 20:15:26 +0000 (22:15 +0200)]
Publish camera commands once per second

It is not necessary to send these commands faster.

13 years agorobofsm: Switch on camera during initialization
Michal Sojka [Fri, 28 May 2010 20:14:49 +0000 (22:14 +0200)]
robofsm: Switch on camera during initialization

13 years agorobofsm: add EV_SWITCH_STRATEGY to unhandled events in homologation to avoid warnings
Filip Jares [Fri, 28 May 2010 16:13:36 +0000 (18:13 +0200)]
robofsm: add EV_SWITCH_STRATEGY to unhandled events in homologation to avoid warnings

13 years agorobofsm: add jerky motion when unloading oranges
Filip Jares [Fri, 28 May 2010 14:46:07 +0000 (16:46 +0200)]
robofsm: add jerky motion when unloading oranges

... to ensure the oranges will unload properly

13 years agorobofsm: remove commented out code (previous versions of movehelper functions calls)
Filip Jares [Fri, 28 May 2010 10:52:51 +0000 (12:52 +0200)]
robofsm: remove commented out code (previous versions of movehelper functions calls)

13 years agoBreak in switch missing - fixed.
Petr Kubiznak [Fri, 28 May 2010 10:50:12 +0000 (12:50 +0200)]
Break in switch missing - fixed.

13 years agoNew lines at the end of orte output messages.
Petr Kubiznak [Fri, 28 May 2010 10:44:50 +0000 (12:44 +0200)]
New lines at the end of orte output messages.

13 years agoTo get actual team color structure orte.robot_switches needs to be used (instead...
Petr Kubiznak [Fri, 28 May 2010 10:41:45 +0000 (12:41 +0200)]
To get actual team color structure orte.robot_switches needs to be used (instead of orte.camera).

13 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
jarda [Fri, 28 May 2010 08:34:45 +0000 (10:34 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

13 years agoDisplay:uprava zobrazovani kukuric
jarda [Fri, 28 May 2010 08:33:53 +0000 (10:33 +0200)]
Display:uprava zobrazovani kukuric

13 years agoFewer frames to average them (on robot, recognition is delayed by about 4-5 seconds...
Petr Kubiznak [Fri, 28 May 2010 08:19:38 +0000 (10:19 +0200)]
Fewer frames to average them (on robot, recognition is delayed by about 4-5 seconds + >>number of averaging frames<<).

13 years agoMerge branch 'master' of ssh://jaresf1@rtime.felk.cvut.cz/var/git/eurobot
Filip Jares [Thu, 27 May 2010 20:41:05 +0000 (22:41 +0200)]
Merge branch 'master' of ssh://jaresf1@rtime.felk.cvut.cz/var/git/eurobot

13 years agorobofsm: add "real" six_oranges strategy (copy and modify the 12 oranges strategy)
Filip Jares [Thu, 27 May 2010 20:40:10 +0000 (22:40 +0200)]
robofsm: add "real" six_oranges strategy (copy and modify the 12 oranges strategy)

13 years agodisp-4dg: Attempt to fix displaying two digits for corns
Michal Sojka [Thu, 27 May 2010 20:26:55 +0000 (22:26 +0200)]
disp-4dg: Attempt to fix displaying two digits for corns

13 years agorobofsm: rename six_oranges strategy to 12_oranges (it in fact performed "12 oranges...
Filip Jares [Thu, 27 May 2010 20:20:32 +0000 (22:20 +0200)]
robofsm: rename six_oranges strategy to 12_oranges (it in fact performed "12 oranges" strategy)

13 years agodisplayd: Show recognized corns
Michal Sojka [Thu, 27 May 2010 11:21:17 +0000 (13:21 +0200)]
displayd: Show recognized corns

13 years agodisplayd: Do not fail when debugging with /dev/null
Michal Sojka [Thu, 27 May 2010 11:20:58 +0000 (13:20 +0200)]
displayd: Do not fail when debugging with /dev/null

13 years agoSix oranges works almost perfectly
Michal Sojka [Wed, 26 May 2010 19:57:02 +0000 (21:57 +0200)]
Six oranges works almost perfectly

13 years agoSix oranges somewhat works
Michal Sojka [Wed, 26 May 2010 19:47:06 +0000 (21:47 +0200)]
Six oranges somewhat works

13 years agoDisable 60 seconds timer
Michal Sojka [Wed, 26 May 2010 19:38:23 +0000 (21:38 +0200)]
Disable 60 seconds timer

13 years agoPrint 60 time interval
Michal Sojka [Wed, 26 May 2010 19:32:02 +0000 (21:32 +0200)]
Print 60 time interval

13 years agoRush the conrs slowly
Michal Sojka [Wed, 26 May 2010 19:31:53 +0000 (21:31 +0200)]
Rush the conrs slowly

13 years agoFine tune loading
Michal Sojka [Wed, 26 May 2010 19:18:20 +0000 (21:18 +0200)]
Fine tune loading

13 years agoFaster acceleration at start
Michal Sojka [Wed, 26 May 2010 19:15:16 +0000 (21:15 +0200)]
Faster acceleration at start

13 years agoload_oranges OK
Michal Sojka [Wed, 26 May 2010 19:11:44 +0000 (21:11 +0200)]
load_oranges OK

13 years agovidle: Perform a new command even if the previous one was not finished
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

13 years agoFix VIDLE_DONE generation
Michal Sojka [Wed, 26 May 2010 18:31:26 +0000 (20:31 +0200)]
Fix VIDLE_DONE generation

13 years agoTune loading oranges
Michal Sojka [Wed, 26 May 2010 18:26:11 +0000 (20:26 +0200)]
Tune loading oranges

13 years agoDisplay competition time for some states
Michal Sojka [Wed, 26 May 2010 18:25:56 +0000 (20:25 +0200)]
Display competition time for some states

13 years agobugfix - Do not enable switches earlier than necessary
Michal Sojka [Wed, 26 May 2010 17:55:50 +0000 (19:55 +0200)]
bugfix - Do not enable switches earlier than necessary

13 years agoIf the game_color is changed during recognition, load appropriate masks.
Petr Kubiznak [Wed, 26 May 2010 17:52:30 +0000 (19:52 +0200)]
If the game_color is changed during recognition, load appropriate masks.

13 years agoFine tune vidle
Michal Sojka [Wed, 26 May 2010 17:47:37 +0000 (19:47 +0200)]
Fine tune vidle

13 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Petr Kubiznak [Wed, 26 May 2010 17:16:50 +0000 (19:16 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

13 years ago"Averaging" results - rozkuk now keeps a number of results in memory, finds the most...
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.

13 years agoFine tune sledge_down to not touch the rim by bumpers
Michal Sojka [Wed, 26 May 2010 17:11:00 +0000 (19:11 +0200)]
Fine tune sledge_down to not touch the rim by bumpers

13 years agoUnused files removal.
Petr Kubiznak [Wed, 26 May 2010 17:10:48 +0000 (19:10 +0200)]
Unused files removal.

13 years agoadd load_oranges timeouts
Michal Sojka [Wed, 26 May 2010 17:10:39 +0000 (19:10 +0200)]
add load_oranges timeouts

13 years agoopp_corn is the default - we are testing this now
Michal Sojka [Wed, 26 May 2010 16:27:27 +0000 (18:27 +0200)]
opp_corn is the default - we are testing this now

13 years agoTune vidle constants
Michal Sojka [Wed, 26 May 2010 16:27:09 +0000 (18:27 +0200)]
Tune vidle constants

13 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Wed, 26 May 2010 16:01:00 +0000 (18:01 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

13 years agorobofsm: Remove debug printf
Michal Sojka [Wed, 26 May 2010 15:51:18 +0000 (17:51 +0200)]
robofsm: Remove debug printf

13 years agorobofsm: actuators_home moves vidle +-1
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.

13 years agorobofsm: Update VIDLE_DONE reporting to match changed LPC firmware
Michal Sojka [Wed, 26 May 2010 15:47:05 +0000 (17:47 +0200)]
robofsm: Update VIDLE_DONE reporting to match changed LPC firmware

13 years agorobofsm: Lower VIDLE_UP
Michal Sojka [Wed, 26 May 2010 15:46:00 +0000 (17:46 +0200)]
robofsm: Lower VIDLE_UP

13 years agovidle: Fix a possible error in reporting of completed command
Michal Sojka [Wed, 26 May 2010 15:45:41 +0000 (17:45 +0200)]
vidle: Fix a possible error in reporting of completed command

13 years agorobofsm: add forgotten strategy_six_oranges.cc file
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

13 years agorobofsm: Attempt to fix two-phase orange loading
Michal Sojka [Wed, 26 May 2010 14:54:01 +0000 (16:54 +0200)]
robofsm: Attempt to fix two-phase orange loading

13 years agorobofsm: add EV_SWITCH_STRATEGY to unhandled events to avoid warnings
Filip Jares [Wed, 26 May 2010 14:53:46 +0000 (16:53 +0200)]
robofsm: add EV_SWITCH_STRATEGY to unhandled events to avoid warnings

13 years agorobofsm: Fix unhandled event warnings
Michal Sojka [Wed, 26 May 2010 14:53:39 +0000 (16:53 +0200)]
robofsm: Fix unhandled event warnings

13 years agorobofsm: add new "six oranges" strategy
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

13 years agorobofsm: Don't move vidle so down after start
Michal Sojka [Wed, 26 May 2010 14:45:01 +0000 (16:45 +0200)]
robofsm: Don't move vidle so down after start

13 years agorobofsm: Switch off camera after start
Michal Sojka [Wed, 26 May 2010 14:44:18 +0000 (16:44 +0200)]
robofsm: Switch off camera after start

13 years agorobofsm: Remove unnecessary new/delete pair
Michal Sojka [Wed, 26 May 2010 14:31:52 +0000 (16:31 +0200)]
robofsm: Remove unnecessary new/delete pair

13 years agorobofsm: Do not send EV_VIDLE_DONE multiple times
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.

13 years agorobofsm: Implement strategy switching by side bumpers
Michal Sojka [Wed, 26 May 2010 13:41:22 +0000 (15:41 +0200)]
robofsm: Implement strategy switching by side bumpers

13 years agoAll debug messages to error output.
Petr Kubiznak [Wed, 26 May 2010 13:34:33 +0000 (15:34 +0200)]
All debug messages to error output.

13 years agorobofsm: Generate EV_VIDLE_DONE
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.

13 years agoDebug info improvement.
Petr Kubiznak [Wed, 26 May 2010 12:53:09 +0000 (14:53 +0200)]
Debug info improvement.

13 years agoNew masks.
Petr Kubiznak [Wed, 26 May 2010 12:52:44 +0000 (14:52 +0200)]
New masks.

13 years agoUpdate backup-robot script
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.

13 years agoAdd restore-robot script
Michal Sojka [Wed, 26 May 2010 10:08:47 +0000 (12:08 +0200)]
Add restore-robot script

13 years agorobofsm: introduce new struct to define which oranges to collect
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

13 years agorobofsm: fix compile-time error
Filip Jares [Wed, 26 May 2010 09:18:17 +0000 (11:18 +0200)]
robofsm: fix compile-time error

remove now nonexistent ACT fsm initialization

13 years agorobofsm: Replace EV_GOAL_NOT_REACHABLE with EV_MOTION_ERROR
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.

13 years agorobofsm: Remove fsmact and other unused stuff
Michal Sojka [Wed, 26 May 2010 08:07:03 +0000 (10:07 +0200)]
robofsm: Remove fsmact and other unused stuff

13 years agorobofsm: hopefully better approach to the slope
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

13 years agoProgram output messages correction.
Petr Kubiznak [Tue, 25 May 2010 16:51:52 +0000 (18:51 +0200)]
Program output messages correction.

13 years agocompetition: improve slope approach position
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.

13 years agocompetition: add state for oranges loading
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

13 years agorobofsm: fix error in previous commit
Filip Jares [Tue, 25 May 2010 16:29:28 +0000 (18:29 +0200)]
robofsm: fix error in previous commit

13 years agorobofsm actuators: support for speed choice when calling act_vidle()
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

13 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Michal Vokac [Tue, 25 May 2010 07:23:18 +0000 (09:23 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

13 years agoSupport for moving continuosly with fork. CAN message expanded for sending req. speed.
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.

13 years agocand: set_vidle_cmd expanded for sending movement speed
Michal Vokac [Tue, 25 May 2010 07:20:14 +0000 (09:20 +0200)]
cand: set_vidle_cmd expanded for sending movement speed

13 years agovidle: now the fork is moving continuously and it is possible to change speed of...
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

14 years agorobofsm: basic strategy rewrite (using the skeleton created by Michal in commit e3afc...
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

14 years agorobofsm: Remove debugging printf()s
Michal Sojka [Fri, 21 May 2010 20:36:16 +0000 (22:36 +0200)]
robofsm: Remove debugging printf()s

14 years agorobomon: Zero orte variables
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.

14 years agorobomon: Draw vidle based on ORTE message "vidle_cmd"
Michal Sojka [Fri, 21 May 2010 20:32:39 +0000 (22:32 +0200)]
robomon: Draw vidle based on ORTE message "vidle_cmd"

14 years agorobomon: Comment out vidle dial widget
Michal Sojka [Fri, 21 May 2010 20:18:21 +0000 (22:18 +0200)]
robomon: Comment out vidle dial widget

14 years agoeb_vidle - opraveno nacitani z pinu + nastaveni GPIO DIR
Jiri Kubias [Fri, 21 May 2010 14:36:39 +0000 (16:36 +0200)]
eb_vidle - opraveno nacitani z pinu + nastaveni GPIO DIR

14 years agodisplayd: Display camera status
Michal Sojka [Fri, 21 May 2010 11:21:19 +0000 (13:21 +0200)]
displayd: Display camera status

14 years agotypes: Move camera constrants from .h to .idl
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.

14 years agoFix one bug in ORTE IDL compiler
Michal Sojka [Fri, 21 May 2010 10:40:35 +0000 (12:40 +0200)]
Fix one bug in ORTE IDL compiler

14 years agoOrte integrated to rozkuk, but it does not work properly yet - needs revision.
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.

14 years agocamera_result structure expansion (to keep also best results distances and error...
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)

14 years agoMerge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot
Matous Pokorny [Fri, 21 May 2010 09:29:42 +0000 (11:29 +0200)]
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/eurobot

14 years agomake change, define input gpio, not work
ehiker [Thu, 20 May 2010 22:00:25 +0000 (00:00 +0200)]
make change, define input gpio, not work

14 years agoAdd camera_onoff test program
Michal Sojka [Thu, 20 May 2010 20:37:47 +0000 (22:37 +0200)]
Add camera_onoff test program

14 years agorobofsm: add ..._trans version to robot_get_est_pos() function
Filip Jares [Wed, 19 May 2010 21:04:32 +0000 (23:04 +0200)]
robofsm: add ..._trans version to robot_get_est_pos() function

14 years agoComments alignment.
Petr Kubiznak [Wed, 19 May 2010 18:23:16 +0000 (20:23 +0200)]
Comments alignment.

14 years agoDo not use this program anymore, the mask processing pipeline has been shorten from:
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

14 years agoLoad gray pnm masks instead of binary (*.bin) float arrays - they don't work on ppc...
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.