fix: low-battery re-arm on charge, preserve no_binary, harden config defaults
This commit is contained in:
1 parent
bb0ef89d99
commit
213dfa30a6
1 file changed
+16
-6
@@ -25,28 +25,34 @@ local function publishCaps(info)
|
||||
product = info.product,
|
||||
vendor = info.vendor,
|
||||
})
|
||||
noctalia.state.set("error", "")
|
||||
end
|
||||
|
||||
local function handleStatus(status)
|
||||
if status == nil then
|
||||
local err = noctalia.state.get("error")
|
||||
if err == "no_binary" then
|
||||
return
|
||||
end
|
||||
noctalia.state.set("error", "unavailable")
|
||||
noctalia.state.set("battery", { status = "BATTERY_UNAVAILABLE", level = -1 })
|
||||
noctalia.state.set("chatmix", 0)
|
||||
return
|
||||
end
|
||||
noctalia.state.set("error", "")
|
||||
local battery = status.battery
|
||||
local battery = status.battery or { status = "BATTERY_UNAVAILABLE", level = -1 }
|
||||
noctalia.state.set("battery", battery)
|
||||
noctalia.state.set("chatmix", status.chatmix)
|
||||
noctalia.state.set("chatmix", status.chatmix or 0)
|
||||
noctalia.state.set("lastUpdate", noctalia.nowMs())
|
||||
if battery.level and battery.level > 0 and battery.status ~= "BATTERY_UNAVAILABLE" then
|
||||
local low = config().battery_low
|
||||
if battery.level ~= nil and battery.level >= 0 and battery.status ~= "BATTERY_UNAVAILABLE" then
|
||||
local low = config().battery_low or 20
|
||||
if battery.level <= low and not warned then
|
||||
warned = true
|
||||
noctalia.notifyError(
|
||||
noctalia.tr("notify.battery_low.title"),
|
||||
string.format(noctalia.tr("notify.battery_low.body"), battery.level)
|
||||
)
|
||||
elseif battery.level > low + 5 then
|
||||
elseif battery.level > low + 5 or battery.status == "BATTERY_CHARGING" or battery.status == "BATTERY_FULL" then
|
||||
warned = false
|
||||
end
|
||||
end
|
||||
@@ -59,14 +65,18 @@ end
|
||||
local function init()
|
||||
local cfg = config()
|
||||
hsc.init(cfg)
|
||||
warned = false
|
||||
if not hsc.isMock() and not noctalia.commandExists("headsetcontrol") then
|
||||
noctalia.state.set("error", "no_binary")
|
||||
noctalia.state.set("caps", {})
|
||||
noctalia.state.set("equalizerPresets", 0)
|
||||
noctalia.state.set("battery", { status = "BATTERY_UNAVAILABLE", level = -1 })
|
||||
noctalia.state.set("chatmix", 0)
|
||||
noctalia.log("headsetcontrol binary not found; polling disabled")
|
||||
return
|
||||
end
|
||||
hsc.fetchCapabilities(publishCaps)
|
||||
noctalia.setUpdateInterval(cfg.poll_interval * 1000)
|
||||
noctalia.setUpdateInterval((cfg.poll_interval or 60) * 1000)
|
||||
poll()
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user