sant智能修改

boards/default_src/micropython/blocks/ai_local.js

@@ -308,16 +308,6 @@ export const SHOOT_AND_SAVE_PICTURE = {
         this.appendValueInput('direct')
             .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.appendValueInput('quality')
-            .appendField(Blockly.Msg.MIXLY_IMAGE_QUALITY);
-        this.appendDummyInput('')
-            .appendField(Blockly.Msg.MIXLY_ROTATION_ANGLE)
-            .appendField(new Blockly.FieldDropdown([
-                ['0','0'],
-                ['90','90'],
-                ['180','180'],
-                ['270','270']
-            ]),'angle');
         this.setPreviousStatement(true);
         this.setNextStatement(true);
         this.setInputsInline(true);
@@ -527,6 +517,9 @@ export const AI_CAMERA_INIT_FACERECOGNIZE = {
         this.appendValueInput('SUB')
             .appendField(Blockly.Msg.MIXLY_MICROPYTHON_SOCKET_MAKE)
             .setCheck("var");
+        this.appendDummyInput("")
+            .appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO)
+            .appendField(Blockly.Msg.MIXLY_AipFace);
         this.appendDummyInput("")
             .appendField(Blockly.Msg.MIXLY_WIDTH)
             .appendField(new Blockly.FieldDropdown([
@@ -550,9 +543,6 @@ export const AI_CAMERA_INIT_FACERECOGNIZE = {
                 ["240px","240"],
                 ["120px","120"]
             ]),"height");
-        this.appendDummyInput("")
-            .appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO)
-            .appendField(Blockly.Msg.MIXLY_AipFace);
         this.appendValueInput("PATH")
             .appendField(Blockly.Msg.PATH_OF_FACE_DATABASE);
         this.setInputsInline(true);
@@ -802,8 +792,7 @@ export const REGISTER_NEW_FACE = {
             .appendField(Blockly.Msg.register_a_new_face_in_the_database);
         this.appendValueInput("NAME")
             .appendField(Blockly.Msg.MICROPYTHON_HUSKYLENS_NAME);
-        this.setPreviousStatement(true);
+        this.setOutput(true)
-        this.setNextStatement(true);
         this.setInputsInline(true);
     }
 };

boards/default_src/micropython/generators/ai_local.js

@@ -140,9 +140,7 @@ export const CREATE_CAMERA = function (_, generator) {
 
 export const SHOOT_AND_SAVE_PICTURE = function (_, generator) {
     var direct = generator.valueToCode(this, 'direct', generator.ORDER_ATOMIC);
-    var q = generator.valueToCode(this, 'quality', generator.ORDER_ATOMIC);
+    var code = 'camera.snapshot(' + direct + ')\n';
-    var a = this.getFieldValue('angle');
-    var code = 'camera.snapshot(' + direct + ',quality='+ q + ',rotation=' + a + ')\n';
     return code;
 }
 
@@ -246,7 +244,7 @@ export const MODEL_LOGOUT = function (_, generator) {
 export const MODEL_RUN = function (_, generator) {
     var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
     var frame = generator.valueToCode(this, 'FRAME', generator.ORDER_ATOMIC);
-    var code = sub + '.run(' + frame +')';
+    var code = sub + '.run(' + frame +'.image)';
     return [code, generator.ORDER_ATOMIC];
 }
 
@@ -345,8 +343,8 @@ export const REGISTER_NEW_FACE = function (_, generator) {
     var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
     var image = generator.valueToCode(this, 'IMAGE', generator.ORDER_ATOMIC);
     var name = generator.valueToCode(this, 'NAME', generator.ORDER_ATOMIC);
-    var code = sub + '.enroll(' + image +', '+ validate +', '+ name +')\n';
+    var code = sub + '.enroll(' + image +'.image, name='+ name +', validate = 1)';
-    return code;
+    return [code, generator.ORDER_ATOMIC];
 }
 
 export const DELETE_FACE_FROM_DATABASE = function (_, generator) {

boards/default_src/micropython_esp32s3/template.xml

@@ -2422,6 +2422,13 @@
           </shadow>
         </value>
       </block>
+      <block type="SHOOT_AND_SAVE_PICTURE">
+        <value name="direct">
+          <shadow type="text">
+            <field name="TEXT">mixly.jpg</field>
+          </shadow>
+        </value>
+      </block>
       <block type="variables_set">
         <field name="VAR">image</field>
         <value name="VALUE">
@@ -2442,18 +2449,6 @@
           </shadow>
         </value>
       </block>
-      <block type="SHOOT_AND_SAVE_PICTURE">
-        <value name="direct">
-          <shadow type="text">
-            <field name="TEXT">mixly.jpg</field>
-          </shadow>
-        </value>
-        <value name="quality">
-          <shadow type="math_number">
-            <field name="NUM">90</field>
-          </shadow>
-        </value>  
-      </block>
       <block type="GET_IMAGE_AND_SAVE">
         <value name="SUB">
           <shadow type="variables_get">