]> rtime.felk.cvut.cz Git - eurobot/public.git/log
eurobot/public.git
11 years agoTransform to C++: Scheduler in robot
Petr Silhavik [Tue, 20 Nov 2012 18:30:22 +0000 (19:30 +0100)]
Transform to C++: Scheduler in robot

Prepare initialization of scheduler.

Chenge pointers to references.

11 years agoTransform to C++: Create special file for Scheduler
Petr Silhavik [Tue, 20 Nov 2012 18:28:41 +0000 (19:28 +0100)]
Transform to C++: Create special file for Scheduler

Create file for Scheduler and move it there.

11 years agoTransform to C++: Makefile OMK
Petr Silhavik [Sun, 18 Nov 2012 16:52:53 +0000 (17:52 +0100)]
Transform to C++: Makefile OMK

Test statemachine can be compiled using OMK.

11 years agoTransform to C++: Update TimedStates
Petr Silhavik [Wed, 14 Nov 2012 14:45:25 +0000 (15:45 +0100)]
Transform to C++: Update TimedStates

11 years agoMake: Update Make for host
Petr Silhavik [Wed, 14 Nov 2012 14:39:23 +0000 (15:39 +0100)]
Make: Update Make for host

Change version of Makefile.rules

Update config.target: Add -std=c++0x option.

11 years agoTransform to C++: TimedStates
Petr Silhavik [Tue, 13 Nov 2012 15:42:15 +0000 (16:42 +0100)]
Transform to C++: TimedStates

Add printing name of active state.

11 years agoTranform to C++: Scheduler
Petr Silhavik [Tue, 13 Nov 2012 15:27:34 +0000 (16:27 +0100)]
Tranform to C++: Scheduler

Add termination of scheduler.

Remove useless variables from Scheduler.

11 years agoTransform to C++: Base classes for state
Petr Silhavik [Sat, 10 Nov 2012 11:31:18 +0000 (12:31 +0100)]
Transform to C++: Base classes for state

Create base classes for state and simple state. These two classes works correctly with adding and removing timers.

11 years agoTransform to C++: TimerList
Petr Silhavik [Sat, 10 Nov 2012 11:29:10 +0000 (12:29 +0100)]
Transform to C++: TimerList

Remove TimerList from state machine and move it to the processor handle

11 years agoTransform to C++: Test implementation of TimedState
Petr Silhavik [Wed, 31 Oct 2012 16:07:42 +0000 (17:07 +0100)]
Transform to C++: Test implementation of TimedState

Using simpler implementation of Timers and timedStates

11 years agoTransform to C++: TimerList
Petr Silhavik [Sat, 27 Oct 2012 20:21:17 +0000 (22:21 +0200)]
Transform to C++: TimerList

Remove template from addTimer

11 years agoTransform to C++: TimedFSM
Petr Silhavik [Sat, 27 Oct 2012 18:21:45 +0000 (20:21 +0200)]
Transform to C++: TimedFSM

Remove functions that are not necessary.

11 years agoTransform to C++: Timers
Petr Silhavik [Sat, 27 Oct 2012 18:16:16 +0000 (20:16 +0200)]
Transform to C++: Timers

Remove TimerList vector and move them to processor handle.

11 years agoTransform to C++: MoveHelper
Petr Silhavik [Tue, 23 Oct 2012 20:15:06 +0000 (22:15 +0200)]
Transform to C++: MoveHelper

Simplify names of methods, make all of them public.

11 years agoTransform to C++: Fix compilation problem
Petr Silhavik [Mon, 22 Oct 2012 20:14:20 +0000 (22:14 +0200)]
Transform to C++: Fix compilation problem

11 years agoTransform to C++: Prepare enum for FSM
Petr Silhavik [Sun, 14 Oct 2012 16:09:21 +0000 (18:09 +0200)]
Transform to C++: Prepare enum for FSM

11 years agoTimedFSM: Tested that event can succesfully carry pointer
Petr Silhavik [Sun, 14 Oct 2012 16:08:47 +0000 (18:08 +0200)]
TimedFSM: Tested that event can succesfully carry pointer

11 years agoTransform to C++: Simplify implementation of Actuators
Petr Silhavik [Sun, 14 Oct 2012 16:07:45 +0000 (18:07 +0200)]
Transform to C++: Simplify implementation of Actuators

11 years agoTransform to C++: Remove useless files
Petr Silhavik [Sat, 13 Oct 2012 20:19:17 +0000 (22:19 +0200)]
Transform to C++: Remove useless files

11 years agoTransform to C++: Fix compilation errors
Petr Silhavik [Fri, 12 Oct 2012 11:28:55 +0000 (13:28 +0200)]
Transform to C++: Fix compilation errors

