Fixes for diagnostics pull request CCNYRoboticsLab#20.

* Added "/" for closing tags in package.xml * Moved lines to non-static function as required.
akrobotics · Jul 14, 2016 · 337ef11 · 337ef11
1 parent 8ab34d5
commit 337ef11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/phidgets_api/package.xml b/phidgets_api/package.xml
@@ -14,8 +14,8 @@
   <author>Ivan Dryanovski</author>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>diagnostics_updater<build_depend>
-  <build_depend>diagnostics_msgs<build_depend>
+  <build_depend>diagnostics_updater</build_depend>
+  <build_depend>diagnostics_msgs</build_depend>
 
   <run_depend>diagnostics_updater</run_depend>
   <run_depend>diagnostics_msgs</run_depend>

diff --git a/phidgets_api/src/phidget.cpp b/phidgets_api/src/phidget.cpp
@@ -97,41 +97,41 @@ std::string Phidget::getErrorDescription(int errorCode)
 
 void Phidget::attachHandler()
 {
+  	is_connected = true;
+  	updater.force_update();
 	printf("Phidget attached (serial# %d)\n", getDeviceSerialNumber());
 }
 
 void Phidget::detachHandler()
 {
 	printf("Phidget detached (serial# %d)\n", getDeviceSerialNumber());
+        is_connected = false;
+        updater.force_update();
 }
 
 void Phidget::errorHandler(int error)
 {
+        is_error = true;
+        updater.force_update();
+        is_error = false;
 	printf("Phidget error [%d]: %s\n", error, getErrorDescription(error).c_str());
 }
 
 int Phidget::AttachHandler(CPhidgetHandle handle, void *userptr)
 {
   ((Phidget*)userptr)->attachHandler();
-  is_connected = true;
-  updater.force_update();
   return 0;
 }
 
 int Phidget::DetachHandler(CPhidgetHandle handle, void *userptr)
 {
   ((Phidget*)userptr)->detachHandler();
-  is_connected = false;
-  updater.force_update();
   return 0;
 }
 
 int Phidget::ErrorHandler(CPhidgetHandle handle, void *userptr, int ErrorCode, const char *unknown)
 {
   ((Phidget*)userptr)->errorHandler(ErrorCode);
-  is_error = true;
-  updater.force_update();
-  is_error = false;
   return 0;
 }