Skip to content

Commit 7df20a9

Browse files
committed
AmpIO.cpp: clarified message in ExplainSiFault when the controller is not an Si controller
1 parent 9bd9e7f commit 7df20a9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/code/AmpIO.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,10 +1866,10 @@ void AmpIO::CheckCollectCallback()
18661866

18671867
//******* Following methods are for dRA1 ********
18681868

1869-
std::string AmpIO::ExplainSiFault() const
1869+
std::string AmpIO::ExplainSiFault(void) const
18701870
{
18711871
if (GetHardwareVersion() != dRA1_String) {
1872-
return "Not a Si controller";
1872+
return "Sorry, no detailed error code available for QLA based controllers.";
18731873
}
18741874
std::stringstream ss;
18751875
const char* amp_fault_text[16] = {"-", "ADC saturated", "Current deviation", "HW overcurrent", "HW overtemp", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined"};
@@ -1880,7 +1880,7 @@ std::string AmpIO::ExplainSiFault() const
18801880
if (!(status & (1 << 0))) ss << "ESPM->dVRK communication failed. Robot not programmed? Cables?" << std::endl;
18811881
if ((status & (1 << 0)) && !(status & (1 << 1))) ss << "ESII/CC->ESPM communication failed. The problem is inside the robot." << std::endl;
18821882
if (!(status & (1 << 3))) ss << "Encoder preload is out of sync. You must preload encoder at least once." << std::endl;
1883-
if (!GetPowerStatus()) ss << "48V bad. E-stop pressed?" << std::endl;
1883+
if (!GetPowerStatus()) ss << "48V bad. E-stop disconnected or button pressed?" << std::endl;
18841884
if (GetWatchdogTimeoutStatus()) ss << "Watchdog timeout." << std::endl;
18851885
ss << "(end)" << std::endl;
18861886
ss << std::endl;

0 commit comments

Comments
 (0)