| Branch: | Revision:

scoutos / scout / libscout @ afa9104d

# Date Author Comment
afa9104d 05/06/2012 07:33 PM Priya

Ok Scheduler warehouse behaviour working! and linefollowing works better now! Onto better demo.

1905324e 04/26/2012 01:22 AM Priya

Trying to make the warehouse robot drive around

58371433 04/25/2012 11:45 PM Priya

Renaming to line follow and getting rid of old linefollowing files.

351f71d1 04/25/2012 11:04 PM Priya

adding maps for warehouse and fixing strtok issue in wh_robot that massed up curr_task

b14656f5 04/24/2012 06:29 PM Leon Zhang

Merge branch 'master' of ssh://

0e9eb730 04/24/2012 06:29 PM Leon Zhang

some testing done on WH_robot exec_task, issue pinpointed to curr_task's dest being stored as 0, not fixed yet

f8655f01 04/24/2012 06:28 PM Priya

made the linefollowing a bit more reliable

ae21730e 04/24/2012 06:21 PM Priya

Sim line can make turns now! yay

53201802 04/24/2012 05:52 PM Leon Zhang

Merge branch 'master' of ssh://

d37cfc69 04/24/2012 05:51 PM Leon Zhang

WH_robot goes home in exec_task, follow_path function added; untested

26562d0c 04/24/2012 05:49 PM Priya

Adding wl_test files that were not added before

5d0687a9 04/24/2012 04:22 PM Priya

Small changes to wireless, and starting turning with line following.

ad5b5826 04/17/2012 05:11 PM Priya

some fixes to whrobot and scheduler

83db6c2c 04/10/2012 06:50 PM Priya

Line following code made bettergit status

5f16a3b8 04/10/2012 06:25 PM roboclub

Merge branch 'master' of ssh://

b2876335 04/10/2012 06:25 PM roboclub

fixed scheduler array access, no more segfaulting, but hangs

a3539955 04/10/2012 06:09 PM Alex Zirbel

Fully working linefollowing. Instructions:

rosrun scoutsim scoutsim_node race
rosrun libscout libscout scout1 6

ebb19fe0 04/10/2012 05:00 PM Alex Zirbel

Merge branch 'master' of ssh://

5866cb38 04/10/2012 04:59 PM Alex Zirbel

Linesensor tested and done!

ade1b7f9 04/10/2012 04:53 PM Alex Zirbel

Basic line sensor readings!

7ac5e9bc 04/09/2012 11:08 PM Priya

ROS scheduler/whrobot behavior needs to be debugged

5bd763bc 04/09/2012 09:43 PM Priya

Merge branch 'master' of ssh://

1034f829 04/09/2012 09:41 PM Alex Zirbel

