merging from py3-deployable

Author: previ

audio.py

@@ -82,7 +82,7 @@ def __init__(self):
         #self._google_speech_client = speech.SpeechClient()
 
     def exit(self):
-        pass
+       pass
         # cleanup stuff.
         #self.stream_in.close()
         #self.pyaudio.terminate()
@@ -201,33 +201,6 @@ def speech_recog(self, model):
                         logging.info("recog text: " + recog_text)
                         return recog_text
 
- #   def speech_recog_google(self, locale):
- #       config = types.RecognitionConfig(
- #           encoding=enums.RecognitionConfig.AudioEncoding.LINEAR16,
- #           sample_rate_hertz=RATE,
- #           language_code=locale)
- #       streaming_config = types.StreamingRecognitionConfig(
- #           config=config,
- #           interim_results=False,
- #           single_utterance=True)
-#
- #       t1 = time.time()
-  #      with self.stream_in as stream:
-   #         audio_generator = stream.generator()
-    #        requests = (types.StreamingRecognizeRequest(audio_content=content)
-     #                   for content in audio_generator)
-#
- #           responses = self._google_speech_client.streaming_recognize(streaming_config, requests)
-
-            # Now, put the transcription responses to use.
-  #          for response in responses:
-   #             if time.time() - t1 > 10:
-    #                return ""
-     #           if response.results:
-      #              result = response.results[0]
-       #             if result.is_final:
-        #                return result.alternatives[0].transcript
-
     class MicrophoneStream(object):
         """Opens a recording stream as a generator yielding the audio chunks."""
         def __init__(self, fmt, rate, chunk):

camera.py

@@ -202,6 +202,7 @@ def get_photo_thumb_file(self, filename):
     def delete_photo(self, filename):
         logging.info("delete photo: " + filename)
         os.remove(PHOTO_PATH + "/" + filename)
+<<<<<<< HEAD
         os.remove(PHOTO_PATH + "/" + filename[:filename.rfind(".")] + PHOTO_THUMB_SUFFIX + self._camera.PHOTO_FILE_EXT)
         for photo in self._photos:
             if photo["name"] == filename:
@@ -371,3 +372,4 @@ def find_class(self):
     def sleep(self, elapse):
         logging.debug("sleep: " + str(elapse))
         time.sleep(elapse)
+

coderbot.py

@@ -419,3 +419,4 @@ def restart(self):
 
     def reboot(self):
         os.system('sudo reboot')
+

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\">#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"}
+{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"controls_whileUntil\" id=\"Ke#n3UKfYnMbv!Cu`zzq\" x=\"7\" y=\"60\"><field name=\"MODE\">WHILE</field><value name=\"BOOL\"><block type=\"logic_boolean\" id=\"!M`eA*wRnoX2_dVQ_FE.\"><field name=\"BOOL\">TRUE</field></block></value><statement name=\"DO\"><block type=\"text_print\" id=\"yM]ThA`sar3kXv^[-,mV\"><value name=\"TEXT\"><block type=\"coderbot_adv_findText\" id=\"v)VQ.8j,.j_tq5%X1XuJ\"><field name=\"ACCEPT\">alpha</field><value name=\"COLOR\"><block type=\"text\" id=\"6;Vb;LrH4txPlXtmCfNs\"><field name=\"TEXT\">#802b29</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='#802b29'))\n", "name": "find_text"}

data/program_no_name.data

@@ -41,7 +41,7 @@
 from flask_babel import Babel
 from flask_cors import CORS
 from werkzeug.datastructures import Headers
-#from flask_sockets import Sockets
+from flask_sockets import Sockets
 
 logger = logging.getLogger()
 logger.setLevel(logging.DEBUG)

main.py

@@ -1,12 +1,10 @@
 auto lo
+allow-hotplug wlan0
 iface lo inet loopback
 iface eth0 inet dhcp
-#allow-hotplug wlan0
-#iface wlan0 inet manual
-#wpa-roam /etc/wpa_supplicant/wpa_supplicant.conf
-#iface default inet dhcp
 iface wlan0 inet static
 address 10.0.0.1
 netmask 255.255.255.0
 wireless-power off
-
+network 10.0.0.0
+broadcast 10.0.0.255

scripts/interfaces_ap

@@ -231,7 +231,7 @@ Blockly.Python['coderbot_sleep'] = function(block) {
   // Generate Python for sleeping.
   var elapse = Blockly.Python.valueToCode(block, 'ELAPSE',
       Blockly.Python.ORDER_NONE) || '\'\'';
-  return 'get_cam().sleep(' + elapse + ')\n';
+  return 'get_bot().sleep(' + elapse + ')\n';
 };
 
 Blockly.Blocks['coderbot_adv_move'] = {