[dss-commits] r8792 - dss/trunk/core/sim

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-09-23 15:09:41 +0200 (Wed, 23 Sep 2009)
New Revision: 8792

Modified:
   dss/trunk/core/sim/dssim.cpp
Log:
ZoneID can in fact be > 0xFF.

Fixes #134

Modified: dss/trunk/core/sim/dssim.cpp
===================================================================
--- dss/trunk/core/sim/dssim.cpp	2009-09-22 17:29:16 UTC (rev 8791)
+++ dss/trunk/core/sim/dssim.cpp	2009-09-23 13:09:41 UTC (rev 8792)
@@ -554,7 +554,7 @@
               break;
             case FunctionGroupCallScene:
               {
-                uint8_t zoneID = pd.get<uint16_t>();
+                uint16_t zoneID = pd.get<uint16_t>();
                 uint8_t groupID = pd.get<uint16_t>();
                 uint8_t sceneID = pd.get<uint16_t>();
                 groupCallScene(zoneID, groupID, sceneID);
@@ -570,7 +570,7 @@
               break;
             case FunctionGroupSaveScene:
               {
-                uint8_t zoneID = pd.get<uint16_t>();
+                uint16_t zoneID = pd.get<uint16_t>();
                 uint8_t groupID = pd.get<uint16_t>();
                 uint8_t sceneID = pd.get<uint16_t>();
                 groupSaveScene(zoneID, groupID, sceneID);
@@ -704,7 +704,7 @@
               break;
             case FunctionModulatorCountDevInZone:
               {
-                uint8_t index = pd.get<uint16_t>();
+                uint16_t index = pd.get<uint16_t>();
                 response = createResponse(cmdFrame, cmdNr);
                 response->getPayload().add<uint16_t>(m_Zones[index].size());
                 distributeFrame(response);
@@ -712,8 +712,8 @@
               break;
             case FunctionModulatorDevKeyInZone:
               {
-                uint8_t zoneID = pd.get<uint16_t>();
-                uint8_t deviceIndex = pd.get<devid_t>();
+                uint16_t zoneID = pd.get<uint16_t>();
+                uint16_t deviceIndex = pd.get<devid_t>();
                 response = createResponse(cmdFrame, cmdNr);
                 response->getPayload().add<uint16_t>(m_Zones[zoneID].at(deviceIndex)->getShortAddress());
                 distributeFrame(response);
@@ -892,7 +892,7 @@
               break;
             case FunctionModulatorAddZone:
               {
-                uint8_t zoneID = pd.get<uint16_t>();
+                uint16_t zoneID = pd.get<uint16_t>();
                 response = createResponse(cmdFrame, cmdNr);
                 bool isValid = true;
                 for(map< const int, std::vector<DSIDInterface*> >::iterator iZoneEntry = m_Zones.begin(), e = m_Zones.end();
@@ -915,7 +915,7 @@
             case FunctionDeviceSetZoneID:
               {
                 devid_t devID = pd.get<devid_t>();
-                uint8_t zoneID = pd.get<uint16_t>();
+                uint16_t zoneID = pd.get<uint16_t>();
                 DSIDInterface& dev = lookupDevice(devID);
 
                 int oldZoneID = m_DeviceZoneMapping[&dev];