ctdo
/
hackcentercontrol
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: ctdo:standalone
Branches Tags
ctdo:master
ctdo:standalone
..
compare: ctdo:master
Branches Tags
ctdo:standalone
ctdo:master

No commits in common. "standalone" and "master" have entirely different histories.
standalone ... master

13 changed files with 145 additions and 544 deletions
Show Stats Expand all files Collapse all files

6
nodeartnet/.idea/compiler.xml
View File

@ -15,7 +15,11 @@
<entry name="?*.tld" /> <entry name="?*.tld" />
<entry name="?*.ftl" /> <entry name="?*.ftl" />
</wildcardResourcePatterns> </wildcardResourcePatterns>
<annotationProcessing enabled="false" useClasspath="true" /> <annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component> </component>
</project> </project>

5
nodeartnet/.idea/misc.xml
View File

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="IdProvider" IDEtalkID="C6B333EE82B1D0849786F1C7113F0428" />
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
@ -15,7 +11,6 @@
<PyConsoleSettings /> <PyConsoleSettings />
</option> </option>
</component> </component>
<component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
<state key="ProjectJDKs.UI"> <state key="ProjectJDKs.UI">

306
nodeartnet/.idea/workspace.xml
View File

@ -2,20 +2,17 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="72d93b4a-de8e-43f1-9d4b-34713e827c14" name="Default" comment=""> <list default="true" id="72d93b4a-de8e-43f1-9d4b-34713e827c14" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/configs/hackcenter/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="DELETED" beforePath="$PROJECT_DIR$/oscMap.json" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/css/style.css" afterPath="$PROJECT_DIR$/bootstrap/css/style.css" />
<change type="MOVED" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/configs/ctdo/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.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$/states.json" afterPath="$PROJECT_DIR$/states.json" />
</list> </list>
<ignored path="nodeartnet.iws" /> <ignored path="nodeartnet.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<file path="/style.css" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747281902" ignored="false" />
<file path="/Dummy.txt" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356737465166" ignored="false" />
<file path="/index.html" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747261765" ignored="false" />
<file path="/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356736182346" ignored="false" />
<file path="$PROJECT_DIR$/../hackcentercontrol/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356729852724" ignored="false" /> <file path="$PROJECT_DIR$/../hackcentercontrol/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356729852724" ignored="false" />
<file path="/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356736182346" ignored="false" />
<file path="/index.html" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747261765" ignored="false" />
<file path="/Dummy.txt" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356737465166" ignored="false" />
<file path="/style.css" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747281902" ignored="false" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -30,7 +27,7 @@
<disable_hints /> <disable_hints />
</component> </component>
<component name="DebuggerManager"> <component name="DebuggerManager">
<breakpoint_any default_suspend_policy="SuspendAll"> <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
<breakpoint> <breakpoint>
<option name="NOTIFY_CAUGHT" value="true" /> <option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" /> <option name="NOTIFY_UNCAUGHT" value="true" />
@ -38,6 +35,7 @@
<option name="LOG_ENABLED" value="false" /> <option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" /> <option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" /> <option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="true" /> <option name="CONDITION_ENABLED" value="true" />
@ -53,6 +51,7 @@
<option name="LOG_ENABLED" value="false" /> <option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" /> <option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" /> <option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="true" /> <option name="CONDITION_ENABLED" value="true" />
@ -62,8 +61,8 @@
<option name="LOG_MESSAGE" value="" /> <option name="LOG_MESSAGE" value="" />
</breakpoint> </breakpoint>
</breakpoint_any> </breakpoint_any>
<ui_properties default_suspend_policy="SuspendAll" /> <breakpoint_rules default_suspend_policy="SuspendAll" default_condition_enabled="true" />
<breakpoint_rules default_suspend_policy="SuspendAll" /> <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
<breakpoint_rules /> <breakpoint_rules />
<ui_properties /> <ui_properties />
</component> </component>
@ -73,37 +72,30 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <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"> <entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="87" column="34" selection-start="2608" selection-end="2608" vertical-scroll-proportion="0.74358976"> <state line="46" column="20" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/configs/ctdo/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="68" column="76" selection-start="3227" selection-end="3227" vertical-scroll-proportion="-14.375"> <state line="186" column="21" selection-start="8852" selection-end="8852" vertical-scroll-proportion="-17.5">
<folding /> <folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="oscMap.json" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="style.css" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/configs/ctdo/oscMap.json">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="25" selection-start="157" selection-end="157" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="style.css" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bootstrap/css/style.css"> <entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="0.0"> <state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="1.3847874">
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -119,24 +111,26 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component> </component>
<component name="GitLogSettings">
<option name="myDateState">
<MyDateState />
</option>
</component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/bootstrap/css/screen.css" /> <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$/configs/ctdo/oscMap.json" />
<option value="$PROJECT_DIR$/configs/ctdo/index.html" />
<option value="$PROJECT_DIR$/app.js" /> <option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/bootstrap/css/style.css" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="2" /> <option name="x" value="-4" />
<option name="y" value="18" /> <option name="y" value="25" />
<option name="width" value="1362" /> <option name="width" value="1608" />
<option name="height" value="729" /> <option name="height" value="853" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
@ -145,8 +139,6 @@
<OptionsSetting value="true" id="Update" /> <OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" /> <OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" /> <OptionsSetting value="true" id="Edit" />
<OptionsSetting value="true" id="Undo Check Out" />
<OptionsSetting value="true" id="Get Latest Version" />
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
@ -166,16 +158,8 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope"> <pane id="Scope" />
<subPane subId="Project Files"> <pane id="PackagesPane" />
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -204,11 +188,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="configs" /> <option name="myItemId" value="bootstrap" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="hackcenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -222,17 +202,16 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="configs" /> <option name="myItemId" value="bootstrap" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="ctdo" /> <option name="myItemId" value="css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -246,11 +225,7 @@
<property name="MemberChooser.copyJavadoc" value="false" /> <property name="MemberChooser.copyJavadoc" value="false" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/configs/ctdo" />
</key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/configs/hackcenter" />
<recent name="$PROJECT_DIR$/bootstrap/js" /> <recent name="$PROJECT_DIR$/bootstrap/js" />
</key> </key>
</component> </component>
@ -259,13 +234,7 @@
<module name="" /> <module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
<option name="PROGRAM_PARAMETERS" /> <option name="PROGRAM_PARAMETERS" />
<method> <method />
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration> </configuration>
<configuration default="true" type="Remote" factoryName="Remote"> <configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="USE_SOCKET_TRANSPORT" value="true" />
@ -273,31 +242,7 @@
<option name="SHMEM_ADDRESS" value="javadebug" /> <option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" /> <option name="HOST" value="localhost" />
<option name="PORT" value="5005" /> <option name="PORT" value="5005" />
<method> <method />
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration> </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG"> <configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@ -325,13 +270,20 @@
<envs /> <envs />
<properties /> <properties />
<listeners /> <listeners />
<method> <method />
<option name="AntTarget" enabled="false" /> </configuration>
<option name="BuildArtifacts" enabled="false" /> <configuration default="true" type="Applet" factoryName="Applet">
<option name="Make" enabled="true" /> <module name="" />
<option name="Maven.BeforeRunTask" enabled="false" /> <option name="MAIN_CLASS_NAME" />
<option name="RakeTask" enabled="false" /> <option name="HTML_FILE_NAME" />
</method> <option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<method />
</configuration> </configuration>
<configuration default="true" type="Application" factoryName="Application"> <configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@ -346,13 +298,7 @@
<option name="PASS_PARENT_ENVS" value="true" /> <option name="PASS_PARENT_ENVS" value="true" />
<module name="" /> <module name="" />
<envs /> <envs />
<method> <method />
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration> </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit"> <configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@ -373,13 +319,7 @@
</option> </option>
<envs /> <envs />
<patterns /> <patterns />
<method> <method />
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration> </configuration>
<list size="0" /> <list size="0" />
<configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false"> <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
@ -428,48 +368,32 @@
<created>1356737467286</created> <created>1356737467286</created>
<updated>1356737467286</updated> <updated>1356737467286</updated>
</task> </task>
<task id="LOCAL-00005" summary="round dmx value"> <option name="localTasksCounter" value="5" />
<created>1357780906470</created>
<updated>1357780906470</updated>
</task>
<task id="LOCAL-00006" summary="only devices in oscMap trigger dmxsend">
<created>1357781130763</created>
<updated>1357781130763</updated>
</task>
<task id="LOCAL-00007" summary="update OSC Devices on every oscmessage with all states&#10;save states to file, to recover on restart">
<created>1357826790758</created>
<updated>1357826790758</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="2" y="18" width="1362" height="729" extended-state="0" /> <frame x="-4" y="25" width="1608" height="853" extended-state="6" />
<editor active="true" /> <editor active="false" />
<layout> <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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3286119" sideWeight="0.497426" order="7" 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" />
<window_info id="JetGradle" 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="Palette" 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="Palette" 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="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk Messages" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286119" sideWeight="0.4980695" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286119" sideWeight="0.4980695" order="7" side_tool="true" content_ui="tabs" />
<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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" 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="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="Messages" 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="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="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="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" /> <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" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24961948" sideWeight="0.81383854" order="0" side_tool="false" content_ui="combo" /> <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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24967825" sideWeight="0.6713881" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<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="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="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="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="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" /> <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" />
</layout> </layout>
@ -496,7 +420,6 @@
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" /> <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" /> <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" /> <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
<option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" /> <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" /> <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
@ -506,12 +429,14 @@
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" /> <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" /> <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" /> <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" /> <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" /> <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
<option name="LIMIT_HISTORY" value="true" />
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" /> <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
<option name="LAST_COMMIT_MESSAGE" value="update OSC Devices on every oscmessage with all states&#10;save states to file, to recover on restart" /> <option name="LAST_COMMIT_MESSAGE" value="bugfix" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" /> <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" /> <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@ -528,9 +453,6 @@
<MESSAGE value="added some logging" /> <MESSAGE value="added some logging" />
<MESSAGE value="blub" /> <MESSAGE value="blub" />
<MESSAGE value="bugfix" /> <MESSAGE value="bugfix" />
<MESSAGE value="round dmx value" />
<MESSAGE value="only devices in oscMap trigger dmxsend" />
<MESSAGE value="update OSC Devices on every oscmessage with all states&#10;save states to file, to recover on restart" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager /> <breakpoint-manager />
@ -543,86 +465,34 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/configs/hackcenter/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="24" column="96" selection-start="672" selection-end="672" vertical-scroll-proportion="0.0"> <state line="24" column="96" selection-start="672" selection-end="672" vertical-scroll-proportion="0.0">
<folding /> <folding>
</state> <element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</provider> </folding>
</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">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/artnet/index.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/artnet/package.json">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/node-osc/lib/osc.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.0576923">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/node-osc/lesser.txt">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/node-osc/index.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<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$/configs/hackcenter/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="80" column="74" selection-start="3859" selection-end="3859" vertical-scroll-proportion="2.388325">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/configs/ctdo/oscMap.json">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="25" selection-start="157" selection-end="157" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/configs/ctdo/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="68" column="76" selection-start="3227" selection-end="3227" vertical-scroll-proportion="-14.375">
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app.js"> <entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="87" column="34" selection-start="2608" selection-end="2608" vertical-scroll-proportion="0.74358976"> <state line="46" column="20" selection-start="1338" selection-end="1338" 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="186" column="21" selection-start="8852" selection-end="8852" vertical-scroll-proportion="-17.5">
<folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</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="1.3847874">
<folding /> <folding />
</state> </state>
</provider> </provider>

