mini板增加讯飞语音

2025-10-18 13:54:27 +08:00
parent be13c0f411
commit d105bf68ec
10 changed files with 303 additions and 29 deletions
--- a/boards/default_src/micropython/blocks/actuator_onboard.js
+++ b/boards/default_src/micropython/blocks/actuator_onboard.js
@@ -538,6 +538,19 @@ export const esp32_onboard_music_play_list = {
    }
 }

+export const backstage_onboard_music_play_list = {
+    init: function () {
+        this.setColour(ACTUATOR_ONBOARD_HUE);
+        this.appendValueInput('LIST')
+            .appendField(Blockly.Msg.MIXLY_BACKSTAGE + Blockly.Msg.MIXLY_ESP32_MUSIC_PLAY_LISTS)
+        this.setPreviousStatement(true);
+        this.setNextStatement(true);
+        this.setInputsInline(true);
+        this.setTooltip(Blockly.Msg.MIXLY_ESP32_MUSIC_PLAY_LISTS);
+
+    }
+}
+
 export const rm_motor = {
    init: function () {
        this.setColour(ACTUATOR_ONBOARD_HUE);
--- a/boards/default_src/micropython/blocks/ai_cloud.js
+++ b/boards/default_src/micropython/blocks/ai_cloud.js
@@ -18,7 +18,7 @@ export const init_xunfei_vi = {
        this.appendValueInput('APIKey')
            .setCheck(String)
            .appendField('APIKey');
-        this.setInputsInline(false);
+        this.setInputsInline(true);
        this.setPreviousStatement(true);
        this.setNextStatement(true);
    }
@@ -32,7 +32,7 @@ export const init_xunfei_Spark_Ultra = {
        this.appendValueInput('VAR')
            .appendField(Blockly.Msg.MIXLY_MICROPYTHON_SOCKET_MAKE);
        this.appendDummyInput()
-            .appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.MIXLY_AS + Blockly.Msg.MIXLY_XUFEI + 'Spark Ultra' +Blockly.Msg.MIXLY_LARGE_LANGUAGE_MODEL );
+            .appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.MIXLY_AS + Blockly.Msg.MIXLY_XUFEI +Blockly.Msg.MIXLY_LARGE_LANGUAGE_MODEL );
        this.appendValueInput('APPID')
            .setCheck(String)
            .appendField('APPID');
@@ -42,13 +42,29 @@ export const init_xunfei_Spark_Ultra = {
        this.appendValueInput('APIKey')
            .setCheck(String)
            .appendField('APIKey');
-        this.setInputsInline(false);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.MIXLY_SELECT_MODEL)
+            .appendField(new Blockly.FieldDropdown([
+                ["Spark-X1-32K","Spark X1-32K"],
+                ["Spark-Lite","Spark Lite"],
+                ["Spark-Pro","Spark Pro"],
+                ["Spark-Pro-128K","Spark Pro-128K"],
+                ["Spark-Max, " + Blockly.Msg.MIXLY_SUPPORT + Blockly.Msg.MIXLY_DIALOGUE_BACKGROUND + "、" + Blockly.Msg.MIXLY_ESP32_ONENET_SUB, "Spark Max"],
+                ["Spark-Max-32K, "+ Blockly.Msg.MIXLY_SUPPORT + Blockly.Msg.MIXLY_DIALOGUE_BACKGROUND + "、" + Blockly.Msg.MIXLY_ESP32_ONENET_SUB, "Spark Max-32K"],
+                ["Spark-Ultra-32K, "+ Blockly.Msg.MIXLY_SUPPORT + Blockly.Msg.MIXLY_DIALOGUE_BACKGROUND + "、" + Blockly.Msg.MIXLY_ESP32_ONENET_SUB, "Spark Ultra-32K"],
+                [Blockly.Msg.MIXLY_KJWX, "Spark kjwx"],
+                [Blockly.Msg.MIXLY_CUSTOMIZE_MODEL + "," + Blockly.Msg.MIXLY_SUPPORT + Blockly.Msg.MIXLY_ESP32_ONENET_SUB, "Spark Customize"]
+            ]),"model");
+        this.appendValueInput('DBG')
+            .setCheck(String)
+            .appendField(Blockly.Msg.MIXLY_DIALOGUE_BACKGROUND);
+        this.setInputsInline(true);
        this.setPreviousStatement(true);
        this.setNextStatement(true);
    }
 };

