Skip to content

Commit 337ef11

Browse files
keshaviyengarmani-monaj
authored andcommitted
Fixes for diagnostics pull request CCNYRoboticsLab#20.
* Added "/" for closing tags in package.xml * Moved lines to non-static function as required.
1 parent 8ab34d5 commit 337ef11

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

phidgets_api/package.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<author>Ivan Dryanovski</author>
1515

1616
<buildtool_depend>catkin</buildtool_depend>
17-
<build_depend>diagnostics_updater<build_depend>
18-
<build_depend>diagnostics_msgs<build_depend>
17+
<build_depend>diagnostics_updater</build_depend>
18+
<build_depend>diagnostics_msgs</build_depend>
1919

2020
<run_depend>diagnostics_updater</run_depend>
2121
<run_depend>diagnostics_msgs</run_depend>

phidgets_api/src/phidget.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,41 +97,41 @@ std::string Phidget::getErrorDescription(int errorCode)
9797

9898
void Phidget::attachHandler()
9999
{
100+
is_connected = true;
101+
updater.force_update();
100102
printf("Phidget attached (serial# %d)\n", getDeviceSerialNumber());
101103
}
102104

103105
void Phidget::detachHandler()
104106
{
105107
printf("Phidget detached (serial# %d)\n", getDeviceSerialNumber());
108+
is_connected = false;
109+
updater.force_update();
106110
}
107111

108112
void Phidget::errorHandler(int error)
109113
{
114+
is_error = true;
115+
updater.force_update();
116+
is_error = false;
110117
printf("Phidget error [%d]: %s\n", error, getErrorDescription(error).c_str());
111118
}
112119

113120
int Phidget::AttachHandler(CPhidgetHandle handle, void *userptr)
114121
{
115122
((Phidget*)userptr)->attachHandler();
116-
is_connected = true;
117-
updater.force_update();
118123
return 0;
119124
}
120125

121126
int Phidget::DetachHandler(CPhidgetHandle handle, void *userptr)
122127
{
123128
((Phidget*)userptr)->detachHandler();
124-
is_connected = false;
125-
updater.force_update();
126129
return 0;
127130
}
128131

129132
int Phidget::ErrorHandler(CPhidgetHandle handle, void *userptr, int ErrorCode, const char *unknown)
130133
{
131134
((Phidget*)userptr)->errorHandler(ErrorCode);
132-
is_error = true;
133-
updater.force_update();
134-
is_error = false;
135135
return 0;
136136
}
137137

0 commit comments

Comments
 (0)