[dss-commits] digitalSTROM Server branch, master, updated. 8005b9114d0f3808e5ab073613ece1db7571339d

git version control dss-commits at forum.digitalstrom.org
Wed Jan 20 10:46:27 CET 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  8005b9114d0f3808e5ab073613ece1db7571339d (commit)
      from  615231c33861558007663d480ed09a6f61304ebb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8005b9114d0f3808e5ab073613ece1db7571339d
Author: Sebastian Kohler <sebastian.kohler at aizo.com>
Date:   Wed Jan 20 10:44:12 2010 +0100

    Scene constants and group constants moved to a separate file
    
    All scene constants and group constants from ds485const.h have been moved to a separate file. Closes Feature #86
    
    Signed-off-by: Patrick Stählin <pstaehlin at futurelab.ch>

-----------------------------------------------------------------------

Changes:
diff --git a/core/ds485/ds485.cpp b/core/ds485/ds485.cpp
index 1d54a82..733c70e 100644
--- a/core/ds485/ds485.cpp
+++ b/core/ds485/ds485.cpp
@@ -25,6 +25,7 @@
 #include "core/base.h"
 #include "core/logger.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/dss.h"
 #include "core/propertysystem.h"
 
diff --git a/core/ds485const.h b/core/ds485const.h
index fe9e445..f0b4a9b 100644
--- a/core/ds485const.h
+++ b/core/ds485const.h
@@ -128,53 +128,6 @@ namespace dss {
   const uint8_t EventDeviceReceivedTelegramLong = 0x84;
   const uint8_t EventDSLinkInterrupt = 0x85;
 
-  // Scene constants for devices
-  const uint8_t SceneOff = 0x00;
-  const uint8_t Scene1 = 0x05;
-  const uint8_t Scene2 = 0x11;
-  const uint8_t Scene3 = 0x12;
-  const uint8_t Scene4 = 0x13;
-  const uint8_t SceneStandBy = 0x30;
-  const uint8_t SceneDeepOff = 0x31;
-  const uint8_t SceneInc = 0x0B;
-  const uint8_t SceneDec = 0x0C;
-  const uint8_t SceneMin = 0x0D;
-  const uint8_t SceneMax = 0x0E;
-  const uint8_t SceneStop = 0x0F;
-  const uint8_t SceneBell = 0x29;
-  const uint8_t SceneAlarm = 0x2A;
-  const uint8_t ScenePanic = 0x2B;
-  const uint8_t SceneEnergyOverload = 0x2C;
-  const uint8_t SceneEnergyHigh = 0x2D;
-  const uint8_t SceneEnergyMiddle = 0x2E;
-  const uint8_t SceneEnergyLow = 0x2F;
-  const uint8_t SceneEnergyClassA = 0x32;
-  const uint8_t SceneEnergyClassB = 0x33;
-  const uint8_t SceneEnergyClassC = 0x34;
-  const uint8_t SceneEnergyClassD = 0x35;
-  const uint8_t SceneEnergyClassE = 0x36;
-  const uint8_t SceneEnergyClassF = 0x37;
-  const uint8_t SceneLocalOff = 0x3D;
-  const uint8_t SceneLocalOn = 0x3E;
-  
-  const uint8_t MaxSceneNumber = 0x3F;
-
-  const uint16_t SceneFlagLocalOff = 0x0100;
-
-  const int GroupIDBroadcast = 0;
-  const int GroupIDYellow = 1;
-  const int GroupIDGray = 2;
-  const int GroupIDBlue = 3;
-  const int GroupIDCyan = 4;
-  const int GroupIDViolet = 5;
-  const int GroupIDRed = 6;
-  const int GroupIDGreen = 7;
-  const int GroupIDBlack = 8;
-  const int GroupIDWhite = 9;
-  const int GroupIDDisplay = 10;
-  const int GroupIDStandardMax = GroupIDDisplay;
-  const int GroupIDMax = 64;
-
   const int FunctionIDDevice = 0;
   const int FunctionIDSwitch = 1;
 
diff --git a/core/model/apartment.cpp b/core/model/apartment.cpp
index ccc8588..8097196 100644
--- a/core/model/apartment.cpp
+++ b/core/model/apartment.cpp
@@ -24,6 +24,7 @@
 
 #include "core/DS485Interface.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/dss.h"
 #include "core/logger.h"
 #include "core/propertysystem.h"
diff --git a/core/model/busscanner.cpp b/core/model/busscanner.cpp
index cbba103..2e5679e 100644
--- a/core/model/busscanner.cpp
+++ b/core/model/busscanner.cpp
@@ -27,6 +27,8 @@
 #include "core/DS485Interface.h"
 #include "core/foreach.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
+
 
 #include "modulator.h"
 #include "device.h"
diff --git a/core/model/device.cpp b/core/model/device.cpp
index b690949..f271646 100644
--- a/core/model/device.cpp
+++ b/core/model/device.cpp
@@ -23,6 +23,7 @@
 #include "device.h"
 
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/model/busrequest.h"
 #include "core/propertysystem.h"
 #include "core/model/scenehelper.h"
diff --git a/core/model/deviceinterface.cpp b/core/model/deviceinterface.cpp
index 072f546..071cd30 100644
--- a/core/model/deviceinterface.cpp
+++ b/core/model/deviceinterface.cpp
@@ -23,6 +23,8 @@
 #include "deviceinterface.h"
 
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
+
 
 namespace dss {
   //================================================== IDeviceInterface
diff --git a/core/model/group.cpp b/core/model/group.cpp
index 8410da6..185d0da 100644
--- a/core/model/group.cpp
+++ b/core/model/group.cpp
@@ -26,6 +26,7 @@
 #include "apartment.h"
 
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 namespace dss {
 
     //============================================= Group
diff --git a/core/model/modelmaintenance.cpp b/core/model/modelmaintenance.cpp
index c027597..8b204ff 100644
--- a/core/model/modelmaintenance.cpp
+++ b/core/model/modelmaintenance.cpp
@@ -32,6 +32,8 @@
 #include "core/DS485Interface.h"
 #include "core/propertysystem.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
+
 
 #include "apartment.h"
 #include "zone.h"
diff --git a/core/model/scenehelper.cpp b/core/model/scenehelper.cpp
index 7e8e18c..5d21127 100644
--- a/core/model/scenehelper.cpp
+++ b/core/model/scenehelper.cpp
@@ -26,6 +26,7 @@
 #include <cassert>
 
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 
 namespace dss {
 
diff --git a/core/model/set.cpp b/core/model/set.cpp
index 63d42ea..3f45a5c 100644
--- a/core/model/set.cpp
+++ b/core/model/set.cpp
@@ -39,6 +39,7 @@ using namespace stdext;
 #include "core/logger.h"
 #include "core/foreach.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 
 #include "device.h"
 #include "group.h"
diff --git a/core/model/zone.cpp b/core/model/zone.cpp
index 3b37c52..2ed8fc9 100644
--- a/core/model/zone.cpp
+++ b/core/model/zone.cpp
@@ -27,6 +27,7 @@
 #include "core/base.h"
 #include "core/logger.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "set.h"
 #include "device.h"
 #include "apartment.h"
diff --git a/core/sim/dsidsim.cpp b/core/sim/dsidsim.cpp
index a6b824d..9a92c3a 100644
--- a/core/sim/dsidsim.cpp
+++ b/core/sim/dsidsim.cpp
@@ -21,6 +21,7 @@
 */
 
 #include "dsidsim.h"
+#include "core/model/modelconst.h"
 
 namespace dss {
   //================================================== DSIDSim
diff --git a/core/sim/dssim.cpp b/core/sim/dssim.cpp
index e696f51..9d28246 100644
--- a/core/sim/dssim.cpp
+++ b/core/sim/dssim.cpp
@@ -32,6 +32,7 @@
 #include <boost/filesystem.hpp>
 
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/base.h"
 #include "core/logger.h"
 #include "core/dss.h"
diff --git a/core/sim/dssim.h b/core/sim/dssim.h
index a5268f7..eab5f77 100644
--- a/core/sim/dssim.h
+++ b/core/sim/dssim.h
@@ -25,6 +25,7 @@
 
 #include "core/ds485types.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/ds485/ds485.h"
 #include "core/subsystem.h"
 
diff --git a/core/web/handler/apartmentrequesthandler.cpp b/core/web/handler/apartmentrequesthandler.cpp
index 166b434..9d65c1a 100644
--- a/core/web/handler/apartmentrequesthandler.cpp
+++ b/core/web/handler/apartmentrequesthandler.cpp
@@ -24,6 +24,7 @@
 
 #include "core/foreach.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 
 #include "core/web/json.h"
 
diff --git a/core/web/handler/simrequesthandler.cpp b/core/web/handler/simrequesthandler.cpp
index d03af80..01b9ef0 100644
--- a/core/web/handler/simrequesthandler.cpp
+++ b/core/web/handler/simrequesthandler.cpp
@@ -23,6 +23,7 @@
 #include "simrequesthandler.h"
 
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/model/group.h"
 #include "core/model/zone.h"
 #include "core/model/apartment.h"
diff --git a/tests/busrequesttests.cpp b/tests/busrequesttests.cpp
index 43ef57a..5c2e6eb 100644
--- a/tests/busrequesttests.cpp
+++ b/tests/busrequesttests.cpp
@@ -25,6 +25,7 @@
 
 #include "core/model/busrequest.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/busrequestdispatcher.h"
 #include "core/model/apartment.h"
 #include "core/model/device.h"
diff --git a/tests/modeltests.cpp b/tests/modeltests.cpp
index 87a1a9b..181c07c 100644
--- a/tests/modeltests.cpp
+++ b/tests/modeltests.cpp
@@ -36,6 +36,7 @@
 #include "core/sim/dssim.h"
 #include "core/dss.h"
 #include "core/ds485const.h"
+#include "core/model/modelconst.h"
 #include "core/ds485/ds485proxy.h"
 #include "core/ds485/ds485busrequestdispatcher.h"
 #include "core/ds485/businterfacehandler.h"


hooks/post-receive
-- 
digitalSTROM Server


More information about the dss-commits mailing list