Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Increase number of connectable devices to 8 #40

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Increase number of connectable devices to 8 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa8d648
Increase number of connectable devices to 8
Drofseh Jun 11, 2023
af6ecbe
set false by default
Drofseh Jun 11, 2023
171a3e0
whitepace
Drofseh Jun 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions Config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.Host4 = "192.168.0.14" -- IP for 4th app

-- device 5
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.Host6 = "192.168.0.16" -- IP for 6th app

-- device 7
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.Host8 = "192.168.0.18" -- IP for 8th app

-- StreamDeck
ExportScript.Config.StreamDeckExport = false; -- sending data to StreamDeck
Expand Down
140 changes: 140 additions & 0 deletions lib/Tools.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
28 changes: 28 additions & 0 deletions lib/Utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down