From 9a331f2f95c71ecb5f426b43329cda9798936db1 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Tue, 9 Apr 2019 16:57:10 +0200 Subject: [PATCH] luci-app-travelmate: sync with update 1.4.5 * see https://github.com/openwrt/packages/pull/8637 for reference Signed-off-by: Dirk Brenken --- .../model/cbi/travelmate/overview_tab.lua | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index 7fe5f23a47..827a39b8cf 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -60,24 +60,30 @@ o2 = s:option(Flag, "trm_captive", translate("Captive Portal Detection"), o2.default = o2.enabled o2.rmempty = false -o3 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"), - translate("Proactively scan and switch to a higher prioritized uplink, despite of an already existing connection.")) -o3.default = o3.enabled +o3 = s:option(Flag, "trm_netcheck", translate("Net Error Check"), + translate("Treat missing internet availability as an error.")) +o3:depends("trm_captive", 1) +o3.default = o3.disabled o3.rmempty = false -o4 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"), +o4 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"), + translate("Proactively scan and switch to a higher prioritized uplink, despite of an already existing connection.")) +o4.default = o4.enabled +o4.rmempty = false + +o5 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"), translate("Name of the used uplink interface.")) if dump then local i, v for i, v in ipairs(dump.interface) do if v.interface ~= "loopback" and v.interface ~= "lan" then local device = v.l3_device or v.device or "-" - o4:value(v.interface, v.interface.. " (" ..device.. ")") + o5:value(v.interface, v.interface.. " (" ..device.. ")") end end end -o4.default = trmiface -o4.rmempty = false +o5.default = trmiface +o5.rmempty = false -- Runtime information @@ -97,34 +103,40 @@ e2 = e:option(Value, "trm_radio", translate("Radio Selection / Order"), translate("Restrict travelmate to a single radio (e.g. 'radio1') or change the overall scanning order (e.g. 'radio1 radio2 radio0').")) e2.rmempty = true -e3 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"), - translate("Additional trigger delay in seconds before travelmate processing begins.")) -e3.datatype = "range(1,60)" -e3.default = 2 +e3 = e:option(Value, "trm_listexpiry", translate("List Auto Expiry"), + translate("Automatically resets the 'Faulty Stations' list after n minutes. Default is '0' which means no expiry.")) +e3.datatype = "range(0,300)" +e3.default = 0 e3.rmempty = false -e4 = e:option(Value, "trm_maxretry", translate("Connection Limit"), - translate("Retry limit to connect to an uplink.")) -e4.default = 3 -e4.datatype = "range(1,10)" +e4 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"), + translate("Additional trigger delay in seconds before travelmate processing begins.")) +e4.datatype = "range(1,60)" +e4.default = 2 e4.rmempty = false -e5 = e:option(Value, "trm_minquality", translate("Signal Quality Threshold"), - translate("Minimum signal quality threshold as percent for conditional uplink (dis-) connections.")) -e5.default = 35 -e5.datatype = "range(20,80)" +e5 = e:option(Value, "trm_maxretry", translate("Connection Limit"), + translate("Retry limit to connect to an uplink.")) +e5.default = 5 +e5.datatype = "range(1,10)" e5.rmempty = false -e6 = e:option(Value, "trm_maxwait", translate("Interface Timeout"), - translate("How long should travelmate wait for a successful wlan uplink connection.")) -e6.default = 30 -e6.datatype = "range(20,40)" +e6 = e:option(Value, "trm_minquality", translate("Signal Quality Threshold"), + translate("Minimum signal quality threshold as percent for conditional uplink (dis-) connections.")) +e6.default = 35 +e6.datatype = "range(20,80)" e6.rmempty = false -e7 = e:option(Value, "trm_timeout", translate("Overall Timeout"), - translate("Overall retry timeout in seconds.")) -e7.default = 60 -e7.datatype = "range(30,300)" +e7 = e:option(Value, "trm_maxwait", translate("Interface Timeout"), + translate("How long should travelmate wait for a successful wlan uplink connection.")) +e7.default = 30 +e7.datatype = "range(20,40)" e7.rmempty = false +e8 = e:option(Value, "trm_timeout", translate("Overall Timeout"), + translate("Overall retry timeout in seconds.")) +e8.default = 60 +e8.datatype = "range(30,300)" +e8.rmempty = false + return m -- 2.30.2