fix 4.1 bugs

Author: previ

main.py

@@ -461,11 +461,12 @@ def remove_doreset_file():
         pass
 
 def align_wifi_config():
-    out = os.popen("sudo ./wifi.py getcfg --ssid").read()
-    if "coderbot_" in out:
-        app.bot_config["wifi_ssid"] = out.split()[0]
-        Config.write(app.bot_config)
-        app.bot_config = Config.get()
+    if app.bot_config["wifi_ssid"] == "coderbot_CHANGEATFIRSTRUN":
+        out = os.popen("sudo ./wifi.py getcfg --ssid").read()
+        if "coderbot_" in out:
+            app.bot_config["wifi_ssid"] = out.split()[0]
+            Config.write(app.bot_config)
+            app.bot_config = Config.get()
 
 # Finally, get the server running
 def run_server():
@@ -476,7 +477,7 @@ def run_server():
             app.bot_config = Config.read()
             align_wifi_config()
             bot = CoderBot.get_instance(motor_trim_factor=float(app.bot_config.get('move_motor_trim', 1.0)),
-                                        encoder=bool(app.bot_config.get('encoder')), encoder=bool(app.bot_config.get('encoder')))
+                                        hw_version=app.bot_config.get('hardware_version'))
             audio = Audio.get_instance()
             audio.say(app.bot_config.get("sound_start"))
 

wifi.py

@@ -148,6 +148,7 @@ def get_ap_params(cls):
     @classmethod
     def set_start_as_client(cls):
         cls._config["wifi_mode"] = "client"
+        os.system("sudo sed -i s/^disabled_network=/network=/ /etc/wpa_supplicant/wpa_supplicant.conf")
         cls.save_config()
 
     @classmethod
@@ -157,13 +158,8 @@ def set_bot_name(cls, name):
 
     @classmethod
     def start_as_client(cls):
-        cls.stop_dnsmasq()
-        cls.stop_hostapd()
         try:
             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("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")
@@ -180,6 +176,7 @@ def start_as_client(cls):
     @classmethod
     def set_start_as_ap(cls):
         cls._config["wifi_mode"] = "ap"
+        os.system("sudo sed -i s/^network=/disabled_network=/ /etc/wpa_supplicant/wpa_supplicant.conf")
         cls.save_config()
 
     @classmethod