68
nodeartnet/app.js
View File

@ -1,35 +1,24 @@
var config = "ctdo"
var express = require('express'); var express = require('express');
var app = express(); var app = express();
var server = require('http').createServer(app), io = require('socket.io').listen(server); var server = require('http').createServer(app), io = require('socket.io').listen(server);
var osc = require('node-osc'); var osc = require('node-osc');
var oscMap = require("./configs/" + config + "/oscMap.json");
var states = require("./configs/" + config + "/states.json");
var fs = require('fs');
var host = process.argv.length > 2 ? process.argv[2] : '195.160.169.33' var host = process.argv.length > 2 ? process.argv[2] : 'distinto.lp-server.net';
var port = process.argv.length > 3 ? process.argv[3] : '9000'; var port = process.argv.length > 3 ? process.argv[3] : '5001';
var oscSender = new osc.Client(host, port); var oscSender = new osc.Client(host, port);
var oscReceiver = new osc.Server(3333, '0.0.0.0');
var artnetclient = require('./node_modules/artnet/lib/artnet_client');
var dmxClient = artnetclient.createClient("195.160.169.15", 6454);
var states = [];
var dmxData = new Array(512); server.listen(8080);
for(var i=0; i<512;i++) {
dmxData[i] = 0;
}
server.listen(8081);
app.use(express.static('bootstrap')); app.use(express.static('bootstrap'));
app.get('/', function (req, res) { app.get('/', function (req, res) {
res.sendfile(__dirname + '/configs/' + config + '/index.html'); res.sendfile(__dirname + '/index.html');
}); });
io.sockets.on('connection', function (socket) { io.sockets.on('connection', function (socket) {
//socket.emit('news', { hello: 'world' });
var address = socket.handshake.address; var address = socket.handshake.address;
console.log("New connection from " + address.address + ":" + address.port); console.log("New connection from " + address.address + ":" + address.port);
@ -39,25 +28,8 @@ io.sockets.on('connection', function (socket) {
var chan = data.chan; var chan = data.chan;
var value = data.val; var value = data.val;
// hier noch nicht einkommentieren, das sendet das sofort ins hackcenter
//oscSender.send(chan, value);
handleMessage(new Array(chan, value))
//console.log(address, chan, value);
});
});
oscReceiver.on("message", function (msg, rinfo) {
handleMessage(msg)
});
function handleMessage(msg) {
console.log("Message:");
console.log(msg);
var chan = msg[0],
value = msg[1];
if(chan == null) return; if(chan == null) return;
// sync states array with value
if(value == null) { if(value == null) {
if(states[chan] == null) { if(states[chan] == null) {
states[chan] = 1 states[chan] = 1
@ -67,24 +39,12 @@ function handleMessage(msg) {
states[chan] = 1; states[chan] = 1;
} }
value = states[chan]; value = states[chan];
} else {
states[chan] = value;
} }
// get mapped dmx channel // hier noch nicht einkommentieren, das sendet das sofort ins hackcenter
if(oscMap[chan] != null) { //oscSender.send(chan, value);
dmxData[oscMap[chan]-1] = Math.round(value*255);
console.log(Math.round(value*255)); console.log(address, chan, value);
dmxClient.send(dmxData); });
} });
// update osc devices to show the current state
// to be done in extra function (with whole states array?)
updateDevices();
fs.writeFile("./configs/" + config + "/states.json", JSON.stringify(states, null, 4));
}
function updateDevices() {
for(var chan in states) {
oscSender.send(chan, states[chan]);
console.log(chan);
}
}

145
nodeartnet/configs/ctdo/index.html
View File

@ -1,145 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>ctdo light control</title>
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="css/style.css" rel="stylesheet" media="screen">
<script src="js/jquery-1.8.3.min.js"></script>
</head>
<body>
<div class="container left">
<h3>ctdo light control</h3>
<div class="row">
<div class="span3">
<div class="btn-group wabe-1-1-red" data-channel="/1/rgb1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-1-1-green" data-channel="/1/rgb1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-1-1-blue" data-channel="/1/rgb1/3">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-3-1-red" data-channel="/1/rgb2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-3-1-green" data-channel="/1/rgb2/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-3-1-blue" data-channel="/1/rgb2/3">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-4-1-red" data-channel="/1/rgb3/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-4-1-green" data-channel="/1/rgb3/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-4-1-blue" data-channel="/1/rgb3/3">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
</div>
<div class="row">
<div class="span3">
<div class="btn-group wabe-5-1-red" data-channel="/1/rgb4/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-5-1-green" data-channel="/1/rgb4/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-5-1-blue" data-channel="/1/rgb4/3">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
</div>
</div>
<!--
<div class="container right">
<div class="span2">
LED
</div>
</div>
<div class="container right">
<div class="span2">
<input type="range" name="right-slider" id="right-slider" min="0" max="100" value="0" />
</div>
</div>
-->
<br style="clear: both" />
<!--
<div class="container bottom">
<input type="range" name="bottom-slider" id="bottom-slider" min="0" max="100" value="0" />
</div> -->
<div class="footer">
from top to bottom: red/green/blue
</div>
<script src="/socket.io/socket.io.js"></script>
<script>
var socket = io.connect('http://' + window.location.hostname + ":" + window.location.port);
socket.on('news', function (data) {
console.log(data);
//
//handleDMXData(data);
});
$(document).ready(function(evnt) {
$(document).delegate('.btn-success', 'click', function(event) {
var channel = $(this).parent().data('channel');
if(channel != null) {
socket.emit('oscmessage', { chan: channel, val: 1 });
}
});
$(document).delegate('.btn-danger', 'click', function(event) {
var channel = $(this).parent().data('channel');
if(channel != null) {
socket.emit('oscmessage', { chan: channel, val: 0 });
}
});
/*
$(document).delegate('#bottom-slider', 'change', function(event) {
socket.emit('oscmessage', { chan: '/1/fader1', val: })
}); */
});
</script>
<script src="js/bootstrap.min.js"></script>
<script src="js/html5slider.js"></script>
</body>
</html>

