Ok fixed compilation issues from last commit
Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos
Conflicts: scout/libscout/CMakeLists.txt
Commiting pseudo-Gaussian random noise generator. Tested and works.
Temporary, possibly broken, commit to add EncodersControl.
Sorry - my ros build is broken. I will immediately debug on Priya's machine.
Sonar prototypes in scoutsim package.
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.
Added get outbound edges to navigation map file
Added WirelessSender class to libscout
WirelessSender will hold some metadata like packet destination, pan, andchannel, and will publish a WirelessPacket (also, addedmesssages/WirelessPacket.msg) to /wireless/sendSo far, lacks proper documentation and static functions similarly named...
Finishing BFS for behaviors navigationMap. Also commiting teleop skeleton code.
BFS for NavigationMap prototype, lots of TODOs
Moved outboundVectTable to navigationMap and filled out the code for it.
lineFollow functions for Scout.
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.
Initial ported traffic navigation code.
navigationMap prototype for Scout
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.
Changed deconstructor for behavior list because I discovered vector::empty which should be used instead.
Fixed CliffsensorControl, now actually part of Behaviors
Committing changes that were not previously committed. Also got rid of some confusing/unnecessary code.
New behavior implementation that uses a list of behaviors to command multiple scouts with multiple behaviors.
Added CliffSensorControl to libscout with very basic functionalitythat hopefully doesn't break anything.(Please let me know if I did something wrong!)
Adding previously missing file sonar_distance.msg
Should have been in previous commits but was not added.
Added scout_constants.h to scoutsim
Previously missing file in last commit.
Fixed the scoutsim node.
Just a couple bugs. All the nodes compile now! You can run "rosmake" from the "scout" directory (compile the whole stack).
Fixed the encoders node.
Simplified the node to only advertise a single service - a query allows other nodes to find out, simply, the total distance traveled. The node also only handles plain encoder ticks, because distance and such computation should be done on the library end.
Fixed the analog node.
Only a couple small changes were needed here. For the most part, good job Dev - looks like this is set up correctly for a skeleton. Changes were debugging only.
Small tidying up.
Took out unneeded gensrv() in buttons, which caused a compilation warning, and made miniscule style changes to motors.cpp.
Fixed the usb_serial node so it now compiles.
Moved the previously split send_serial_data and receive_serial_data into a single message. Renamed files to use usb_serial instead of usbserial. Updated CMakeLists to actually refer to usb_serial and not motors. Fixed bugs.
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.
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.
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....
Didn't update the CMakeLists in my previous commit.
Removed references to now nonexistant files.
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....
Created Behavior class and a sample behavior using the class. Not tested.
Chaned libscout sonar code so that it turned sonar on and off when necessary.
Integrated SonarControl into the libscout package.
Created SonarControl files. Not tested and therefore not included in libscout interface yet.
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....
actually removing what I removed
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)
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:
Updated motors code.
Changed the definitions for the set_motors message, which forced a fewimplementation changes as well.
Changed "libscout_node" to "node" and "n" to "node" in other packages.
Updated the motors class and set_motors message.
Still todo: update the query_motors service, make the util file exported as a library.
Only added libbuttons files. Adding changes to libscout that make libbuttons work.
Added buttons to libscout. Compiles!
Made libscout compile. Changed behavior.cpp to set motors to the same speed in order to test simulator code.
Added temporary scout images for turtlesim into the repository. Removed old turtle images.
Added a template scout simulator class.
Scoutsim is modeled directly from turtlesim. At this point, the only changes are in names and indentation. A separate licensing file was also added to get rid of the junk at the top of the old turtlesim files.
Fixed bugs I saw in headlights code. Fixed object parameter missing error. Added no-set capability to headlights. Changed attribution in motors. Fixed CMakeLists.txt due to error I put in there on my last commit (extra comma). Should compile now. I'm sorry if it doesn't.
Added libheadlights.cpp(cpp/h). Also updated constants.h and libscout.(cpp/h) for libheadlights. Have not compiled yet, but it should work.
Added behavior.cpp to CMakeLists.txt because I forgot to add it before.
Restructured libscout.(cpp/h) so the behavior main runs in a separate file, and just calls upon libscout.cpp for initialization. This behavior function can then be swapped out or changed, and the rest of the libscout node can be precompiled so it doesn't have to be recompiled every time.
Deleted compiler output files that were accidentally included in analog.
cleaned up some files - should be ready to make.
Fixed headlights/src/headlights.cpp to get rid of the compile-time bug. I forgot to dereference a pointer in the message subscriber that subscribes to set_headlights.
Deleted obsolete file, fixed small bug in define statement
Added files for analog from motors with modifications
Finished skeleton of cliffsensor node. Compiles.
de-crapping the repository. Kids, don't git add * if you don't know what you're doing.
removed all the stuff from the compiler that I commited because I'm a moron
Added a @todo
Added the power node and skeleton
Created structure for buttons node. Compiles. However event_button function is not written.
Created ROS skeleton for Headlights node. Currently has functionality for getting headlights set via a message and setting some variables to the message contents, but doesn't write to hardware. Also does not include code in libscout to support headlights yet....
Added a new bom node skeleton.
It works using one service that sends the goal bot and current bot in therequest and gets the information from the 4 boms back in the response.I did not actually implement the communication with the bom because thatrequires communication with the avr, which is beyond my knowledge....
Updated motors.cpp and motors.h with small stylistic changes.
Updated encoder node code with preliminary driver functionality.Renamed encoder_state.msg to encoders_state.msg.Added functions to encoders.cpp to send message of current encoder state.Added function headers to encoders.h.Added function to encoders.cpp to convert to different units....
Updated the sonar module prototype.
The biggest change to the proposed node is a restructuring of the sonar code style. Two services (sonar_toggle and sonar_set_scan) allow another node to turn the sonar on and off. The sonar constantly scans, keeps track of its position, and publishes all its readings in the topic sonar_direction.msg....
Added Encoders and USB/Serial ROS nodes. Some of the functions in thesrc/<node>.cpp files are not fully functional yet.
Added buttons and cliffsensor ROS nodes. Everything except for src/<node>.cpp file functions have been changed.
Added code inside motors.cpp to set and read individual speeds in different units. Also added appropriate headers to motors.h, and units field to query_motors.srv and set_motors.msg
Merge ssh://roboclub.org/home/svn/scoutos
Revert "fixed 2009 to 2011 in date" I don't care about this, I'll fix it later.
This reverts commit 266c675837021b50b9c38d45ba9fdee4ffc35a54.
fixed 2009 to 2011 in date
Added a new Doxygen generator file.
To generate a "docs" folder containing all autogenerated Doxygen files,install doxygen, then run "doxygen Doxyfile" within this folder.
Updated motors.cpp and motors.h to comply with coding standards and doxygen.
Changed the module comments so motors are properly labeled as a the motor module.Chaned indentation to four spaces.Put braces on a new line.
Edited manifest.xml and mainpage.dox to have better descriptions.
Added the ROS stack with the libscout, motors, and sonar packages to the reposititory, and associated files. There are probably still things missing. Libscout won't run properly, but it and motors will compile. Sonar is probably broken, but nothing depends on it yet, so this shouldn't be an issue.
Created first version of git repository; added libscout and motors packages.
The repository root is the ros directory, which contains the ROS stack for the scout project.The included files are those that ROS creates with a new stack or package, and those created manually. Files created during compilation are not included....
untarred prex
deleted test file
testing
test