fix #60 #61

Author: previ

camera.py

@@ -155,7 +155,9 @@ def video_rec(self, video_name=None):
       filename = VIDEO_PREFIX + video_name + self._camera.VIDEO_FILE_EXT;
       filename_thumb = VIDEO_PREFIX + video_name + PHOTO_THUMB_SUFFIX + self._camera.PHOTO_FILE_EXT;
       try:
+        #remove previous file and reference in album
         os.remove(PHOTO_PATH + "/" + filename)
+        self._photos.remove(filename)
       except:
         pass
 

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": "", "move_tr_elapse": "0.5", "sound_stop": "$shutdown.mp3", "prog_video_rec": "true", "show_control_move_commands": "true", "prog_level": "basic", "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": "40", "move_motor_trim": "1.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": "5", "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", "prog_video_rec": "true", "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": "40", "move_motor_trim": "1.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"}

main.py

@@ -311,7 +311,7 @@ def run_server():
       audio.say(app.bot_config.get("sound_start"))
       try:
 	cam = Camera.get_instance()
-        motion = Motion.get_instance()
+        #motion = Motion.get_instance()
       except picamera.exc.PiCameraError:
         logging.error("Camera not present")
 

static/js/program.js

@@ -6,9 +6,6 @@ $(document).on( "pageshow", '#page-program', function( event, ui ) {
         Blockly.inject(document.getElementById('blocklyDiv'),
             {path: '../../', toolbox: document.getElementById('toolbox'),
              scrollbars:CODERBOT_PROG_SCROLLBARS, maxBlocks:CODERBOT_PROG_MAXBLOCKS});
-        $('.blocklyToolboxDiv').appendTo('#page-program');
-        $('.blocklyTooltipDiv').appendTo('#page-program');
-        $('.blocklyWidgetDiv').appendTo('#page-program');
       }
 
       $('[href="#page-program"]').addClass( "ui-btn-active" );

static/media/disconnect.wav

@@ -32,7 +32,7 @@ <h1>CoderBot</h1>
    <!--div class="ui-block-c"><button id="b_end_prog" class="ui-btn ui-btn-icon-left ui-icon-cb-stop" type="button">{% trans %}Stop{% endtrans %}</button></div-->
   </fieldset>
 {%endif%}
-  <div id="blocklyDiv" style="height: 480px; width:100%;"></div>
+  <div id="blocklyDiv" style="height: 480px; left:4px; right:4px;"></div>
   {%include "blocks_"+program_level+".xml"%}
  </div>
  <div data-role="popup" id="dialogRunning" data-history="false" data-overlay-theme="b" data-theme="b" data-dismissible="false" style="max-width:680px;">