added a local_client wifi mode2

Author: explosivose

coderbot.cfg

@@ -1 +1 @@
-{"move_tr_speed": "75", "move_fw_elapse": "1.5", "arm_angle_raised": "120", "load_at_start": "", "move_tr_elapse": "90", "show_page_program": "true", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_move_motion": "yes", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "ctrl_counter": "yes", "sound_start": "$startup.mp3", "camera_rotation": "180", "ctrl_fw_speed": "100", "move_fw_speed": "100", "show_page_control": "true", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "arm_angle_lowered": "60", "prog_maxblocks": "-1", "ctrl_hud_image": "", "button_func": "none", "move_motor_mode": "servo", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "20", "move_power_angle_3": "20", "ctrl_tr_speed": "80", "move_power_angle_1": "15"}
+{"move_tr_speed": "75", "move_fw_elapse": "1.5", "arm_angle_raised": "120", "load_at_start": "", "move_tr_elapse": "90", "show_page_program": "true", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "fixedfps", "prog_move_motion": "yes", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "ctrl_counter": "yes", "sound_start": "$startup.mp3", "camera_rotation": "180", "ctrl_fw_speed": "100", "move_fw_speed": "100", "show_page_control": "true", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "arm_angle_lowered": "60", "prog_maxblocks": "-1", "ctrl_hud_image": "", "button_func": "none", "move_motor_mode": "servo", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "20", "move_power_angle_3": "20", "ctrl_tr_speed": "80", "move_power_angle_1": "15"}

main.py

@@ -62,8 +62,8 @@ def handle_wifi():
     logging.info(client_params)
     os.system("sudo python wifi.py updatecfg " + mode + client_params)
     if mode == "ap":
-      return "http://coder.bot:8080/";
-    else:
+      return "http://coder.bot:8080/"
+    elif mode == "client":
       return "http://coderbotsrv.appspot.com/"
 
 @app.route("/bot", methods=["GET"])

static/js/control.js

@@ -114,8 +114,10 @@ $(document).on( "pagecreate", '#page-preferences', function( event ) {
                 $('#popup-wifi').popup('close');
                 if($("[name='wifi_mode']:checked").val()=="ap"){
 			$('#popup-wifi-ap').popup('open');
-                } else {
+                } else if ($("[name='wifi_mode']:checked").val()=="client") {
                         $('#popup-wifi-client').popup('open');
+		} else if ($("[name=wifi_mode']:checked").val()=="local_client") {
+			$('#popup-wifi-local-client').popup('open');
 		}
                 return false;
         });

templates/config.html

@@ -171,6 +171,8 @@ <h3>{% trans %}WiFi Client mode access data{% endtrans %}</h3>
     <label for="r_wifi_mode_a">{% trans %}Access Point{% endtrans %}</label>
     <input type="radio" name="wifi_mode" id="r_wifi_mode_b" value="client" {%if config.wifi_mode=='client'%}checked="checked"{%endif%}>
     <label for="r_wifi_mode_b">{% trans %}Client{% endtrans %}</label>
+    <input type="radio" name ="wifi_mode" id="r_wifi_mode_c" value="local_client" {%if config.wifi_mode=='local_client'%}checked="checked"{%endif%}>
+    <label for="r_wifi_mode_c">Local Client</label>
    </fieldset>
    <label for="i_wifi_ssid">{% trans %}WiFi name{% endtrans %}</label>
    <input type="text" id="i_wifi_ssid" name="wifi_ssid" value="{{config.wifi_ssid}}">
@@ -208,4 +210,15 @@ <h3>{% trans %}WiFi Client mode access{% endtrans %}</h3>
   </div>
  </div>
 </div>
+<div data-role="popup" id="popup-wifi-local-client" data-history="false" data-theme="a" class="ui-corner-all" data-dismissible="false" data-position-to "window">
+  <div style="padding:10px 20px;">
+    <h3> WiFi Local Client mode access</h3>
+    <p>Client mode is being set:
+    <ol>
+    <li>Wait 30 seconds</li>
+    <li>Connect your device to your own wifi</li>
+    <li>Click on the following link: <a href="http://192.168.0.1:8080">Local Coderbot Hub</a></li>
+    </ol>
+  </div>
+</div>
 

wifi.py

@@ -13,7 +13,7 @@
 class WiFi():
 
   CONFIG_FILE = "/etc/coderbot_wifi.conf"
-  adapters = ["RT5370", "RTL8188CUS"] 
+  adapters = ["RT5370", "RTL8188CUS", "RT3572"] 
   hostapds = {"RT5370": "hostapd.RT5370", "RTL8188CUS": "hostapd.RTL8188"} 
   web_url = "http://coderbotsrv.appspot.com/register_ip"
   wifi_client_conf_file = "/etc/wpa_supplicant/wpa_supplicant.conf"
@@ -45,13 +45,13 @@ def get_adapter_type(cls):
 
   @classmethod
   def start_hostapd(cls):
-    adapter = cls.get_adapter_type()
-    hostapd_type = cls.hostapds.get(adapter)
+    #adapter = cls.get_adapter_type()
+    #hostapd_type = cls.hostapds.get(adapter)
     try:
       print "starting hostapd..."
       #os.system("start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/" + hostapd_type + " -- /etc/hostapd/" + hostapd_type + " &")
-      os.system("/usr/sbin/" + hostapd_type + " /etc/hostapd/" + hostapd_type + " -B")
-
+      #os.system("/usr/sbin/" + hostapd_type + " /etc/hostapd/" + hostapd_type + " -B")
+      out = subprocess.check_output(["service", "hostapd", "start"])
     except subprocess.CalledProcessError as e:
       print e.output
 
@@ -100,12 +100,14 @@ def set_client_params(cls, wssid, wpsk):
     f.write("  psk=\""+wpsk+"\"\n")
     f.write("}")
 
+  # set WIFI client mode
   @classmethod
   def set_start_as_client(cls):
     shutil.copy("/etc/network/interfaces_cli", "/etc/network/interfaces")
     cls._config["wifi_mode"] = "client"
     cls.save_config()
 
+  # start as client to coderbot server
   @classmethod
   def start_as_client(cls):
     cls.stop_hostapd()
@@ -118,6 +120,25 @@ def start_as_client(cls):
       print e.output
       raise
 
+  # set WIFI client mode and record as "local_client"
+  @classmethod
+  def set_start_as_local_client(cls):
+    shutil.copy("/etc/network/interfaces_cli", "/etc/network/interfaces")
+    cls._config["wifi_mode"] = "local_client"
+    cls.save_config()
+  
+  # start as client without registering to coderbot server
+  @classmethod
+  def start_as_local_client(cls):
+    cls.stop_hostapd()
+    try:
+      out = subprocess.check_output(["ifdown", "wlan0"])
+      out = subprocess.check_output(["ifup", "wlan0"])
+    except:
+      print e.output
+      raise
+    
+
   @classmethod
   def set_start_as_ap(cls):
     shutil.copy("/etc/network/interfaces_ap", "/etc/network/interfaces")
@@ -139,9 +160,16 @@ def start_service(cls):
     elif config["wifi_mode"] == "client":
       print "starting as client..."
       try:
-        cls.start_as_client()
+        cls.start_as_start_as_local_clientclient()
       except:
         print "Unable to register ip, revert to ap mode"
+        cls.start_as_astart_as_local_clientp()
+    elif config["wifi_mode"] == "local_client":
+      print "starting as local client..."
+      try:
+        cls.start_as_local_client()
+      except:
+        print "Unable to connect to WLAN, rever to ap mode"
         cls.start_as_ap()
 
 def main():
@@ -160,6 +188,16 @@ def main():
       except:
         print "Unable to register ip, revert to ap mode"
         w.start_as_ap()
+    elif len(sys.argv) > 2 and sys.argv[2] == "local_client":
+      if len(sys.argv) > 3:
+        w.set_client_params(sys.argv[3], sys.argv[4])
+      w.set_start_as_client()
+      try:
+        w.start_as_local_client()
+      except:
+        print "Unable to connect to WLAN, revert to ap mode"
+        w.start_as_ap()
+      
   else:
     w.start_service()