18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改外接显示-OLED显示屏 初始化

Browse Source
This commit is contained in:
Irene-Maxine
2024-11-19 15:36:02 +08:00
parent e5dfaa8a2c
commit 8a9ac316d8
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
boards/default_src/micropython/blocks/display_extern.js
View File

@@ -1175,12 +1175,6 @@ 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);
@@ -1301,10 +1295,15 @@ export const display_oled_use_i2c_init = {
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO + 'oled128x64')
this.appendValueInput("ADDR")
.setCheck(Number)
.appendField(Blockly.Msg.MQTT_SERVER_ADD);
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_DRIVER)
.appendField(new Blockly.FieldDropdown([
['SSD1306','0'],
['SSD1315','1']
]),'driver');
this.setInputsInline(true);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);

6
boards/default_src/micropython/generators/display_extern.js
View File

@@ -509,10 +509,9 @@ 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 + ',types=' + m +')\n';
code = v + ' = i2clcd.LCD' + "(" + iv + ',lcd_width=' + key + ',i2c_addr=' + addr +')\n';
return code;
}
@@ -557,6 +556,7 @@ export const display_oled_use_i2c_init = function (_, generator) {
var v = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var iv = generator.valueToCode(this, 'I2CSUB', generator.ORDER_ATOMIC);
var addr = generator.valueToCode(this, 'ADDR', generator.ORDER_ATOMIC);
var m =this.getFieldValue("driver");
var version = Boards.getSelectedBoardKey().split(':')[2]
var font = '';
if (['mpython', 'mixgo_pe', 'mixgo_nova'].indexOf(version) >= 0) {
@@ -568,7 +568,7 @@ export const display_oled_use_i2c_init = function (_, generator) {
}
var code;
generator.definitions_['import_oled128x64'] = 'import oled128x64';
code = v + ' = oled128x64.OLED' + "(" + iv + ',address=' + addr + ',font_address=' + font + ')\n';
code = v + ' = oled128x64.OLED' + "(" + iv + ',address=' + addr + ',font_address=' + font + ',types='+m+')\n';
return code;
}

2
common/msg/blockly/en.js
View File

@@ -3788,5 +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';
En.MIXLY_DRIVER = 'driver';
})();

2
common/msg/blockly/zh-hans.js
View File

@@ -3941,5 +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 = '驱动';
ZhHans.MIXLY_DRIVER = '驱动';
})();

2
common/msg/blockly/zh-hant.js
View File

@@ -3791,5 +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 = '驅動';
ZhHant.MIXLY_DRIVER = '驅動';
})();