wireless fixes

Author: monospacesoftware

http/connect.php

@@ -10,29 +10,22 @@
       <div class="title">KegNet Client WiFi Configuration</div>
       <hr/>
       <br/>
-      <textarea rows="15" cols="72" wrap="hard" disabled="disabled">
+      <textarea wrap="hard" disabled="disabled" style="width:90%; height:120px;">
 <?php $ok = connect(); ?>
       </textarea>
       <br/>
       <br/>
       <div class="instructions">
 <?php if ($ok) { ?>
-        Wifi Setup Success!<br/>
+        Wifi Configuration OK!<br/>
         <br/>
-        <span class="large">Step 1.</span>Disconnect the power and ethernet network cable from your 
-        KegNet device, and then reconnect the power cable only.<br/>
-        <br/>
-        <span class="large">Step 2.</span >In 2-3 minutes, the green "CON" indicator 
-        light should illuminate indicating a successfull connection to the 
-        KegNet servers over Wifi.<br/>
-        <br/>
-        <div class="center">
-          <img alt="diagram" src="case_front_1.png" width="250" style="margin-left:auto;">
-        </div>
+        <span class="large">Click Next below to continue</span>
 <?php } else { ?>
         Wifi Configuration Failed!<br/>
         <br/>
-        Click BACK try again.  For addition help, please save and submit the 
+        <span class="large">Click BACK try again.</span><br/>
+        <br/>
+        For addition help, please save and submit the 
         above output to KegNet support.
 <?php } ?>
       </div>

http/index.php

@@ -28,7 +28,7 @@
     <br/>
     Diagnostic report:<br/>
     <textarea rows="10" cols="70" wrap="hard">
-iwconfig results:
+ip link results:
 <?php echo var_dump($checkResult) ?>
 iwlist results:
 <?php echo var_dump($scanResult) ?>
@@ -76,17 +76,14 @@
   <?php } ?>
 <?php } ?>
   </div>
-  <pre>
-<?php echo var_dump($scanResult) ?>
-  </pre>
   </body>
 </html>
 <?php
   function checkWifi()
   {
     $lines = null;
     $ret = -1;
-    exec('sudo iwconfig wlan0', $lines, $ret);
+    exec('sudo ip link show wlan0', $lines, $ret);
     if ($ret != 0) {
       return array(false, $ret, $lines);
     } else {

http/style.css

@@ -2,7 +2,7 @@ body {
   background-color: white;
   font-family: "Courier New", Courier, monospace;
   font-size: 16px;
-  color: #2e6e9e;
+  color: #123464;
   margin: 20px;
 }
 
@@ -12,18 +12,31 @@ table {
 }
 
 td {
-  border: 1px solid #a6c9e2;
+  border: 1px solid #123464;
   margin: 0;
   padding: 5px;
 }
 
 hr {
-  border: 1px solid #a6c9e2;
+  border: 1px solid #123464;
 }
 
-input {
+input[type="submit"] {
   font-family: "Courier New", Courier, monospace;
   font-size: 16px;
+}
+
+input[type="submit"] {
+  font-family: "Courier New", Courier, monospace;
+  font-size: 18px;
+  font-weight: bold;
+  color: #123464;
+  border: 1px solid #123464;
+  border-radius: 5px;
+  cursor: hand;
+}
+
+input[type="submit"]:hover {
   color: #2e6e9e;
 }
 
@@ -36,13 +49,13 @@ textarea {
 .instructions {
   font-family: "Courier New", Courier, monospace;
   font-size: 16px;
-  color: #2e6e9e;
+  color: #123464;
 }
 
 .large {
   font-family: "Courier New", Courier, monospace;
   font-size: 16px;
-  color: #2e6e9e;
+  color: #123464;
   font-weight: bold;
 }
 
@@ -57,8 +70,8 @@ textarea {
 }
 
 .container {
-  width: 600px;
-  border: 1px solid #a6c9e2;
+  width: 95%;
+  border: none;
   display: block;
   margin: auto;
   padding: 10px;
@@ -67,7 +80,7 @@ textarea {
 .buttonBar {
   width: 100%;
   display: block;
-  background-color: #a6c9e2;
+  border-top: 2px solid #123464;
 }
 
 .buttons {
@@ -79,4 +92,4 @@ textarea {
 
 .passwordBox {
   font-weight: bold;
-}
+}

lib/client.py

@@ -14,6 +14,7 @@
 from ConfigParser import SafeConfigParser
 import M2Crypto
 from M2Crypto import EVP
+import subprocess
 from subprocess import call
 from kegnet import w1therm
 
@@ -229,7 +230,7 @@ def process_IN_MOVED_TO(self, event):
   sys.exit(1)
 
 def retryPours():
-  log(syslog.LOG_DEBUG, "checking for pour retries...");
+  #log(syslog.LOG_DEBUG, "checking for pour retries...");
 
   fileList = os.listdir(SPOOL_DIR)
   if len(fileList) == 0:
@@ -316,7 +317,7 @@ def ping():
   log(syslog.LOG_DEBUG, "ping temp '{0}'".format(temp))
 
   signData = "{0},{1},{2}".format(uuidString, temp, ts)
-  log(syslog.LOG_DEBUG, "ping data {0}".format(signData))
+  #log(syslog.LOG_DEBUG, "ping data {0}".format(signData))
 
   try:
     key.reset_context(md='sha256')
@@ -366,22 +367,26 @@ def checkIP():
 
   now = time.time()
   et = (now - lastIPCheck)
-  log(syslog.LOG_DEBUG, "lastIPCheck={0}, et={1}".format(lastIPCheck, et));
-  if (et < 600):
+  if (et < 3600):
     return
-  
+   
+  DEVNULL = open(os.devnull, 'w')
+  if call(["ip", "link", "show", "wlan0"], stdout=DEVNULL, stderr=subprocess.STDOUT) != 0:
+    log(syslog.LOG_DEBUG, "no wifi adapter found")
+    return
+
   ip = socket.gethostbyname(socket.gethostname())
-  if (ip != lastIP):
-    lastIP = ip
-    sendIP(ip)
-  
+
+  lastIP = ip
   lastIPCheck = now
 
+  sendIP(ip)
+
 def sendIP(ip):
   ts = currentTimeMillis()
 
   signData = "{0},{1},{2}".format(uuidString, ip, ts)
-  log(syslog.LOG_DEBUG, "ip data {0}".format(signData))
+  #log(syslog.LOG_DEBUG, "ip data {0}".format(signData))
 
   try:
     key.reset_context(md='sha256')

scripts/wificonfig

@@ -73,12 +73,19 @@ fi
 
 echo "}" >> $temp
 
+# wpa_supplicant appears to rewrite wpa_supplicant.conf upon startup, so
+# as a result if power is cycled during this, the file ends up zero length
+# so I am purposely stopping wpa_supplicant before writing the config file,
+# it will be started on boot
+#systemctl stop wpa_supplicant
+
 mv $temp $conf
 chmod go-rwx $conf
 
-echo "Wrote $conf, restarting wpa_supplicant"
+sync
+sync
 
-systemctl restart wpa_supplicant
+echo "Wrote $conf, reboot to take effect"
 
 exit 0