14
nodeartnet/configs/ctdo/oscMap.json
View File

@ -1,14 +0,0 @@
{
"/1/rgb1/1":2,
"/1/rgb1/2":3,
"/1/rgb1/3":4,
"/1/rgb2/1":7,
"/1/rgb2/2":8,
"/1/rgb2/3":9,
"/1/rgb3/1":12,
"/1/rgb3/2":13,
"/1/rgb3/3":14,
"/1/rgb4/1":17,
"/1/rgb4/2":18,
"/1/rgb4/3":19
}

15
nodeartnet/configs/ctdo/states.json
View File

@ -1,15 +0,0 @@
{
"/1/encoder1": 1,
"/1/rgb1/1": 1,
"/1/rgb1/2": 0,
"/1/rgb1/3": 0.26404494047164917,
"/1/rgb4/1": 1,
"/1/rgb2/2": 0,
"/1/rgb2/3": 0.317415714263916,
"/1/rgb2/1": 1,
"/1/rgb3/1": 1,
"/1/rgb3/2": 0,
"/1/rgb3/3": 0.31179773807525635,
"/1/rgb4/2": 0,
"/1/rgb4/3": 0.32865166664123535
}

36
nodeartnet/configs/hackcenter/oscMap.json
View File

@ -1,36 +0,0 @@
{
"/1/wabe1/1/1":1,
"/1/wabe1/2/1":2,
"/1/wabe1/1/2":3,
"/1/wabe2/1/1":4,
"/1/wabe2/2/1":5,
"/1/wabe2/1/2":6,
"/1/wabe3/1/1":7,
"/1/wabe3/2/1":8,
"/1/wabe3/1/2":9,
"/1/wabe4/1/1":10,
"/1/wabe4/2/1":11,
"/1/wabe4/1/2":12,
"/1/wabe5/1/1":13,
"/1/wabe5/2/1":14,
"/1/wabe5/1/2":15,
"/1/wabe6/1/1":16,
"/1/wabe6/2/1":17,
"/1/wabe6/1/2":18,
"/1/wabe7/1/1":19,
"/1/wabe7/2/1":20,
"/1/wabe7/1/2":21,
"/1/wabe8/1/1":22,
"/1/wabe8/2/1":23,
"/1/wabe8/1/2":24,
"/1/wabe9/1/1":25,
"/1/wabe9/2/1":26,
"/1/wabe9/1/2":27,
"/1/lamp1":28,
"/1/lamp2":29,
"/1/lamp3":30,
"/1/halogen1":31,
"/1/halogen2":32,
"/1/voucher1":33,
"/1/voucher2":34
}

