diff --git a/camera.py b/camera.py index 4a861c28..e4842600 100644 --- a/camera.py +++ b/camera.py @@ -84,11 +84,11 @@ def __init__(self): self._photos.append({'name': filename}) self.save_photo_metadata() - #self._cnn_classifiers = {} - #cnn_model = config.Config.get().get("cnn_default_model", "") - #if cnn_model != "": - # self._cnn_classifiers[cnn_model] = CNNManager.get_instance().load_model(cnn_model) - # self._cnn_classifier_default = self._cnn_classifiers[cnn_model] + self._cnn_classifiers = {} + cnn_model = config.Config.get().get("cnn_default_model", "") + if cnn_model != "": + self._cnn_classifiers[cnn_model] = CNNManager.get_instance().load_model(cnn_model) + self._cnn_classifier_default = self._cnn_classifiers[cnn_model] self._camera.grab_start() self._image_cv = self.get_image() diff --git a/cnn_models/mnist.pb b/cnn_models/mnist.pb new file mode 100644 index 00000000..d230cb3a Binary files /dev/null and b/cnn_models/mnist.pb differ diff --git a/cnn_models/mnist.txt b/cnn_models/mnist.txt new file mode 100644 index 00000000..bc424136 --- /dev/null +++ b/cnn_models/mnist.txt @@ -0,0 +1,7 @@ +0 +1 +3 +4 +5 +7 +8 diff --git a/cnn_models/models.json b/cnn_models/models.json index 0967ef42..2f818e3b 100644 --- a/cnn_models/models.json +++ b/cnn_models/models.json @@ -1 +1 @@ -{} +{"mnist": {"image_width": "224", "status": 1, "image_height": "224"}} diff --git a/coderbot.cfg b/coderbot.cfg index 43c25c76..7e757d92 100644 --- a/coderbot.cfg +++ b/coderbot.cfg @@ -1 +1 @@ -{"move_power_angle_3": "60", "cnn_default_model": "fruit_025_128_1", "prog_maxblocks": "-1", "camera_jpeg_quality": "5", "show_page_control": "true", "camera_framerate": "30", "prog_scrollbars": "true", "move_fw_speed": "100", "prog_level": "adv", "move_motor_trim": "1", "move_motor_mode": "dc", "cv_image_factor": "2", "move_power_angle_1": "45", "camera_path_object_size_min": "4000", "button_func": "none", "camera_color_object_size_min": "4000", "camera_jpeg_bitrate": "1000000", "move_fw_elapse": "1", "show_control_move_commands": "true", "camera_color_object_size_max": "160000", "show_page_prefs": "true", "camera_exposure_mode": "auto", "ctrl_tr_elapse": "-1", "show_page_program": "true", "move_tr_elapse": "0.5", "camera_path_object_size_max": "160000", "sound_shutter": "$shutter.mp3", "ctrl_fw_elapse": "-1", "sound_stop": "$shutdown.mp3", "ctrl_tr_speed": "80", "ctrl_fw_speed": "100", "move_tr_speed": "85", "move_power_angle_2": "60", "ctrl_hud_image": "", "load_at_start": "", "sound_start": "$startup.mp3"} \ No newline at end of file +{"cnn_default_model": "mnist", "show_control_move_commands": "true", "prog_level": "adv", "ctrl_tr_speed": "80", "camera_exposure_mode": "auto", "camera_framerate": "30", "sound_shutter": "$shutter.mp3", "camera_jpeg_quality": "5", "ctrl_fw_speed": "100", "move_motor_trim": "1", "sound_stop": "$shutdown.mp3", "move_power_angle_3": "60", "show_page_prefs": "true", "button_func": "none", "prog_scrollbars": "true", "ctrl_fw_elapse": "-1", "move_fw_speed": "100", "cv_image_factor": "2", "ctrl_hud_image": "", "camera_path_object_size_min": "4000", "show_page_program": "true", "move_motor_mode": "dc", "camera_jpeg_bitrate": "1000000", "move_power_angle_1": "45", "sound_start": "$startup.mp3", "move_power_angle_2": "60", "move_tr_speed": "85", "load_at_start": "", "camera_path_object_size_max": "160000", "camera_color_object_size_max": "160000", "show_page_control": "true", "prog_maxblocks": "-1", "move_fw_elapse": "1", "camera_color_object_size_min": "4000", "ctrl_tr_elapse": "-1", "move_tr_elapse": "0.5"} \ No newline at end of file diff --git a/data/program_mnist-test.data b/data/program_mnist-test.data new file mode 100644 index 00000000..8472aeed --- /dev/null +++ b/data/program_mnist-test.data @@ -0,0 +1 @@ +{"code": "result = None\n\n\nwhile True:\n get_prog_eng().check_end()\n result = get_cam().find_class()\n get_cam().set_text(get_cam().find_class())\n get_audio().say(get_cam().find_class(), locale=\"en\")\n", "name": "mnist-test", "dom_code": "resultWHILETRUEresulten"} \ No newline at end of file diff --git a/scripts/update_coderbot.sh b/scripts/update_coderbot.sh index ade02be3..78090a4d 100755 --- a/scripts/update_coderbot.sh +++ b/scripts/update_coderbot.sh @@ -1,3 +1,3 @@ #!/bin/sh -git pull origin master +git pull origin develop diff --git a/templates/blocks_adv.xml b/templates/blocks_adv.xml index 57dfd16b..42a03e32 100644 --- a/templates/blocks_adv.xml +++ b/templates/blocks_adv.xml @@ -302,7 +302,7 @@ - + {%endif%}