Remove leftover JointGroupCtrlr; Fix Effort.h IFDEF

RethinkRobotics · May 23, 2017 · 2e3bd6e · 2e3bd6e
1 parent fa90a82
commit 2e3bd6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 125 deletions.
diff --git a/sawyer_sim_controllers/config/sawyer_sim_controllers_plugins.xml b/sawyer_sim_controllers/config/sawyer_sim_controllers_plugins.xml
@@ -24,12 +24,4 @@
         </description>
     </class>
 
-    <class name="sawyer_sim_controllers/JointGroupPositionController"
-           type="sawyer_sim_controllers::JointGroupPositionController"
-           base_class_type="controller_interface::ControllerBase">
-       <description>
-           The JointGroupPositionController provides position controllers for effort hardware interfaces.
-       </description>
-    </class>
-
 </library>
diff --git a/sawyer_sim_controllers/include/sawyer_sim_controllers/sawyer_effort_controller.h b/sawyer_sim_controllers/include/sawyer_sim_controllers/sawyer_effort_controller.h
@@ -14,8 +14,8 @@
 * limitations under the License.
 **************************************************************************/
 
-#ifndef SAWYER_VELOCITY_CONTROLLER_H
-#define SAWYER_VELOCITY_CONTROLLER_H
+#ifndef SAWYER_EFFORT_CONTROLLER_H
+#define SAWYER_EFFORT_CONTROLLER_H
 
 #include <sawyer_sim_controllers/joint_array_controller.h>
 #include <intera_core_msgs/JointCommand.h>
@@ -40,4 +40,4 @@ namespace sawyer_sim_controllers
   };
 }
 
-#endif
+#endif
diff --git a/sawyer_sim_controllers/src/joint_group_position_controller.cpp b/sawyer_sim_controllers/src/joint_group_position_controller.cpp