Added LinesensorControl =(

3f72678f 04/09/2012 09:40 PM Priya

Changing scheduler and WH robot to ROS messages

e7b4f56d 04/09/2012 05:35 PM Alex Zirbel

Added sim_line behavior for line follow testing.

dc742c14 04/09/2012 05:31 PM Alex Zirbel

Fixed bugs and compiler warnings in old code.

dee6320c 04/09/2012 01:58 PM Alex Zirbel

Merge branch 'master' of ssh://


26258aeb 04/09/2012 01:57 PM Alex Zirbel

Added linesensor to the behavior class.

aac281d5 04/07/2012 07:44 PM Priya

Forgot to add scheduler to behavior list

6761a531 04/07/2012 07:43 PM Priya

Pushing modified behavior process that requires less arguments and appends scoutname to ros node name. and a compiling but not tested version of test_behaviors (scheduler and wh_robot)

2f025967 04/03/2012 06:40 PM Priya

Got scheduler to compile. onto wh robots

92d4adda 03/27/2012 06:21 PM Priya

added get worst case time to wh_robot

cc399ab3 03/27/2012 06:19 PM Priya

added get_worst_case_time to nav maps

9491b3e2 03/25/2012 12:22 AM Alex Zirbel

Merge branch 'master' of ssh://

2eaafff2 03/25/2012 12:21 AM Alex Zirbel

Added maps and menus in scoutsim.

Menu options for about, quit, clear, and viewing different maps.

9b4328d7 03/24/2012 07:16 PM Priya

Merged WH_Robots with other files

ca164875 03/24/2012 07:16 PM Leon

updating Order with util functs

fe8da1b9 03/24/2012 06:42 PM Leon

minor edit to prev push

a4378953 03/24/2012 06:40 PM Leon

Merge branch 'master' of ssh://

bebd9bcb 03/24/2012 06:40 PM Leon

WH_Robot preliminary code, untested

6642eee3 03/24/2012 06:35 PM Priya

Fixed some bugs in navmap

76cefba1 03/24/2012 05:48 PM Priya

Merged scheduler implementations and modified order structrure class

bd699151 03/24/2012 04:51 PM unknown

Merge branch 'master' of ssh://

97b6298e 03/24/2012 04:49 PM unknown

Scheduler interface.

16f43cae 03/24/2012 04:42 PM James Carroll

An implementation of a portion of the scheduler code. Will probably be stripped for useful content and added to the real final version. Mostly just sets up the structure of the scheduler class and its interface with getting and putitng jobs into the lists.

962cda83 03/24/2012 04:32 PM unknown

Adding scheduler interface.

4678c6c2 03/06/2012 06:25 PM unknown

Merge branch 'master' of ssh://

2d697b1f 03/04/2012 08:03 PM Leon

Adding Doxygen documentation to navigationMap

cccc25c9 03/04/2012 05:31 PM Priya

Made nav map into an actual workable behaviorgit statusgit status

31be19a6 03/03/2012 08:17 PM Priya

Behaviours now have names!

60b98383 03/03/2012 06:19 PM Priya

Committing some clean ups done in the linefollowing behaviours

5d634058 02/28/2012 07:58 PM Thomas Mullins

Added WirelessReceiver to libscout

It does not yet have any filtering functionality, which can be added in
the future if it's really needed.

4469dadd 02/28/2012 06:30 PM unknown

Added Priority Queue Wrapper and Order object for the scheduler to use to keep track of tasks.

57e82e6c 02/27/2012 06:00 PM James Carroll

Fixed some of the syntax problems with the navigationMap fsm and tested it, it seems to generally work. Note the fsm eta still does not work for various reasons.

738e44fb 02/26/2012 06:14 PM Priya

navigationMap bfs tested and worksgit status!

d9e85e54 02/26/2012 04:16 PM Priya

Merge branch 'master' of ssh://

e1a60f89 02/26/2012 04:15 PM Priya

Fixed problems with running behaviors. Something wrong with Cliffsensor control. Must debug later. Also encoder control not working!

aa28526f 02/26/2012 04:00 PM James Carroll

Fixed more errors of indentation and spaces.

aa84b67c 02/26/2012 03:43 PM James Carroll

Fixed Some indentation Errors that were made in LineDrive.cpp and linefollow.cpp
Please enter the commit message for your changes. Lines starting

f34d6221 02/25/2012 06:30 PM Priya

Ok fixed compilation issues from last commit

f79fbce2 02/25/2012 06:23 PM Priya

Merge branch 'master' of ssh://


8f030bc3 02/25/2012 06:20 PM Priya

Commiting pseudo-Gaussian random noise generator. Tested and works.

a739cdbd 02/25/2012 06:19 PM Alex Zirbel

Temporary, possibly broken, commit to add EncodersControl.

Sorry - my ros build is broken. I will immediately debug on Priya's machine.

ede03b64 02/22/2012 12:25 AM James Carroll

Hello, this is James, I updated the navigation map code to better support the getting of the current state and the getting of the estimated time until the robot arrives at its destination. Also there is a TODO that says that we need to find the actual speed of the robot.

0b6591e2 02/20/2012 05:38 PM Priya

Added get outbound edges to navigation map file

71d57001 02/16/2012 04:33 PM Thomas Mullins

Added WirelessSender class to libscout

WirelessSender will hold some metadata like packet destination, pan, and
channel, and will publish a WirelessPacket (also, added
messsages/WirelessPacket.msg) to /wireless/send
So far, lacks proper documentation and static functions similarly named...

aa5e4ddc 02/14/2012 06:15 PM Leon

Finishing BFS for behaviors navigationMap. Also commiting teleop skeleton code.

93210a92 02/10/2012 01:21 PM Leon

BFS for NavigationMap prototype, lots of TODOs

d8caf546 02/07/2012 10:08 PM Priya

Moved outboundVectTable to navigationMap and filled out the code for it.

9143e077 02/07/2012 07:14 PM Lalitha Ganesan

lineFollow functions for Scout.

9295436d 02/07/2012 07:08 PM James Carroll

The lineDrive function from the colony 3 bots that has been modded to be compatable with c++ and also the motors commands were switched to handle the scouts library. Note: If it fails to compile, I probably did the motors wrong. Love James.

3ac7a078 02/07/2012 06:52 PM unknown

Merge branch 'master' of ssh://

0e6831f5 02/07/2012 06:51 PM unknown

Initial ported traffic navigation code.

24145262 02/07/2012 06:21 PM Leon

Merge branch 'master' of ssh://

46587b36 02/07/2012 06:21 PM Leon

navigationMap prototype for Scout

9f547ef7 01/28/2012 04:58 PM Alex Zirbel

Added scoutsim support for encoders.

To see the query_encoders.srv (used for accessing this data) in action, use: rosrun libscout test_encoders. You will see a stream of encoder data.

95bede66 01/26/2012 10:37 PM Priya

Merge branch 'master' of ssh://

c460d4c2 01/26/2012 10:35 PM Priya

Changed deconstructor for behavior list because I discovered vector::empty which should be used instead.

9c0008d0 01/24/2012 09:36 PM Leon

Fixed CliffsensorControl, now actually part of Behaviors

94a3af93 01/24/2012 04:06 PM Priya

Committing changes that were not previously committed. Also got rid of some confusing/unnecessary code.

ba0d744f 01/14/2012 02:27 PM Priya

Merge branch 'master' of ssh://

c239584b 01/14/2012 02:26 PM Priya

New behavior implementation that uses a list of behaviors to command multiple scouts with multiple behaviors.

dbe4fa43 01/07/2012 09:47 PM Leon

Added CliffSensorControl to libscout with very basic functionality
that hopefully doesn't break anything.
(Please let me know if I did something wrong!)

b00761a0 01/04/2012 10:27 PM Alex Zirbel

Updated ButtonControl and SonarControl.

Finally, the behavior compiles. Had to fix a lot of problems involving misunderstandings with Publisher/Client/ServiceServer/ServiceClient confusion.

We can now run priya_behavior as an executable, though the process for generating behavior executables still needs some work.

c492be62 01/03/2012 11:41 PM Alex Zirbel

Updated the licensing information in many files.

This is a broken commit because I decided to do this at a bad time. Sorry! The build will be working after next commit, I promise (and I won't push till then). This commit reflects the licensing in the files after I used my auto-add/remove script.

cc558a8d 01/02/2012 07:18 PM Alex Zirbel

Modified the Behaviors to take a scoutname.

Scoutname now specifies which scout the behavior will affect. Scoutname must be passed to the constructors of each control module (some of which are now in need of modification), so that they can publish to the correct topic....

4de6257c 01/02/2012 05:08 PM Alex Zirbel

Didn't update the CMakeLists in my previous commit.

Removed references to now nonexistant files.

c384dc7e 01/02/2012 03:14 PM Alex Zirbel

Updated the Behavior definition and extensions.

The Behavior.cpp/h class now works and can be extended by simply implementing its run() method. However, the subclass must also be extantiated and used in an external executable. An example of this can be seen in PriyaBehavior.cpp/h, and the executable, priya_behavior_process.cpp. In the future, we should move all behaviors into a behaviors/ folder, and autogenerate the executable to be compiled....

cef78c70 12/30/2011 12:27 AM Priyanka Deo

Created Behavior class and a sample behavior using the class. Not tested.

15b7e607 12/26/2011 10:34 PM Priyanka Deo

Chaned libscout sonar code so that it turned sonar on and off when necessary.

ce8c3190 12/26/2011 05:01 PM Alex Zirbel

Integrated SonarControl into the libscout package.

65c7f52b 12/26/2011 04:49 PM Priyanka Deo

Created SonarControl files. Not tested and therefore not included in libscout interface yet.

144137a1 12/26/2011 04:15 PM Alex Zirbel

Got motor control working with scoutsim

Behaviors can now use the MotorControl class to change the speed of the motors in the simulator. The simulator correctly handles the command.
At the moment, the set_motors command is limited to 'scout1'. We should look into prefixes to specify which scout (scout1, scout2, etc) each behavior should command....

d1cc615c 12/08/2011 05:16 PM Leon

actually removing what I removed

42e8c915 12/08/2011 05:10 PM Leon

Rewrote libbuttons to use objects (ButtonControl).

Also removed query_motors (motors node now responsible for publishing changes)

bugfix: removed -lmotors from manifest files (causing rosmake errors)

a8480867 12/04/2011 01:17 AM Alex Zirbel

Made a lot of changes to the general structure.

Applied object-orienting techniques to the code, cleaning it up considerably. Major design changes are as follows:

  • All separate node code (ie motors) are meant to only interface with hardware - doing as little logic as possible....
2814387f 11/30/2011 10:14 PM Alex Zirbel

Updated motors code.

Changed the definitions for the set_motors message, which forced a few
implementation changes as well.

Changed "libscout_node" to "node" and "n" to "node" in other packages.

6d488cf1 11/30/2011 07:45 PM Priya

Only added libbuttons files. Adding changes to libscout that make libbuttons work.

76a1593f 11/30/2011 07:29 PM Priya

Added buttons to libscout. Compiles!

dec96050 11/27/2011 12:25 AM Priya

Made libscout compile. Changed behavior.cpp to set motors to the same speed in order to test simulator code.