From 0d9fbc7a21ada20285a12b2acd13a32f50091b61 Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Thu, 29 May 2025 11:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E8=BD=BD=E6=99=BA=E8=83=BD=20?=
=?UTF-8?q?=E5=9B=BE=E5=83=8F=E5=A4=84=E7=90=86=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
boards/default_src/micropython/blocks/ai_local.js | 13 +++++++++++++
.../micropython/blocks/display_onboard.js | 11 +++++++++++
.../default_src/micropython/generators/ai_local.js | 6 ++++++
.../micropython/generators/display_onboard.js | 7 +++++++
boards/default_src/micropython_esp32s3/template.xml | 1 +
common/msg/blockly/zh-hans.js | 2 +-
6 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/boards/default_src/micropython/blocks/ai_local.js b/boards/default_src/micropython/blocks/ai_local.js
index 1e2c199d..33bfd516 100644
--- a/boards/default_src/micropython/blocks/ai_local.js
+++ b/boards/default_src/micropython/blocks/ai_local.js
@@ -322,6 +322,19 @@ export const AI_CAMERA_INIT = {
}
};
+
+export const GET_QR_CODE_RECOGNITION_DATA = {
+ init: function () {
+ this.setColour(AI_LOCAL_GRAPH_HUE);
+ this.appendValueInput('SUB')
+ .setCheck("var");
+ this.appendDummyInput()
+ .appendField(Blockly.Msg.MIXLY_GET_QR_CODE_RECOGNITION_RESULT);
+ this.setOutput(true);
+ this.setInputsInline(true);
+ }
+};
+
export const GET_COLOR_DETECTION_NUM = {
init: function () {
this.setColour(AI_LOCAL_GRAPH_HUE);
diff --git a/boards/default_src/micropython/blocks/display_onboard.js b/boards/default_src/micropython/blocks/display_onboard.js
index a5ecb4d9..fc655bdc 100644
--- a/boards/default_src/micropython/blocks/display_onboard.js
+++ b/boards/default_src/micropython/blocks/display_onboard.js
@@ -376,6 +376,17 @@ export const display_clear = {
}
};
+export const display_available = {
+ init: function () {
+ this.setColour(DISPLAY_ONBOARD_HUE);
+ this.appendDummyInput()
+ .appendField(Blockly.Msg.MIXLY_SHOW + Blockly.Msg.MIXLY_DISPLAY_MATRIX_WRITE_NOW);
+ this.setPreviousStatement(true, null);
+ this.setNextStatement(true, null);
+ this.setInputsInline(true);
+ }
+};
+
/**
* @deprecated To be removed in the future
*/
diff --git a/boards/default_src/micropython/generators/ai_local.js b/boards/default_src/micropython/generators/ai_local.js
index 946d7bfc..85db7da9 100644
--- a/boards/default_src/micropython/generators/ai_local.js
+++ b/boards/default_src/micropython/generators/ai_local.js
@@ -137,6 +137,12 @@ export const AI_CAMERA_INIT = function (_, generator) {
return code;
}
+export const GET_QR_CODE_RECOGNITION_DATA = function (_, generator) {
+ var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
+ var code = sub + '.code_recognitionn()';
+ return [code, generator.ORDER_ATOMIC];
+}
+
export const GET_COLOR_DETECTION_NUM = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var color = this.getFieldValue('color');
diff --git a/boards/default_src/micropython/generators/display_onboard.js b/boards/default_src/micropython/generators/display_onboard.js
index a66c27fa..578369f0 100644
--- a/boards/default_src/micropython/generators/display_onboard.js
+++ b/boards/default_src/micropython/generators/display_onboard.js
@@ -263,6 +263,13 @@ export const display_clear = function (block, generator) {
return code;
}
+export const display_available = function (block, generator) {
+ var version = Boards.getSelectedBoardKey().split(':')[2];
+ generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft";
+ var code = 'onboard_tft.write()\n';
+ return code;
+}
+
export const image_arithmetic = function (a, generator) {
var version = Boards.getSelectedBoardKey().split(':')[2];
generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix";
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index b7170b8b..7813b4f3 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -2170,6 +2170,7 @@
+
diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js
index 76d11c8f..aa7861a0 100644
--- a/common/msg/blockly/zh-hans.js
+++ b/common/msg/blockly/zh-hans.js
@@ -4095,7 +4095,7 @@ ZhHans.MIXLY_GET_PICTURE_DATA = '获取图像数据';
ZhHans.MIXlY_SCREEN_SHOW_CAM_SHOOT = '屏幕显示摄像头采集图像';
ZhHans.MIXlY_STOP_SCREEN_DISPLAY = '关闭摄像头采集图像LCD实时显示';
ZhHans.MIXLY_RECOGNITION = '检测';
-// ZhHans.MIXLY_GET_QR_CODE_RECOGNITION_RESULT = '获取二维码检测结果';
+ZhHans.MIXLY_GET_QR_CODE_RECOGNITION_RESULT = '获取二维码检测结果';
// ZhHans.MIXLY_GET_QR_CODE_RECOGNITION_RESULT_TOOLTIP = '无检测结果返回None,有结果左上角出现绿色小方块,并返回二维码信息。'
ZhHans.COLOUR_RGB_GREY = "灰色";
ZhHans.MIXLY_CUSTOM_STUDY = "自定义学习";