[dss-commits] r8832 - in dss/trunk: . data unix

dss-commits at forum.digitalstrom.org dss-commits at forum.digitalstrom.org
Wed Oct 7 14:01:13 CEST 2009


Author: jwinkelmann
Date: 2009-10-07 14:01:13 +0200 (Wed, 07 Oct 2009)
New Revision: 8832

Modified:
   dss/trunk/
   dss/trunk/data/apartment.xml
   dss/trunk/data/config.xml
   dss/trunk/data/sim.xml
   dss/trunk/unix/ds485proxy.cpp
Log:
revert 8831



Property changes on: dss/trunk
___________________________________________________________________
Deleted: svn:mergeinfo
   - /dss/branches/0.5:8830

Modified: dss/trunk/data/apartment.xml
===================================================================
--- dss/trunk/data/apartment.xml	2009-10-07 11:59:55 UTC (rev 8831)
+++ dss/trunk/data/apartment.xml	2009-10-07 12:01:13 UTC (rev 8832)
@@ -4,82 +4,245 @@
 		<name>dSS</name>
 	</apartment>
 	<devices>
-		<device dsid="3504175fe0000000ffc00011"/>
+		<device dsid="3504175fe0000000ffc00011">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
 		<device dsid="3504175fe0000000ffc00004">
 			<name>Sim Lampe 1</name>
+			<location>
+				<x>1.1</x>
+				<y>2.5</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000ffc00006">
 			<name>Klingel</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000ffc00003">
 			<name>Schalter</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000ffc00005">
 			<name>Sim Lampe 2</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000ffc00007">
 			<name>Sensornest</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000ffc00002">
 			<name>VLC</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
-		<device dsid="3504175fe000000000001317"/>
-		<device dsid="3504175fe000000000000a6e"/>
-		<device dsid="3504175fe000000000000650"/>
+		<device dsid="3504175fe000000000001317">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
+		<device dsid="3504175fe000000000000a6e">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
+		<device dsid="3504175fe000000000000650">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
 		<device dsid="3504175fe000000000001310">
 			<name>Föhn</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
-		<device dsid="3504175fe00000000000097a"/>
-		<device dsid="3504175fe0000000000011c0"/>
-		<device dsid="3504175fe000000000000b39"/>
-		<device dsid="3504175fe000000000000a92"/>
-		<device dsid="3504175fe000000000000b41"/>
+		<device dsid="3504175fe00000000000097a">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
+		<device dsid="3504175fe0000000000011c0">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
+		<device dsid="3504175fe000000000000b39">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
+		<device dsid="3504175fe000000000000a92">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
+		<device dsid="3504175fe000000000000b41">
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
+		</device>
 		<device dsid="3504175fe0000000ffc00001">
 			<name>Schalter</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="000000000000004290772995">
 			<name>Special</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000000006e0">
 			<name>Lampe 1</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe00000000000079f">
 			<name>Lampe 2</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe00000000000077e">
 			<name>Lampe 3</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe00000000000079c">
 			<name>Lampe Tulpe</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe000000000000439">
 			<name>Spot Eingangsbereich</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe000000000001219">
 			<name>Stehlampe Neon</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe000000000000765">
 			<name>Stehlampe Schirm</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe00000000000040b">
 			<name>Wandlampe Links</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000000006d7">
 			<name>Kugel</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe00000000000040e">
 			<name>Deckenlampe Blume</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe000000000000901">
 			<name>Arbeitsfläche Küche</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe0000000000008fd">
 			<name>Deckenlampe</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
 		<device dsid="3504175fe00000000000040a">
 			<name>Wandlampe Rechts</name>
+			<location>
+				<x>0</x>
+				<y>0</y>
+				<z>0</z>
+			</location>
 		</device>
-		<device dsid="3504175fe000000000000059"/>
 	</devices>
 	<zones>
 		<zone id="0"/>
@@ -88,13 +251,14 @@
 		<zone id="172">
 			<name>Wohnzimmer</name>
 		</zone>
+		<zone id="0"/>
+		<zone id="0"/>
 		<zone id="209"/>
 		<zone id="181"/>
 		<zone id="3"/>
