[dss-commits] r8896 - in dss/branches/0.6: . core core/sim external

[dss-commits at forum.digitalstrom.org]

Author: jwinkelmann
Date: 2009-11-09 08:35:42 +0100 (Mon, 09 Nov 2009)
New Revision: 8896

Modified:
   dss/branches/0.6/CMakeLists.txt
   dss/branches/0.6/core/dss.cpp
   dss/branches/0.6/core/sim/dssim.cpp
   dss/branches/0.6/external/CMakeLists.txt
Log:
dss-0.6: remove sensornest related code


Modified: dss/branches/0.6/CMakeLists.txt
===================================================================
--- dss/branches/0.6/CMakeLists.txt	2009-11-09 07:34:45 UTC (rev 8895)
+++ dss/branches/0.6/CMakeLists.txt	2009-11-09 07:35:42 UTC (rev 8896)
@@ -161,7 +161,7 @@
        )
 
 
-TARGET_LINK_LIBRARIES(dss ${TEST_LIB} ${BOOST_TEST_LIB} core unix slaves webservices pthread
+TARGET_LINK_LIBRARIES(dss ${TEST_LIB} ${BOOST_TEST_LIB} core unix webservices pthread
 	mongoose ${REQUIRED_LIBS})
 
 

Modified: dss/branches/0.6/core/dss.cpp
===================================================================
--- dss/branches/0.6/core/dss.cpp	2009-11-09 07:34:45 UTC (rev 8895)
+++ dss/branches/0.6/core/dss.cpp	2009-11-09 07:35:42 UTC (rev 8896)
@@ -49,7 +49,6 @@
 #include "event.h"
 #include "metering/metering.h"
 #include "metering/fake_meter.h"
-#include "external/slaves/sensornest.h"
 #include "foreach.h"
 
 #include "unix/systeminfo.h"
@@ -198,12 +197,12 @@
       boost::shared_ptr<dss::LogTarget>
         logTarget(new dss::FileLogTarget(logFileName));
       if (!dss::Logger::getInstance()->setLogTarget(logTarget)) {
-        Logger::getInstance()->log("Failed to open logfile '" + 
+        Logger::getInstance()->log("Failed to open logfile '" +
                                    logFileName + "'", lsFatal);
         return false;
       }
     } else {
-      Logger::getInstance()->log("No logfile configured, logging to stdout", 
+      Logger::getInstance()->log("No logfile configured, logging to stdout",
                                  lsInfo);
     }
 
@@ -264,10 +263,6 @@
     SystemInfo info;
     info.collect();
 
-    SensornestServer server;
-    server.run();
-
-
     m_State = ssInitializingSubsystems;
     std::for_each(m_Subsystems.begin(), m_Subsystems.end(), InitializeSubsystem);
 

Modified: dss/branches/0.6/core/sim/dssim.cpp
===================================================================
--- dss/branches/0.6/core/sim/dssim.cpp	2009-11-09 07:34:45 UTC (rev 8895)
+++ dss/branches/0.6/core/sim/dssim.cpp	2009-11-09 07:35:42 UTC (rev 8896)
@@ -38,7 +38,6 @@
 #include "core/DS485Interface.h"
 #include "core/foreach.h"
 #include "core/propertysystem.h"
-#include "external/slaves/sensornest.h"
 #include "dsid_js.h"
 #include "dsid_plugin.h"
 
@@ -87,7 +86,6 @@
     Subsystem::initialize();
     m_DSIDFactory.registerCreator(new DSIDSimCreator());
     m_DSIDFactory.registerCreator(new DSIDSimSwitchCreator());
-    m_DSIDFactory.registerCreator(new DSIDSimSensornestCreator());
 
     PropertyNodePtr pNode = getDSS().getPropertySystem().getProperty(getConfigPropertyBasePath() + "js-devices");
     if(pNode != NULL) {
@@ -943,8 +941,8 @@
                 devid_t devID = pd.get<devid_t>();
                 DSIDInterface& dev = lookupDevice(devID);
                 uint16_t valueToSend = pd.get<uint16_t>();
-                uint16_t flags = pd.get<uint16_t>();    
-                
+                uint16_t flags = pd.get<uint16_t>();
+
                 bool handled = false;
                 uint8_t value = dev.dsLinkSend(valueToSend, flags, handled);
                 if(handled && ((flags & DSLinkSendWriteOnly) == 0)) {

Modified: dss/branches/0.6/external/CMakeLists.txt
===================================================================
--- dss/branches/0.6/external/CMakeLists.txt	2009-11-09 07:34:45 UTC (rev 8895)
+++ dss/branches/0.6/external/CMakeLists.txt	2009-11-09 07:35:42 UTC (rev 8896)
@@ -1,2 +1 @@
 add_subdirectory(mongoose)
-add_subdirectory(slaves)