[Personalrobots-commit] SF.net SVN: personalrobots:[14585] pkg/trunk

[<bla...@us...>]

Revision: 14585
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=14585&view=rev
Author:   blaisegassend
Date:     2009-04-28 21:58:00 +0000 (Tue, 28 Apr 2009)

Log Message:
-----------
Put the trigger_configuration typedef into the controller namespace.

Modified Paths:
--------------
    pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h
    pkg/trunk/controllers/robot_mechanism_controllers/src/trigger_controller.cpp
    pkg/trunk/drivers/cam/forearm_cam/src/nodes/forearm_node.cpp

Modified: pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h	2009-04-28 21:40:08 UTC (rev 14584)
+++ pkg/trunk/controllers/robot_mechanism_controllers/include/robot_mechanism_controllers/trigger_controller.h	2009-04-28 21:58:00 UTC (rev 14585)
@@ -58,10 +58,9 @@
   * 
   */
   
-typedef robot_mechanism_controllers::SetWaveform::Request trigger_configuration;
-
 namespace controller
 {
+typedef robot_mechanism_controllers::SetWaveform::Request trigger_configuration;
 
 class TriggerControllerNode;
 

Modified: pkg/trunk/controllers/robot_mechanism_controllers/src/trigger_controller.cpp
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/src/trigger_controller.cpp	2009-04-28 21:40:08 UTC (rev 14584)
+++ pkg/trunk/controllers/robot_mechanism_controllers/src/trigger_controller.cpp	2009-04-28 21:58:00 UTC (rev 14585)
@@ -99,6 +99,9 @@
       //  ROS_INFO("Changed to: %i (%s)", active, actuator_name_.c_str()); // KILLME
     }
   }
+  
+  //if (actuator_command_->digital_out_ && !(active ^ config_.active_low))
+  //    ROS_DEBUG("digital out falling at time %f", robot_->hw_->current_time_);
 
   actuator_command_->digital_out_ = active ^ config_.active_low;
 

Modified: pkg/trunk/drivers/cam/forearm_cam/src/nodes/forearm_node.cpp
===================================================================
--- pkg/trunk/drivers/cam/forearm_cam/src/nodes/forearm_node.cpp	2009-04-28 21:40:08 UTC (rev 14584)
+++ pkg/trunk/drivers/cam/forearm_cam/src/nodes/forearm_node.cpp	2009-04-28 21:58:00 UTC (rev 14585)
@@ -190,7 +190,7 @@
   std::string serial_number_;
   std::string hwinfo_;
   std::string mode_name_;
-  trigger_configuration trig_req_;
+  controller::trigger_configuration trig_req_;
   robot_mechanism_controllers::SetWaveform::Response trig_rsp_;
 
   DiagnosticUpdater<ForearmNode> diagnostic_;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.