From c1f0f6b50baec5e9ca27f8aaa7dc0c375c5475ec Mon Sep 17 00:00:00 2001 From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1️⃣字节转16进制字符2️⃣蓝牙3类调整位置3️⃣心知天气参数 默认天 --- .../micropython/generators/weather.js | 20 +-- .../css/color_esp32_mixgo.css | 16 ++ .../micropython_esp32/template.xml | 148 +++++++++-------- .../css/color_esp32c3_mixgocc.css | 16 ++ .../micropython_esp32c2/template.xml | 156 +++++++++--------- boards/default_src/python/blocks/math.js | 4 +- boards/default_src/python/generators/math.js | 3 +- common/msg/blockly/en.js | 6 +- common/msg/blockly/zh-hans.js | 6 +- common/msg/blockly/zh-hant.js | 6 +- 10 files changed, 215 insertions(+), 166 deletions(-) diff --git a/boards/default_src/micropython/generators/weather.js b/boards/default_src/micropython/generators/weather.js index 5bd3c5de..6d4e2f38 100644 --- a/boards/default_src/micropython/generators/weather.js +++ b/boards/default_src/micropython/generators/weather.js @@ -121,12 +121,11 @@ export const Weather_daily_content = function (_, generator) { generator.definitions_['import_seniverse_api*'] = "from seniverse_api import *"; var content = this.getFieldValue('content'); var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC); - var index = day - 1; if (content == 'none') { - var code = 'Weather_daily.analysis()'; + var code = 'Weather_daily.analysis('+day+')'; } else { - var code = 'Weather_daily.analysis(' + index + ',"' + content + '")'; + var code = 'Weather_daily.analysis(' + day + ',"' + content + '")'; } return [code, generator.ORDER_ATOMIC]; }; @@ -135,12 +134,11 @@ export const Air_daily_content = function (_, generator) { generator.definitions_['import_seniverse_api*'] = "from seniverse_api import *"; var content = this.getFieldValue('content'); var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC); - var index = day - 1; if (content == 'none') { - var code = 'Air_daily.analysis()'; + var code = 'Air_daily.analysis('+day+')'; } else { - var code = 'Air_daily.analysis(' + index + ',"' + content + '")'; + var code = 'Air_daily.analysis(' + day + ',"' + content + '")'; } return [code, generator.ORDER_ATOMIC]; }; @@ -149,12 +147,11 @@ export const Geo_sun_content = function (_, generator) { generator.definitions_['import_seniverse_api*'] = "from seniverse_api import *"; var content = this.getFieldValue('content'); var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC); - var index = day - 1; if (content == 'none') { - var code = 'Geo_sun.analysis()'; + var code = 'Geo_sun.analysis('+day+')'; } else { - var code = 'Geo_sun.analysis(' + index + ',"' + content + '")'; + var code = 'Geo_sun.analysis(' + day + ',"' + content + '")'; } return [code, generator.ORDER_ATOMIC]; }; @@ -163,12 +160,11 @@ export const Geo_moon_content = function (_, generator) { generator.definitions_['import_seniverse_api*'] = "from seniverse_api import *"; var content = this.getFieldValue('content'); var day = generator.valueToCode(this, 'day', generator.ORDER_ATOMIC); - var index = day - 1; if (content == 'none') { - var code = 'Geo_moon.analysis()'; + var code = 'Geo_moon.analysis('+day+')'; } else { - var code = 'Geo_moon.analysis(' + index + ',"' + content + '")'; + var code = 'Geo_moon.analysis(' + day + ',"' + content + '")'; } return [code, generator.ORDER_ATOMIC]; }; \ No newline at end of file diff --git a/boards/default_src/micropython_esp32/css/color_esp32_mixgo.css b/boards/default_src/micropython_esp32/css/color_esp32_mixgo.css index b56311c2..9d7b2efc 100644 --- a/boards/default_src/micropython_esp32/css/color_esp32_mixgo.css +++ b/boards/default_src/micropython_esp32/css/color_esp32_mixgo.css @@ -343,4 +343,20 @@ div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(12) > div.blo #catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ background:url('../../../../common/media/mark/requests2.png') no-repeat; background-size: 100% auto; +} +#catBLEC.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni.png') no-repeat; + background-size: 100% auto; +} +#catBLEC.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni2.png') no-repeat; + background-size: 100% auto; +} +#catBLEKM.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni.png') no-repeat; + background-size: 100% auto; +} +#catBLEKM.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni2.png') no-repeat; + background-size: 100% auto; } \ No newline at end of file diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml index 273529a6..15aeafdc 100644 --- a/boards/default_src/micropython_esp32/template.xml +++ b/boards/default_src/micropython_esp32/template.xml @@ -1691,78 +1691,6 @@ - - - - ble_keyboard - - - - - - - - - - - - - - - - - - - Hello, Mixly! - - - - - 10 - - - - - - - 10 - - - - - - - ble_Mouse - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - - - @@ -2978,6 +2906,8 @@ + + @@ -3025,6 +2955,80 @@ + + + + + ble_keyboard + + + + + + + + + + + + + + + + + + + Hello, Mixly! + + + + + 10 + + + + + + + 10 + + + + + + + ble_Mouse + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + + + + diff --git a/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css b/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css index 23d9e78b..74a88796 100644 --- a/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css +++ b/boards/default_src/micropython_esp32c2/css/color_esp32c3_mixgocc.css @@ -357,4 +357,20 @@ div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(12) > div.blo #catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ background:url('../../../../common/media/mark/requests2.png') no-repeat; background-size: 100% auto; +} +#catBLEC.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni.png') no-repeat; + background-size: 100% auto; +} +#catBLEC.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni2.png') no-repeat; + background-size: 100% auto; +} +#catBLEKM.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni.png') no-repeat; + background-size: 100% auto; +} +#catBLEKM.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ + background:url('../../../../common/media/mark/comuni2.png') no-repeat; + background-size: 100% auto; } \ No newline at end of file diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml index a3a9793f..a53ee6ce 100644 --- a/boards/default_src/micropython_esp32c2/template.xml +++ b/boards/default_src/micropython_esp32c2/template.xml @@ -1738,78 +1738,6 @@ - - - - ble_keyboard - - - - - - - - - - - - - - - - - - - Hello, Mixly! - - - - - 10 - - - - - - - 10 - - - - - - - ble_Mouse - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - - - @@ -2676,28 +2604,28 @@ - 1 + 0 - 1 + 0 - 1 + 0 - 1 + 0 @@ -2820,6 +2748,8 @@ + + @@ -2867,6 +2797,80 @@ + + + + + ble_keyboard + + + + + + + + + + + + + + + + + + + Hello, Mixly! + + + + + 10 + + + + + + + 10 + + + + + + + ble_Mouse + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + + + + diff --git a/boards/default_src/python/blocks/math.js b/boards/default_src/python/blocks/math.js index b8d18a05..adbc3258 100644 --- a/boards/default_src/python/blocks/math.js +++ b/boards/default_src/python/blocks/math.js @@ -533,8 +533,8 @@ export const turn_to_int = { init: function () { this.setColour(MATH_HUE); this.appendValueInput('VAR') - .appendField(Blockly.Msg.LANG_MATH_BYTE+Blockly.Msg.MIXLY_TO_INT); + .appendField(Blockly.Msg.LANG_MATH_BYTE+Blockly.Msg.MIXLY_TO_HEX); this.setOutput(true, Number); - this.setTooltip(Blockly.Msg.MIXLY_PYTHON_TOOLTIP_TOINT) + this.setTooltip(Blockly.Msg.MIXLY_PYTHON_TOOLTIP_TOHEX) } }; \ No newline at end of file diff --git a/boards/default_src/python/generators/math.js b/boards/default_src/python/generators/math.js index 53d804ba..b5e95410 100644 --- a/boards/default_src/python/generators/math.js +++ b/boards/default_src/python/generators/math.js @@ -304,6 +304,7 @@ export const text_to_number_skulpt = function (_, generator) { export const base_map = math_map; export const turn_to_int = function (_, generator) { + generator.definitions_.import_hexlify = "from ubinascii import hexlify"; var str = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC); - return ["int(" + str + ')', generator.ORDER_ATOMIC]; + return ["hexlify(" + str + ').decode()', generator.ORDER_ATOMIC]; } \ No newline at end of file diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js index bebd126c..4fd8644a 100644 --- a/common/msg/blockly/en.js +++ b/common/msg/blockly/en.js @@ -156,7 +156,9 @@ En.MSG = { catAudio: "Audio", catNeopixel: "RGB light", catOneWire: "OneWire Communicate", - catBLE: "Bluetooth", + catBLE: "Bluetooth transmission", + catBLEC:"Bluetooth remote control", + catBLEKM:"Bluetooth keyboard and mouse", catBLE_HID: "Peripheral Device (Slave)", catBLE_UART: "Central Device (Host)", catBLE_PERIPHERAL: "Serial port transparent transmission", @@ -3749,4 +3751,6 @@ En.MIXLY_RANGE_OF_BATTERY = "the range of battery level is 0~100%"; En.MIXLY_MOUSE = "mouse"; En.MIXLY_SEND = "send"; En.MIXLY_VARIABLE_UNPACK = "Unpack"; +En.MIXLY_TO_HEX = "Convert hexadecimal characters"; +En.MIXLY_PYTHON_TOOLTIP_TOHEX = "Converts a value to a hexadecimal character"; })(); \ No newline at end of file diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js index 709c2255..a6779e8a 100644 --- a/common/msg/blockly/zh-hans.js +++ b/common/msg/blockly/zh-hans.js @@ -167,7 +167,9 @@ ZhHans.MSG = { catAudio: "音频", catNeopixel: "RGB灯", catOneWire: "OneWire通信", - catBLE: "蓝牙", + catBLE: "蓝牙透传", + catBLEC:"蓝牙遥控", + catBLEKM:"蓝牙键鼠", catBLE_HID: "外围设备(从机)", catBLE_UART: "中心设备(主机)", catBLE_PERIPHERAL: "串口透传", @@ -3897,4 +3899,6 @@ ZhHans.MIXLY_RANGE_OF_BATTERY = "电池的电量范围为 0~100%"; ZhHans.MIXLY_MOUSE = "鼠标"; ZhHans.MIXLY_SEND = "发送"; ZhHans.MIXLY_VARIABLE_UNPACK = "解包"; +ZhHans.MIXLY_TO_HEX = "转16进制字符"; +ZhHans.MIXLY_PYTHON_TOOLTIP_TOHEX = "将一个值转换为一个16进制字符"; })(); \ No newline at end of file diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js index 0202ed51..cf75ad0e 100644 --- a/common/msg/blockly/zh-hant.js +++ b/common/msg/blockly/zh-hant.js @@ -155,7 +155,9 @@ ZhHant.MSG = { catAudio: "音頻", catNeopixel: "RGB燈", catOneWire: "OneWire通信", - catBLE: "藍牙", + catBLE: "藍牙透傳", + catBLEC:"藍牙遙控", + catBLEKM:"藍牙鍵鼠", catBLE_HID: "外圍設備(從機)", catBLE_UART: "中心設備(主機)", catBLE_PERIPHERAL: "串口透傳", @@ -3752,4 +3754,6 @@ ZhHant.MIXLY_RANGE_OF_BATTERY = "電池的電量範圍為 0~100%"; ZhHant.MIXLY_MOUSE = "鼠標"; ZhHant.MIXLY_SEND = "發送"; ZhHant.MIXLY_VARIABLE_UNPACK = "解包"; +ZhHant.MIXLY_TO_HEX = "轉16進制字符"; +ZhHant.MIXLY_PYTHON_TOOLTIP_TOHEX = "將一個值轉換為一個16進制字符"; })(); \ No newline at end of file