]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Benes Petr [Sat, 25 Apr 2009 02:47:42 +0000 (04:47 +0200)]
Competetion layout strategies modified
Jiri Kubias [Sat, 25 Apr 2009 01:29:14 +0000 (03:29 +0200)]
eb_lift opravene zajizdeni na nulovou pozici. Asci by t ochtelo nejak v budoucnu opravit.
Jiri Kubias [Sat, 25 Apr 2009 00:54:29 +0000 (02:54 +0200)]
eb_lift: pridal jsem vopras do regulatoru - pri pozadavku na nulovou
pozici to musi dojet vzdy do nulove pozice.
Musi se opravit, porad to sebou cuka pri dojezdu
Jiri Kubias [Sat, 25 Apr 2009 00:30:09 +0000 (02:30 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Sat, 25 Apr 2009 00:29:02 +0000 (02:29 +0200)]
robot: added ShmapFree to robot_destroy
Jiri Kubias [Fri, 24 Apr 2009 23:32:36 +0000 (01:32 +0200)]
eb_pwr fixed can messages
Filip Jares [Fri, 24 Apr 2009 23:22:12 +0000 (01:22 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Conflicts:
src/robofsm/competition.cc
Filip Jares [Fri, 24 Apr 2009 23:16:32 +0000 (01:16 +0200)]
MAIN FSM: implementing acropolis approach
- approach_acropolis state
- robot_goto_acropolis() using robot_moveto_trans;
- newly defined acropolis approach angles array
Jiri Kubias [Fri, 24 Apr 2009 23:16:21 +0000 (01:16 +0200)]
eb_sberac: added back switch
Martin Zidek [Fri, 24 Apr 2009 22:40:33 +0000 (00:40 +0200)]
actuators: added camera control functions
Martin Zidek [Fri, 24 Apr 2009 22:36:24 +0000 (00:36 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 22:33:30 +0000 (00:33 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Michal Sojka [Fri, 24 Apr 2009 22:32:54 +0000 (00:32 +0200)]
Added puck inside switch handling
Michal Sojka [Fri, 24 Apr 2009 22:25:04 +0000 (00:25 +0200)]
robofsm: Added wall invalidation when moving to certain targets
Michal Sojka [Fri, 24 Apr 2009 22:22:46 +0000 (00:22 +0200)]
map: Fixed detection of free obstacles
Filip Jares [Fri, 24 Apr 2009 22:04:26 +0000 (00:04 +0200)]
robodim.h: ACROPOLIS_RADIUS redefined correctly, ACROPOLIS_DIAMETER defined
Filip Jares [Fri, 24 Apr 2009 22:04:05 +0000 (00:04 +0200)]
robodim.h: ACROPOLIS_RADIUS redefined correctly, ACROPOLIS_DIAMETER defined
Filip Jares [Fri, 24 Apr 2009 21:59:34 +0000 (23:59 +0200)]
robodim.h: ACROPOLIS_CENTER_X, resp ..._Y coords defined
Filip Jares [Fri, 24 Apr 2009 21:45:47 +0000 (23:45 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 21:45:37 +0000 (23:45 +0200)]
ACT FSM: dummy actions improved to count number of pucks loaded
Martin Zidek [Fri, 24 Apr 2009 21:37:18 +0000 (23:37 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Benes Petr [Fri, 24 Apr 2009 21:08:27 +0000 (23:08 +0200)]
Merge branch 'master' of benesp7@rtime.felk.cvut.cz:/var/git/eurobot
Benes Petr [Fri, 24 Apr 2009 21:07:57 +0000 (23:07 +0200)]
Map: edited map flags and created walls
Added MAP_FLAG_INVALIDATE_WALL
Filip Jares [Fri, 24 Apr 2009 20:58:06 +0000 (22:58 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 20:57:21 +0000 (22:57 +0200)]
MAIN FSM: empty decide_what_next and deposit_at_acropolis states created
and obsolete states removed from switch statements
Martin Zidek [Fri, 24 Apr 2009 20:43:45 +0000 (22:43 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Fri, 24 Apr 2009 20:20:48 +0000 (22:20 +0200)]
Canged handling of back switch
Michal Sojka [Fri, 24 Apr 2009 20:20:00 +0000 (22:20 +0200)]
Robot exits when start plug is plugged in after competition start
Filip Jares [Fri, 24 Apr 2009 20:04:53 +0000 (22:04 +0200)]
actuator variables initialization moved to the init state, obsolete, previously commented out code removed
Michal Sojka [Fri, 24 Apr 2009 20:01:17 +0000 (22:01 +0200)]
Fixed COMPETITION flag
Martin Zidek [Fri, 24 Apr 2009 19:49:07 +0000 (21:49 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Fri, 24 Apr 2009 19:44:43 +0000 (21:44 +0200)]
robofsm: FIxed warnings
Martin Zidek [Fri, 24 Apr 2009 19:44:30 +0000 (21:44 +0200)]
competition: prepared to retrieve real lot nr from camera
Michal Sojka [Fri, 24 Apr 2009 19:31:27 +0000 (21:31 +0200)]
Robot root backup
Michal Sojka [Fri, 24 Apr 2009 19:18:22 +0000 (21:18 +0200)]
robofsm: Main program is now called competition
Filip Jares [Fri, 24 Apr 2009 19:11:14 +0000 (21:11 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 19:11:06 +0000 (21:11 +0200)]
robofsm/robot.h: comment added
Filip Jares [Fri, 24 Apr 2009 19:10:53 +0000 (21:10 +0200)]
warnings in homologation.cc avoided
MAIN FSM:
- look around for puck action commented out, updating the code to take
into account that there is no sharp sensor present now
EV_PREPARE_FOR_LOAD action removed
Filip Jares [Fri, 24 Apr 2009 19:08:08 +0000 (21:08 +0200)]
fsmact: USE_DUMMY_ACTIONS and GIVE_UO_ON_PUCK_PRESENCE_SENSOR #defines added
- to decide on whether to use puck presence sensor or not and
- to decide on whether to use real actuators or timer-based dummy actions at compile time
MAIN FSM:
- look around for puck action commented out, updating the code to take
into account that there is no sharp sensor present now
Michal Sojka [Fri, 24 Apr 2009 18:57:00 +0000 (20:57 +0200)]
robofsm: Correct handling of back switch
- taken into account only after 5 sec after start
- react on first switch
- react on continuous switch only when moving backwards
Michal Sojka [Fri, 24 Apr 2009 18:42:55 +0000 (20:42 +0200)]
robomon: Working start plug
Michal Sojka [Fri, 24 Apr 2009 17:59:50 +0000 (19:59 +0200)]
robofsm: Team color can be switched during run-time
(from display)
Michal Sojka [Fri, 24 Apr 2009 16:59:15 +0000 (18:59 +0200)]
robofsm: Fixed warning
Martin Zidek [Fri, 24 Apr 2009 17:11:46 +0000 (19:11 +0200)]
disp: fixed oledlib function for sending of fsm state name (message
always truncated to 20 chars max)
Michal Sojka [Fri, 24 Apr 2009 16:42:56 +0000 (18:42 +0200)]
robomon: Added start command (not working)
Michal Sojka [Fri, 24 Apr 2009 14:09:30 +0000 (16:09 +0200)]
display: Fixed error caused by long state names
Michal Sojka [Fri, 24 Apr 2009 13:51:08 +0000 (15:51 +0200)]
robofsm: Fixed back swicth handling
Michal Sojka [Fri, 24 Apr 2009 13:22:01 +0000 (15:22 +0200)]
robofsm: decreased distance for detection of loses
Michal Sojka [Fri, 24 Apr 2009 13:20:15 +0000 (15:20 +0200)]
robofsm: Back switches handling
Michal Sojka [Fri, 24 Apr 2009 13:02:11 +0000 (15:02 +0200)]
camera display
Michal Sojka [Fri, 24 Apr 2009 13:01:15 +0000 (15:01 +0200)]
robofsm main: fix warnings
Michal Sojka [Fri, 24 Apr 2009 12:37:09 +0000 (14:37 +0200)]
Added missing rozporte files
Michal Sojka [Fri, 24 Apr 2009 10:01:20 +0000 (12:01 +0200)]
robofsm: Display status is updated correctly
Michal Sojka [Fri, 24 Apr 2009 09:39:04 +0000 (11:39 +0200)]
robofsm: Final fix for ekf init
Martin Zidek [Fri, 24 Apr 2009 09:21:57 +0000 (11:21 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Fri, 24 Apr 2009 09:21:37 +0000 (11:21 +0200)]
robofsm: EKF initialiation hopefully correct
Martin Zidek [Fri, 24 Apr 2009 09:21:34 +0000 (11:21 +0200)]
disp: added main fsm state vizualization
Michal Sojka [Fri, 24 Apr 2009 09:15:19 +0000 (11:15 +0200)]
Revert "robofsm: Added custom initialization of Kalman filter"
This reverts commit
76677b8b7df162bd184abbd3139af9ce8d696aa4 .
Filip Jares [Fri, 24 Apr 2009 09:04:07 +0000 (11:04 +0200)]
event previously removed from roboevent.py removed from switch in fsmmain, homologation and test/test_actuators.cc
Michal Sojka [Fri, 24 Apr 2009 08:57:06 +0000 (10:57 +0200)]
robofsm: Added custom initialization of Kalman filter
Filip Jares [Fri, 24 Apr 2009 08:54:17 +0000 (10:54 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Fri, 24 Apr 2009 08:53:52 +0000 (10:53 +0200)]
robofsm/roboevent.py: two unused events commented out
Michal Sojka [Fri, 24 Apr 2009 08:37:57 +0000 (10:37 +0200)]
robofsm: Fixed movehelper when WE_ARE_RED color
Martin Zidek [Fri, 24 Apr 2009 07:31:19 +0000 (09:31 +0200)]
rozpuk: removed duplicit library link
Michal Sojka [Fri, 24 Apr 2009 07:00:14 +0000 (09:00 +0200)]
robofsm: Fixed recalculation of ARRIVE_FROM
Michal Sojka [Fri, 24 Apr 2009 05:58:54 +0000 (07:58 +0200)]
fsmmove: Added ARRIVE_FROM target angle operation and several move helper functions
Replanning of ARRIVE_FROM needs to be fixed.
Michal Sojka [Fri, 24 Apr 2009 04:53:51 +0000 (06:53 +0200)]
Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/eurobot
Conflicts:
src/types/robottype.idl
Michal Sojka [Fri, 24 Apr 2009 04:50:52 +0000 (06:50 +0200)]
types: Fixed uncompilable .idl
Michal Sojka [Fri, 24 Apr 2009 04:49:27 +0000 (06:49 +0200)]
roboorte: changed refresh and exporation times
Marek Peca [Fri, 24 Apr 2009 01:18:21 +0000 (03:18 +0200)]
rozpuk: added getopt manual game color selection
Marek Peca [Thu, 23 Apr 2009 23:40:18 +0000 (01:40 +0200)]
rozpuk: added ORTE, game color, better debug, getopt
Filip Jares [Thu, 23 Apr 2009 19:56:54 +0000 (21:56 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Thu, 23 Apr 2009 19:56:49 +0000 (21:56 +0200)]
robot_orte.c: puck presence switch handling added
Jiri Kubias [Thu, 23 Apr 2009 19:46:37 +0000 (21:46 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Thu, 23 Apr 2009 19:46:07 +0000 (21:46 +0200)]
eb_sberac added puck sensor detection
Filip Jares [Thu, 23 Apr 2009 19:19:56 +0000 (21:19 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Martin Zidek [Thu, 23 Apr 2009 19:11:28 +0000 (21:11 +0200)]
types: changed camera control "on" member to octet
Martin Zidek [Thu, 23 Apr 2009 18:25:36 +0000 (20:25 +0200)]
cand: added CAN_PUCK message handling
Filip Jares [Thu, 23 Apr 2009 18:24:54 +0000 (20:24 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Martin Zidek [Thu, 23 Apr 2009 18:22:55 +0000 (20:22 +0200)]
types: added puck microswitch status
Jiri Kubias [Thu, 23 Apr 2009 18:14:29 +0000 (20:14 +0200)]
Merge branch 'master' of kubiaj1@rtime.felk.cvut.cz:/var/git/eurobot
Jiri Kubias [Thu, 23 Apr 2009 18:14:05 +0000 (20:14 +0200)]
can_ids added puck
Martin Zidek [Thu, 23 Apr 2009 18:08:01 +0000 (20:08 +0200)]
camera integrated to robofsm
Michal Sojka [Thu, 23 Apr 2009 17:49:50 +0000 (19:49 +0200)]
lift: Fixed all problems :)
Filip Jares [Thu, 23 Apr 2009 17:32:57 +0000 (19:32 +0200)]
ACT FSM: timeout changed
Martin Zidek [Thu, 23 Apr 2009 17:26:56 +0000 (19:26 +0200)]
types: added orte types for camera
Filip Jares [Thu, 23 Apr 2009 17:04:59 +0000 (19:04 +0200)]
actlib: lift constants changed
Filip Jares [Thu, 23 Apr 2009 17:03:31 +0000 (19:03 +0200)]
fsmact: few printfs changed; removing the sharp sensor
Filip Jares [Thu, 23 Apr 2009 16:58:07 +0000 (18:58 +0200)]
robofsm/test/test_actuators.cc: robot_destroy() call moved to main to ensure mechanisms cleanup etc.
Filip Jares [Thu, 23 Apr 2009 16:51:35 +0000 (18:51 +0200)]
robofsm/robot.c: actuators cleanup added to robot_destroy()
set chelae and holder position to fully open on exit to avoid mechanisms strain
Filip Jares [Thu, 23 Apr 2009 16:34:14 +0000 (18:34 +0200)]
robofsm/test/test_actuators.cc: bug corrected, I forgot to pass the floor number to the ACT FSM
Michal Sojka [Thu, 23 Apr 2009 16:29:05 +0000 (18:29 +0200)]
lift: Fixes for errors caused probably by low battery oltage
Marek Peca [Thu, 23 Apr 2009 15:15:37 +0000 (17:15 +0200)]
rozpuk: debug image output added
Michal Sojka [Thu, 23 Apr 2009 13:56:11 +0000 (15:56 +0200)]
Updated lineavoid
Michal Sojka [Thu, 23 Apr 2009 13:55:29 +0000 (15:55 +0200)]
robodim: Fixed hokuyo position
Michal Sojka [Thu, 23 Apr 2009 12:47:47 +0000 (14:47 +0200)]
hokyuo: Fixed orientation and several compiler warnings
Martin Zidek [Thu, 23 Apr 2009 12:47:46 +0000 (14:47 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Thu, 23 Apr 2009 12:47:33 +0000 (14:47 +0200)]
lineavoid: added wait for start
Filip Jares [Thu, 23 Apr 2009 12:41:34 +0000 (14:41 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Filip Jares [Thu, 23 Apr 2009 12:41:27 +0000 (14:41 +0200)]
robofsm/robot.c, robodim: acropolis diameter moved to robodim.h