Merge branch 'develop'

Author: previ

audioControls.py

@@ -39,8 +39,7 @@ def get_instance(cls):
         return cls._instance
 
     def __init__(self):
-        self.mixer = alsaaudio.Mixer('PCM', cardindex=1)
-        #self.mixer = alsaaudio.PCM(device='numid=1', cardindex=1)
+        self.mixer = alsaaudio.Mixer('Headphone')
 
     def getVolume(self):
         print(self.mixer.getvolume())

main.py

@@ -192,9 +192,9 @@ def handle_wifi():
     psk = request.form.get("wifi_psk")
 
     logging.info("mode " + mode +" ssid: " + ssid + " psk: " + psk)
-    client_params = " \"" + ssid + "\" \"" + psk + "\"" if ssid != "" and psk != "" else ""
+    client_params = " --ssid \"" + ssid + "\" --pwd \"" + psk + "\"" if ssid != "" and psk != "" else ""
     logging.info(client_params)
-    os.system("sudo ./wifi.py updatecfg " + mode + client_params)
+    os.system("sudo ./wifi.py updatecfg --mode " + mode + client_params)
     os.system("sudo reboot")
     if mode == "ap":
         return "http://coder.bot"

wifi.py

@@ -91,7 +91,7 @@ def get_ipaddr(cls, ifname):
         return socket.inet_ntoa(fcntl.ioctl(
             s.fileno(),
             0x8915,  # SIOCGIFADDR
-            struct.pack('256s', ifname[:15])
+            struct.pack('256s', ifname.encode('utf-8')[:15])
         )[20:24])
 
     @classmethod
@@ -153,7 +153,11 @@ def start_as_client(cls):
             time.sleep(1.0)
             out = os.system("wpa_supplicant -B -i wlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf > /dev/null 2>&1")
             out += os.system("dhclient -1 wlan0")
-            print(out)
+            print("start_as_client: " + str(out))
+            ipaddr = cls.get_ipaddr("wlan0")
+            if ipaddr is None or "169.254" in ipaddr:
+                os.system("sudo pkill wpa_supplicant")
+                raise Exception()
             try:
                 cls.register_ipaddr(cls.get_macaddr("wlan0"), cls.get_config().get('bot_name', 'CoderBot'), cls.get_ipaddr("wlan0"), "[email protected]")
                 print("registered bot, ip: " + str(cls.get_ipaddr("wlan0") + " name: " + cls.get_config().get('bot_name', 'CoderBot')))
@@ -175,7 +179,7 @@ def start_as_ap(cls):
         out += str(subprocess.check_output(["ip", "a", "add", "10.0.0.1/24", "dev", "wlan0"]))
         out += str(subprocess.check_output(["ip", "link", "set", "dev", "wlan0", "up"]))
         out += str(subprocess.check_output(["ifconfig"]))
-        print(out)
+        print("start_as_ap: " + str(out))
         cls.start_hostapd()
         cls.start_dnsmasq()