2
nodeartnet/configs/hackcenter/states.json
View File

@ -1,2 +0,0 @@
{
}

BIN
nodeartnet/ctdo.touchosc
View File

Binary file not shown.

BIN
nodeartnet/hackcenter_cch_touchosc.touchosc
View File

Binary file not shown.

60
nodeartnet/configs/hackcenter/index.html → nodeartnet/index.html
View File

@ -14,49 +14,49 @@
<div class="row"> <div class="row">
<div class="span3"> <div class="span3">
<div class="btn-group wabe-1-1-red" data-channel="/1/wabe1/1/1"> <div class="btn-group wabe-1-1-red" data-channel="/2/multitoggle/1/1">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-1-1-green" data-channel="/1/wabe1/2/1"> <div class="btn-group wabe-1-1-green" data-channel="/2/multitoggle/2/1">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-1-1-blue" data-channel="/1/wabe1/1/2"> <div class="btn-group wabe-1-1-blue" data-channel="/2/multitoggle/1/2">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3 spansmall"> <div class="span3 spansmall">
<div class="btn-group wabe-2-1-red" data-channel="/1/lamp1/white"> <div class="btn-group wabe-2-1-red" data-channel="/2/multitoggle/1/16">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<div class="btn-group wabe-3-1-red" data-channel="/1/wabe2/1/1"> <div class="btn-group wabe-3-1-red" data-channel="/2/multitoggle/3/1">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-3-1-green" data-channel="/1/wabe2/2/1"> <div class="btn-group wabe-3-1-green" data-channel="/2/multitoggle/4/1">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-3-1-blue" data-channel="/1/wabe2/1/2"> <div class="btn-group wabe-3-1-blue" data-channel="/2/multitoggle/3/2">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<div class="btn-group wabe-4-1-red" data-channel="/1/wabe3/1/1"> <div class="btn-group wabe-4-1-red" data-channel="/2/multitoggle/5/1">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-4-1-green" data-channel="/1/wabe3/2/1"> <div class="btn-group wabe-4-1-green" data-channel="/2/multitoggle/6/1">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-4-1-blue" data-channel="/1/wabe3/1/2"> <div class="btn-group wabe-4-1-blue" data-channel="/2/multitoggle/5/2">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
@ -64,49 +64,49 @@
</div> </div>
<div class="row"> <div class="row">
<div class="span3"> <div class="span3">
<div class="btn-group wabe-5-1-red" data-channel="/1/wabe4/1/1"> <div class="btn-group wabe-5-1-red" data-channel="/2/multitoggle/1/3">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-5-1-green" data-channel="/1/wabe4/2/1"> <div class="btn-group wabe-5-1-green" data-channel="/2/multitoggle/2/3">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-5-1-blue" data-channel="/1/wabe4/1/2"> <div class="btn-group wabe-5-1-blue" data-channel="/2/multitoggle/1/4">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3 spansmall"> <div class="span3 spansmall">
<div class="btn-group wabe-6-1-red" data-channel="/1/lamp2/white"> <div class="btn-group wabe-6-1-red" data-channel="/2/multitoggle/2/16">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<div class="btn-group wabe-7-1-red" data-channel="/1/wabe5/1/1"> <div class="btn-group wabe-7-1-red" data-channel="/2/multitoggle/3/3">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-7-1-green" data-channel="/1/wabe5/2/1"> <div class="btn-group wabe-7-1-green" data-channel="/2/multitoggle/4/3">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-7-1-blue" data-channel="/1/wabe5/1/2"> <div class="btn-group wabe-7-1-blue" data-channel="/2/multitoggle/3/4">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<div class="btn-group wabe-8-1-red" data-channel="/1/wabe6/1/1"> <div class="btn-group wabe-8-1-red" data-channel="/2/multitoggle/5/3">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-8-1-green" data-channel="/1/wabe6/2/1"> <div class="btn-group wabe-8-1-green" data-channel="/2/multitoggle/6/3">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-8-1-blue" data-channel="/1/wabe6/1/2"> <div class="btn-group wabe-8-1-blue" data-channel="/2/multitoggle/5/4">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
@ -114,49 +114,49 @@
</div> </div>
<div class="row"> <div class="row">
<div class="span3"> <div class="span3">
<div class="btn-group wabe-9-1-red" data-channel="/1/wabe7/1/1"> <div class="btn-group wabe-9-1-red" data-channel="/2/multitoggle/1/5">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-9-1-green" data-channel="/1/wabe7/2/1"> <div class="btn-group wabe-9-1-green" data-channel="/2/multitoggle/2/5">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-9-1-blue" data-channel="/1/wabe7/1/2"> <div class="btn-group wabe-9-1-blue" data-channel="/2/multitoggle/1/6">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3 spansmall"> <div class="span3 spansmall">
<div class="btn-group wabe-10-1-red" data-channel="/1/lamp3/white"> <div class="btn-group wabe-10-1-red" data-channel="/2/multitoggle/3/16">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<div class="btn-group wabe-11-1-red" data-channel="/1/wabe8/1/1"> <div class="btn-group wabe-11-1-red" data-channel="/2/multitoggle/3/5">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-11-1-green" data-channel="/1/wabe8/2/1"> <div class="btn-group wabe-11-1-green" data-channel="/2/multitoggle/4/5">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-11-1-blue" data-channel="/1/wabe8/1/2"> <div class="btn-group wabe-11-1-blue" data-channel="/2/multitoggle/3/6">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
</div> </div>
<div class="span3"> <div class="span3">
<div class="btn-group wabe-12-1-red" data-channel="/1/wabe9/1/1"> <div class="btn-group wabe-12-1-red" data-channel="/2/multitoggle/5/5">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-12-1-green" data-channel="/1/wabe9/2/1"> <div class="btn-group wabe-12-1-green" data-channel="/2/multitoggle/6/5">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>
<div class="btn-group wabe-12-1-blue" data-channel="/1/wabe9/1/2"> <div class="btn-group wabe-12-1-blue" data-channel="/2/multitoggle/5/6">
<button class="btn btn-success">on</button> <button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button> <button class="btn btn-danger">off</button>
</div> </div>

16
nodeartnet/states.json
View File

@ -1,16 +0,0 @@
{
"/1/rgb1/1": 0,
"/1/rgb2/2": 0,
"/1/rgb3/3": 0,
"/1/wabe4/1/1": 1,
"/1/wabe2/1/1": 1,
"/1/rgb1/2": 0,
"/1/rgb1/3": 0,
"/1/rgb2/1": 0,
"/1/rgb2/3": 0,
"/1/rgb3/1": 0,
"/1/rgb3/2": 0,
"/1/rgb4/1": 0,
"/1/rgb4/2": 0,
"/1/rgb4/3": 0
}