Change calls of function to new style due to testing.

11 years agoTransform to C++: Add define for including
Petr Silhavik [Fri, 12 Oct 2012 11:26:52 +0000 (13:26 +0200)]
Transform to C++: Add define for including

11 years agoTransform to C++: Fix linking and compiling problems
Petr Silhavik [Wed, 10 Oct 2012 19:15:04 +0000 (21:15 +0200)]
Transform to C++: Fix linking and compiling problems

Fix linking and compiling problems during testing.

11 years agotransform to C++: Actuators
Petr Silhavik [Sun, 7 Oct 2012 13:26:05 +0000 (15:26 +0200)]
transform to C++: Actuators

Remove useless header.

11 years agoTransform to C++: Robot
Petr Silhavik [Sun, 7 Oct 2012 13:03:21 +0000 (15:03 +0200)]
Transform to C++: Robot

Remove useless variables.

11 years agoTransform to C++: Actuators
Petr Silhavik [Sun, 7 Oct 2012 12:31:13 +0000 (14:31 +0200)]
Transform to C++: Actuators

Add info about last jaws request.

11 years agoTransform to C++: MoveHelper
Petr Silhavik [Sat, 6 Oct 2012 10:08:58 +0000 (12:08 +0200)]
Transform to C++: MoveHelper

Change methods. Remove sharing trajectory using class Robot.
Trajectory can now be written this way.
new_trajectory(...).add_point(...).add_final_point(...);

Delete set position methods and move them to class robot.

11 years agoTransform to C++: Replace Lock as Guard
Petr Silhavik [Sat, 6 Oct 2012 10:05:03 +0000 (12:05 +0200)]
Transform to C++: Replace Lock as Guard

11 years agotimed fsm: Conditions for timers
petr [Sat, 29 Sep 2012 14:45:59 +0000 (16:45 +0200)]
timed fsm: Conditions for timers

Change testing conditions for timers.

11 years agoCorrected compile error
petr [Fri, 28 Sep 2012 10:01:14 +0000 (12:01 +0200)]
Corrected compile error

11 years agoMerge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into personal/silhap...
petr [Fri, 28 Sep 2012 09:46:47 +0000 (11:46 +0200)]
Merge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into personal/silhape2/boost

11 years agoTimed fsm
petr [Fri, 28 Sep 2012 09:44:55 +0000 (11:44 +0200)]
Timed fsm

Finished implementation of timed fsm.

Add new test FSM.

11 years agoTimed_FSM
petr [Wed, 26 Sep 2012 20:31:55 +0000 (22:31 +0200)]
Timed_FSM

Add support for timers. Almost finished the main loop implementation.

Example now wait 5 secs and then send event Ev2 and transit back to State1.

Updated makefile to be able to compile using gcc 4.6 (remove std=c++11)

11 years agoMerge branch 'sick-day' of rtime.felk.cvut.cz:/eurobot into sick-day
Michal Sojka [Tue, 25 Sep 2012 14:09:21 +0000 (16:09 +0200)]
Merge branch 'sick-day' of rtime.felk.cvut.cz:/eurobot into sick-day

11 years agoTimed_FSM: First part of implementation
petr [Sat, 22 Sep 2012 19:35:02 +0000 (21:35 +0200)]
Timed_FSM: First part of implementation

Implemented thread safety using mutex.

Add support for multiple state machines.

11 years agoAdd example a simplest possible scheduler
Michal Sojka [Wed, 19 Sep 2012 22:50:07 +0000 (00:50 +0200)]
Add example a simplest possible scheduler

11 years agorobomon: Do not draw power group.
Michal Vokac [Wed, 19 Sep 2012 17:36:12 +0000 (19:36 +0200)]
robomon: Do not draw power group.

There are too much controls on right panel - mouse position in low right corner is then hidden.
Power group is one of the least used controls so I hid it.

11 years agopathplan: Increase map cell size to 200mm.
Michal Vokac [Wed, 19 Sep 2012 17:32:02 +0000 (19:32 +0200)]
pathplan: Increase map cell size to 200mm.

This is 100x100 cells in the map, which is OK for processing.

11 years agorobot: No known obstacles in the map.
Michal Vokac [Wed, 19 Sep 2012 17:30:06 +0000 (19:30 +0200)]
robot: No known obstacles in the map.

11 years agorobomon: Draw grid on playground for better reference.
Michal Vokac [Wed, 19 Sep 2012 17:29:26 +0000 (19:29 +0200)]
robomon: Draw grid on playground for better reference.

