feat: rename BILLBOARD_MONITOR_SIDE to BILLBOARD_MONITOR for consistency

This commit is contained in:
MayaTheShy
2026-03-26 14:21:15 -04:00
parent 8a50bc586d
commit c7a1b7066a
3 changed files with 7 additions and 16 deletions

View File

@@ -195,11 +195,11 @@ local function main()
end end
-- Billboard monitor (optional — set billboardMonitorSide in .manager_config) -- Billboard monitor (optional — set billboardMonitorSide in .manager_config)
if cfg.BILLBOARD_MONITOR_SIDE ~= "" then if cfg.BILLBOARD_MONITOR ~= "" then
if display.setupBillboardMonitor() then if display.setupBillboardMonitor() then
log.info("INIT", "Billboard monitor: %s", display.billboardMonName) log.info("INIT", "Billboard monitor: %s", display.billboardMonName)
else else
log.warn("INIT", "Billboard monitor not found: %s", cfg.BILLBOARD_MONITOR_SIDE) log.warn("INIT", "Billboard monitor not found: %s", cfg.BILLBOARD_MONITOR)
end end
end end

View File

@@ -34,7 +34,7 @@ C.COMPOST_INTERVAL = 3
C.ALERT_INTERVAL = 15 C.ALERT_INTERVAL = 15
C.CACHE_FILE = _configPath(".inventory_cache") C.CACHE_FILE = _configPath(".inventory_cache")
C.SMELTER_MONITOR_SIDE = "top" C.SMELTER_MONITOR_SIDE = "top"
C.BILLBOARD_MONITOR_SIDE = "" -- e.g. "monitor_0"; empty = disabled C.BILLBOARD_MONITOR = "" -- network name e.g. "monitor_0"; empty = disabled
C.BILLBOARD_TOP_ITEMS = 20 -- max items in billboard bar chart C.BILLBOARD_TOP_ITEMS = 20 -- max items in billboard bar chart
C.DISABLED_RECIPES_FILE = _configPath(".disabled_recipes") C.DISABLED_RECIPES_FILE = _configPath(".disabled_recipes")
@@ -120,7 +120,7 @@ function C.loadConfig()
if cfg.barrelName then C.BARREL_NAME = cfg.barrelName end if cfg.barrelName then C.BARREL_NAME = cfg.barrelName end
if cfg.monitorSide then C.MONITOR_SIDE = cfg.monitorSide end if cfg.monitorSide then C.MONITOR_SIDE = cfg.monitorSide end
if cfg.smelterMonitorSide then C.SMELTER_MONITOR_SIDE = cfg.smelterMonitorSide end if cfg.smelterMonitorSide then C.SMELTER_MONITOR_SIDE = cfg.smelterMonitorSide end
if cfg.billboardMonitorSide then C.BILLBOARD_MONITOR_SIDE = cfg.billboardMonitorSide end if cfg.billboardMonitor then C.BILLBOARD_MONITOR = cfg.billboardMonitor end
if cfg.billboardTopItems then C.BILLBOARD_TOP_ITEMS = cfg.billboardTopItems end if cfg.billboardTopItems then C.BILLBOARD_TOP_ITEMS = cfg.billboardTopItems end
if cfg.pollInterval then C.POLL_INTERVAL = cfg.pollInterval end if cfg.pollInterval then C.POLL_INTERVAL = cfg.pollInterval end
if cfg.scanInterval then C.SCAN_INTERVAL = cfg.scanInterval end if cfg.scanInterval then C.SCAN_INTERVAL = cfg.scanInterval end

View File

@@ -163,25 +163,16 @@ function D.setupSmelterMonitor()
end end
function D.setupBillboardMonitor() function D.setupBillboardMonitor()
if not cfg.BILLBOARD_MONITOR_SIDE or cfg.BILLBOARD_MONITOR_SIDE == "" then if not cfg.BILLBOARD_MONITOR or cfg.BILLBOARD_MONITOR == "" then
return false return false
end end
local mon = peripheral.wrap(cfg.BILLBOARD_MONITOR_SIDE) local mon = peripheral.wrap(cfg.BILLBOARD_MONITOR)
if mon and mon.setTextScale then if mon and mon.setTextScale then
D.billboardMon = mon D.billboardMon = mon
D.billboardMonName = cfg.BILLBOARD_MONITOR_SIDE D.billboardMonName = cfg.BILLBOARD_MONITOR
D.billboardMon.setTextScale(0.5) D.billboardMon.setTextScale(0.5)
return true return true
end end
-- Fallback: try to find a monitor with that name on the network
for _, name in ipairs(peripheral.getNames()) do
if name == cfg.BILLBOARD_MONITOR_SIDE and peripheral.getType(name) == "monitor" then
D.billboardMon = peripheral.wrap(name)
D.billboardMonName = name
D.billboardMon.setTextScale(0.5)
return true
end
end
return false return false
end end