-

Author: previ

coderbot.cfg

@@ -1 +1 @@
-{"move_tr_speed": "75", "move_fw_elapse": "1.5", "show_page_program": "true", "prog_saveonrun": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "prog_level": "basic_move", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "5", "ctrl_hud_image": "", "button_func": "none", "move_motor_mode": "dc", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "show_page_control": "true", "ctrl_tr_speed": "80"}
+{"wifi_psk": "catoblepa catoblepa io ti dono le mie tepa", "move_tr_speed": "75", "move_fw_elapse": "1.5", "move_motor_mode": "dc", "show_page_program": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "prog_level": "basic_move", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "5", "ctrl_hud_image": "coderbot_hud_2.png", "button_func": "none", "wifi_mode": "ap", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "wifi_ssid": "kanaha", "show_page_control": "true", "ctrl_tr_speed": "80"}

main.py

@@ -43,6 +43,20 @@ def handle_config():
     app.bot_config = Config.get()
     return "ok";
 
+@app.route("/wifi", methods=["POST"])
+def handle_wifi():
+    mode = request.form.get("wifi_mode")
+    ssid = request.form.get("wifi_ssid")
+    psk = request.form.get("wifi_psk")
+    print "mode ", mode, " ssid: ", ssid, " psk: ", psk
+    client_params = " \"" + ssid + "\" \"" + psk + "\"" if ssid != "" and psk != "" else ""
+    print client_params
+    os.system("sudo python wifi.py updatecfg " + mode + client_params)
+    if mode == "ap":
+      return "http://coder.bot:8080";
+    else:
+      return "http://coderbotsrv.appspot.com/"
+
 @app.route("/bot", methods=["GET"])
 def handle_bot():
     cmd = request.args.get('cmd')

static/js/control.js

@@ -110,6 +110,15 @@ $(document).on( "pagecreate", '#page-preferences', function( event ) {
                 });
                 return false;
 	});
+        $('#b_wifi_apply').on("click", function (){
+                var form_data = $(this).parents("form").serialize();
+                $.post(url='/wifi', form_data, success=function(data){
+                  alert(BotMessages.Saved);
+                  location.href=data;
+                });
+                return false;
+        });
+
 });
 
 $(document).on( "pageshow", '#page-photos', function( event ) {

templates/config.html

@@ -142,6 +142,7 @@ <h1>CoderBot</h1>
      <input type="text" id="i_wifi_ssid" name="wifi_ssid" value="{{config.wifi_ssid}}">
      <label for="i_wifi_psk">{% trans %}WiFi password{% endtrans %}</label>
      <input type="text" id="i_wifi_psk" name="wifi_psk" value="{{config.wifi_psk}}">
+     <button type="button" id="b_wifi_apply" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-mini">{% trans %}Apply Wifi config{% endtrans %}</button>
     </div>
     <div class="ui-grid-a">
      <div class="ui-block-a"><a href="#" data-rel="close" class="ui-btn ui-shadow ui-corner-all ui-btn-b ui-mini">{% trans %}Cancel{% endtrans %}</a></div>

wifi.py

@@ -77,6 +77,7 @@ def get_ipaddr(cls, ifname):
   def register_ipaddr(cls, ipaddr, botname):
     try:
       ret = urllib2.urlopen(cls.web_url + "?name=" + botname + "&ipaddr=" + ipaddr)
+      print str(ret.getcode())
       if ret.getcode() != 200:
         raise Exception()
     except URLError as e:
@@ -110,6 +111,8 @@ def start_as_client(cls):
     try:
       out = subprocess.check_output(["ifdown", "wlan0"])
       out = subprocess.check_output(["ifup", "wlan0"])
+      print "registering ip..."
+      cls.register_ipaddr(cls.get_ipaddr("wlan0"), "CoderBot")
     except subprocess.CalledProcessError as e:
       print e.output
       raise
@@ -126,24 +129,38 @@ def start_as_ap(cls):
     out = subprocess.check_output(["ifup", "wlan0"])
     cls.start_hostapd()
 
+  @classmethod
+  def start_service(cls):
+    config = cls.load_config()
+    if config["wifi_mode"] == "ap":
+      print "starting as ap..."
+      cls.start_as_ap()
+    elif config["wifi_mode"] == "client":
+      print "starting as client..."
+      try:
+        cls.start_as_client()
+      except:
+        print "Unable to register ip, revert to ap mode"
+        cls.start_as_ap()
 
 def main():
-  print "starting wifi service..."
   w = WiFi()
-  config = w.load_config()
-
-  if config["wifi_mode"] == "ap":
-    print "starting as ap..."
-    w.start_as_ap()
-  elif config["wifi_mode"] == "client":
-    print "starting as client..."
-    w.start_as_client()
-    try:
-      print "registering ip..."
-      w.register_ipaddr(w.get_ipaddr("wlan0"), "CoderBot")
-    except:
-      print "Unable to register ip, revert to ap mode"
+  if len(sys.argv) > 2 and sys.argv[1] == "updatecfg":
+    if len(sys.argv) > 2 and sys.argv[2] == "ap":
+      w.set_start_as_ap()
       w.start_as_ap()
+    elif len(sys.argv) > 2 and sys.argv[2] == "client":
+      if len(sys.argv) > 3:
+        w.set_client_params(sys.argv[3], sys.argv[4])
+      w.set_start_as_client()
+      w.stop_hostapd()
+      try:
+        w.start_as_client()
+      except:
+        print "Unable to register ip, revert to ap mode"
+        w.start_as_ap()
+  else:
+    w.start_service()
 
 if __name__ == "__main__":
   main()