Skip to content
Permalink
Browse files

rc: webui: Remove amas_force flag

  • Loading branch information...
RMerl committed Jul 11, 2019
1 parent 7104341 commit 4ed4f1c83136990f0c6f35bb8a6d30cd6fe4b136
@@ -193,12 +193,6 @@ void adjust_merlin_config(void)
nvram_unset("lan_dns_fwd_local");
}

/* Enable experimental AiMesh */
#ifdef RTCONFIG_AMAS
if (f_exists("/jffs/.gomesh"))
nvram_set("amas_force", "1");
#endif

/* Migrate update server */
if (nvram_match("firmware_server", "https://fwupdate.lostrealm.ca/asuswrt-merlin"))
nvram_set("firmware_server", "https://fwupdate.asuswrt-merlin.net");
@@ -643,22 +643,15 @@ var wifiproxy_support = isSupport("wifiproxy");
var lyra_hide_support = isSupport("lyra_hide");
var port2_device = isSupport("port2_device");
var hdspindown_support = isSupport("hdspindown");
if ("<% nvram_get("amas_force"); %>" == "1") {
var amesh_support = uiSupport("amas");
var cfg_sync_support = uiSupport("cfg_sync");
var ameshRouter_support = uiSupport("amasRouter");
var ameshNode_support = uiSupport("amasNode");
} else {
var amesh_support = false;
var cfg_sync_support = false;
var ameshRouter_support = false;
var ameshNode_support = false;
}
var amesh_support = uiSupport("amas");
var ameshRouter_support = uiSupport("amasRouter");
var ameshNode_support = uiSupport("amasNode");
var ifttt_support = isSupport("ifttt");
var alexa_support = isSupport("alexa");
var hnd_support = isSupport("hnd");
var tagged_based_vlan = isSupport("tagged_based_vlan");
var vpn_fusion_support = isSupport("vpn_fusion");
var cfg_sync_support = isSupport("cfg_sync");
var meoVoda_support = isSupport("meoVoda");
var movistarTriple_support = isSupport("movistarTriple");
var utf8_ssid_support = isSupport("utf8_ssid");
@@ -395,9 +395,8 @@ var Get_Component_WirelessInput = function(wlArray){
function handleSysDep(){
var isNoWAN = (httpApi.detwanGetRet().wanType == 'NOWAN');

var enableAMAS = httpApi.nvramGet(["amas_force"], true);
$(".amasSupport").toggle(isSupport("AMAS") && (enableAMAS.amas_force == "1"));
$(".noAmasSupport").toggle(!isSupport("AMAS") || (enableAMAS.amas_force != "1"));
$(".amasSupport").toggle(isSupport("AMAS"));
$(".noAmasSupport").toggle(!isSupport("AMAS"));
$(".tosSupport").toggle(systemVariable.isDefault && isSupport("QISBWDPI"));
$(".repeaterSupport").toggle(isSupport("repeater"));
$(".pstaSupport").toggle(isSupport("psta"));

0 comments on commit 4ed4f1c

Please sign in to comment.
You can’t perform that action at this time.