Project

General

Profile

Statistics
| Branch: | Revision:

root @ 5d1c5d81

# Date Author Comment
5d1c5d81 04/07/2013 01:49 PM Hui Jun Tay

undid overwrite of maze_solve with maze_solve_simple

a1219504 04/03/2013 10:53 PM viki

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

Conflicts:
scout/libscout/src/BehaviorList.cpp
scout/libscout/src/BehaviorList.h
scout/libscout/src/test_behaviors/smart_runaround.cpp

4c9fb6ba 04/03/2013 10:19 PM viki

Update smart_runaround and add old files.

dbbad8ed 04/01/2013 06:57 PM Thomas Mullins

Added a reset() function to EncodersControl. Untested.

f3bfb5b5 03/31/2013 03:24 PM Alex Zirbel

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

126fea96 03/31/2013 03:22 PM Alex Zirbel

Fixed existing doxygen; preparing to add more.

bb64f5e5 03/31/2013 03:01 PM Priya

Added a ScoutPosition struct with some functions and Changed the odometry code to use it.

259aaff8 03/31/2013 02:56 PM Colony Scout

Flipped front left encoder ticks because its backwards on the scout. Also continuing testing Odometery_new.

339f64d2 03/31/2013 01:48 PM Alex Zirbel

Fixed warnings in libscout behaviors.

Some of these were actually serious errors. Others were little things.

4f83d2b4 03/31/2013 01:27 PM Priya

Removed Makefile. Needs to be automatically generated using 'cmake .'

82590ec3 03/23/2013 04:03 PM Priya

Changed this so that it runs the generate script automatically.

4778412a 03/23/2013 03:35 PM Priya

Added the make clean script to the makefile as make superclean.

4d5b5262 03/23/2013 03:25 PM Alex Zirbel

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

673f8af1 03/23/2013 03:24 PM Alex Zirbel

Added messages/services I forgot to add earlier.

492d2fde 03/23/2013 03:20 PM Colony Scout

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

beaf9201 03/23/2013 03:16 PM Colony Scout

Fixes to the Odometery behavior.

6ebee82c 03/23/2013 02:44 PM Alex Zirbel

Moved all messages to the messages/ folder.

This meant changing a lot of includes and things.

bda6eaa0 03/23/2013 02:12 PM Alex Zirbel

Removed BehaviorList.cpp and h, since they are autogenerated.

97c5c430 03/23/2013 02:12 PM Colony Scout

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

bf68fc90 03/23/2013 02:09 PM Alex Zirbel

Removed useless NodeHandlePtr.

c33e5aa4 03/23/2013 01:55 PM Alex Zirbel

Fixed CW and CCW circle behaviors to turn the right way XD

4026134b 03/23/2013 01:49 PM Alex Zirbel

Added Behavior::wait() to spinOnce for a duration.

Also added maze_solve_simple which always turns right.

f358d0b2 03/23/2013 01:48 PM Colony Scout

Tested encoders on scout. Made hacky changes so that it works. Tom needs to clean this up.

4bdd00ba 03/19/2013 04:50 PM Thomas Mullins

Changed cliff_status_changed to a singe int8 bitmask

0970d303 03/18/2013 05:38 PM Thomas Mullins

Fixed AVR code for new message locations

Also finished and tested cliffsensors. They work.

b2d280c7 03/04/2013 09:15 PM Yuyang Guo

fixed the autoname generating issue

caba2d8a 03/04/2013 09:14 PM Yuyang Guo

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

36701fcd 03/04/2013 09:12 PM Yuyang Guo

added new Odometry in test behaviors, done some simple testing in scoutsim

071926c2 03/04/2013 08:28 PM Alex Zirbel

Retired (deleted) unused packages.

Moved their msg/srv definitions to the messages/ package instead, and revised the libscout and scoutsim files that depended on those namespaces.

1057a46d 03/04/2013 07:06 PM Alex Zirbel

Removed old files and test executables.

b333d404 03/03/2013 03:14 PM Yuyang Guo

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

cfef1cdc 03/03/2013 03:13 PM Yuyang Guo

fixed the issue of behavior list not corresponding to the GUI list
of behaviors

f09d002e 03/03/2013 03:06 PM Hui Jun Tay

behaviors now overwrite teleop (see comments in scout.cpp for details)

e10d9dd5 03/03/2013 01:49 PM Thomas Mullins

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

