fix CoderBotOrg#42

Author: previ

camera.py

@@ -323,6 +323,7 @@ def find_text(self, accept, back_color):
     self._image_lock.release()
     image = img.find_rect(color=color)
     if image:
+      logging.info("image: " + str(image))
       bin_image = image.binarize().invert()
       #self.save_image(bin_image.to_jpeg())
       text = bin_image.find_text(accept)

coderbot.cfg

@@ -1 +1 @@
-{"move_tr_speed": "80", "move_fw_elapse": "1", "camera_color_object_size_min": "4000", "camera_path_object_size_min": "4000", "load_at_start": "saluta", "move_tr_elapse": "0.5", "sound_stop": "$shutdown.mp3", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "move_fw_speed": "100", "camera_color_object_size_max": "160000", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "cv_image_factor": "4", "ctrl_hud_image": "", "button_func": "none", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "60", "move_power_angle_3": "60", "move_power_angle_1": "45", "move_motor_trim": "1", "show_page_program": "true", "sound_start": "$startup.mp3", "camera_exposure_mode": "auto", "ctrl_tr_speed": "80", "ctrl_fw_speed": "100", "camera_refresh_timeout": "0.1", "camera_jpeg_quality": "20", "prog_maxblocks": "-1", "move_motor_mode": "dc", "camera_path_object_size_max": "160000", "show_page_control": "true"}
+{"move_tr_speed": "80", "move_fw_elapse": "1", "camera_color_object_size_min": "4000", "camera_path_object_size_min": "4000", "load_at_start": "", "move_tr_elapse": "0.5", "sound_stop": "$shutdown.mp3", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "move_fw_speed": "100", "camera_color_object_size_max": "160000", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "cv_image_factor": "4", "ctrl_hud_image": "", "button_func": "none", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "60", "move_power_angle_3": "60", "move_power_angle_1": "45", "move_motor_trim": "1", "show_page_program": "true", "sound_start": "$startup.mp3", "camera_exposure_mode": "auto", "ctrl_tr_speed": "80", "ctrl_fw_speed": "100", "camera_refresh_timeout": "0.1", "camera_jpeg_quality": "20", "prog_maxblocks": "-1", "move_motor_mode": "dc", "camera_path_object_size_max": "160000", "show_page_control": "true"}

data/program_find_text.data

@@ -1 +1 @@
-{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"controls_whileUntil\" x=\"7\" y=\"60\"><field name=\"MODE\">WHILE</field><value name=\"BOOL\"><block type=\"logic_boolean\"><field name=\"BOOL\">TRUE</field></block></value><statement name=\"DO\"><block type=\"text_print\"><value name=\"TEXT\"><block type=\"coderbot_adv_findText\"><field name=\"ACCEPT\">alpha</field><value name=\"COLOR\"><block type=\"text\"><field name=\"TEXT\">#20554b</field></block></value></block></value></block></statement></block></xml>", "code": "while True:\n  get_prog_eng().check_end()\n  get_cam().set_text(get_cam().find_text(accept=\"alpha\", back_color='#20554b'))\n", "name": "find_text"}
+{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"controls_whileUntil\" x=\"7\" y=\"60\"><field name=\"MODE\">WHILE</field><value name=\"BOOL\"><block type=\"logic_boolean\"><field name=\"BOOL\">TRUE</field></block></value><statement name=\"DO\"><block type=\"text_print\"><value name=\"TEXT\"><block type=\"coderbot_adv_findText\"><field name=\"ACCEPT\">alpha</field><value name=\"COLOR\"><block type=\"text\"><field name=\"TEXT\">#a81300</field></block></value></block></value></block></statement></block></xml>", "code": "while True:\n  get_prog_eng().check_end()\n  get_cam().set_text(get_cam().find_text(accept=\"alpha\", back_color='#a81300'))\n", "name": "find_text"}

wifi.py

@@ -5,6 +5,7 @@
 import shutil
 import sys
 import os
+import time
 import urllib2
 import fcntl
 import struct
@@ -49,17 +50,17 @@ def start_hostapd(cls):
     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")
-
+      out = os.system("/usr/sbin/" + hostapd_type + " /etc/hostapd/" + hostapd_type + " -B")
+      print "hostapd out: " + str(out)
     except subprocess.CalledProcessError as e:
       print e.output
 
   @classmethod
   def stop_hostapd(cls):
     try:
-      out = subprocess.check_output(["pkill", "-9", "hostapd"])
-      print out
+      print "stopping hostapd..."
+      out = subprocess.check_output(["sudo", "pkill", "-9", "hostapd"])
+      print "hostapd out: " + str(out)
     except subprocess.CalledProcessError as e:
       print e.output
 
@@ -71,20 +72,16 @@ def get_ipaddr(cls, ifname):
         0x8915,  # SIOCGIFADDR
         struct.pack('256s', ifname[:15])
     )[20:24])
-    ipaddr = socket.gethostbyname(socket.gethostname())
-    return ipaddr
 
   @classmethod
-  def register_ipaddr(cls, ipaddr, botname):
+  def register_ipaddr(cls, botname, ipaddr):
     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:
-      print e
+      print "except: " + str(e)
       raise
-    print botname, ": ", ipaddr
 
   @classmethod
   def get_wlans(cls):
@@ -110,10 +107,11 @@ def set_start_as_client(cls):
   def start_as_client(cls):
     cls.stop_hostapd()
     try:
-      out = subprocess.check_output(["ifdown", "wlan0"])
+      time.sleep(1.0)
+      out = subprocess.check_output(["ifdown", "--force", "wlan0"])
       out = subprocess.check_output(["ifup", "wlan0"])
-      print "registering ip..."
-      cls.register_ipaddr(cls.get_ipaddr("wlan0"), self.get_config().get('bot_name', 'CoderBot'))
+      cls.register_ipaddr(cls.get_config().get('bot_name', 'CoderBot'), cls.get_ipaddr("wlan0"))
+      print "registered bot, ip: " + str(cls.get_ipaddr("wlan0") + " name: " + cls.get_config().get('bot_name', 'CoderBot'))
     except subprocess.CalledProcessError as e:
       print e.output
       raise
@@ -126,7 +124,8 @@ def set_start_as_ap(cls):
 
   @classmethod
   def start_as_ap(cls):
-    out = subprocess.check_output(["ifdown", "wlan0"])
+    time.sleep(1.0)
+    out = subprocess.check_output(["ifdown", "--force", "wlan0"])
     out = subprocess.check_output(["ifup", "wlan0"])
     cls.start_hostapd()
 
@@ -149,20 +148,21 @@ def main():
   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()
+      #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()
+      """
     elif len(sys.argv) > 3 and sys.argv[2] == "bot_name":
-      self.get_config()['bot_name'] = sys.argv[3]
-      self.save_config()
+      WiFi.get_config()['bot_name'] = sys.argv[3]
+      WiFi.save_config()
   else:
     w.start_service()