Munelit/StargateControl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respond to iris opening quicker

Browse Source
This commit is contained in:
Moonlit Productions
2026-01-02 00:24:27 -05:00
parent d11641693b
commit 738b7b53f3
4 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
startup.lua
View File

@ -11,6 +11,12 @@
- Whitelist/blacklist security
]]
---------------------------------------------
-- PROGRAM VERSION
---------------------------------------------
local PROGRAM_VERSION = "2.0"
---------------------------------------------
-- LOAD MODULES
---------------------------------------------
@ -461,8 +467,8 @@ local function handleIncomingWormhole()
-- Send version message to remote gate
sleep(0.5) -- Brief delay to ensure connection is stable
utils.sendVersionMessage()
utils.debug("Sent: SGCS_V" .. config.programVersion)
utils.sendVersionMessage(PROGRAM_VERSION)
utils.debug("Sent: SGCS_V" .. PROGRAM_VERSION)
-- Handle iris
if config.autoCloseIrisOnIncoming then
@ -753,6 +759,11 @@ local function handleOutgoingDial()
utils.log("Remote gate requires password for entry")
lastMessageTime = os.clock()
break -- Got password request, that's all we need
elseif message == "GDO_IRIS_OPEN" then
utils.log("Remote iris opened via GDO")
state.remotePasswordRequired = false
lastMessageTime = os.clock()
break -- Iris opened, no password needed
end
elseif result == 2 then
-- GDO transmission received (handled by event system)
@ -802,8 +813,11 @@ local function handleOutgoingDial()
-- Check if iris opened during password entry (via GDO)
if result == "IRIS_OPENED" then
utils.log("Iris opened during password entry")
utils.log("Iris opened during password entry (via GDO or message)")
connectionSafe = true
-- Show success message briefly
display.showPasswordResult(true)
sleep(1)
elseif result then
-- Password was entered, send it
utils.debug("Sent: IRIS_PASSWORD:" .. result)
@ -818,7 +832,7 @@ local function handleOutgoingDial()
if waitResult == 1 then
local response = state.lastReceivedMessage
state.lastReceivedMessage = nil
if response == "IRIS_OPEN" then
if response == "IRIS_OPEN" or response == "GDO_IRIS_OPEN" then
display.showPasswordResult(true)
utils.log("Password accepted - iris opened")
sleep(1)
@ -831,17 +845,21 @@ local function handleOutgoingDial()
end
end
-- Re-check iris state
-- Re-check iris state after password/GDO attempt
if transceiver then
remoteIrisState = transceiver.checkConnectedShielding()
utils.log("Re-checked remote iris state: " .. tostring(remoteIrisState))
if not remoteIrisState or remoteIrisState == 0 then
connectionSafe = true
utils.log("Remote iris confirmed open")
end
end
end
-- Show warning screen if iris still closed
if not connectionSafe and remoteIrisState and remoteIrisState > 0 then
utils.log("DEBUG: connectionSafe=" ..
tostring(connectionSafe) .. ", remoteIrisState=" .. tostring(remoteIrisState))
mon.setBackgroundColor(colors.red)
mon.clear()
mon.setTextScale(1)
@ -860,17 +878,25 @@ local function handleOutgoingDial()
end
else
-- Remote iris is open or no iris present
utils.log("DEBUG: Remote iris is open or no iris present")
connectionSafe = true
end
utils.log("DEBUG: Before iris opening check - connectionSafe=" ..
tostring(connectionSafe) .. ", config.irisEnabled=" .. tostring(config.irisEnabled))
-- Only open local iris if connection is safe
if connectionSafe and config.irisEnabled then
utils.log("Connection safe - opening local iris")
-- Wait 2 seconds to avoid voiding the iris
sleep(2)
utils.openIris()
display.showConnected(state.destAddressname, state.destAddress)
elseif connectionSafe then
utils.log("Connection safe - no iris to open")
display.showConnected(state.destAddressname, state.destAddress)
else
utils.log("Connection NOT safe - iris remains closed")
end
if (gate.isStargateConnected() == true) then