11 years agorobomon: Disable background image in robomon playground.
Michal Vokac [Wed, 19 Sep 2012 17:21:39 +0000 (19:21 +0200)]
robomon: Disable background image in robomon playground.

Rename and resize sick-day playground image.

I disable background image because of huge memory consumption.
When the image is scaled too much (20000mm x 20000mm), robomon uses more than 1GB of memory!

11 years agoRemove timerlist.cc and move the implementation to header file
petr [Tue, 18 Sep 2012 17:35:06 +0000 (19:35 +0200)]
Remove timerlist.cc and move the implementation to header file

11 years agochange playground background and dimensions
cvrcevo1 [Mon, 17 Sep 2012 15:38:52 +0000 (17:38 +0200)]
change playground background and dimensions

11 years agoFifoWorker
petr [Sun, 16 Sep 2012 16:25:09 +0000 (18:25 +0200)]
FifoWorker

Add semaphore and its initialization. Change Lock to Guard

11 years agoTransorm to C++: Update TimerList
petr [Sun, 16 Sep 2012 16:19:58 +0000 (18:19 +0200)]
Transorm to C++: Update TimerList

Timerlist is now automatically sorted. First timeout is on the first position.

11 years agoTransform to C++: MyFifoWorker
petr [Mon, 10 Sep 2012 15:55:13 +0000 (17:55 +0200)]
Transform to C++: MyFifoWorker

Prepared for using. Last missing part is checking for first timeout.

11 years agoTransform to C++: MyFifoWorker
petr [Sun, 9 Sep 2012 16:01:13 +0000 (18:01 +0200)]
Transform to C++: MyFifoWorker

New class my_fifo_worker replaces class fifo_worker from Boost Statechart.

Missing check for the first timer.

11 years agoTransform to C++: EventQueue
petr [Thu, 6 Sep 2012 20:12:56 +0000 (22:12 +0200)]
Transform to C++: EventQueue

Implementation of eventqueue

11 years agoeb_jaws_11: add ability to control OMRON sensor
cvrcevo1 [Thu, 6 Sep 2012 14:01:02 +0000 (16:01 +0200)]
eb_jaws_11: add ability to control OMRON sensor

11 years agoTransform to C++: EventQueue
petr [Thu, 6 Sep 2012 08:17:11 +0000 (10:17 +0200)]
Transform to C++: EventQueue

New class EventQueue for threadsafe sending events

11 years agoTransform to C++: Update TimerList
petr [Thu, 6 Sep 2012 08:16:29 +0000 (10:16 +0200)]
Transform to C++: Update TimerList

11 years agoTransform to C++: TimerList implementation
petr [Sun, 2 Sep 2012 16:36:49 +0000 (18:36 +0200)]
Transform to C++: TimerList implementation

11 years agoTransform to C++: TimerList
petr [Sat, 1 Sep 2012 17:56:16 +0000 (19:56 +0200)]
Transform to C++: TimerList

Definition of class TimerList

11 years agoTransform to C++: Macros for simple definition of states nad state machines
petr [Sat, 1 Sep 2012 17:55:39 +0000 (19:55 +0200)]
Transform to C++: Macros for simple definition of states nad state machines

11 years agoTransform to C++: FSM_EVENTS
petr [Thu, 30 Aug 2012 15:22:14 +0000 (17:22 +0200)]
Transform to C++: FSM_EVENTS

List of FSM events available and used in actual implementation of FSM.

11 years agosick-tim3xx: Remove function, that can do problem with libusb.
Matous Pokorny [Wed, 29 Aug 2012 20:34:05 +0000 (22:34 +0200)]
sick-tim3xx: Remove function, that can do problem with libusb.

11 years agosick-tim3xx: Remove warnings
Matous Pokorny [Wed, 29 Aug 2012 20:32:04 +0000 (22:32 +0200)]
sick-tim3xx: Remove warnings

11 years agocamera/color-finder: Remove robot control from main app.
Matous Pokorny [Mon, 27 Aug 2012 12:50:03 +0000 (14:50 +0200)]
camera/color-finder: Remove robot control from main app.

11 years agocamera/color-finder: Web camera is used camera.
Matous Pokorny [Mon, 27 Aug 2012 12:48:39 +0000 (14:48 +0200)]
camera/color-finder: Web camera is used camera.

11 years agocamera/color-finder: Use MIN, MAX macros from robomath
Matous Pokorny [Mon, 27 Aug 2012 12:41:07 +0000 (14:41 +0200)]
camera/color-finder: Use MIN, MAX macros from robomath

11 years agocamera/color-finder: Remove duplicity
Matous Pokorny [Mon, 27 Aug 2012 11:54:06 +0000 (13:54 +0200)]
camera/color-finder: Remove duplicity

