From aa8d648c4737429d6946362b03c68d17cf6c2ba0 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Sun, 11 Jun 2023 15:56:11 -0700 Subject: [PATCH 1/3] Increase number of connectable devices to 8 --- Config.lua | 32 +++++++++--- lib/Tools.lua | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/Utils.lua | 28 ++++++++++ 3 files changed, 192 insertions(+), 8 deletions(-) diff --git a/Config.lua b/Config.lua index 8721909..3629a23 100644 --- a/Config.lua +++ b/Config.lua @@ -12,21 +12,37 @@ ExportScript.Config = {} ExportScript.Config.MultiAppDevice = false; -- true: if you want to use several apps on the same device at the same time -- device 1 -ExportScript.Config.Export = true; -- sending data -ExportScript.Config.Host = "192.168.0.12" -- IP for 1st app -ExportScript.Config.Port = 5160; -- port for sending data for all connected devices +ExportScript.Config.Export = true; -- sending data +ExportScript.Config.Host = "192.168.0.11" -- IP for 1st app +ExportScript.Config.Port = 5160; -- port for sending data for all connected devices -- device 2 ExportScript.Config.Export2 = true; -- sending data -ExportScript.Config.Host2 = "192.168.0.14" -- IP for 2nd app +ExportScript.Config.Host2 = "192.168.0.12" -- IP for 2nd app -- device 3 -ExportScript.Config.Export3 = false; -- sending data -ExportScript.Config.Host3 = "192.168.0.16" -- IP for 3rd app +ExportScript.Config.Export3 = true; -- sending data +ExportScript.Config.Host3 = "192.168.0.13" -- IP for 3rd app -- device 4 -ExportScript.Config.Export4 = false; -- sending data -ExportScript.Config.Host4 = "192.168.0.18" -- IP for 4rd app +ExportScript.Config.Export4 = true; -- sending data +ExportScript.Config.Host4 = "192.168.0.14" -- IP for 4th app + +-- device 5 +ExportScript.Config.Export5 = true; -- sending data +ExportScript.Config.Host5 = "192.168.0.15" -- IP for 5th app + +-- device 6 +ExportScript.Config.Export6 = true; -- sending data +ExportScript.Config.Host6 = "192.168.0.16" -- IP for 6th app + +-- device 7 +ExportScript.Config.Export7 = true; -- sending data +ExportScript.Config.Host7 = "192.168.0.17" -- IP for 7th app + +-- device 8 +ExportScript.Config.Export8 = true; -- sending data +ExportScript.Config.Host8 = "192.168.0.18" -- IP for 8th app -- StreamDeck ExportScript.Config.StreamDeckExport = false; -- sending data to StreamDeck diff --git a/lib/Tools.lua b/lib/Tools.lua index e91445f..f500e51 100644 --- a/lib/Tools.lua +++ b/lib/Tools.lua @@ -43,6 +43,10 @@ local lDeviceIp1 = "" local lDeviceIp2 = "" local lDeviceIp3 = "" local lDeviceIp4 = "" +local lDeviceIp5 = "" +local lDeviceIp6 = "" +local lDeviceIp7 = "" +local lDeviceIp8 = "" local lDeviceIpMap = "" local lDevicePortMap = ExportScript.Config.Port @@ -263,6 +267,10 @@ function ExportScript.Tools.ProcessInput() elseif (lDevicesNo == 2) then elseif (lDevicesNo == 3) then elseif (lDevicesNo == 4) then + elseif (lDevicesNo == 5) then + elseif (lDevicesNo == 6) then + elseif (lDevicesNo == 7) then + elseif (lDevicesNo == 8) then end local opt = tonumber(string.sub(_input,2,2)) @@ -272,6 +280,10 @@ function ExportScript.Tools.ProcessInput() if (lDeviceIp2 == from) then lDeviceIp2 = "" end if (lDeviceIp3 == from) then lDeviceIp3 = "" end if (lDeviceIp4 == from) then lDeviceIp4 = "" end + if (lDeviceIp5 == from) then lDeviceIp5 = "" end + if (lDeviceIp6 == from) then lDeviceIp6 = "" end + if (lDeviceIp7 == from) then lDeviceIp7 = "" end + if (lDeviceIp8 == from) then lDeviceIp8 = "" end end if opt == 1 then @@ -310,6 +322,42 @@ function ExportScript.Tools.ProcessInput() ExportScript.Tools.lDeviceIp4 = from return end + -- Device 5 + elseif (lDeviceIp5 == "") then + ExportScript.Tools.lDeviceIp5 = from + return + elseif (lDeviceIp5 ~= "") then + if (from == lDeviceIp5) then + ExportScript.Tools.lDeviceIp5 = from + return + end + -- Device 6 + elseif (lDeviceIp6 == "") then + ExportScript.Tools.lDeviceIp6 = from + return + elseif (lDeviceIp6 ~= "") then + if (from == lDeviceIp6) then + ExportScript.Tools.lDeviceIp6 = from + return + end + -- Device 7 + elseif (lDeviceIp7 == "") then + ExportScript.Tools.lDeviceIp7 = from + return + elseif (lDeviceIp7 ~= "") then + if (from == lDeviceIp7) then + ExportScript.Tools.lDeviceIp7 = from + return + end + -- Device 8 + elseif (lDeviceIp8 == "") then + ExportScript.Tools.lDeviceIp8 = from + return + elseif (lDeviceIp8 ~= "") then + if (from == lDeviceIp8) then + ExportScript.Tools.lDeviceIp8 = from + return + end end end @@ -1227,6 +1275,58 @@ function ExportScript.Tools.SendShortData(message) try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host4, ExportScript.Config.Port)) end end + + if ExportScript.Config.Export5 then + if (ExportScript.Config.Host5 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice == false) then + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + elseif (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host5, ExportScript.Config.Port)) + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host5, ExportScript.Config.Port)) + end + end + + if ExportScript.Config.Export6 then + if (ExportScript.Config.Host6 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice == false) then + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + elseif (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host6, ExportScript.Config.Port)) + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host6, ExportScript.Config.Port)) + end + end + + if ExportScript.Config.Export7 then + if (ExportScript.Config.Host7 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice == false) then + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + elseif (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host7, ExportScript.Config.Port)) + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host7, ExportScript.Config.Port)) + end + end + + if ExportScript.Config.Export8 then + if (ExportScript.Config.Host8 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice == false) then + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + elseif (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host8, ExportScript.Config.Port)) + try(ExportScript.UDPsender:sendto(_packet, lDeviceIpMap, lDevicePortMap)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host8, ExportScript.Config.Port)) + end + end end) _flushData() end @@ -1298,6 +1398,46 @@ function ExportScript.Tools.FlushData() end end + if ExportScript.Config.Export5 then + if (ExportScript.Config.Host5 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host5, ExportScript.Config.Port)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host5, ExportScript.Config.Port)) + end + end + + if ExportScript.Config.Export6 then + if (ExportScript.Config.Host6 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host6, ExportScript.Config.Port)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host6, ExportScript.Config.Port)) + end + end + + if ExportScript.Config.Export7 then + if (ExportScript.Config.Host7 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host7, ExportScript.Config.Port)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host7, ExportScript.Config.Port)) + end + end + + if ExportScript.Config.Export8 then + if (ExportScript.Config.Host8 == lDeviceIpMap) then + if (ExportScript.Config.MultiAppDevice ~= nil and ExportScript.Config.MultiAppDevice) then + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host8, ExportScript.Config.Port)) + end + else + try(ExportScript.UDPsender:sendto(_packet, ExportScript.Config.Host8, ExportScript.Config.Port)) + end + end + if ExportScript.Config.StreamDeckExport then local _id = "" _id = ExportScript.Id diff --git a/lib/Utils.lua b/lib/Utils.lua index 4a812bc..3bb3995 100644 --- a/lib/Utils.lua +++ b/lib/Utils.lua @@ -22,6 +22,18 @@ do PWDEV.Properties.Export4 = false PWDEV.Properties.Host4 = "" + PWDEV.Properties.Export5 = false + PWDEV.Properties.Host5 = "" + + PWDEV.Properties.Export6 = false + PWDEV.Properties.Host6 = "" + + PWDEV.Properties.Export7 = false + PWDEV.Properties.Host7 = "" + + PWDEV.Properties.Export8 = false + PWDEV.Properties.Host8 = "" + PWDEV.Properties.StreamDeckExport = false PWDEV.Properties.StreamDeckHost = "" PWDEV.Properties.StreamDeckPort = 0 @@ -62,6 +74,14 @@ function PWDEV.Utils.SetOld() PWDEV.Properties.Host3 = ExportScript.Config.Host3 PWDEV.Properties.Export4 = ExportScript.Config.Export4 PWDEV.Properties.Host4 = ExportScript.Config.Host4 + PWDEV.Properties.Export5 = ExportScript.Config.Export5 + PWDEV.Properties.Host5 = ExportScript.Config.Host5 + PWDEV.Properties.Export6 = ExportScript.Config.Export6 + PWDEV.Properties.Host6 = ExportScript.Config.Host6 + PWDEV.Properties.Export7 = ExportScript.Config.Export7 + PWDEV.Properties.Host7 = ExportScript.Config.Host7 + PWDEV.Properties.Export8 = ExportScript.Config.Export8 + PWDEV.Properties.Host8 = ExportScript.Config.Host8 PWDEV.Properties.StreamDeckExport = ExportScript.Config.StreamDeckExport PWDEV.Properties.StreamDeckHost = ExportScript.Config.StreamDeckHost PWDEV.Properties.StreamDeckPort = ExportScript.Config.StreamDeckPort @@ -95,6 +115,14 @@ function PWDEV.Utils.SetNew() PWDEV.Properties.Host3 = PWDEV.Config.Host3 PWDEV.Properties.Export4 = PWDEV.Config.Export4 PWDEV.Properties.Host4 = PWDEV.Config.Host4 + PWDEV.Properties.Export5 = PWDEV.Config.Export5 + PWDEV.Properties.Host5 = PWDEV.Config.Host5 + PWDEV.Properties.Export6 = PWDEV.Config.Export6 + PWDEV.Properties.Host6 = PWDEV.Config.Host6 + PWDEV.Properties.Export7 = PWDEV.Config.Export7 + PWDEV.Properties.Host7 = PWDEV.Config.Host7 + PWDEV.Properties.Export8 = PWDEV.Config.Export8 + PWDEV.Properties.Host8 = PWDEV.Config.Host8 PWDEV.Properties.StreamDeckExport = PWDEV.Config.StreamDeckExport PWDEV.Properties.StreamDeckHost = PWDEV.Config.StreamDeckHost PWDEV.Properties.StreamDeckPort = PWDEV.Config.StreamDeckPort From af6ecbe43b9d8408360763c2db44e41a91eb0d87 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Sun, 11 Jun 2023 16:04:58 -0700 Subject: [PATCH 2/3] set false by default --- Config.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Config.lua b/Config.lua index 3629a23..94b64de 100644 --- a/Config.lua +++ b/Config.lua @@ -21,27 +21,27 @@ ExportScript.Config.Export2 = true; -- sending data ExportScript.Config.Host2 = "192.168.0.12" -- IP for 2nd app -- device 3 -ExportScript.Config.Export3 = true; -- sending data +ExportScript.Config.Export3 = false; -- sending data ExportScript.Config.Host3 = "192.168.0.13" -- IP for 3rd app -- device 4 -ExportScript.Config.Export4 = true; -- sending data +ExportScript.Config.Export4 = false; -- sending data ExportScript.Config.Host4 = "192.168.0.14" -- IP for 4th app -- device 5 -ExportScript.Config.Export5 = true; -- sending data +ExportScript.Config.Export5 = false; -- sending data ExportScript.Config.Host5 = "192.168.0.15" -- IP for 5th app -- device 6 -ExportScript.Config.Export6 = true; -- sending data +ExportScript.Config.Export6 = false; -- sending data ExportScript.Config.Host6 = "192.168.0.16" -- IP for 6th app -- device 7 -ExportScript.Config.Export7 = true; -- sending data +ExportScript.Config.Export7 = false; -- sending data ExportScript.Config.Host7 = "192.168.0.17" -- IP for 7th app -- device 8 -ExportScript.Config.Export8 = true; -- sending data +ExportScript.Config.Export8 = false; -- sending data ExportScript.Config.Host8 = "192.168.0.18" -- IP for 8th app -- StreamDeck From 171a3e00f30947b16764f8fb921ecdda4d284ed6 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Sun, 11 Jun 2023 16:05:48 -0700 Subject: [PATCH 3/3] whitepace --- Config.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Config.lua b/Config.lua index 94b64de..0257396 100644 --- a/Config.lua +++ b/Config.lua @@ -21,27 +21,27 @@ ExportScript.Config.Export2 = true; -- sending data ExportScript.Config.Host2 = "192.168.0.12" -- IP for 2nd app -- device 3 -ExportScript.Config.Export3 = false; -- sending data +ExportScript.Config.Export3 = false; -- sending data ExportScript.Config.Host3 = "192.168.0.13" -- IP for 3rd app -- device 4 -ExportScript.Config.Export4 = false; -- sending data +ExportScript.Config.Export4 = false; -- sending data ExportScript.Config.Host4 = "192.168.0.14" -- IP for 4th app -- device 5 -ExportScript.Config.Export5 = false; -- sending data +ExportScript.Config.Export5 = false; -- sending data ExportScript.Config.Host5 = "192.168.0.15" -- IP for 5th app -- device 6 -ExportScript.Config.Export6 = false; -- sending data +ExportScript.Config.Export6 = false; -- sending data ExportScript.Config.Host6 = "192.168.0.16" -- IP for 6th app -- device 7 -ExportScript.Config.Export7 = false; -- sending data +ExportScript.Config.Export7 = false; -- sending data ExportScript.Config.Host7 = "192.168.0.17" -- IP for 7th app -- device 8 -ExportScript.Config.Export8 = false; -- sending data +ExportScript.Config.Export8 = false; -- sending data ExportScript.Config.Host8 = "192.168.0.18" -- IP for 8th app -- StreamDeck