]>
rtime.felk.cvut.cz Git - eurobot/public.git/log
Filip Jares [Tue, 7 Apr 2009 10:34:41 +0000 (12:34 +0200)]
Merge branch 'master' of /var/git/eurobot
Filip Jares [Tue, 7 Apr 2009 10:34:32 +0000 (12:34 +0200)]
'default' clause removed from switch statements in robofsm/fsmmain.c, experimenting with map, ...
robodim/robodim.h: some constants added defining free column element's grid's position
ACT FSM: some dummy_action state defined while actuator control not ready
Marek Peca [Tue, 7 Apr 2009 08:51:50 +0000 (10:51 +0200)]
robofsm/motion-control: estimator coordinates unified with common coord system
Filip Jares [Tue, 7 Apr 2009 08:40:01 +0000 (10:40 +0200)]
Merge branch 'master' of /var/git/eurobot
Michal Sojka [Tue, 7 Apr 2009 08:31:04 +0000 (10:31 +0200)]
Fixed prepare_infrastructure again to work with older Git
Michal Sojka [Tue, 7 Apr 2009 08:28:11 +0000 (10:28 +0200)]
Fixed prepare_infrastructure to work with older Git
Filip Jares [Tue, 7 Apr 2009 08:26:03 +0000 (10:26 +0200)]
Merge branch 'master' of /var/git/eurobot
Filip Jares [Tue, 7 Apr 2009 08:24:52 +0000 (10:24 +0200)]
something like MAIN FSM's state "go_to_our_static_dispenser" added
Michal Sojka [Tue, 7 Apr 2009 08:16:42 +0000 (10:16 +0200)]
CONFIG_OPEN_LOOP removed
The OPEN_LOOP behavior is detected on runtime. It is switched to open loop
mode when measurement is not received.
Michal Sojka [Tue, 7 Apr 2009 08:14:09 +0000 (10:14 +0200)]
Fixed do_control() invocation
If measurement data are received do_control() is called when the
measurement is received, otherwise it is called on timeout in the same way
as before Marek's changes.
Marek Peca [Tue, 7 Apr 2009 08:18:56 +0000 (10:18 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Michal Sojka [Tue, 7 Apr 2009 09:03:43 +0000 (11:03 +0200)]
commit-graph: Updated to display only this year and new co-workers
Marek Peca [Tue, 7 Apr 2009 08:15:06 +0000 (10:15 +0200)]
ULoPoS: angle added to watchtower
Marek Peca [Tue, 7 Apr 2009 07:56:09 +0000 (09:56 +0200)]
beacon coordinates corrected
- adapted to common coordinate system in robo*
- added 22mm/10mm borders according to EB2009 drawing
Marek Peca [Tue, 7 Apr 2009 07:25:42 +0000 (09:25 +0200)]
added symlink uzv to build/ppc
Marek Peca [Tue, 7 Apr 2009 05:51:41 +0000 (07:51 +0200)]
robofsm/motion-control connected with ULoPoS/EKF
Marek Peca [Tue, 7 Apr 2009 05:04:59 +0000 (07:04 +0200)]
robofsm, ULoPoS/EKF: DBG() prints corrected
Marek Peca [Tue, 7 Apr 2009 04:59:10 +0000 (06:59 +0200)]
robofsm/motion-control: deleted forgotten timeval
Marek Peca [Tue, 7 Apr 2009 04:32:01 +0000 (06:32 +0200)]
robofsm/motion-control: prepared for ULoPoS EKF
Marek Peca [Mon, 6 Apr 2009 21:51:36 +0000 (23:51 +0200)]
robofsm: mistaken hooks to inactive fsmloc reverted back, sorry
Marek Peca [Mon, 6 Apr 2009 21:24:12 +0000 (23:24 +0200)]
robofsm: motion IRC cb edit + ultrasonic dist measurement event
adapted to use with fsmloc & ULoPoS estimator
Marek Peca [Mon, 6 Apr 2009 16:47:33 +0000 (18:47 +0200)]
ULoPoS: 8th EKF incl. odometry added
Marek Peca [Mon, 6 Apr 2009 14:03:07 +0000 (16:03 +0200)]
ULoPoS: swapped prediction/correction step in EKF
it helped a bit, now the measurement is smoother, but delayed
greetings to Havlena ;-)
Marek Peca [Mon, 6 Apr 2009 13:38:06 +0000 (15:38 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Marek Peca [Mon, 6 Apr 2009 13:37:55 +0000 (15:37 +0200)]
ULoPoS: index bug in matrix.c corrected
Filip Jares [Mon, 6 Apr 2009 12:29:07 +0000 (14:29 +0200)]
experimenting with walls
Filip Jares [Mon, 6 Apr 2009 12:13:34 +0000 (14:13 +0200)]
robodim: static puck (column element) dispenser position added; fiddling about with fsmmain
Marek Peca [Mon, 6 Apr 2009 10:12:09 +0000 (12:12 +0200)]
Iehova wiped out of Makefile.omk
Marek Peca [Mon, 6 Apr 2009 10:05:52 +0000 (12:05 +0200)]
Merge branch 'master' of pecam1@rtime.felk.cvut.cz:/var/git/eurobot
Filip Jares [Mon, 6 Apr 2009 10:54:02 +0000 (12:54 +0200)]
robofsm/robot.c: fsm_destroy() call on ACT fsm added to robot_destroy()
Filip Jares [Mon, 6 Apr 2009 10:46:56 +0000 (12:46 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
Marek Peca [Mon, 6 Apr 2009 10:05:37 +0000 (12:05 +0200)]
updated uzv/Makefile.omk
Michal Sojka [Mon, 6 Apr 2009 08:22:47 +0000 (10:22 +0200)]
Better fix for error in ORTE
Marek Peca [Sun, 5 Apr 2009 17:41:24 +0000 (19:41 +0200)]
ULoPoS EKF debug msgs
Marek Peca [Sun, 5 Apr 2009 17:40:57 +0000 (19:40 +0200)]
ULoPoS: EKF error recovery and reinitialization added
- detection of "get lost" state
-- if robot found too far out of playground
-- if state contains NaN or Inf (should not happen)
-- if >=2 measurement errors occur in >=N_LOST consecutive periods
- reinitialization using analytic solution
Filip Jares [Sun, 5 Apr 2009 14:07:26 +0000 (16:07 +0200)]
robot_orte_init... picker publisher removed to avoid chelae epilepsy
Marek Peca [Sun, 5 Apr 2009 13:17:09 +0000 (15:17 +0200)]
ULoPoS: hypintsec moved to new library uzvgeom
Marek Peca [Sun, 5 Apr 2009 09:24:20 +0000 (11:24 +0200)]
ULoPoS: disable clock process noise, if >=2 erroneous measurements
Martin Zidek [Sat, 4 Apr 2009 12:56:38 +0000 (14:56 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Sat, 4 Apr 2009 12:53:01 +0000 (14:53 +0200)]
robomon: connected action handler to actuators dials
Filip Jares [Sat, 4 Apr 2009 12:43:13 +0000 (14:43 +0200)]
robofsm/Makefile.omk: actlib added; hokuyo init removed temporarily; robomon: blue starting area changed to green;
jirka [Sat, 4 Apr 2009 11:04:29 +0000 (13:04 +0200)]
sberac: data reload
Martin Zidek [Sat, 4 Apr 2009 09:26:02 +0000 (11:26 +0200)]
cand: fixed segfault introduced by !Marek! ;)
Filip Jares [Sat, 4 Apr 2009 09:06:33 +0000 (11:06 +0200)]
Merge branch 'master' of jaresf1@rtime:/var/git/eurobot
jirka [Sat, 4 Apr 2009 08:48:42 +0000 (10:48 +0200)]
lift: added LED documentation
Filip Jares [Fri, 3 Apr 2009 15:54:43 +0000 (17:54 +0200)]
robofsm: obsolete doxygen doc deleted; fsmmain.c: ACT FSM initial state added
Jarda Sach [Thu, 2 Apr 2009 14:31:52 +0000 (16:31 +0200)]
lift: no change
Jarda Sach [Wed, 1 Apr 2009 19:31:28 +0000 (21:31 +0200)]
Merge branch 'master' of sachj1@rtime.felk.cvut.cz:/var/git/eurobot
Jarda Sach [Wed, 1 Apr 2009 19:31:20 +0000 (21:31 +0200)]
lift: jarda nevi co sem napsat ... nefunguje ISR
Filip Jares [Wed, 1 Apr 2009 17:29:43 +0000 (19:29 +0200)]
fsm/fsm.c: fsm_exit() added to doxygen group 'fsm'; typo in documentation corrected
Michal Sojka [Wed, 1 Apr 2009 15:28:03 +0000 (17:28 +0200)]
robofsm: Add missing things for act FSM
Not existing of act FSM caused that the applications did not exit on
Ctrl-C.
Michal Sojka [Wed, 1 Apr 2009 15:26:37 +0000 (17:26 +0200)]
robofsm: Move motion initialization and add destroy to robot.c
Thanks to this, the robot can be properly destroyed.
Michal Sojka [Wed, 1 Apr 2009 15:24:23 +0000 (17:24 +0200)]
fsm: Fix segfault when sending signals to exited FSMs
Filip Jares [Wed, 1 Apr 2009 15:14:45 +0000 (17:14 +0200)]
Merge branch 'master' into blueToGreen
Filip Jares [Wed, 1 Apr 2009 15:04:39 +0000 (17:04 +0200)]
What was BLUE renamed to GREEN, some FIXME comments added
Michal Sojka [Wed, 1 Apr 2009 14:21:27 +0000 (16:21 +0200)]
Block real-time signals on startup
This is necessary to avoid crashes when stop() is called earlier than
motion-control thread fully starts.
Michal Sojka [Wed, 1 Apr 2009 14:15:13 +0000 (16:15 +0200)]
Suppress warnings about DBG redefinition
Filip Jares [Wed, 1 Apr 2009 12:15:59 +0000 (14:15 +0200)]
ambiguous identifiers 'CAN_SERVOS' and 'CAN_DRIVES' renamed; corrected plural form 'chelae'
CAN_DRIVES renamed to CAN_BELTS,
CAN_SERVO renamed to CAN_CHELAE,
all occurrences of 'chelas' corrected to correct plural form 'chelae'
Marek P [Tue, 31 Mar 2009 13:00:47 +0000 (15:00 +0200)]
ULoPoS EKF/matrix.c: crude protection agains numeric faults
Two operations are protected in a very basic way against numerical fault,
which occured very often during tests. The operations are float / and sqrt.
If supplied with wrong data, the resulting matrices diverged to either NaN of Inf
and never returned to normal values.
Filip Jares [Mon, 30 Mar 2009 18:59:24 +0000 (20:59 +0200)]
actlib: few constants changed; joyd: chelae handling mapped on some buttons
Jarda Sach [Mon, 30 Mar 2009 15:25:01 +0000 (17:25 +0200)]
backup upload
Jarda Sach [Mon, 30 Mar 2009 15:23:30 +0000 (17:23 +0200)]
Merge branch 'master' of sachj1@rtime.felk.cvut.cz:/var/git/eurobot
Filip Jares [Mon, 30 Mar 2009 12:32:33 +0000 (14:32 +0200)]
joyd: actuators: handling of the joystick buttons changed
Filip Jares [Mon, 30 Mar 2009 11:33:28 +0000 (13:33 +0200)]
newline added to make the joyd.cc file conform coding style standards
Filip Jares [Mon, 30 Mar 2009 09:12:34 +0000 (11:12 +0200)]
cand/cand.cc: bug introduced by me the day before yesterday corrected
joyd: change made by me two days ago reset to original state
Michal Sojka [Sun, 29 Mar 2009 10:19:09 +0000 (12:19 +0200)]
prepare_infrastructure is less verbose
Michal Sojka [Sun, 29 Mar 2009 10:16:26 +0000 (12:16 +0200)]
sysless-lpc21xx updated to the merge of eurobot branch and master branch modifiled by Marek
Martin Zidek [Sun, 29 Mar 2009 09:40:57 +0000 (11:40 +0200)]
actuators: fixed wrong function prototypes
Martin Zidek [Sun, 29 Mar 2009 09:40:32 +0000 (11:40 +0200)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Sun, 29 Mar 2009 09:39:57 +0000 (11:39 +0200)]
robomon:
updated controls, added controls to control the chelae and belts
Michal Sojka [Sun, 29 Mar 2009 07:50:45 +0000 (09:50 +0200)]
Updated and fixed robot-root
Update was that Jarda is added to ortemanager's peers and fix was that I've
pushed new subproject version without pushing the robot-root subproject.
Therefore, others cannot update to the correct version of robot-root.
Marek P [Sat, 28 Mar 2009 22:46:36 +0000 (23:46 +0100)]
ULoPoS uzv_rx arranged to run from FLASH
Marek P [Sat, 28 Mar 2009 21:47:55 +0000 (22:47 +0100)]
ULoPoS uzv_rx cleanup
Co tu tropis za neplechy, mrcho nezvedena!
Marek P [Sat, 28 Mar 2009 21:43:34 +0000 (22:43 +0100)]
ULoPoS uzv_rx almost fully OMaKized
I still don't know, how to manipulate .dat->.s conversion and compilation in OMK.
.s is apparently a headache in OMK, since only .S is supported; the problem is in .includes vs #includes
Marek P [Sat, 28 Mar 2009 20:58:14 +0000 (21:58 +0100)]
ULoPoS majak switched to use pll library
Marek P [Sat, 28 Mar 2009 20:30:52 +0000 (21:30 +0100)]
ULoPoS majak cleanup
Marek P [Sat, 28 Mar 2009 20:29:29 +0000 (21:29 +0100)]
ULoPoS majak: ISR replaced by polling due to MCU HW bug
According to erratum Timer.1 (early LPC21x9), match IRQ
event may be lost; almost no reasonable workaround, thus
timer ISR has been replaced by a busy polling loop.
Anyway, CPLD/FPGA would be the right solution for this task, the
MCU is employed since it has been ready on the PCB.
Marek P [Sat, 28 Mar 2009 18:02:34 +0000 (19:02 +0100)]
subdir spejblarm/uzv_majak linked
Marek P [Sat, 28 Mar 2009 18:00:45 +0000 (19:00 +0100)]
ULoPoS majak now OMaKized
Marek P [Sat, 28 Mar 2009 17:59:27 +0000 (18:59 +0100)]
New LPC2xxx
Marek P [Sat, 28 Mar 2009 17:04:14 +0000 (18:04 +0100)]
Added build/spejblarm OMK tree
Filip Jares [Sat, 28 Mar 2009 16:19:18 +0000 (17:19 +0100)]
Work on actuators FSM begun. LPCs not ready yet.
Filip Jares [Sat, 28 Mar 2009 16:15:02 +0000 (17:15 +0100)]
temporary chela handling added (again)
LPCs not ready yet,
- trying to make the actuators work partially
- trying to learn how to work with them...
Filip Jares [Sat, 28 Mar 2009 15:59:47 +0000 (16:59 +0100)]
temporary chela handling added
LPCs not ready yet,
- trying to make the actuators work partially
- trying to learn how to work with them...
Filip Jares [Fri, 27 Mar 2009 23:31:10 +0000 (00:31 +0100)]
src/joyd/joyd.cc: typo
Martin Zidek [Fri, 27 Mar 2009 18:49:57 +0000 (19:49 +0100)]
actuators: fixed constants
Martin Zidek [Fri, 27 Mar 2009 18:49:12 +0000 (19:49 +0100)]
joyd: defined actions for some buttons
Martin Zidek [Fri, 27 Mar 2009 18:08:44 +0000 (19:08 +0100)]
robofsm: removed some unnecessary code
Martin Zidek [Fri, 27 Mar 2009 18:06:23 +0000 (19:06 +0100)]
cand: removed some dead code
Martin Zidek [Fri, 27 Mar 2009 18:02:31 +0000 (19:02 +0100)]
cand: added actuators handling
Martin Zidek [Fri, 27 Mar 2009 18:01:59 +0000 (19:01 +0100)]
can_ids: fixed documentation link
Martin Zidek [Fri, 27 Mar 2009 17:59:58 +0000 (18:59 +0100)]
actuators: defined constants
Martin Zidek [Fri, 27 Mar 2009 17:53:40 +0000 (18:53 +0100)]
can_ids: defined IDs for holder and pusher
Martin Zidek [Fri, 27 Mar 2009 16:19:36 +0000 (17:19 +0100)]
Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot
Martin Zidek [Fri, 27 Mar 2009 16:19:08 +0000 (17:19 +0100)]
actuators: implemented actuators actions
Filip Jares [Fri, 27 Mar 2009 16:16:56 +0000 (17:16 +0100)]
deleted obsolete roboorte symlinks in build directories
contents of src/roboorte directory previously moved to src/types/
Michal Sojka [Fri, 27 Mar 2009 16:06:41 +0000 (17:06 +0100)]
Added comment to config.target
Also deleted inclusion of config.omk.local since config.omk is already meant to
be "local".
Michal Sojka [Fri, 27 Mar 2009 15:13:22 +0000 (16:13 +0100)]
Defined data types for actuators
actlib prefix shortened to act_
Michal Sojka [Fri, 27 Mar 2009 13:57:05 +0000 (14:57 +0100)]
roboorte moved to types directory
The reason is that .idl is used as source and I don't like .. in paths :)
Filip Jares [Fri, 27 Mar 2009 12:53:09 +0000 (13:53 +0100)]
Initial work on actlib changes