11 years agoTransform to C++: Movehelper
petr [Sat, 18 Aug 2012 20:00:44 +0000 (22:00 +0200)]
Transform to C++: Movehelper

New class Movehelper representing functions for motion control.

11 years agoTransform to C++: Robot
petr [Sat, 18 Aug 2012 19:59:15 +0000 (21:59 +0200)]
Transform to C++: Robot

Correction of mispelled name of object

11 years agoTransform to C++: Actuators
petr [Sat, 18 Aug 2012 19:39:14 +0000 (21:39 +0200)]
Transform to C++: Actuators

Simplify names of functions

11 years agoTransform to C++: Locks
petr [Sun, 5 Aug 2012 18:36:28 +0000 (20:36 +0200)]
Transform to C++: Locks

Using pointers to mutex in locks.

11 years agoTransform to C++
petr [Sun, 5 Aug 2012 18:26:39 +0000 (20:26 +0200)]
Transform to C++

Correction of using locks.

11 years agoTransform to C++
petr [Sun, 5 Aug 2012 18:23:06 +0000 (20:23 +0200)]
Transform to C++

Correction of class Locks.

11 years agoRenamed file from robot_orte.c to robot_orte.cc
petr [Sun, 5 Aug 2012 18:21:56 +0000 (20:21 +0200)]
Renamed file from robot_orte.c to robot_orte.cc

11 years agoTransform to C++
petr [Sun, 5 Aug 2012 17:37:44 +0000 (19:37 +0200)]
Transform to C++

Old version of robot_orte.

11 years agoTransform to C++
petr [Sun, 5 Aug 2012 17:35:15 +0000 (19:35 +0200)]
Transform to C++

Class Actuators representing the interface for actuators control.

11 years agoTransform to C++
petr [Sun, 5 Aug 2012 17:33:29 +0000 (19:33 +0200)]
Transform to C++

New class Locks. This class represents easier mutexing. Mutex is locked
when constructor is called and unlocked when destructor is called.

11 years agoTransform to C++
petr [Sun, 5 Aug 2012 17:29:19 +0000 (19:29 +0200)]
Transform to C++

Transformed struct robot to class Robot. Methods manipulating with robot
are included to new class. Object of this class is global.

11 years agoboost: Remove all testing files.
petr [Thu, 2 Aug 2012 16:12:29 +0000 (18:12 +0200)]
boost: Remove all testing files.

This is done because I start to rewrite the control software from C to C++.

11 years agoboost: Pull some testing files
petr [Thu, 2 Aug 2012 16:10:59 +0000 (18:10 +0200)]
boost: Pull some testing files

11 years agoMerge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into personal/silhap...
petr [Thu, 2 Aug 2012 16:08:49 +0000 (18:08 +0200)]
Merge branch 'sick-day' of ssh://rtime.felk.cvut.cz/eurobot/soft into personal/silhape2/boost

Conflicts:
src/eb_test/main.c

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 agocamera: Include headers for color-finder from _compiled/include directory.
Michal Vokac [Wed, 25 Jul 2012 19:15:10 +0000 (21:15 +0200)]
camera: Include headers for color-finder from _compiled/include directory.

11 years agocamera: OMK support for color-finder compilation.
Michal Vokac [Wed, 25 Jul 2012 19:03:08 +0000 (21:03 +0200)]
camera: OMK support for color-finder compilation.

11 years agoUse pkg-config to find out the right flags for compilation against libusb
Michal Sojka [Thu, 12 Jul 2012 08:24:11 +0000 (10:24 +0200)]
Use pkg-config to find out the right flags for compilation against libusb

11 years agoMerge branch 'master' into sick-day
Michal Sojka [Mon, 9 Jul 2012 17:11:44 +0000 (19:11 +0200)]
Merge branch 'master' into sick-day

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 agoAdd preliminary OMK support for color-finder compilation
Michal Sojka [Mon, 9 Jul 2012 16:07:40 +0000 (18:07 +0200)]
Add preliminary OMK support for color-finder compilation

TODO: Modify OMK to support .cpp extension.

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 agoAdded SICK TiM3xx laser rangefinder example program.
Michal Vokac [Sun, 10 Jun 2012 21:08:55 +0000 (23:08 +0200)]
Added SICK TiM3xx laser rangefinder example program.

11 years agocamera: Add sources for color (object) recognition using webcam.
Michal Vokac [Mon, 25 Jun 2012 15:56:33 +0000 (17:56 +0200)]
camera: Add sources for color (object) recognition using webcam.

Source: robotrevue, http://www.robotrevue.cz/2010/06/37

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

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.