feat: add CCU-Jack to interfaces

ptweety · Oct 12, 2022 · 718ff65 · 718ff65
1 parent c1ef6ca
commit 718ff65
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/nodes/ccu-connection.html b/nodes/ccu-connection.html
@@ -10,6 +10,7 @@
             iprfEnabled: {value: true},
             virtEnabled: {value: true},
             bcwiEnabled: {value: false},
+            jackEnabled: {value: false},
             cuxdEnabled: {value: false},
 
             regaPoll: {value: true},
@@ -79,6 +80,7 @@
                                 $('#node-config-input-iprfEnabled').prop('checked', ccu.interfaces['HmIP-RF']);
                                 $('#node-config-input-virtEnabled').prop('checked', ccu.interfaces.VirtualDevices);
                                 $('#node-config-input-bcwiEnabled').prop('checked', ccu.interfaces['BidCos-Wired']);
+                                $('#node-config-input-jackEnabled').prop('checked', ccu.interfaces['CCU-Jack']);
                                 $('#node-config-input-cuxdEnabled').prop('checked', ccu.interfaces.CuXD);
                             }
                         });
@@ -127,7 +129,7 @@
 
 </script>
 
-<script type="text/x-red" data-template-name="ccu-connection">
+<script type="text/html" data-template-name="ccu-connection">
     <style>
         label.ccu-checkbox {
             display: block !important;
@@ -170,6 +172,7 @@
             <label class="ccu-checkbox"><input type="checkbox" id="node-config-input-bcwiEnabled"> BidCos-Wired</label><br>
             <label class="ccu-checkbox"><input type="checkbox" id="node-config-input-iprfEnabled"> HmIP-RF</label><br>
             <label class="ccu-checkbox"><input type="checkbox" id="node-config-input-virtEnabled"> VirtualDevices</label><br>
+            <label class="ccu-checkbox"><input type="checkbox" id="node-config-input-jackEnabled"> CCU-Jack</label><br>
             <label class="ccu-checkbox"><input type="checkbox" id="node-config-input-cuxdEnabled"> CUxD</label>
         </div>
     </div>
@@ -222,7 +225,7 @@
 
 
 
-<script type="text/x-red" data-help-name="ccu-connection" lang="de-DE">
+<script type="text/html" data-help-name="ccu-connection" lang="de-DE">
         <p>Im Connection Node wird die Verbindung zu den CCU Schnittstellenprozessen und zur Logikschicht verwaltet.</p>
         <h3>Konfiguration</h3>
             <ul>
@@ -255,6 +258,7 @@ <h3>Konfiguration</h3>
                         <li>BidCos-Wired: Homematic Wired</li>
                         <li>HmIP-RF: Homematic-IP Funk</li>
                         <li>VirtualDevices: Heizungsgruppen, in CCU eingebundene Systeme wie Osram Lightify</li>
+                        <li>CCU-Jack</li>
                         <li>CUxD</li>
                     </ul>
 

diff --git a/nodes/ccu-connection.js b/nodes/ccu-connection.js
@@ -410,6 +410,20 @@ module.exports = function (RED) {
                     init: true,
                     ping: false, // Todo ?
                 },
+                'CCU-Jack': {
+                    conf: 'jack',
+                    rpc: xmlrpc,
+                    port: config.tls ? 2122 : 2121,
+                    path: 'RPC3',
+                    protocol: 'http',
+                    auth: config.authentication,
+                    user: config.username,
+                    pass: config.password,
+                    tls: config.tls,
+                    inSecure: config.inSecure,
+                    init: true,
+                    ping: false,
+                },
                 CUxD: {
                     conf: 'cuxd',
                     rpc: binrpc,

diff --git a/nodes/lib/discover.js b/nodes/lib/discover.js
@@ -58,7 +58,7 @@ const discover = (options, callback) => {
                     {id: 'HmIP-RF', port: 2010},
                     {id: 'VirtualDevices', port: 9292},
                     {id: 'CUxD', port: 8701},
-                    // {id: 'CCU-Jack (VEAP)', port: 2121},
+                    {id: 'CCU-Jack', port: 2121},
                     // {id: 'CCU-Jack (secure VEAP)', port: 2122},
                     // {id: 'CCU-Jack (MQTT)', port: 1883},
                     // {id: 'CCU-Jack (secure MQTT)', port: 8883},