[dss-commits] r8844 - dss/trunk/unix

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-10-15 12:08:13 +0200 (Thu, 15 Oct 2009)
New Revision: 8844

Modified:
   dss/trunk/unix/ds485.cpp
   dss/trunk/unix/ds485proxy.cpp
Log:
Read the dSID from the property tree.

Closes #96

Modified: dss/trunk/unix/ds485.cpp
===================================================================
--- dss/trunk/unix/ds485.cpp	2009-10-15 10:08:04 UTC (rev 8843)
+++ dss/trunk/unix/ds485.cpp	2009-10-15 10:08:13 UTC (rev 8844)
@@ -24,6 +24,8 @@
 #include "core/base.h"
 #include "core/logger.h"
 #include "core/ds485const.h"
+#include "core/dss.h"
+#include "core/propertysystem.h"
 
 #include <stdexcept>
 #include <sstream>
@@ -252,6 +254,7 @@
     m_StationID = 0xFF;
     time_t responseSentAt;
     time_t tokenReceivedAt;
+    m_DSID = dsid_t::fromString(DSS::getInstance()->getPropertySystem().getStringValue("/system/dsid"));
 
     // prepare token frame
     boost::scoped_ptr<DS485Frame> token(new DS485Frame());

Modified: dss/trunk/unix/ds485proxy.cpp
===================================================================
--- dss/trunk/unix/ds485proxy.cpp	2009-10-15 10:08:04 UTC (rev 8843)
+++ dss/trunk/unix/ds485proxy.cpp	2009-10-15 10:08:13 UTC (rev 8844)
@@ -244,7 +244,7 @@
       _pDSS->getPropertySystem().createProperty(getPropertyBasePath() + "state")
             ->linkToProxy(PropertyProxyMemberFunction<DS485Controller, std::string>(m_DS485Controller, &DS485Controller::getStateAsString));
 
-      _pDSS->getPropertySystem().setStringValue(getConfigPropertyBasePath() + "dsid", "3504175FE0000000DEADBEEF", true, false);
+      _pDSS->getPropertySystem().setStringValue("/system/dsid", "3504175FE0000000DEADBEEF", true, false);
     }
   } // ctor