-export const init_xunfei_vi_run = {
+export const xunfei_vi_run = {
    init: function () {
        this.setColour(AI_CLOUD_VOICE_HUE);
        this.appendValueInput('VAR')
@@ -64,7 +80,7 @@ export const init_xunfei_vi_run = {
    }
 };

-export const init_xunfei_Spark_Ultra_run = {
+export const xunfei_Spark_Ultra_run = {
    init: function () {
        this.setColour(AI_CLOUD_VOICE_HUE);
        this.appendValueInput('VAR')
@@ -95,14 +111,122 @@ export const llm_set_callback = {
    init: function () {
        this.setColour(AI_CLOUD_VOICE_HUE);
        this.appendValueInput('VAR1')
-            .appendField(Blockly.Msg.MIXLY_LARGE_LANGUAGE_MODEL)
        this.appendValueInput('callback')
            .appendField(Blockly.Msg.MIXLY_PYTHON_CONTROLS_THREAD_USE)
-        this.appendValueInput('VAR')
-            .appendField(Blockly.Msg.MIXLY_PARAMS);
+        this.appendValueInput('VAR2')
+            .appendField(Blockly.Msg.MIXLY_FUNCTION_NAME);
+        this.appendValueInput('VAR3')
+            .appendField(Blockly.Msg.MIXLY_FUNCTION_DESCRIPTION)
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.MIXLY_PARAMS + Blockly.Msg.OLED_STRING);
+
+        this.itemCount_ = 2;
+        this.updateShape_();
+
+        this.setMutator(new Blockly.icons.MutatorIcon(['llm_set_callback_item'], this));
        this.setPreviousStatement(true);
        this.setNextStatement(true);
        this.setInputsInline(true);
        this.setTooltip(Blockly.Msg.llm_set_callback_tooltip);
+    },
+
+        mutationToDom: function () {
+            var container = document.createElement('mutation');
+            container.setAttribute('items', this.itemCount_);
+            return container;
+        },
+        domToMutation: function (xmlElement) {
+            this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+            this.updateShape_();
+        },
+        decompose: function (workspace) {
+            var containerBlock =
+                workspace.newBlock('llm_set_callback_container');
+            containerBlock.initSvg();
+            var connection = containerBlock.getInput('STACK').connection;
+            for (var i = 0; i < this.itemCount_; i++) {
+                var itemBlock = workspace.newBlock('llm_set_callback_item');
+                itemBlock.initSvg();
+                connection.connect(itemBlock.previousConnection);
+                connection = itemBlock.nextConnection;
+            }
+            return containerBlock;
+        },
+        compose: function (containerBlock) {
+            var itemBlock = containerBlock.getInputTargetBlock('STACK');
+            // Count number of inputs.
+            var connections = [];
+            var i = 0;
+            while (itemBlock) {
+                connections[i] = itemBlock.valueConnection_;
+                itemBlock = itemBlock.nextConnection &&
+                    itemBlock.nextConnection.targetBlock();
+                i++;
+            }
+            this.itemCount_ = i;
+            this.updateShape_();
+            // Reconnect any child blocks.
+            for (var i = 0; i < this.itemCount_; i++) {
+                if (connections[i]) {
+                    this.getInput('ADD' + i)
+                        .connection.connect(connections[i]);
+                }
+            }
+        },
+        saveConnections: function (containerBlock) {
+            var itemBlock = containerBlock.getInputTargetBlock('STACK');
+            var i = 0;
+            while (itemBlock) {
+                var input = this.getInput('ADD' + i);
+                itemBlock.valueConnection_ = input && input.connection.targetConnection;
+                i++;
+                itemBlock = itemBlock.nextConnection &&
+                    itemBlock.nextConnection.targetBlock();
+            }
+        },
+        updateShape_: function () {
+            // Delete everything.
+            if (this.getInput('EMPTY')) {
+                this.removeInput('EMPTY');
+            } else {
+                var i = 0;
+                while (this.getInput('ADD' + i)) {
+                    this.removeInput('ADD' + i);
+                    i++;
+                }
+            }
+            // Rebuild block.
+            if (this.itemCount_ == 0) {
+                this.appendDummyInput('EMPTY')
+                    // .appendField(Blockly.Msg.MIXLY_PARAMS);
+            } else {
+                for (var i = 0; i < this.itemCount_; i++) {
+                    var input = this.appendValueInput('ADD' + i);
+                    if (i == 0) {
+                        // input.appendField(Blockly.MIXLY_PARAMS);
+                    }
+                }
+            }
+        }
+};
+
+export const llm_set_callback_container = {
+    init: function () {
+        this.setColour(AI_CLOUD_VOICE_HUE);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.MIXLY_SETTING + Blockly.Msg.MIXLY_PARAMS);
+        this.appendStatementInput('STACK');
+        this.contextMenu = false;
+    }
+};
+
+export const llm_set_callback_item = {
+    init: function () {
+        this.setColour(AI_CLOUD_VOICE_HUE);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.LISTS_CREATE_WITH_ITEM_TITLE);
+        this.setPreviousStatement(true);
+        this.setNextStatement(true);
+        this.contextMenu = false;
    }
 };
--- a/boards/default_src/micropython/generators/actuator_onboard.js
+++ b/boards/default_src/micropython/generators/actuator_onboard.js
@@ -70,6 +70,14 @@ export const esp32_onboard_music_play_list = function (_, generator) {
    return code;
 }

+export const backstage_onboard_music_play_list = function (_, generator) {
+    var version = Boards.getSelectedBoardKey().split(':')[2]
+    var lst = generator.valueToCode(this, 'LIST', generator.ORDER_ASSIGNMENT);
+    generator.definitions_['import_' + version + '_onboard_music'] = 'from ' + version + ' import onboard_music';
+    var code = "onboard_music.play_thread(" + lst + ")\n";
+    return code;
+}
+
 export const esp32_music_reset = function (_, generator) {
    var version = Boards.getSelectedBoardKey().split(':')[2]
    generator.definitions_['import_' + version + '_onboard_music'] = 'from ' + version + ' import onboard_music';
--- a/boards/default_src/micropython/generators/ai_cloud.js
+++ b/boards/default_src/micropython/generators/ai_cloud.js
@@ -16,14 +16,19 @@ export const init_xunfei_Spark_Ultra = function (_, generator) {
    var id = generator.valueToCode(this, 'APPID', generator.ORDER_ATOMIC);
    var s = generator.valueToCode(this, 'APISecret', generator.ORDER_ATOMIC);
    var key = generator.valueToCode(this, 'APIKey', generator.ORDER_ATOMIC);
-    var code = v + ' = mini_xunfei.LLM_WebSocket(' + id + ',' + key + ',' + s +')\n';
+    var m = this.getFieldValue('model');
+    var code = v + ' = mini_xunfei.LLM_WebSocket(' + id + ',' + key + ',' + s + ',"' + m + '")\n';
    return code;
 }

-export const init_xunfei_vi_run = function (_, generator) {
+export const xunfei_vi_run = function (_, generator) {
    var v = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
    var t = generator.valueToCode(this, 'time', generator.ORDER_ATOMIC);
    var code = v + '.run(' + t +')';
+    return [code,generator.ORDER_ATOMIC];
+}
+
+export const xunfei_Spark_Ultra_run = function (_, generator) {
    var v = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
    var q = generator.valueToCode(this, 'qus', generator.ORDER_ATOMIC);
    var code = v + '.run(' + q +')';
@@ -38,11 +43,24 @@ export const init_xunfei_Spark_Ultra_clr_his = function (_, generator) {

 export const llm_set_callback = function (_, generator) {
    var v1 = generator.valueToCode(this, "VAR1", generator.ORDER_NONE) || "None";
-    var v = generator.valueToCode(this, "VAR", generator.ORDER_NONE) || "None";
+    var v2 = generator.valueToCode(this, "VAR2", generator.ORDER_NONE) || "None";
+    var v3 = generator.valueToCode(this, "VAR3", generator.ORDER_NONE) || "None";
+    var a0 = generator.valueToCode(this, "ADD0", generator.ORDER_NONE) || "None";
    var callback = generator.variableDB_.getName(
        generator.valueToCode(this, "callback", generator.ORDER_NONE) || "None",
        Blockly.Procedures.NAME_TYPE
    );
-    var code = v1 +".function_call(" + callback + ", " + v + ")\n";
+    var code = new Array(this.itemCount_);
+    var default_value = '0';
+    for (var n = 0; n < this.itemCount_; n++) {
+        code[n] = generator.valueToCode(this, 'ADD' + n, generator.ORDER_NONE) || default_value;
+    }
+    if (this.itemCount_ > 1){
+        var code = v1 +'.function_call(' + callback + ', ' + v2 + ', ' + v3 + ', (' + code.join(', ') +'))\n';
+    }else{
+        var code = v1 +'.function_call(' + callback + ', ' + v2 + ', ' + v3 + ', ' + code.join(', ') +')\n';
+    }
+    
    return code;
-}
+}
+
--- a/boards/default_src/micropython_esp32c2/template.xml
+++ b/boards/default_src/micropython_esp32c2/template.xml
@@ -1629,6 +1629,11 @@
        <shadow type="pins_playlist"></shadow>
      </value>
    </block>
+    <block type="backstage_onboard_music_play_list">
+      <value name="LIST">
+        <shadow type="pins_playlist"></shadow>
+      </value>
+    </block>
    <block type="esp32_music_set_tempo">
      <value name="TICKS">
        <shadow type="math_number">
@@ -2822,17 +2827,17 @@
        </value>
        <value name="APPID">
          <shadow type="text">
-            <field name="TEXT">ba3917dd</field>
+            <field name="TEXT"></field>
          </shadow>
        </value>
        <value name="APISecret">
          <shadow type="text">
-            <field name="TEXT">Nzg4MWUyNGE1ZTcxOGZkNzM4NWQ4Yzdi</field>
+            <field name="TEXT"></field>
          </shadow>
        </value>
        <value name="APIKey">
          <shadow type="text">
-            <field name="TEXT">b47549319a8324f5eab3dd5c37dfa1dd</field>
+            <field name="TEXT"></field>
          </shadow>
        <value>
      </block>
@@ -2844,21 +2849,26 @@
        </value>
        <value name="APPID">
          <shadow type="text">
-            <field name="TEXT">ba3917dd</field>
+            <field name="TEXT"></field>
          </shadow>
        </value>
        <value name="APISecret">
          <shadow type="text">
-            <field name="TEXT">Nzg4MWUyNGE1ZTcxOGZkNzM4NWQ4Yzdi</field>
+            <field name="TEXT"></field>
          </shadow>
        </value>
        <value name="APIKey">
          <shadow type="text">
-            <field name="TEXT">b47549319a8324f5eab3dd5c37dfa1dd</field>
+            <field name="TEXT"></field>
          </shadow>
-        <value>
+        </value>
+        <value name="DBG">
+          <shadow type="text">
+            <field name="TEXT"></field>
+          </shadow>
+        </value>
      </block>
-      <block type="init_xunfei_vi_run">
+      <block type="xunfei_vi_run">
        <value name="VAR">
          <shadow type="variables_get">
            <field name="VAR">asr</field>
@@ -2870,7 +2880,7 @@
          </shadow>
        </value>
      </block>
-      <block type="init_xunfei_Spark_Ultra_run">
+      <block type="xunfei_Spark_Ultra_run">
        <value name="VAR">
          <shadow type="variables_get">
            <field name="VAR">llm</field>
@@ -2900,12 +2910,33 @@
            <field name="VALUE">cb_func</field>
          </shadow>
        </value>
-        <value name="VAR">
-          <block type="tuple_create_with_text_return">
-            <field name="TEXT">"参数名","类型","描述"</field>
+        <value name="VAR2">
+          <shadow type="text">
+            <field name="TEXT">灯光控制</field>
+          </shadow>
+        </value>
+        <value name="VAR3">
+          <shadow type="text">
+            <field name="TEXT">用来控制LED灯光的开关</field>
+          </shadow>
+        </value>
+        <mutation items="1"></mutation>
+        <value name="ADD0">
+          <block type="tuple_create_llm_params">
+            <value name="params">
+              <shadow type="text">
+                <field name="TEXT">power</field>
+              </shadow>
+            </value>
+            <value name="des">
+              <shadow type="text">
+                <field name="TEXT">开为true,关为false</field>
+              </shadow>
+            </value>
          </block>
        </value>
      </block>
+      
      <block type="procedures_defnoreturn">
        <mutation>
          <arg name="xx"></arg>
--- a/boards/default_src/python/blocks/tuple.js
+++ b/boards/default_src/python/blocks/tuple.js
@@ -741,4 +741,32 @@ export const tuple_input = {
            .appendField(')');
        this.setOutput(true);
    }
+};
+
+
+export const tuple_create_llm_params= {
+    init: function () {
+        this.setColour(TUPLE_HUE);
+        this.appendValueInput("params")
+            .appendField('(')
+            .appendField(Blockly.Msg.MIXLY_NAME_OF_PARAMS)
+        this.appendDummyInput()
+            .appendField(',')
+            .appendField(Blockly.Msg.MIXLY_TYPE)
+            .appendField(new Blockly.FieldDropdown([
+                [Blockly.Msg.MIXLY_TYPE_BOOLEAN,"boolean"],
+                [Blockly.Msg.MIXLY_TYPE_STRING,"string"],
+                [Blockly.Msg.MIXLY_TYPE_NUMBER,"number"],
+                [Blockly.Msg.MIXLY_TYPE_INTEGER,"integer"],
+                [Blockly.Msg.MIXLY_TYPE_NULL,"null"]
+            ]),"type")
+        this.appendValueInput("des")
+            .appendField(',')
+            .appendField(Blockly.Msg.MIXLY_DESCRIPTION)
+        this.appendDummyInput()
+            .appendField(')');
+        this.setOutput(true);
+        this.setInputsInline(true);
+        this.setTooltip(Blockly.Msg.MIXPY_TOOLTIP_TUPLE_CREATE_WITH_TEXT);
+    }
 };
--- a/boards/default_src/python/generators/tuple.js
+++ b/boards/default_src/python/generators/tuple.js
@@ -295,4 +295,12 @@ export const tuple_input = function (_, generator) {
    var text = this.getFieldValue('CONTENT');
    var code = '(' + text + ')';
    return [code, generator.ORDER_ATOMIC];
+}
+
+export const tuple_create_llm_params = function (_, generator) {
+    var params = generator.valueToCode(this, 'params', generator.ORDER_ATOMIC) || '0'
+    var des = generator.valueToCode(this, 'des', generator.ORDER_ATOMIC) || '0'
+    var type = this.getFieldValue('type');
+    var code = '(' + params + ',"' + type + '",' + des +')';
+    return [code, generator.ORDER_ATOMIC];
 }