wip #35

Author: previ

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", "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": "1", "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", "cnn_default_model": "apple_kiwi_fast", "show_page_program": "true", "sound_start": "$startup.mp3", "camera_exposure_mode": "auto", "ctrl_tr_speed": "80", "prog_move_mpu": "yes", "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": "85", "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": "2", "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", "cnn_default_model": "apple_kiwi_fast", "show_page_program": "true", "sound_start": "$startup.mp3", "camera_exposure_mode": "auto", "ctrl_tr_speed": "80", "prog_move_mpu": "yes", "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"}

static/js/blockly/blocks.js

@@ -844,7 +844,10 @@ Blockly.Blocks['coderbot_conv_get_action'] = {
         .setCheck("String");
     this.appendDummyInput()
         .appendField("in")
-        .appendField(new Blockly.FieldDropdown([["italiano","it"], ["inglese","en"], ["francese","fr"], ["tedesco","de"]]), "locale");
+        .appendField(new Blockly.FieldDropdown([[Blockly.Msg.CODERBOT_LOCALE_EN, 'en'],
+                                                [Blockly.Msg.CODERBOT_LOCALE_IT, 'it'],
+                                                [Blockly.Msg.CODERBOT_LOCALE_FR, 'fr'],
+                                                [Blockly.Msg.CODERBOT_LOCALE_ES, 'es']]), "locale");
     this.setInputsInline(true);
     this.setOutput(true, "HashMap");
     this.setColour(230);
@@ -954,9 +957,10 @@ Blockly.Blocks['coderbot_audio_listen'] = {
     this.setColour(220);
     this.appendDummyInput()
         .appendField(Blockly.Msg.CODERBOT_AUDIO_LISTEN)
-        .appendField(new Blockly.FieldDropdown([[Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_SIMPLE, 'model_simple'],
-                                                [Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_MEDIUM, 'model_medium'],
-                                                [Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_ADV, 'model_adv']]), 'MODEL');
+        .appendField(new Blockly.FieldDropdown([[Blockly.Msg.CODERBOT_LOCALE_EN, 'en-US'],
+                                                [Blockly.Msg.CODERBOT_LOCALE_IT, 'it-IT'],
+                                                [Blockly.Msg.CODERBOT_LOCALE_FR, 'fr-FR'],
+                                                [Blockly.Msg.CODERBOT_LOCALE_ES, 'es-ES']]), 'MODEL');
     this.setInputsInline(true);
     this.setOutput(true, 'String');
     this.setTooltip(Blockly.Msg.LOGIC_BOOLEAN_TOOLTIP);
@@ -966,8 +970,7 @@ Blockly.Blocks['coderbot_audio_listen'] = {
 Blockly.Python['coderbot_audio_listen'] = function(block) {
   // Boolean values true and false.
   var model = block.getFieldValue('MODEL');
-  //var code = 'get_audio().speech_recog(model="' + model + '")';
-  var code = 'get_audio().speech_recog_google(locale="it_IT")';
+  var code = 'get_audio().speech_recog_google(locale=\'' + model + '\')';
   return [code, Blockly.Python.ORDER_ATOMIC];
 };