From e3d4f39097ad30d42670a50c1e0afb77b228c655 Mon Sep 17 00:00:00 2001 From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com> Date: Thu, 20 Feb 2025 13:04:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=93=9D=E7=89=99=E9=94=AE?= =?UTF-8?q?=E9=BC=A0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micropython/blocks/actuator_onboard.js | 16 ++++++++-------- common/msg/blockly/en.js | 1 + common/msg/blockly/zh-hans.js | 1 + common/msg/blockly/zh-hant.js | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/boards/default_src/micropython/blocks/actuator_onboard.js b/boards/default_src/micropython/blocks/actuator_onboard.js index 6b5785fa..60433909 100644 --- a/boards/default_src/micropython/blocks/actuator_onboard.js +++ b/boards/default_src/micropython/blocks/actuator_onboard.js @@ -1522,7 +1522,7 @@ export const analog_ble_keyboard_mouse_init = { init: function () { this.setColour(ACTUATOR_ONBOARD_HUE); this.appendDummyInput() - .appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_KEYBOARD + Blockly.Msg.MIXLY_MOUSE); + .appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE); this.appendValueInput('kname') .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_SYSTEM_DEVICE_NAME); this.setPreviousStatement(true); @@ -1535,7 +1535,7 @@ export const ble_keyboard_mouse_get_mac = { init: function () { this.setColour(ACTUATOR_ONBOARD_HUE); this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_KEYBOARD + Blockly.Msg.MIXLY_MOUSE + Blockly.Msg.MIXLY_BELONG + Blockly.Msg.MIXLY_ETHERNET_MAC_ADDRESS); + .appendField(Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE + Blockly.Msg.MIXLY_BELONG + Blockly.Msg.MIXLY_ETHERNET_MAC_ADDRESS); this.setOutput(true); this.setInputsInline(true); } @@ -1545,7 +1545,7 @@ export const ble_keyboard_mouse_connect = { init: function () { this.setColour(ACTUATOR_ONBOARD_HUE); this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_KEYBOARD + Blockly.Msg.MIXLY_MOUSE + Blockly.Msg.MIXLY_IS_CONNECT); + .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE + Blockly.Msg.MIXLY_IS_CONNECT); this.setOutput(true); this.setInputsInline(true); } @@ -1555,7 +1555,7 @@ export const analog_ble_keyboard_mouse_send_battery = { init: function () { this.setColour(ACTUATOR_ONBOARD_HUE); this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_KEYBOARD + Blockly.Msg.MIXLY_MOUSE); + .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE); this.appendValueInput('battery') .appendField(Blockly.Msg.MIXLY_SEND_KEYBOARD + Blockly.Msg.MIXLY_MOUSE + Blockly.Msg.MIXLY_BELONG + Blockly.Msg.MIXLY_BATTERY + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO); this.appendDummyInput() @@ -1570,7 +1570,7 @@ export const analog_ble_keyboard_mouse_input = { init: function () { this.setColour(ACTUATOR_ONBOARD_HUE); this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_KEYBOARD + Blockly.Msg.MIXLY_MOUSE) + .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE) .appendField(Blockly.Msg.MIXLY_SEND_KEYBOARD); this.appendValueInput('special'); this.appendValueInput('general'); @@ -1591,7 +1591,7 @@ export const analog_ble_keyboard_mouse_str = { init: function () { this.setColour(ACTUATOR_ONBOARD_HUE); this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_KEYBOARD + Blockly.Msg.MIXLY_MOUSE); + .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE); this.appendValueInput('str') .appendField(Blockly.Msg.MIXLY_SEND_KEYBOARD + Blockly.Msg.MIXLY_STR_PRINT); this.appendValueInput('time') @@ -1608,7 +1608,7 @@ export const analog_ble_mouse_keyboard_input = { init: function () { this.setColour(ACTUATOR_ONBOARD_HUE); this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG+ Blockly.Msg.MIXLY_KEYBOARD + Blockly.Msg.MIXLY_MOUSE) + .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE) .appendField(Blockly.Msg.MIXLY_SEND + Blockly.Msg.MIXLY_MOUSE_INPUT); this.appendValueInput('key'); this.appendValueInput('x') @@ -1626,7 +1626,7 @@ export const analog_ble_mouse_keyboard_input = { this.setPreviousStatement(true); this.setNextStatement(true); this.setInputsInline(true); - this.setTooltip(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_KEYBOARD_INPUT); + this.setTooltip(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.ANALOG + Blockly.Msg.MIXLY_MOUSE_INPUT); } }; //educore actuator diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js index 646addb8..08c606e9 100644 --- a/common/msg/blockly/en.js +++ b/common/msg/blockly/en.js @@ -3908,4 +3908,5 @@ En.MIXLY_RFID_SCAN_NOTAGERR = 'no card response'; En.MIXLY_RFID_SCAN_ERROR = 'card error'; En.MIXLY_WEIGH_SENSOR = 'Load cell'; En.MIXLY_Calibration_ratio = 'Calibration ratio'; +En.MIXLY_KEYBOARD_AND_MOUSE = "keyboard and mouse " })(); diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js index 5ba562f8..db6cee40 100644 --- a/common/msg/blockly/zh-hans.js +++ b/common/msg/blockly/zh-hans.js @@ -4062,4 +4062,5 @@ ZhHans.MIXLY_RFID_SCAN_NOTAGERR = '卡无反应'; ZhHans.MIXLY_RFID_SCAN_ERROR = '卡错误'; ZhHans.MIXLY_WEIGH_SENSOR = '称重传感器'; ZhHans.MIXLY_Calibration_ratio = '校准比例'; +ZhHans.MIXLY_KEYBOARD_AND_MOUSE = '键鼠'; })(); \ No newline at end of file diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js index 3be37c91..42ea11fd 100644 --- a/common/msg/blockly/zh-hant.js +++ b/common/msg/blockly/zh-hant.js @@ -3912,4 +3912,5 @@ ZhHant.MIXLY_RFID_SCAN_NOTAGERR = '卡無反應'; ZhHant.MIXLY_RFID_SCAN_ERROR = '卡錯誤'; ZhHant.MIXLY_WEIGH_SENSOR = '稱重傳感器'; ZhHant.MIXLY_Calibration_ratio = '校準比例'; +ZhHant.MIXLY_KEYBOARD_AND_MOUSE = '鍵鼠'; })();