#536 fix for clearing settings

This commit is contained in:
Mikayla 2024-08-20 20:52:38 +00:00
parent bee96ed12e
commit c323967b6a
10 changed files with 20 additions and 10 deletions

View File

@ -959,7 +959,9 @@ local function config_view(display)
end
local function save_and_continue()
for k, v in pairs(tmp_cfg) do settings.set(k, v) end
for k, v in pairs(tmp_cfg) do
if v == nil then settings.unset(k) else settings.set(k, v) end
end
if settings.save("/coordinator.settings") then
load_settings(settings_cfg, true)

View File

@ -19,7 +19,7 @@ local renderer = require("coordinator.renderer")
local sounder = require("coordinator.sounder")
local threads = require("coordinator.threads")
local COORDINATOR_VERSION = "v1.5.2"
local COORDINATOR_VERSION = "v1.5.3"
local CHUNK_LOAD_DELAY_S = 30.0

View File

@ -379,7 +379,9 @@ local function config_view(display)
end
local function save_and_continue()
for k, v in pairs(tmp_cfg) do settings.set(k, v) end
for k, v in pairs(tmp_cfg) do
if v == nil then settings.unset(k) else settings.set(k, v) end
end
if settings.save("/pocket.settings") then
load_settings(settings_cfg, true)

View File

@ -20,7 +20,7 @@ local pocket = require("pocket.pocket")
local renderer = require("pocket.renderer")
local threads = require("pocket.threads")
local POCKET_VERSION = "v0.11.4-alpha"
local POCKET_VERSION = "v0.11.5-alpha"
local println = util.println
local println_ts = util.println_ts

View File

@ -450,7 +450,9 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, style, exit)
end
local function save_and_continue()
for k, v in pairs(tmp_cfg) do settings.set(k, v) end
for k, v in pairs(tmp_cfg) do
if v == nil then settings.unset(k) else settings.set(k, v) end
end
if settings.save("/reactor-plc.settings") then
load_settings(settings_cfg, true)

View File

@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc")
local renderer = require("reactor-plc.renderer")
local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "v1.8.3"
local R_PLC_VERSION = "v1.8.4"
local println = util.println
local println_ts = util.println_ts

View File

@ -651,7 +651,9 @@ local function config_view(display)
---@param exclude_conns boolean? true to exclude saving peripheral/redstone connections
local function save_and_continue(exclude_conns)
for k, v in pairs(tmp_cfg) do
if not (exclude_conns and (k == "Peripherals" or k == "Redstone")) then settings.set(k, v) end
if not (exclude_conns and (k == "Peripherals" or k == "Redstone")) then
if v == nil then settings.unset(k) else settings.set(k, v) end
end
end
-- always set these if missing

View File

@ -31,7 +31,7 @@ local sna_rtu = require("rtu.dev.sna_rtu")
local sps_rtu = require("rtu.dev.sps_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "v1.10.3"
local RTU_VERSION = "v1.10.4"
local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE

View File

@ -907,7 +907,9 @@ local function config_view(display)
end
local function save_and_continue()
for k, v in pairs(tmp_cfg) do settings.set(k, v) end
for k, v in pairs(tmp_cfg) do
if v == nil then settings.unset(k) else settings.set(k, v) end
end
if settings.save("/supervisor.settings") then
load_settings(settings_cfg, true)

View File

@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
local svsessions = require("supervisor.session.svsessions")
local SUPERVISOR_VERSION = "v1.4.3"
local SUPERVISOR_VERSION = "v1.4.4"
local println = util.println
local println_ts = util.println_ts