04270a10 03/03/2013 01:29 PM Thomas Mullins

Changed everything to use group scout because of Upstart bug

7f2ccb46 02/28/2013 05:05 PM Alex Zirbel

Fixed up the smart_runaround behavior to integrate it fully.

8b7d6f99 02/28/2013 04:55 PM Alex Zirbel

Updated BehaviorList with the new smart_runaround.

c9638ad1 02/28/2013 04:55 PM Alex Zirbel

Added BehaviorList templates.

5dd9f396 02/28/2013 04:54 PM Alex Zirbel

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

6350051e 02/28/2013 04:52 PM Alex Zirbel

Added a script to auto-generate BehaviorList files.

This includes some sub-changes: * Restructured behaviors/ folder into behaviors/, test_behaviors/ and limbo_behaviors/ * Added a new CMakeLists.txt that automatically finds behaviors in their folders * Removed the obsolete trafficNavigtaion.*...

2fd5122a 02/28/2013 04:49 PM viki

Add smart runaround behaviors.

a69f6363 02/28/2013 04:46 PM viki

Test commit for new clone.

d7c3c222 02/25/2013 07:38 PM Thomas Mullins

Encoders node now actually reads from hardware

This compiles but hasn't been tested on the Scout yet.

2237e1f0 02/25/2013 07:37 PM Thomas Mullins

Changed motor max speed and added constants in set_motors.msg

The new speed range is -100 to 100, to be consistent with the pwm
driver. They can be accessed with motors::set_motors::MIN_SPEED and
motors::set_motors::MAX_SPEED respectively.

2e8030ea 02/24/2013 03:11 PM Priya

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

Conflicts:
scout/libscout/src/BehaviorProcess.cpp

dcf49526 02/24/2013 03:08 PM Priya

Overwrote the ROS sigint handler so now behaviours stop and die and stop motors upon exiting.

1e52c76b 02/24/2013 02:01 PM Yuyang Guo

fixed died rosnode kill and added sonar viz

a283b65b 02/23/2013 03:05 PM Thomas Mullins

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

8741d18c 02/23/2013 03:04 PM Thomas Mullins

Added cliffsensor/ROS code to main file (untested)

414d2b48 02/19/2013 11:32 PM Alex Zirbel

Updated line follow code to make turns for Lab 2.

Also upgraded at_destination and LineSensor::destination() for Intro Lab 2.

af7e0f94 02/19/2013 06:18 PM Alex Zirbel

Added new at_destination functionality.

Maze turns are buggy and are the next order of business.

40659cb8 02/17/2013 03:57 PM Colony Scout

More fixes to launch scripts (poorly written by Tom ;)

0fb861bc 02/17/2013 03:48 PM Thomas Mullins

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

e203e719 02/17/2013 03:48 PM Thomas Mullins

Fixed launch script error

92019044 02/17/2013 03:44 PM Hui Jun Tay

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

c06735bb 02/17/2013 03:42 PM Hui Jun Tay

Removed headers, sonar uses custom timestamp, added code to manually update timestamp

9873e344 02/17/2013 03:21 PM Yuyang Guo

changed GUI according to the new order to conform to
"rosrun libscout libscout <behavior#> <scoutname>"
w

94ec93e0 02/17/2013 03:18 PM Yuyang Guo

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

c467de4f 02/17/2013 03:16 PM Yuyang Guo

running libscout behaviors without specifying a name should
make everything publish directly (e.g., to /set_motor instead of
/scout1/set_motor) and thus should work on hardware.

d2acabf3 02/17/2013 03:04 PM Thomas Mullins

Added rosscout.launch in libscout

On startup, it will now launch rosscout instead of rosserial. rosscout
includes rosserial, motors, encoders, and any other helper nodes added
later.

18db4dfa 02/17/2013 02:20 PM AnsonLinux

cliffSensor edited

679f4e26 02/17/2013 02:17 PM Priya

Freeing memory we allocate. Yay!

6ee555a3 02/14/2013 01:44 PM Priya

Changed scout constants to refresh faster. Also retuned linefollowing for faster refresh rate.

fa857318 02/13/2013 08:53 PM Priya

Fixed bugs with how the simulator was doing math for pose estimation.

ab8736ac 02/13/2013 01:00 AM Yuyang Guo

added teleop to GUI, should be able to choose which scout to control now

9a4d8398 02/13/2013 12:22 AM Yuyang Guo

