sant智能修改

boards/default_src/micropython/blocks/ai_local.js

@@ -306,8 +306,7 @@ export const SHOOT_AND_SAVE_PICTURE = {
     init: function () {
         this.setColour(AI_LOCAL_GRAPH_HUE);
         this.appendValueInput('direct')
-            .appendField(Blockly.Msg.MIXLY_SHOOT_AND_SAVE_PICTURE)
+            .appendField(Blockly.Msg.MIXLY_SHOOT_AND_SAVE_PICTURE);
-            .appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MICROPYTHON_HUSKYLENS_SAVE_AS + Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_THE_PATH);
         this.setPreviousStatement(true);
         this.setNextStatement(true);
         this.setInputsInline(true);
@@ -419,12 +418,8 @@ export const SCREEN_SHOW_CAM_GRAPH_SHOOT = {
         this.setColour(DISPLAY_ONBOARD_HUE);
         this.appendValueInput("SUB")
             .appendField(Blockly.Msg.OLEDDISPLAY + Blockly.Msg.MIXLY_MICROBIT_IMAGE)
-        this.appendDummyInput('')
+        this.appendValueInput('boolean')
-            .appendField(Blockly.Msg.MIXLY_SYNC_DISPLAY)
+            .appendField( Blockly.Msg.MIXLY_synchronize + ':');
-            .appendField(new Blockly.FieldDropdown([
-                [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE, "0"],
-                [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE, "1"]
-            ]),"sync");
         this.setPreviousStatement(true);
         this.setNextStatement(true);
         this.setInputsInline(true);
@@ -445,12 +440,8 @@ export const SCREEN_DISPLAY_IMAGE = {
                 ['180','180'],
                 ['270','270']
             ]),'angle');
-        this.appendDummyInput('')
+        this.appendValueInput('boolean')
-            .appendField(Blockly.Msg.MIXLY_SYNC_DISPLAY)
+            .appendField( Blockly.Msg.MIXLY_synchronize + ':');
-            .appendField(new Blockly.FieldDropdown([
-                [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_FALSE, "0"],
-                [Blockly.Msg.MIXLY_TURTLE_WRITE_MOVE_TRUE, "1"]
-            ]),"sync");
         this.setPreviousStatement(true);
         this.setNextStatement(true);
         this.setInputsInline(true);
@@ -702,10 +693,10 @@ export const GET_NO_XY_RECOGNITION_FACE = {
             .appendField(new Blockly.FieldDropdown([
                 [Blockly.Msg.MIXLY_LEFT_EYE + "x","[0]"],
                 [Blockly.Msg.MIXLY_LEFT_EYE + "y","[1]"],
-                [Blockly.Msg.MIXLY_RIGHT_EYE + "x","[2"],
+                [Blockly.Msg.MIXLY_RIGHT_EYE + "x","[2]"],
-                [Blockly.Msg.MIXLY_RIGHT_EYE + "y","[3"],
+                [Blockly.Msg.MIXLY_RIGHT_EYE + "y","[3]"],
-                [Blockly.Msg.MIXLY_NOSE + "x","[4"],
+                [Blockly.Msg.MIXLY_NOSE + "x","[4]"],
-                [Blockly.Msg.MIXLY_NOSE + "y","[5"],
+                [Blockly.Msg.MIXLY_NOSE + "y","[5]"],
                 [Blockly.Msg.MIXLY_LEFT_MOUSE_CORNER + "x","[6]"],
                 [Blockly.Msg.MIXLY_LEFT_MOUSE_CORNER + "y","[7]"],
                 [Blockly.Msg.MIXLY_RIGHT_MOUSE_CORNER + "x","[8"],

boards/default_src/micropython/generators/ai_local.js

@@ -193,8 +193,8 @@ export const SCREEN_SHOW_CAM_GRAPH_SHOOT = function (_, generator) {
     var version = Boards.getSelectedBoardKey().split(':')[2];
     generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
     var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
-    var s = this.getFieldValue('sync');
+    var bool = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
-    var code = 'onboard_tft.display(' + sub +', sync='+ s +')\n';
+    var code = 'onboard_tft.display(' + sub +', sync='+ bool +')\n';
     return code;
 }
 
@@ -203,8 +203,8 @@ export const SCREEN_DISPLAY_IMAGE = function (_, generator) {
     generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
     var direct = generator.valueToCode(this, 'direct', generator.ORDER_ATOMIC);
     var a = this.getFieldValue('angle');
-    var s = this.getFieldValue('sync');
+    var bool = generator.valueToCode(this, 'boolean', generator.ORDER_ATOMIC);
-    var code = 'onboard_tft.display(' + direct + ',rotation=' + a +  ',sync='+ s + ')\n';
+    var code = 'onboard_tft.display(' + direct + ',rotation=' + a +  ',sync='+ bool + ')\n';
     return code;
 }
 

boards/default_src/micropython_esp32s3/template.xml

@@ -1845,9 +1845,9 @@
         <shadow type="pins_builtinimg"></shadow>
       </value>
       <value name="boolean">
-          <shadow type="logic_boolean">
+        <shadow type="logic_boolean">
-          </shadow>
+        </shadow>
-        </value>
+      </value>
     </block>
     <block type="onboard_tft_show_image_xy">
       <value name="data">
@@ -1976,6 +1976,10 @@
           <field name="TEXT">mixly.jpg</field>
         </shadow>
       </value>
+      <value name="boolean">
+        <shadow type="logic_boolean">
+        </shadow>
+      </value>
     </block>
     <block type="display_scroll_string">
       <value name="data">
@@ -2485,6 +2489,10 @@
             <field name="TEXT">mixly.jpg</field>
           </shadow>
         </value>
+        <value name="boolean">
+          <shadow type="logic_boolean">
+          </shadow>
+        </value>
       </block>
       <block type="variables_set">
         <field name="VAR">image</field>
@@ -2498,6 +2506,10 @@
             <field name="VAR">image</field>
           </shadow>
         </value>
+        <value name="boolean">
+          <shadow type="logic_boolean">
+          </shadow>
+        </value>
       </block>
       <block type="AI_CAMERA_INIT">
           <value name="SUB">

common/msg/blockly/zh-hans.js

@@ -4095,7 +4095,7 @@ ZhHans.MIXLY_TRANS_TO_RADIAN = '转换为弧度';
 ZhHans.MIXLY_REF_TO_PRESSURE = '参考气压';
 ZhHans.MIXLY_CAL_TO_ALTITUDE = '计算获取海拔';
 ZhHans.MIXLY_SHOOTING_SIZE = '图像尺寸';
-ZhHans.MIXLY_SHOOT_AND_SAVE_PICTURE = '拍摄照片并保存';
+ZhHans.MIXLY_SHOOT_AND_SAVE_PICTURE = '拍摄保存';
 ZhHans.MIXLY_GET_PICTURE_DATA = '获取摄像头图像';
 ZhHans.MIXlY_SCREEN_SHOW_CAM_SHOOT = '屏幕显示摄像头数据';
 ZhHans.MIXLY_RECOGNITION = '检测';