Commit 36a49aac authored by David Mondou's avatar David Mondou
Browse files

Merge branch 'feature/autostart-wifi' into 'master'

Feature/autostart wifi

See merge request !1
parents 5ee30e96 39cbf52e
......@@ -470,8 +470,7 @@ def configureNetworkAP(changewifi):
print noooo("the last line of configureNetworkAP")
def setNetwork(network_conf, ssid):
if not os.path.isfile('/etc/wpa_supplicant.conf.original'):
subprocess.call("cp /etc/wpa_supplicant.conf /etc/wpa_supplicant.conf.original", shell=True)
subprocess.call("cp /usr/lib/node_modules/iot-gateway-setup/wpa_supplicant.tpl /etc/wpa_supplicant.conf", shell=True)
wpa_supplicant = open('/etc/wpa_supplicant.conf','a') #Will not take care of duplicates at the moment.
wpa_supplicant.write(network_conf)
......@@ -685,6 +684,9 @@ def disableOneTimeSetup(persist):
subprocess.call("/usr/rigado/scripts/led_control.sh green solid", shell=True)
subprocess.call("/etc/init.d/iot-gateway-setup-server stop", shell=True)
if not 'auto wlan0' in open('/etc/network/interfaces').read():
subprocess.call("sed -i '/iface wlan/i auto wlan0' /etc/network/interfaces", shell=True)
def toggleOneTimeSetup(persist):
if showWiFiMode() == "Master":
disableOneTimeSetup(persist)
......
......@@ -25,19 +25,9 @@
<h1>Leaving Setup</h1>
<div class='section'>
<div class="content" style="padding: 30px; padding-bottom: 0px">
Please wait while we setup your device. Note that if WiFi is being setup, <b>the device will disconnect
momentarily. When that happens, please reconnect by joining <i>this</i> machine to the 'params_new_wifi'
network</b> and wait while we try to reach your device at
<a href="http://params_hostname">http://params_hostname</a>.
Please wait while we setup your device. Once the setup is complete the user LED on the Rigado Gateway will turn solid green. <b> When that happens, please reconnect by joining <i>this</i> machine to the 'params_new_wifi'
network</b>
<br><br>
<hr class="progressbar" id="progressbar" align="left">
<textarea class="progresstext" id="progresstext" readonly rows="1" cols="200"></textarea><br><br>
<textarea class="cmdout" id="cmdout" readonly rows="10"></textarea>
</div>
</div>
<div class='section'>
<div class="content" id="errbox" style="padding: 30px; padding-bottom: 0px; padding-top: 0px; display: none">
</div>
</div>
</body>
......
......@@ -228,8 +228,6 @@
</table>
</td>
<td class="right">
<button type="button" class="linkbutton" id="backToAutomatic" style="visibility: hidden"
onclick="switchToAutomaticSetup();">Back to automatic setup</button>
<input type="text" id="newwifi" name="newwifi" class="textbox" style="display: none">
<select id="newwifis" name="newwifis" class="selector" onchange="setSsidsRelatedFields()"
style="display: inline-block">
......
File mode changed from 100644 to 100755
......@@ -73,10 +73,10 @@ function injectStatus(in_text, statusmsg, iserr) {
if (statusmsg) {
if (iserr){
status = '<div id="statusarea" name="statusarea" class="status errmsg">' + '</div>';
status = '<div id="statusarea" name="statusarea" class="status errmsg">' + statusmsg + '</div>';
//console.log("status errmsg");
}else{
status = '<div id="statusarea" name="statusarea" class="status">' + '</div>';
status = '<div id="statusarea" name="statusarea" class="status">' + statusmsg + '</div>';
//console.log("status good");
}
}
......@@ -227,14 +227,11 @@ function submitForm(params, res, req) {
res.end(injectStatus(getStateBasedIndexPage(), result.failure, true));
return;
}
else
{
res.end(injectStatus(getStateBasedIndexPage(), params, true));
}
if (result.cmd){
console.log(result);
commands.push(result);
}
}
}
// no errors occurred. Do success response.
......
ctrl_interface=/var/run/wpa_supplicant
ctrl_interface_group=0
update_config=1
network={
key_mgmt=NONE
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment