Skip to content

Commit

Permalink
Move packages into monorepo for kinetic; strip out ur packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Bovbel committed Dec 23, 2016
1 parent f9f10c8 commit 2c8d64a
Show file tree
Hide file tree
Showing 113 changed files with 12,541 additions and 1,389 deletions.
45 changes: 2 additions & 43 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,47 +1,6 @@
build/
bin/
lib/
msg_gen/
srv_gen/
msg/*Action.msg
msg/*ActionFeedback.msg
msg/*ActionGoal.msg
msg/*ActionResult.msg
msg/*Feedback.msg
msg/*Goal.msg
msg/*Result.msg
msg/_*.py

# Generated by dynamic reconfigure
*.cfgc
/cfg/cpp/
/cfg/*.py

# Ignore generated docs
*.dox
*.wikidoc

# eclipse stuff
.project
.cproject

# qcreator stuff
CMakeLists.txt.user

srv/_*.py
*.pcd
*.pyc
qtcreator-*
*.user

/planning/cfg
/planning/docs
/planning/src

*~

# Emacs
.#*

# Catkin custom files
CATKIN_IGNORE

*.pyc
29 changes: 28 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,35 @@ real robot operation.
- husky_description : Robot description (URDF)
- husky_msgs : Message definitions
- husky_navigation : Navigation configurations and demos
- husky_ur5_moveit_config : MoveIt configuration and demos

For Husky instructions and tutorials, please see [Robots/Husky](http://wiki.ros.org/Robots/Husky).

To create a custom Husky description or simulation, please fork [husky_customization](https://github.com/husky/husky_customization).

husky_desktop
=============

Desktop ROS packages for the Clearpath Husky, which may pull in graphical dependencies.

- husky_viz : Visualization (rviz) configuration and bringup

For Husky instructions and tutorials, please see http://wiki.ros.org/Robots/Husky

husky_robot
===========

Robot ROS packages for the Clearpath Husky, for operating robot hardware.

- husky_bringup : Bringup launch files and scripts.
- husky_base : Hardware driver for communicating with the onboard MCU.

For Husky instructions and tutorials, please see http://wiki.ros.org/Robots/Husky

husky_simualtor
==============

Simulator ROS packages for the Clearpath Husky.

- husky_gazebo : Gazebo plugin definitions and extensions to the robot URDF.

For Husky instructions and tutorials, please see http://wiki.ros.org/Robots/Husky
98 changes: 98 additions & 0 deletions husky_base/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package husky_base
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.2.6 (2016-10-03)
------------------
* Adding support for the UM7 IMU.
* Contributors: Tony Baltovski

0.2.5 (2015-12-31)
------------------
* Fix absolute value to handle negative rollover readings effectively
* Another bitwise fix, now for x86.
* Formatting
* Fix length complement check.
There's a subtle difference in how ~ is implemented in aarch64 which
causes this check to fail. The new implementation should work on x86
and ARM.
* Contributors: Mike Purvis, Paul Bovbel

0.2.4 (2015-07-08)
------------------

0.2.3 (2015-04-08)
------------------
* Integrate husky_customization workflow
* Contributors: Paul Bovbel

0.2.2 (2015-03-23)
------------------
* Fix package urls
* Contributors: Paul Bovbel

0.2.1 (2015-03-23)
------------------
* Add missing dependencies
* Contributors: Paul Bovbel

0.2.0 (2015-03-23)
------------------
* Add UR5_ENABLED envvar
* Contributors: Paul Bovbel

0.1.5 (2015-02-19)
------------------
* Fix duration cast
* Contributors: Paul Bovbel

0.1.4 (2015-02-13)
------------------
* Correct issues with ROS time discontinuities - now using monotonic time source
* Implement a sane retry policy for communication with MCU
* Contributors: Paul Bovbel

0.1.3 (2015-01-30)
------------------
* Update description and maintainers
* Contributors: Paul Bovbel

0.1.2 (2015-01-20)
------------------
* Fix library install location
* Contributors: Paul Bovbel

0.1.1 (2015-01-13)
------------------
* Add missing description dependency
* Contributors: Paul Bovbel

0.1.0 (2015-01-12)
------------------
* Fixed encoder overflow issue
* Ported to ros_control for Indigo release
* Contributors: Mike Purvis, Paul Bovbel, finostro

0.0.5 (2013-10-04)
------------------
* Mark the config directory to install.

0.0.4 (2013-10-03)
------------------
* Parameterize husky port in env variable.

0.0.3 (2013-09-24)
------------------
* Add launchfile check.
* removing imu processing by dead_reckoning.py
* removing dynamic reconfigure from dead_reckoning because it was only there for handling gyro correction
* adding diagnostic aggregator and its related config file under config/diag_agg.yaml

0.0.2 (2013-09-11)
------------------
* Fix diagnostic_msgs dependency.

0.0.1 (2013-09-11)
------------------
* New husky_base package for Hydro, which contains the nodes
formerly in husky_bringup.
56 changes: 56 additions & 0 deletions husky_base/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
cmake_minimum_required(VERSION 2.8.3)
project(husky_base)

find_package(catkin REQUIRED COMPONENTS controller_manager hardware_interface husky_msgs
diagnostic_updater roslaunch roslint roscpp sensor_msgs)
find_package(Boost REQUIRED COMPONENTS chrono)

catkin_package(
INCLUDE_DIRS include
LIBRARIES horizon_legacy
CATKIN_DEPENDS diagnostic_updater hardware_interface husky_msgs roscpp sensor_msgs
DEPENDS Boost
)

include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})

add_library(horizon_legacy
src/horizon_legacy/crc.cpp
src/horizon_legacy/Logger.cpp
src/horizon_legacy/Message.cpp
src/horizon_legacy/Message_data.cpp
src/horizon_legacy/Message_request.cpp
src/horizon_legacy/Message_cmd.cpp
src/horizon_legacy/Transport.cpp
src/horizon_legacy/Number.cpp
src/horizon_legacy/linux_serial.cpp
)

add_executable(husky_node
src/husky_base.cpp
src/husky_hardware.cpp
src/husky_diagnostics.cpp
src/horizon_legacy_wrapper.cpp)
target_link_libraries(husky_node horizon_legacy ${catkin_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(husky_node husky_msgs_gencpp)

roslint_cpp(
src/husky_base.cpp
src/husky_hardware.cpp
src/husky_diagnostics.cpp
include/husky_base/husky_diagnostics.h
include/husky_base/husky_hardware.h
)

roslaunch_add_file_check(launch)

install(TARGETS horizon_legacy husky_node
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

install(DIRECTORY launch config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
7 changes: 7 additions & 0 deletions husky_base/config/diagnostics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
analyzers:
husky:
type: diagnostic_aggregator/GenericAnalyzer
path: Husky A200
find_and_remove_prefix: 'husky_base: '
expected: ['husky_base: power_status','husky_base: system_status','husky_base: safety_status','husky_base: software_status']
timeout: 5.0
68 changes: 68 additions & 0 deletions husky_base/include/husky_base/horizon_legacy/Exception.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/**
* _____
* / _ \
* / _/ \ \
* / / \_/ \
* / \_/ _ \ ___ _ ___ ___ ____ ____ ___ _____ _ _
* \ / \_/ \ / / _\| | | __| / _ \ | ++ \ | ++ \ / _ \ |_ _|| | | |
* \ \_/ \_/ / | | | | | ++ | |_| || ++ / | ++_/| |_| | | | | +-+ |
* \ \_/ / | |_ | |_ | ++ | _ || |\ \ | | | _ | | | | +-+ |
* \_____/ \___/|___||___||_| |_||_| \_\|_| |_| |_| |_| |_| |_|
* ROBOTICS™
*
* File: Exception.h
* Desc: Provides the clearpath::Exception class, which is the parent class
* for all clearpath exceptions.
* Auth: Iain Peet
*
* Copyright (c) 2010, Clearpath Robotics, Inc.
* All Rights Reserved
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Clearpath Robotics, Inc. nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL CLEARPATH ROBOTICS, INC. BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Please send comments, questions, or patches to skynet@clearpathrobotics.com
*
*/

#ifndef CPR_EXCEPTION_H
#define CPR_EXCEPTION_H

#include <iostream>

namespace clearpath
{

class Exception
{
public:
const char *message;

protected:
Exception(const char *msg = "none") : message(msg)
{
}
};

}; // namespace clearpath

#endif // CPR_EXCEPTION_H
Loading

0 comments on commit 2c8d64a

Please sign in to comment.