New GUI should be working now! (run, pause resume should all work
pretty robustly). Teleop is not working yet...

01f09975 02/12/2013 04:29 PM Yuyang Guo

Partially done GUI rewriting GUI
now can only add and kill scouts freely but can do nothing else

daf6a575 02/11/2013 05:12 PM Thomas Mullins

Added position to published sonar messages

1ad3d43a 02/11/2013 04:48 PM Thomas Mullins

Adding Upstart files to start roscore and rosserial

8deb8e3f 02/10/2013 03:09 PM Priya

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

35a71cce 02/10/2013 03:08 PM Priya

Adding 3 line following maps to the repository.

60a90290 02/10/2013 02:36 PM Hui Jun Tay

\Fixed teleop to work with behaviors. Teleop currently has priority over behaviors

60800b68 02/04/2013 04:16 PM AnsonLinux

cliffSensor.cpp fixed.

164c2505 02/03/2013 06:47 PM Priya

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

fa5ca6e3 02/03/2013 06:46 PM Priya

Fixed pause not working with the GUI. Also removed super annoying printf from MotorControl. And also fixed some pause/resume GUI bugs and the fact that process.kill and process.terminate wouldnt do anything.

3493418f 02/03/2013 06:07 PM Alex Zirbel

Removed 'priya_draw_name' include from BehaviorList.

e117f879 02/03/2013 05:32 PM Alex Zirbel

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

b4865319 02/03/2013 05:28 PM Alex Zirbel

Adding make_clean.sh to recursively clean subdirectories.

80224838 02/03/2013 05:16 PM Priya

Hacky fix to pause to work around issue that sending motor commands sometimes does nothing.

c15f2677 02/03/2013 04:54 PM Priya

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

faa11f08 02/03/2013 04:54 PM Priya

Changed it so that all behaviors are not instantiated immediately. Also changed pause so it does not spam (0, 0) motor speeds.

07121480 02/03/2013 03:53 PM Alex Zirbel

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

d2dedb17 02/03/2013 03:53 PM Alex Zirbel

Bugfix to BehaviorGUI causing crashes.

360e3b6c 01/30/2013 08:09 PM Thomas Mullins

Fixed segfault from LinesensorControl when the service call failed

066b08bb 01/30/2013 04:56 PM Thomas Mullins

Adding Charles's headlight code

cfdb3afa 01/29/2013 07:18 PM Alex Zirbel

Added latching to publishers so the first message gets noticed.

63e19141 01/28/2013 05:57 PM Thomas Mullins

Committing Anson's BOM changes

64aea12e 01/25/2013 08:33 PM Thomas Mullins

Added ENABLE output for stepper

This will hopefully solve the problem of the stepper heating excessively
and constantly using current.

958699af 01/21/2013 04:26 PM Thomas Mullins

Fixed rosserial; now works with Gumstix

2853d46b 01/17/2013 10:20 PM Thomas Mullins

Changed stepper to always step in step_sweep

Also added whole/half step as a separate setting, with a single
step_do_step function. Also added stepper to main.cpp.

2b0ba4bb 01/14/2013 06:25 PM Thomas Mullins

Fixed encoder.ko makefile and missing #include

54f7fa50 01/13/2013 04:00 PM Thomas Mullins

Removed encoder udev rule

f325b893 01/06/2013 06:50 PM Alex Zirbel

Added conversions abs_to_rel and rel_to_abs.

Also, added warnings after these conversions in the case that a requested speed has to be cropped.

Tested against a temporary behavior which set the speeds (now removed since it's very easy to write such a test behavior).

4e393fcc 01/04/2013 05:46 PM Alex Zirbel

Added code for unit conversion, pending tests.

f3549f76 01/04/2013 04:07 PM Alex Zirbel

Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos

9d9e04ba 01/04/2013 04:06 PM Alex Zirbel

Old little changes to sonar.

4807b056 12/30/2012 12:08 PM Priya

Adding a Priya custom scout.

280c6899 12/10/2012 07:11 PM Thomas Mullins

Changes to the encoder driver

It now uses an entry in sysfs instead of /dev. Also it now compiles.

c0b686d7 12/09/2012 07:16 PM Thomas Mullins

Adding kernel patch for scout_power_off

493cc515 12/09/2012 06:12 PM Thomas Mullins

Removed unnecessary extra code in motors node (oops!)