[dss-commits] r8830 - dss/branches/0.5/unix

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-10-07 10:24:21 +0200 (Wed, 07 Oct 2009)
New Revision: 8830

Modified:
   dss/branches/0.5/unix/ds485proxy.cpp
Log:
DS485Proxy::getDevicesInGroup: Don't ignore device ids which seem to be sane.
- Promoted log message to fatal

Modified: dss/branches/0.5/unix/ds485proxy.cpp
===================================================================
--- dss/branches/0.5/unix/ds485proxy.cpp	2009-10-06 15:35:18 UTC (rev 8829)
+++ dss/branches/0.5/unix/ds485proxy.cpp	2009-10-07 08:24:21 UTC (rev 8830)
@@ -733,11 +733,15 @@
       cmdFrame.getPayload().add<uint16_t>(iDevice);
       int16_t res = int16_t(receiveSingleResult16(cmdFrame, FunctionGroupGetDevKeyForInd));
       if(res < 0) {
-        log("GetDevicesInGroup: Negative device id received '" + intToString(res) + "' for index " + intToString(iDevice));
+        log("GetDevicesInGroup: Negative device id received '" + intToString(res) + "' for index " + intToString(iDevice), lsFatal);
       } else {
         result.push_back(res);
       }
-      checkResultCode(res);
+      try {
+        checkResultCode(res);
+      } catch(DS485ApiError& err) {
+        log(std::string("Error reported back by dSM: ") + err.what(), lsFatal);
+      }
     }
 
     return result;