From 0dacc9ee596de687c8a1a9bde91a3110c2e1edc7 Mon Sep 17 00:00:00 2001
From: hennieliminator <accounts@hfellerhoff.de>
Date: Thu, 10 Jan 2013 02:25:30 +0100
Subject: [PATCH] only devices in oscMap trigger dmxsend

---
 nodeartnet/.idea/workspace.xml | 72 +++++++++++++++++-----------------
 nodeartnet/app.js              |  8 ++--
 nodeartnet/oscMap.json         | 10 +++--
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/nodeartnet/.idea/workspace.xml b/nodeartnet/.idea/workspace.xml
index 39aff1f..c857c1e 100644
--- a/nodeartnet/.idea/workspace.xml
+++ b/nodeartnet/.idea/workspace.xml
@@ -2,12 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="72d93b4a-de8e-43f1-9d4b-34713e827c14" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oscMap.json" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app.js" afterPath="$PROJECT_DIR$/app.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/oscMap.json" afterPath="$PROJECT_DIR$/oscMap.json" />
     </list>
     <ignored path="nodeartnet.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -73,19 +70,19 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="app.js" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="app.js" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="72" column="38" selection-start="1986" selection-end="1986" vertical-scroll-proportion="0.61538464">
+            <state line="73" column="5" selection-start="1984" selection-end="1984" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="oscMap.json" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="oscMap.json" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/oscMap.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="30" column="16" selection-start="612" selection-end="612" vertical-scroll-proportion="0.0">
+            <state line="33" column="18" selection-start="669" selection-end="689" vertical-scroll-proportion="0.8717949">
               <folding />
             </state>
           </provider>
@@ -125,8 +122,8 @@
         <option value="$PROJECT_DIR$/bootstrap/css/screen.css" />
         <option value="$PROJECT_DIR$/bootstrap/css/style.css" />
         <option value="$PROJECT_DIR$/index.html" />
-        <option value="$PROJECT_DIR$/oscMap.json" />
         <option value="$PROJECT_DIR$/app.js" />
+        <option value="$PROJECT_DIR$/oscMap.json" />
       </list>
     </option>
   </component>
@@ -480,12 +477,16 @@
       <created>1356737467286</created>
       <updated>1356737467286</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="round dmx value">
+      <created>1357780906470</created>
+      <updated>1357780906470</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="ToolWindowManager">
     <frame x="2" y="18" width="1362" height="729" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
       <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18616144" sideWeight="0.497426" order="7" side_tool="false" content_ui="tabs" />
@@ -498,6 +499,7 @@
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24961948" sideWeight="0.21746293" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -508,7 +510,6 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -551,7 +552,7 @@
     <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="bugfix" />
+    <option name="LAST_COMMIT_MESSAGE" value="round dmx value" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -568,6 +569,7 @@
     <MESSAGE value="added some logging" />
     <MESSAGE value="blub" />
     <MESSAGE value="bugfix" />
+    <MESSAGE value="round dmx value" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -587,27 +589,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="80" column="74" selection-start="3859" selection-end="3859" vertical-scroll-proportion="-12.716216">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/oscMap.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="30" column="16" selection-start="612" selection-end="612" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/artnet/lib/artnet_client.js">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.18681319">
@@ -650,9 +631,30 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="80" column="74" selection-start="3859" selection-end="3859" vertical-scroll-proportion="-12.716216">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="72" column="38" selection-start="1986" selection-end="1986" vertical-scroll-proportion="0.61538464">
+        <state line="73" column="5" selection-start="1984" selection-end="1984" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/oscMap.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="33" column="18" selection-start="669" selection-end="689" vertical-scroll-proportion="0.8717949">
           <folding />
         </state>
       </provider>
diff --git a/nodeartnet/app.js b/nodeartnet/app.js
index 7bcdd18..40cf2f0 100644
--- a/nodeartnet/app.js
+++ b/nodeartnet/app.js
@@ -70,9 +70,11 @@ function handleMessage(msg) {
     }
 
     // get mapped dmx channel
-    dmxData[oscMap[chan]] = Math.round(value*255);
-    console.log(Math.round(value*255));
-    dmxClient.send(dmxData);
+    if(oscMap[chan] != null) {
+        dmxData[oscMap[chan]] = Math.round(value*255);
+        console.log(Math.round(value*255));
+        dmxClient.send(dmxData);
+    }
     // update osc devices to show the current state
     // to be done in extra function (with whole states array?)
     oscSender.send(chan, value);
diff --git a/nodeartnet/oscMap.json b/nodeartnet/oscMap.json
index 50c172d..1d50b86 100644
--- a/nodeartnet/oscMap.json
+++ b/nodeartnet/oscMap.json
@@ -26,7 +26,11 @@
   "/1/wabe9/1/1":25,
   "/1/wabe9/2/1":26,
   "/1/wabe9/1/2":27,
-  "/1/lampe1":28,
-  "/1/lampe2":29,
-  "/1/lampe3":30
+  "/1/lamp1":28,
+  "/1/lamp2":29,
+  "/1/lamp3":30,
+  "/1/halogen1":31,
+  "/1/halogen2":32,
+  "/1/voucher1":33,
+  "/1/voucher2":34
 }
\ No newline at end of file