From aed474ea6fffc5964af2dca9334b45abbb3cdd24 Mon Sep 17 00:00:00 2001 From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:07:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E6=8E=A5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA-OLED=E6=98=BE=E7=A4=BA=E5=B1=8F=20=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boards/default_src/micropython/blocks/display_extern.js | 6 ++++++ boards/default_src/micropython/generators/display_extern.js | 3 ++- common/msg/blockly/en.js | 1 + common/msg/blockly/zh-hans.js | 1 + common/msg/blockly/zh-hant.js | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/boards/default_src/micropython/blocks/display_extern.js b/boards/default_src/micropython/blocks/display_extern.js index 1443fcf8..732b6845 100644 --- a/boards/default_src/micropython/blocks/display_extern.js +++ b/boards/default_src/micropython/blocks/display_extern.js @@ -1175,6 +1175,12 @@ export const display_lcd_use_i2c_init = { this.appendValueInput("ADDR") .setCheck(Number) .appendField(Blockly.Msg.MQTT_SERVER_ADD); + this.appendDummyInput("") + .appendField(Blockly.Msg.MIXLY_MOTOR_M) + .appendField(new Blockly.FieldDropdown([ + ['SSD1306','0'], + ['SSD1315','1'] + ]),'motor'); this.setInputsInline(true); this.setPreviousStatement(true, null); this.setNextStatement(true, null); diff --git a/boards/default_src/micropython/generators/display_extern.js b/boards/default_src/micropython/generators/display_extern.js index 1d900065..39e0fb4b 100644 --- a/boards/default_src/micropython/generators/display_extern.js +++ b/boards/default_src/micropython/generators/display_extern.js @@ -509,9 +509,10 @@ export const display_lcd_use_i2c_init = function (_, generator) { var iv = generator.valueToCode(this, 'I2CSUB', generator.ORDER_ATOMIC); var key = this.getFieldValue("key"); var addr = generator.valueToCode(this, 'ADDR', generator.ORDER_ATOMIC); + var m =this.getFieldValue("motor"); var code; generator.definitions_['import_i2clcd'] = 'import i2clcd'; - code = v + ' = i2clcd.LCD' + "(" + iv + ',lcd_width=' + key + ',i2c_addr=' + addr + ')\n'; + code = v + ' = i2clcd.LCD' + "(" + iv + ',lcd_width=' + key + ',i2c_addr=' + addr + ',types=' + m +')\n'; return code; } diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js index ad1f5f98..2d10a62d 100644 --- a/common/msg/blockly/en.js +++ b/common/msg/blockly/en.js @@ -3788,4 +3788,5 @@ En.MIXLY_RADIO_FREQUENCY_READER = "radio frequency reader"; En.MIXLY_NINE_AXIS_SENSOR ='nine-axis sensor'; En.MIXLY_RADAR_SENSOR = 'microwave radar sensor'; En.MIXLY_PLAYER_PLAY_MUSIC_TOOTIP = 'Track input parameter:int type used to denote a song track(The sequence of tracks is the first to be placed on the USB flash drive.); str type used to represent the short file name of the song(Default mixly*.mp3, does not support Chinese, can be * omitted)'; +En.MIXLY_MOTOR_M = 'motor'; })(); diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js index bf4926ee..65506fba 100644 --- a/common/msg/blockly/zh-hans.js +++ b/common/msg/blockly/zh-hans.js @@ -3941,4 +3941,5 @@ ZhHans.MIXLY_RADIO_FREQUENCY_READER = "无线射频读写器"; ZhHans.MIXLY_NINE_AXIS_SENSOR ='九轴传感器'; ZhHans.MIXLY_RADAR_SENSOR = '微波雷达传感器'; ZhHans.MIXLY_PLAYER_PLAY_MUSIC_TOOTIP = '曲目输入参数:int类型用来表示歌曲曲目(曲目顺序为放进去U盘的先后), str类型用来表示歌曲短文件名(默认mixly*.mp3,不支持中文,可用*省略)'; +ZhHans.MIXLY_MOTOR_M = '驱动'; })(); \ No newline at end of file diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js index 038be088..0c7c4d8f 100644 --- a/common/msg/blockly/zh-hant.js +++ b/common/msg/blockly/zh-hant.js @@ -3791,4 +3791,5 @@ ZhHant.MIXLY_RADIO_FREQUENCY_READER = "無線頻射讀寫器"; ZhHant.MIXLY_NINE_AXIS_SENSOR ='九軸傳感器'; ZhHant.MIXLY_RADAR_SENSOR = '微波雷達傳感器'; ZhHant.MIXLY_PLAYER_PLAY_MUSIC_TOOTIP = '曲目輸入參數:int類型用來表示歌曲曲目(曲目順序為放進去U盤的先後), str類型用來表示歌曲短文件名(默認mixly*.mp3,不支持中文,可用*省略)'; +ZhHant.MIXLY_MOTOR_M = '驅動'; })(); \ No newline at end of file