Closed moriarty closed 6 years ago
alex@alex-ubuntu-desktop:~/indigo-cob3-1-stable$ rosdep install --from-paths src --ignore-src --rosdistro kinetic
dpkg-query: no packages found matching libmuparser-dev
dpkg-query: no packages found matching ros-kinetic-ur-description
dpkg-query: no packages found matching ros-kinetic-rplidar-ros
dpkg-query: no packages found matching ros-kinetic-cob-head-axis
dpkg-query: no packages found matching ros-kinetic-ur-driver
dpkg-query: no packages found matching ros-kinetic-cob-gazebo-ros-control
dpkg-query: no packages found matching ros-kinetic-cob-android-script-server
dpkg-query: no packages found matching libvlc-dev
dpkg-query: no packages found matching ros-kinetic-serial
dpkg-query: no packages found matching python-sympy
dpkg-query: no packages found matching vlc
dpkg-query: no packages found matching libopencv-dev
dpkg-query: no packages found matching ros-kinetic-joint-state-publisher
dpkg-query: no packages found matching ipmitool
dpkg-query: no packages found matching python-mechanize
dpkg-query: no packages found matching ros-kinetic-spacenav-node
ERROR: the following packages/stacks could not have their rosdep keys resolved
to system dependencies:
cob_bringup: Cannot locate rosdep definition for [prosilica_camera]
cob_obstacle_distance: Cannot locate rosdep definition for [fcl]
👎 one of the above dependencies brings in texlive that seems live overkill.
just creating the cob3-1-stable workspace, most build with just a few ignored for now.
[build] Summary: All 82 packages succeeded!
[build] Ignored: 12 packages were skipped or are blacklisted.
[build] Warnings: 3 packages succeeded with warnings.
[build] Abandoned: None.
[build] Failed: None.
[build] Runtime: 50.3 seconds total.
[build] Note: Workspace packages have changed, please re-source setup files to use them.
The following packages are ignored
alex@alex-ubuntu-desktop:~/indigo-cob3-1-stable$ find ./src/ -name CATKIN_IGNORE
./src/cob_control/cob_obstacle_distance/CATKIN_IGNORE
./src/cob_control/cob_twist_controller/CATKIN_IGNORE
./src/prosilica_driver/prosilica_camera/CATKIN_IGNORE
./src/cob_driver/cob_light/CATKIN_IGNORE
cob_light passed after cleaning my build directory and trying again, the error was:
[build] Found '95' packages in 0.0 seconds.
[build] Package table is up to date.
Starting >>> cob_light
________________________________________________________________________________________________________________________________________________________________________________________________________
Errors << cob_light:cmake /home/alex/indigo-cob3-1-stable/logs/cob_light/build.cmake.006.log
CMake Error at /opt/ros/kinetic/share/catkin/cmake/assert.cmake:17 (message):
Assertion failed: check for file existence, but filename
(RT_LIBRARY-NOTFOUND) unset. Message: RT Library
Call Stack (most recent call first):
/opt/ros/kinetic/share/catkin/cmake/tools/rt.cmake:42 (assert_file_exists)
/opt/ros/kinetic/share/catkin/cmake/all.cmake:147 (include)
/opt/ros/kinetic/share/catkin/cmake/catkinConfig.cmake:20 (include)
CMakeLists.txt:4 (find_package)
ipa320/cob_control has a kinetic_dev branch, but we diverged...
alex@alex-ubuntu-desktop:~/indigo-cob3-1-stable/src/cob_control$ git merge ipa/kinetic_dev
Removing cob_undercarriage_ctrl_node/src/cob_undercarriage_ctrl_new.cpp
Removing cob_undercarriage_ctrl_node/package.xml
CONFLICT (modify/delete): cob_undercarriage_ctrl_node/CMakeLists.txt deleted in ipa/kinetic_dev and modified in HEAD. Version HEAD of cob_undercarriage_ctrl_node/CMakeLists.txt left in tree.
Auto-merging cob_twist_controller/src/limiters/limiter.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/limiters/limiter.cpp
Auto-merging cob_twist_controller/src/kinematic_extensions/kinematic_extension_urdf.cpp
Auto-merging cob_twist_controller/src/kinematic_extensions/kinematic_extension_lookat.cpp
Auto-merging cob_twist_controller/src/kinematic_extensions/kinematic_extension_dof.cpp
Auto-merging cob_twist_controller/src/kinematic_extensions/kinematic_extension_builder.cpp
Auto-merging cob_twist_controller/src/inverse_jacobian_calculations/inverse_jacobian_calculation.cpp
Auto-merging cob_twist_controller/src/inverse_differential_kinematics_solver.cpp
Auto-merging cob_twist_controller/src/debug/test_twist_command_sine_node.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/debug/test_twist_command_sine_node.cpp
Auto-merging cob_twist_controller/src/debug/test_trajectory_command_sine_node.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/debug/test_trajectory_command_sine_node.cpp
Auto-merging cob_twist_controller/src/debug/test_simpson_integrator_node.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/debug/test_simpson_integrator_node.cpp
Auto-merging cob_twist_controller/src/debug/test_moving_average_node.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/debug/test_moving_average_node.cpp
Auto-merging cob_twist_controller/src/debug/test_forward_command_sine_node.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/debug/test_forward_command_sine_node.cpp
Auto-merging cob_twist_controller/src/debug/debug_trajectory_marker_node.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/debug/debug_trajectory_marker_node.cpp
Auto-merging cob_twist_controller/src/controller_interfaces/controller_interface.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/controller_interfaces/controller_interface.cpp
Auto-merging cob_twist_controller/src/constraint_solvers/solvers/weighted_least_norm_solver.cpp
Auto-merging cob_twist_controller/src/constraint_solvers/solvers/task_priority_solver.cpp
Auto-merging cob_twist_controller/src/constraint_solvers/solvers/stack_of_tasks_solver.cpp
Auto-merging cob_twist_controller/src/constraint_solvers/solvers/gradient_projection_method_solver.cpp
Auto-merging cob_twist_controller/src/constraint_solvers/constraint_solver_factory.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/constraint_solvers/constraint_solver_factory.cpp
Auto-merging cob_twist_controller/src/cob_twist_controller_node.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/cob_twist_controller_node.cpp
Auto-merging cob_twist_controller/src/cob_twist_controller.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/cob_twist_controller.cpp
Auto-merging cob_twist_controller/src/callback_data_mediator.cpp
CONFLICT (content): Merge conflict in cob_twist_controller/src/callback_data_mediator.cpp
Removing cob_twist_controller/scripts/test_publisher_simpson_integrator.py
Removing cob_twist_controller/scripts/test_publisher_moving_average.py
Removing cob_twist_controller/scripts/test/test_raw31.py
Auto-merging cob_twist_controller/include/cob_twist_controller/utils/simpson_integrator.h
Auto-merging cob_twist_controller/include/cob_twist_controller/utils/moving_average.h
Auto-merging cob_twist_controller/include/cob_twist_controller/limiters/limiter.h
CONFLICT (content): Merge conflict in cob_twist_controller/include/cob_twist_controller/limiters/limiter.h
Auto-merging cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_urdf.h
CONFLICT (content): Merge conflict in cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_urdf.h
Auto-merging cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_lookat.h
Auto-merging cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_dof.h
Auto-merging cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_builder.h
Auto-merging cob_twist_controller/include/cob_twist_controller/inverse_differential_kinematics_solver.h
Auto-merging cob_twist_controller/include/cob_twist_controller/controller_interfaces/controller_interface.h
CONFLICT (content): Merge conflict in cob_twist_controller/include/cob_twist_controller/controller_interfaces/controller_interface.h
CONFLICT (modify/delete): cob_twist_controller/include/cob_twist_controller/constraints/self_motion_magnitude.h deleted in ipa/kinetic_dev and modified in HEAD. Version HEAD of cob_twist_controller/include/cob_twist_controller/constraints/self_motion_magnitude.h left in tree.
Auto-merging cob_twist_controller/include/cob_twist_controller/constraints/constraint_jla_impl.h
Auto-merging cob_twist_controller/include/cob_twist_controller/constraints/constraint_impl.h
CONFLICT (content): Merge conflict in cob_twist_controller/include/cob_twist_controller/constraints/constraint_impl.h
Auto-merging cob_twist_controller/include/cob_twist_controller/constraints/constraint_ca_impl.h
CONFLICT (content): Merge conflict in cob_twist_controller/include/cob_twist_controller/constraints/constraint_ca_impl.h
Auto-merging cob_twist_controller/include/cob_twist_controller/constraints/constraint_base.h
Auto-merging cob_twist_controller/include/cob_twist_controller/constraints/constraint.h
Auto-merging cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/constraint_solver_base.h
Auto-merging cob_twist_controller/include/cob_twist_controller/constraint_solvers/constraint_solver_factory.h
Auto-merging cob_twist_controller/CMakeLists.txt
CONFLICT (content): Merge conflict in cob_twist_controller/CMakeLists.txt
Auto-merging cob_obstacle_distance/CMakeLists.txt
CONFLICT (content): Merge conflict in cob_obstacle_distance/CMakeLists.txt
Auto-merging cob_model_identifier/CMakeLists.txt
Auto-merging cob_control_mode_adapter/CMakeLists.txt
CONFLICT (content): Merge conflict in cob_control_mode_adapter/CMakeLists.txt
Auto-merging cob_collision_velocity_filter/CMakeLists.txt
Auto-merging cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_sinoid.cpp
CONFLICT (content): Merge conflict in cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_sinoid.cpp
Auto-merging cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_ramp.cpp
CONFLICT (content): Merge conflict in cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_ramp.cpp
Auto-merging cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_builder.cpp
Auto-merging cob_cartesian_controller/src/trajectory_interpolator/trajectory_interpolator.cpp
Auto-merging cob_cartesian_controller/src/cartesian_controller_utils.cpp
Auto-merging cob_cartesian_controller/src/cartesian_controller.cpp
Removing cob_cartesian_controller/scripts/example_move_lin.py
Auto-merging cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_sinoid.h
Auto-merging cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_ramp.h
Auto-merging cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_builder.h
Auto-merging cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_base.h
Auto-merging cob_cartesian_controller/include/cob_cartesian_controller/cartesian_controller_utils.h
Auto-merging cob_cartesian_controller/include/cob_cartesian_controller/cartesian_controller.h
Auto-merging cob_base_velocity_smoother/src/cob_base_velocity_smoother.cpp
Auto-merging cob_base_velocity_smoother/CMakeLists.txt
CONFLICT (content): Merge conflict in cob_base_velocity_smoother/CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.
alex@alex-ubuntu-desktop:~/indigo-cob3-1-stable/src/cob_control$ git status
On branch indigo_dev
Your branch is up-to-date with 'origin/indigo_dev'.
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
new file: .github/PULL_REQUEST_TEMPLATE.md
modified: .gitignore
modified: .travis.yml
modified: README.md
modified: cob_base_velocity_smoother/CHANGELOG.rst
modified: cob_base_velocity_smoother/include/cob_base_velocity_smoother/cob_base_velocity_smoother.h
modified: cob_base_velocity_smoother/include/cob_base_velocity_smoother/velocity_smoother.h
modified: cob_base_velocity_smoother/package.xml
modified: cob_base_velocity_smoother/src/cob_base_velocity_smoother.cpp
modified: cob_base_velocity_smoother/src/cob_base_velocity_smoother/velocity_smoother.cpp
modified: cob_base_velocity_smoother/src/velocity_smoother_node.cpp
modified: cob_cartesian_controller/CHANGELOG.rst
modified: cob_cartesian_controller/CMakeLists.txt
modified: cob_cartesian_controller/config/example_cartesian_controller.yaml
modified: cob_cartesian_controller/include/cob_cartesian_controller/cartesian_controller.h
modified: cob_cartesian_controller/include/cob_cartesian_controller/cartesian_controller_data_types.h
modified: cob_cartesian_controller/include/cob_cartesian_controller/cartesian_controller_utils.h
modified: cob_cartesian_controller/include/cob_cartesian_controller/trajectory_interpolator/trajectory_interpolator.h
modified: cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_base.h
modified: cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_builder.h
modified: cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_ramp.h
modified: cob_cartesian_controller/include/cob_cartesian_controller/trajectory_profile_generator/trajectory_profile_generator_sinoid.h
modified: cob_cartesian_controller/launch/example.launch
modified: cob_cartesian_controller/package.xml
deleted: cob_cartesian_controller/scripts/example_move_lin.py
modified: cob_cartesian_controller/scripts/test_move_around_torus.py
modified: cob_cartesian_controller/scripts/test_move_circ.py
modified: cob_cartesian_controller/scripts/test_move_circ_interface.py
modified: cob_cartesian_controller/scripts/test_move_lin.py
modified: cob_cartesian_controller/scripts/test_move_lin_interface.py
modified: cob_cartesian_controller/scripts/test_move_santa.py
modified: cob_cartesian_controller/src/cartesian_controller.cpp
modified: cob_cartesian_controller/src/cartesian_controller_node.cpp
modified: cob_cartesian_controller/src/cartesian_controller_utils.cpp
modified: cob_cartesian_controller/src/simple_cartesian_interface/simple_cartesian_interface.py
modified: cob_cartesian_controller/src/trajectory_interpolator/trajectory_interpolator.cpp
modified: cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_builder.cpp
modified: cob_collision_velocity_filter/CHANGELOG.rst
modified: cob_collision_velocity_filter/CMakeLists.txt
modified: cob_collision_velocity_filter/include/cob_collision_velocity_filter.h
modified: cob_collision_velocity_filter/include/velocity_limited_marker.h
modified: cob_collision_velocity_filter/package.xml
modified: cob_collision_velocity_filter/src/cob_collision_velocity_filter.cpp
modified: cob_collision_velocity_filter/src/velocity_limited_marker.cpp
modified: cob_control/CHANGELOG.rst
modified: cob_control/package.xml
modified: cob_control_mode_adapter/CHANGELOG.rst
modified: cob_control_mode_adapter/package.xml
modified: cob_control_mode_adapter/src/cob_control_mode_adapter_node.cpp
new file: cob_control_msgs/CHANGELOG.rst
new file: cob_control_msgs/CMakeLists.txt
renamed: cob_obstacle_distance/msg/ObstacleDistance.msg -> cob_control_msgs/msg/ObstacleDistance.msg
renamed: cob_obstacle_distance/msg/ObstacleDistances.msg -> cob_control_msgs/msg/ObstacleDistances.msg
new file: cob_control_msgs/package.xml
new file: cob_control_msgs/srv/GetObstacleDistance.srv
modified: cob_footprint_observer/CHANGELOG.rst
modified: cob_footprint_observer/include/cob_footprint_observer.h
modified: cob_footprint_observer/package.xml
modified: cob_footprint_observer/src/cob_footprint_observer.cpp
modified: cob_frame_tracker/CHANGELOG.rst
modified: cob_frame_tracker/CMakeLists.txt
modified: cob_frame_tracker/include/cob_frame_tracker/cob_frame_tracker.h
modified: cob_frame_tracker/include/cob_frame_tracker/interactive_frame_target.h
modified: cob_frame_tracker/package.xml
modified: cob_frame_tracker/scripts/interactive_frame_target.py
modified: cob_frame_tracker/src/cob_frame_tracker.cpp
modified: cob_frame_tracker/src/cob_frame_tracker_node.cpp
modified: cob_frame_tracker/src/interactive_frame_target.cpp
modified: cob_frame_tracker/src/interactive_frame_target_node.cpp
modified: cob_frame_tracker/src/spacenav_commander.cpp
modified: cob_model_identifier/CHANGELOG.rst
modified: cob_model_identifier/CMakeLists.txt
modified: cob_model_identifier/include/cob_model_identifier/output_recorder.h
modified: cob_model_identifier/package.xml
modified: cob_model_identifier/scripts/input_series_twist.py
modified: cob_model_identifier/src/output_recorder.cpp
modified: cob_model_identifier/src/output_recorder_node.cpp
modified: cob_obstacle_distance/CHANGELOG.rst
modified: cob_obstacle_distance/include/cob_obstacle_distance/chainfk_solvers/advanced_chainfksolver_recursive.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/distance_manager.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/fcl_marker_converter.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/helpers/helper_functions.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/link_to_collision.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/marker_shapes/marker_shapes.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/marker_shapes/marker_shapes_impl.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/marker_shapes/marker_shapes_interface.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/obstacle_distance_data_types.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/parsers/mesh_parser.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/parsers/parser_base.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/parsers/stl_parser.hpp
modified: cob_obstacle_distance/include/cob_obstacle_distance/shapes_manager.hpp
modified: cob_obstacle_distance/launch/example.launch
modified: cob_obstacle_distance/package.xml
modified: cob_obstacle_distance/scripts/example_obstacle_publisher_node.py
modified: cob_obstacle_distance/scripts/test_interactive_obstacle_node.py
modified: cob_obstacle_distance/scripts/test_obstacle_publisher_node.py
modified: cob_obstacle_distance/src/chainfk_solvers/advanced_chainfksolver_recursive.cpp
modified: cob_obstacle_distance/src/cob_obstacle_distance.cpp
modified: cob_obstacle_distance/src/debug/debug_obstacle_distance_node.cpp
modified: cob_obstacle_distance/src/distance_manager.cpp
modified: cob_obstacle_distance/src/helpers/helper_functions.cpp
modified: cob_obstacle_distance/src/link_to_collision.cpp
modified: cob_obstacle_distance/src/marker_shapes/marker_shapes_impl.cpp
modified: cob_obstacle_distance/src/marker_shapes/marker_shapes_interface.cpp
modified: cob_obstacle_distance/src/parsers/mesh_parser.cpp
modified: cob_obstacle_distance/src/parsers/stl_parser.cpp
modified: cob_obstacle_distance/src/shapes_manager.cpp
modified: cob_omni_drive_controller/CHANGELOG.rst
modified: cob_omni_drive_controller/CMakeLists.txt
new file: cob_omni_drive_controller/cfg/SteerCtrl.cfg
modified: cob_omni_drive_controller/include/cob_omni_drive_controller/OdometryTracker.h
modified: cob_omni_drive_controller/include/cob_omni_drive_controller/UndercarriageCtrlGeom.h
modified: cob_omni_drive_controller/include/cob_omni_drive_controller/UndercarriageCtrlGeomROS.h
new file: cob_omni_drive_controller/launch/stuck_detector.launch
new file: cob_omni_drive_controller/msg/WheelCommands.msg
modified: cob_omni_drive_controller/package.xml
new file: cob_omni_drive_controller/scripts/test_publisher_twist_sine.py
new file: cob_omni_drive_controller/scripts/test_publisher_twist_step.py
modified: cob_omni_drive_controller/src/GeomController.h
modified: cob_omni_drive_controller/src/UndercarriageCtrlGeom.cpp
new file: cob_omni_drive_controller/src/WheelControllerBase.h
modified: cob_omni_drive_controller/src/control_plugin.cpp
modified: cob_omni_drive_controller/src/odom_plugin.cpp
modified: cob_omni_drive_controller/src/param_parser.cpp
new file: cob_omni_drive_controller/src/stuck_detector.cpp
modified: cob_trajectory_controller/CHANGELOG.rst
modified: cob_trajectory_controller/common/include/cob_trajectory_controller/BSplineND.h
modified: cob_trajectory_controller/common/include/cob_trajectory_controller/RefValJS_PTP.h
modified: cob_trajectory_controller/common/include/cob_trajectory_controller/RefValJS_PTP_Trajectory.h
modified: cob_trajectory_controller/common/include/cob_trajectory_controller/RefVal_JS.h
modified: cob_trajectory_controller/common/include/cob_trajectory_controller/TimeStamp.h
modified: cob_trajectory_controller/common/include/cob_trajectory_controller/genericArmCtrl.h
modified: cob_trajectory_controller/common/src/RefValJS_PTP.cpp
modified: cob_trajectory_controller/common/src/RefValJS_PTP_Trajectory.cpp
modified: cob_trajectory_controller/common/src/TimeStamp.cpp
modified: cob_trajectory_controller/common/src/genericArmCtrl.cpp
modified: cob_trajectory_controller/package.xml
modified: cob_trajectory_controller/ros/src/cob_trajectory_controller.cpp
modified: cob_twist_controller/CHANGELOG.rst
modified: cob_twist_controller/cfg/TwistController.cfg
modified: cob_twist_controller/config/example_cartesian_controller.yaml
new file: cob_twist_controller/controller_interface_plugins.xml
modified: cob_twist_controller/include/cob_twist_controller/callback_data_mediator.h
modified: cob_twist_controller/include/cob_twist_controller/cob_twist_controller.h
modified: cob_twist_controller/include/cob_twist_controller/cob_twist_controller_data_types.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/constraint_solver_factory.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/factories/solver_factory.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/constraint_solver_base.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/gradient_projection_method_solver.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/stack_of_tasks_solver.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/task_priority_solver.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/unconstraint_solver.h
new file: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/unified_joint_limit_singularity_solver.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/weighted_least_norm_solver.h
modified: cob_twist_controller/include/cob_twist_controller/constraint_solvers/solvers/wln_joint_limit_avoidance_solver.h
modified: cob_twist_controller/include/cob_twist_controller/constraints/constraint.h
modified: cob_twist_controller/include/cob_twist_controller/constraints/constraint_base.h
modified: cob_twist_controller/include/cob_twist_controller/constraints/constraint_jla_impl.h
modified: cob_twist_controller/include/cob_twist_controller/constraints/constraint_params.h
modified: cob_twist_controller/include/cob_twist_controller/controller_interfaces/controller_interface_base.h
modified: cob_twist_controller/include/cob_twist_controller/damping_methods/damping.h
modified: cob_twist_controller/include/cob_twist_controller/damping_methods/damping_base.h
modified: cob_twist_controller/include/cob_twist_controller/inverse_differential_kinematics_solver.h
modified: cob_twist_controller/include/cob_twist_controller/inverse_jacobian_calculations/inverse_jacobian_calculation.h
modified: cob_twist_controller/include/cob_twist_controller/inverse_jacobian_calculations/inverse_jacobian_calculation_base.h
modified: cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_base.h
modified: cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_builder.h
modified: cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_dof.h
modified: cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_lookat.h
modified: cob_twist_controller/include/cob_twist_controller/limiters/limiter_base.h
modified: cob_twist_controller/include/cob_twist_controller/task_stack/task_stack_controller.h
modified: cob_twist_controller/include/cob_twist_controller/utils/moving_average.h
modified: cob_twist_controller/include/cob_twist_controller/utils/simpson_integrator.h
modified: cob_twist_controller/launch/example.launch
modified: cob_twist_controller/package.xml
modified: cob_twist_controller/scripts/collect_twist_control_eval_data.py
modified: cob_twist_controller/scripts/evaluate_dbg_jnt_velocity_tests.py
modified: cob_twist_controller/scripts/test/test_careobot_GPM_jla_ca_torus.py
modified: cob_twist_controller/scripts/test/test_careobot_base.py
modified: cob_twist_controller/scripts/test/test_careobot_st_jla_ca_selfcollision_arm_left_direct_head.py
modified: cob_twist_controller/scripts/test/test_careobot_st_jla_ca_selfcollision_arm_left_internal_motion.py
modified: cob_twist_controller/scripts/test/test_careobot_st_jla_ca_sphere.py
modified: cob_twist_controller/scripts/test/test_careobot_st_jla_ca_torus.py
deleted: cob_twist_controller/scripts/test/test_raw31.py
new file: cob_twist_controller/scripts/test_publisher_float_sine_noise.py
deleted: cob_twist_controller/scripts/test_publisher_moving_average.py
deleted: cob_twist_controller/scripts/test_publisher_simpson_integrator.py
modified: cob_twist_controller/scripts/test_publisher_twist.py
modified: cob_twist_controller/scripts/test_publisher_twist_series.py
modified: cob_twist_controller/scripts/test_publisher_twist_sine.py
modified: cob_twist_controller/scripts/test_publisher_twist_stamped.py
modified: cob_twist_controller/scripts/test_publisher_vel.py
modified: cob_twist_controller/src/constraint_solvers/solvers/gradient_projection_method_solver.cpp
modified: cob_twist_controller/src/constraint_solvers/solvers/stack_of_tasks_solver.cpp
modified: cob_twist_controller/src/constraint_solvers/solvers/task_priority_solver.cpp
modified: cob_twist_controller/src/constraint_solvers/solvers/unconstraint_solver.cpp
new file: cob_twist_controller/src/constraint_solvers/solvers/unified_joint_limit_singularity_solver.cpp
modified: cob_twist_controller/src/constraint_solvers/solvers/weighted_least_norm_solver.cpp
modified: cob_twist_controller/src/constraint_solvers/solvers/wln_joint_limit_avoidance_solver.cpp
modified: cob_twist_controller/src/damping_methods/damping.cpp
modified: cob_twist_controller/src/data_collection/data_collection.py
modified: cob_twist_controller/src/debug/debug_evaluate_jointstates_node.cpp
modified: cob_twist_controller/src/inverse_differential_kinematics_solver.cpp
modified: cob_twist_controller/src/inverse_jacobian_calculations/inverse_jacobian_calculation.cpp
modified: cob_twist_controller/src/kinematic_extensions/kinematic_extension_builder.cpp
modified: cob_twist_controller/src/kinematic_extensions/kinematic_extension_dof.cpp
modified: cob_twist_controller/src/kinematic_extensions/kinematic_extension_lookat.cpp
modified: cob_twist_controller/src/kinematic_extensions/kinematic_extension_urdf.cpp
modified: cob_twist_controller/src/twist_controller_config/twist_controller_config.py
deleted: cob_undercarriage_ctrl_node/package.xml
deleted: cob_undercarriage_ctrl_node/src/cob_undercarriage_ctrl_new.cpp
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: cob_base_velocity_smoother/CMakeLists.txt
both modified: cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_ramp.cpp
both modified: cob_cartesian_controller/src/trajectory_profile_generator/trajectory_profile_generator_sinoid.cpp
both modified: cob_control_mode_adapter/CMakeLists.txt
both modified: cob_obstacle_distance/CMakeLists.txt
both modified: cob_twist_controller/CMakeLists.txt
both modified: cob_twist_controller/include/cob_twist_controller/constraints/constraint_ca_impl.h
both modified: cob_twist_controller/include/cob_twist_controller/constraints/constraint_impl.h
deleted by them: cob_twist_controller/include/cob_twist_controller/constraints/self_motion_magnitude.h
both modified: cob_twist_controller/include/cob_twist_controller/controller_interfaces/controller_interface.h
both modified: cob_twist_controller/include/cob_twist_controller/kinematic_extensions/kinematic_extension_urdf.h
both modified: cob_twist_controller/include/cob_twist_controller/limiters/limiter.h
both modified: cob_twist_controller/src/callback_data_mediator.cpp
both modified: cob_twist_controller/src/cob_twist_controller.cpp
both modified: cob_twist_controller/src/cob_twist_controller_node.cpp
both modified: cob_twist_controller/src/constraint_solvers/constraint_solver_factory.cpp
both modified: cob_twist_controller/src/controller_interfaces/controller_interface.cpp
both modified: cob_twist_controller/src/debug/debug_trajectory_marker_node.cpp
both modified: cob_twist_controller/src/debug/test_forward_command_sine_node.cpp
both modified: cob_twist_controller/src/debug/test_moving_average_node.cpp
both modified: cob_twist_controller/src/debug/test_simpson_integrator_node.cpp
both modified: cob_twist_controller/src/debug/test_trajectory_command_sine_node.cpp
both modified: cob_twist_controller/src/debug/test_twist_command_sine_node.cpp
both modified: cob_twist_controller/src/limiters/limiter.cpp
deleted by them: cob_undercarriage_ctrl_node/CMakeLists.txt
The stable packages build enough to start the mas-group software. I was keeping notes in the comments above.
Most of the errors look like straight forward C++ or OpenCV fixes... But I just ignored them and moved on.
@argenos @sthoduka
[build] Summary: All 94 packages succeeded!
[build] Ignored: 33 packages were skipped or are blacklisted.
[build] Warnings: 6 packages succeeded with warnings.
[build] Abandoned: None.
[build] Failed: None.
[build] Runtime: 40.9 seconds total.
[build] Note: Workspace packages have changed, please re-source setup files to use them.
alex@alex-ubuntu-desktop:~/kinetic$ find ./src/ -name CATKIN_IGNORE
./src/mas_third_party_software/mercury_planner/CATKIN_IGNORE
./src/mas_domestic_robotics/mdr_planning/mdr_behaviors/mdr_haptic/CATKIN_IGNORE
./src/mas_domestic_robotics/mdr_kinematics/mdr_cob_head_kinematics/CATKIN_IGNORE
./src/mas_domestic_robotics/mdr_kinematics/mdr_lwr_kinematics/CATKIN_IGNORE
./src/mas_common_robotics/mcr_drivers/mcr_fake_camera/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_blob_detection/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_leg_detection/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_object_categorization/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_people_tracking/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_nearest_object_detection/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_body_detection_3d/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_blob_tracking/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_background_change_detection/CATKIN_IGNORE
./src/mas_common_robotics/mcr_manipulation/mcr_interpolation_planner_moveit/CATKIN_IGNORE
./src/mas_common_robotics/mcr_manipulation/mcr_trajectory_time_parameterizer/CATKIN_IGNORE
./src/mas_common_robotics/mcr_common/mcr_algorithms/CATKIN_IGNORE
./src/mas_common_robotics/mcr_behaviors/mcr_follow_person/CATKIN_IGNORE
./src/mas_common_robotics/mcr_task_planning/mcr_task_planners/CATKIN_IGNORE
The problem is also not as bad as it looks, there are a few key dependencies which are broken, like mcr_algorithms, which at least 6 other package depend on and therefor fail to build (they could also be broken but I doubt it.)
alex@alex-ubuntu-desktop:~/kinetic$ grep -r mcr_algo ./src/ --include=CMakeLists.txt | uniq
./src/mas_domestic_robotics/mdr_planning/mdr_behaviors/mdr_haptic/CMakeLists.txt: mcr_algorithms
./src/mas_common_robotics/mcr_perception/mcr_leg_detection/CMakeLists.txt: mcr_algorithms
./src/mas_common_robotics/mcr_perception/mcr_people_tracking/CMakeLists.txt: mcr_algorithms
./src/mas_common_robotics/mcr_perception/mcr_nearest_object_detection/CMakeLists.txt: mcr_algorithms
./src/mas_common_robotics/mcr_perception/mcr_body_detection_3d/CMakeLists.txt: mcr_algorithms
./src/mas_common_robotics/mcr_common/mcr_algorithms/CMakeLists.txt:project(mcr_algorithms)
./src/mas_common_robotics/mcr_behaviors/mcr_follow_person/CMakeLists.txt: mcr_algorithms
@alex-mitrevski & @svenschneider, just tagging you here to keep you in the loop.
Sven you were also running Arch Linux. I know when I left campus I had two of the Uni Laptops, one with Arch and one with Ubuntu, I’m sure I had already worked on upgrading ROS, but some packages were not available (MoveIt- which is now all or mostly available in kinetic) and most were installed from git... ¯_(ツ)_/¯
From the errors I saw when looking into this last night, it all seemed very déjà vu.
@oscar-lima
Has done this also: https://github.com/socrob/robocup-at-work
I simply cloned @oscar-lima fork into a new empty catkin workspace, renaming the repository from "robocup-at-work" to "src" and compiled.
A lot of warnings, and one test fails but it isn't reported as catkin as failing..
That's only RoboCup@Work code, but it includes the "mas_common_robotics" repository.
Dropping oscar's "mas_common_robotics" into the workspace setup for "mas_domestic_robotics" and then cleaning and recompiling, fails due to mcr_blob_detection & OpenCV.
But ignoring that package, the rest seems to build... And it looks like @frederikhegger has checked in CATKIN_IGNORE files into that repository for some non robocup at work packages.
https://github.com/socrob/robocup-at-work/commit/f04dc9f19b7ee2ef5ae90ebdaf0045be337b76f3#commitcomment-25697694 let me to this commit:
https://github.com/socrob/robocup-at-work/commit/71c67b24a3561e3c735f183e95521a0c4587450c I needed two of @oscar-lima's changes in "mas_third_party_software"
now all compile:
and the tests pass:
I will close this issue now. there is a kinetic branch in this repo which updates the repository.rosinstall and repository.debs files for kinetic.
@alex-mitrevski, @svenschneider, @argenos @sthoduka Someone should cherry-pick @oscar-lima's changes into the official repositories. Or @oscar-lima should be given access to the GitLab repo so he can submit a pull request.
@argenos which package gave you trouble?
Currently all build except for the following which I've ignored:
alex@alex-ubuntu-desktop:~/kinetic$ find ./src/ -name CATKIN_IGNORE
./src/mas_third_party_software/mercury_planner/CATKIN_IGNORE
./src/mas_domestic_robotics/mdr_planning/mdr_behaviors/mdr_haptic/CATKIN_IGNORE
./src/mas_domestic_robotics/mdr_kinematics/mdr_cob_head_kinematics/CATKIN_IGNORE
./src/mas_domestic_robotics/mdr_kinematics/mdr_lwr_kinematics/CATKIN_IGNORE
./src/mas_common_robotics/mcr_perception/mcr_object_categorization/CATKIN_IGNORE
./src/mas_common_robotics/mcr_speech/mcr_speech_synthesis/CATKIN_IGNORE
./src/mas_common_robotics/mcr_speech/mcr_speech_recognition_microsoft/CATKIN_IGNORE
But I should try again in a clean virtual machine
I think it was cob_control, but I need to check
The problem with mdr_cob_head_kinematics
and mdr_lwr_kinematics
is easy to resolve (it's about using C++ 11). mercury_planner
builds for me.
Just as @argenos , I have problems with cob_control
, in particular cob_obstacle_distance
, which fails due to fcl
for some reason.
Just for reference, I resolved my problem with cob_obstacle_distance
by
kinetic-dev
branch from the upstream cob-control
repositoryfcl
(version 0.5 instead of the most recent 0.6)
When I left campus, I am sure I tested the latest version of ROS... But that must have been on my university laptop or my old hard drive.
Trying to brute force follow these instructions with a relatively clean 16.04+Kinetic machine & Gazebo8 results in:
I've started a kinetic branch.