-		<zone id="11634"/>
-		<zone id="412"/>
-		<zone id="417"/>
-		<zone id="390"/>
+		<zone id="0"/>
+		<zone id="0"/>
+		<zone id="0"/>
 	</zones>
 	<modulators>
 		<modulator id="3504175fe0000000ffc00013"/>
@@ -102,10 +266,5 @@
 		<modulator id="3504175fe0000010000000d1"/>
 		<modulator id="3504175fe0000010000000b5"/>
 		<modulator id="3504175fe0000010000000ac"/>
-		<modulator id="3504175fe0000010000000d5"/>
-		<modulator id="3504175fe00000100000019c"/>
-		<modulator id="9672ca6e09a12da0f747a913"/>
-		<modulator id="3504175fe0000010000001a1"/>
-		<modulator id="3504175fe000001000000186"/>
 	</modulators>
 </config>

Modified: dss/trunk/data/config.xml
===================================================================
--- dss/trunk/data/config.xml	2009-10-07 11:59:55 UTC (rev 8831)
+++ dss/trunk/data/config.xml	2009-10-07 12:01:13 UTC (rev 8832)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <properties version="1">
   <property name="config">
-    <property name="logfile" type="string">
-      <value>/tmp/dss.log</value>
-    </property>
     <property name="subsystems/DS485Proxy/rs485devicename" type="string">
       <value>/dev/ttyUSB0</value>
     </property>

Modified: dss/trunk/data/sim.xml
===================================================================
--- dss/trunk/data/sim.xml	2009-10-07 11:59:55 UTC (rev 8831)
+++ dss/trunk/data/sim.xml	2009-10-07 12:01:13 UTC (rev 8832)
@@ -1,3 +1,51 @@
 <?xml version="1.0"?>
 <simulation version="1">
+  <modulator busid="71" dsid="13">
+    <zone id="4">
+      <device dsid="11" busid="11" type="standard.simple"/>
+      <device dsid="16" busid="16" type="example.temperature_sensor"/>
+      <group id="3">
+        <device busid="16" />
+      </group>
+    </zone>
+  </modulator>
+  <modulator busid="70" dsid="10">
+    <device dsid="1" busid="1" type="standard.switch" />
+    <zone id="1"> 
+      <device dsid="4" busid="4" type="standard.simple"/>
+      <device dsid="13" busid="13" type="standard.simple"/>
+<!--      <device dsid="6" busid="6" type="standard.switch" bell="true"/> -->
+      <group id="1">
+        <device busid="4" />
+        <device busid="13" />
+      </group>
+      <group id="3">
+      </group>        
+    </zone>
+    <zone id="4">
+      <device dsid="3" busid="3" type="standard.switch"/>
+      <device dsid="5" busid="5" type="standard.simple" />
+      <group id="1">
+        <device busid="5" />
+      </group>
+    </zone>
+    <zone id="172">
+      <device dsid="7" busid="7" type="standard.switch">
+      </device>
+<!--
+      <device dsid="2" busid="2" type="example.vlc_remote"> 
+        <parameter name="port">4212</parameter>
+        <parameter name="host">192.168.169.232</parameter>
+      </device>
+      <device dsid="2" busid="2" type="aizo.slim_slave"> 
+        <parameter name="port">9090</parameter>
+        <parameter name="host">localhost</parameter>
+        <parameter name="playermac">00:04:20:1e:2f:ca</parameter>
+      </device>
+      <group id="4">
+        <device busid="2" />
+      </group>
+-->
+    </zone>
+  </modulator>
 </simulation>

Modified: dss/trunk/unix/ds485proxy.cpp
===================================================================
--- dss/trunk/unix/ds485proxy.cpp	2009-10-07 11:59:55 UTC (rev 8831)
+++ dss/trunk/unix/ds485proxy.cpp	2009-10-07 12:01:13 UTC (rev 8832)
@@ -733,15 +733,11 @@
       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), lsFatal);
+        log("GetDevicesInGroup: Negative device id received '" + intToString(res) + "' for index " + intToString(iDevice));
       } else {
         result.push_back(res);
       }
-      try {
-        checkResultCode(res);
-      } catch(DS485ApiError& err) {
-        log(std::string("Error reported back by dSM: ") + err.what(), lsFatal);
-      }
+      checkResultCode(res);
     }
 
     return result;



More information about the dss-commits mailing list