diff --git a/boards/default_src/micropython/generators/display_onboard.js b/boards/default_src/micropython/generators/display_onboard.js index 8b2fd21d..a880ea3b 100644 --- a/boards/default_src/micropython/generators/display_onboard.js +++ b/boards/default_src/micropython/generators/display_onboard.js @@ -22,6 +22,9 @@ export const display_show_image_or_string_delay = function (_, generator) { generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; var code = "onboard_tft.shows(" + data + ",space = " + space + ',center = ' + op + ")\n"; return code; + }else if (version == "educore"){ + generator.definitions_['import_' + version + 'oled'] = "from " + version + " import oled"; + var code = "oled.print(" + data + ',space = ' + space + ',center = ' + op + ")\n"; } generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var code = "onboard_matrix.shows(" + data + ',space = ' + space + ',center = ' + op + ")\n"; @@ -30,7 +33,7 @@ export const display_show_image_or_string_delay = function (_, generator) { export const display_show_frame_string = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - if (version == 'mpython') { + if (version == 'mpython' || version == 'educore') { generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var code = "onboard_oled.frame(" + data + ")\n"; @@ -44,16 +47,22 @@ export const display_show_frame_string = function (_, generator) { export const display_show_frame_string_delay = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT); - var code = "onboard_matrix.frame(" + data + ',delay = ' + time + ")\n"; + if (version == 'mpython' || version == 'educore') { + generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; + var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); + var code = "onboard_oled.frame(" + data + ',delay = ' + time + ")\n"; + } else { + generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; + var code = "onboard_matrix.frame(" + data + ',delay = ' + time + ")\n"; + } return code; } export const display_scroll_string = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - if (version == 'mpython') { + if (version == 'mpython'|| version == 'educore') { generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var code = "onboard_oled.scroll(" + data + ")\n"; @@ -67,11 +76,16 @@ export const display_scroll_string = function (_, generator) { export const display_scroll_string_delay = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT); var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT); - var code = "onboard_matrix.scroll(" + data + ',speed =' + time + ',space = ' + space + ")\n"; + if (version == 'mpython'|| version == 'educore') { + generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; + var code = "onboard_oled.scroll(" + data + ',speed =' + time + ',space = ' + space + ")\n"; + }else{ + generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; + var code = "onboard_matrix.scroll(" + data + ',speed =' + time + ',space = ' + space + ")\n"; + } return code; } diff --git a/boards/default_src/micropython_educore/blocks/esp32_profile.js b/boards/default_src/micropython_educore/blocks/esp32_profile.js index 9d205de0..8a35635b 100644 --- a/boards/default_src/micropython_educore/blocks/esp32_profile.js +++ b/boards/default_src/micropython_educore/blocks/esp32_profile.js @@ -2,7 +2,7 @@ import { Profile } from 'mixly'; const pins = {}; -pins["Edu Core"] = { +pins["mpython"] = { description: "MicroPython[EDUCORE Edu Core]", digital_pin: Profile.generate(['0-10', '18']), input_pin: Profile.generate(['0-10', '18']), diff --git a/boards/default_src/micropython_educore/template.xml b/boards/default_src/micropython_educore/template.xml index 15c75a21..df566899 100644 --- a/boards/default_src/micropython_educore/template.xml +++ b/boards/default_src/micropython_educore/template.xml @@ -2360,7 +2360,7 @@ - mqtt.mypep.cn + mixio.mixly.cn @@ -2445,117 +2445,7 @@ - - - - - - - wifiname - - - - - wifipassword - - - - - - - mixio.mixly.cn - - - - - - - - - - - - mixio.mixly.cn - - - - - A1B2C3 - - - - - - - mixio.mixly.cn - - - - - username - - - - - password - - - - - MyProject - - - - - - - topic - - - - - msg - - - - - - - topic - - - - - method - - - - - - - - - - method - - - - - EQ - - - msg - - - - - 1 - - - - - - + @@ -2648,7 +2517,7 @@ - + --> diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js index 8c5dabf3..e0c646d8 100644 --- a/common/msg/blockly/zh-hans.js +++ b/common/msg/blockly/zh-hans.js @@ -168,7 +168,7 @@ ZhHans.MSG = { catAudio: "音频", catNeopixel: "RGB灯", catOneWire: "OneWire通信", - catBLE: "蓝牙传透", + catBLE: "蓝牙透传", catBLEC:"蓝牙遥控", catBLEKM:"蓝牙键鼠", catBLE_HID: "外围设备(从机)", diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js index ffd574a0..237edde5 100644 --- a/common/msg/blockly/zh-hant.js +++ b/common/msg/blockly/zh-hant.js @@ -156,7 +156,7 @@ ZhHant.MSG = { catAudio: "音頻", catNeopixel: "RGB燈", catOneWire: "OneWire通信", - catBLE: "藍牙傳透", + catBLE: "藍牙透傳", catBLEC:"藍牙遙控", catBLEKM:"藍牙鍵鼠", catBLE_HID: "外圍設備(從機)",