diff --git a/boards/default_src/micropython/blocks/display_onboard.js b/boards/default_src/micropython/blocks/display_onboard.js index fd7dfaa7..f0188a1c 100644 --- a/boards/default_src/micropython/blocks/display_onboard.js +++ b/boards/default_src/micropython/blocks/display_onboard.js @@ -59,19 +59,60 @@ export const display_scroll_string_delay = { this.appendValueInput('data') .setCheck(String) .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_MONITOR_SCROLL_STRING); + var version = Boards.getSelectedBoardKey() + if (version == 'micropython:esp32s3:mixgo_nova') { + this.appendValueInput("y") + .setCheck(Number) + .appendField('y'); + this.appendValueInput("size") + .setCheck(Number) + .appendField(Blockly.Msg.MIXLY_TURTLE_WRITE_FONT_NUM); + } this.appendValueInput("space") .setCheck(Number) .appendField(Blockly.Msg.MICROPYTHON_DISPLAY_FONT_SPACE); this.appendValueInput("time") .setCheck(Number) .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_MONITOR_SCROLL_INTERVAL); + if (version == 'micropython:esp32s3:mixgo_nova') { + this.appendValueInput('VAR') + .appendField(Blockly.Msg.HTML_COLOUR); + } this.setPreviousStatement(true, null); this.setNextStatement(true, null); this.setInputsInline(true); + this.setTooltip(Blockly.Msg.MIXLY_ESP32_SCROLL_IMAGE_OR_STRING_DELAY); } }; +export const onboard_tft_scroll_string_delay = { + init: function () { + this.setColour(DISPLAY_ONBOARD_HUE); + this.appendValueInput('data') + .setCheck(String) + .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_MONITOR_SCROLL_STRING); + this.appendValueInput("y") + .setCheck(Number) + .appendField('y'); + this.appendValueInput("size") + .setCheck(Number) + .appendField(Blockly.Msg.MIXLY_TURTLE_WRITE_FONT_NUM); + this.appendValueInput("space") + .setCheck(Number) + .appendField(Blockly.Msg.MICROPYTHON_DISPLAY_FONT_SPACE); + this.appendValueInput("time") + .setCheck(Number) + .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_MONITOR_SCROLL_INTERVAL); + this.appendValueInput('VAR') + .appendField(Blockly.Msg.HTML_COLOUR); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + this.setInputsInline(true); + this.setTooltip(Blockly.Msg.MIXLY_ESP32_SCROLL_IMAGE_OR_STRING_DELAY); + } +}; + export const display_show_frame_string = { init: function () { this.setColour(DISPLAY_ONBOARD_HUE); @@ -969,57 +1010,6 @@ export const onboard_tft_show_image_or_string_delay = { } }; -export const onboard_tft_scroll_string = { - init: function () { - this.setColour(DISPLAY_ONBOARD_HUE); - this.appendValueInput('data') - .setCheck(String) - .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_MONITOR_SCROLL_STRING); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setInputsInline(true); - } -}; - -export const onboard_tft_scroll_string_delay = { - init: function () { - this.setColour(DISPLAY_ONBOARD_HUE); - this.appendValueInput('data') - .setCheck(String) - .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_MONITOR_SCROLL_STRING); - this.appendValueInput("y") - .setCheck(Number) - .appendField('y'); - this.appendValueInput("size") - .setCheck(Number) - .appendField(Blockly.Msg.MIXLY_TURTLE_WRITE_FONT_NUM); - this.appendValueInput("space") - .setCheck(Number) - .appendField(Blockly.Msg.MICROPYTHON_DISPLAY_FONT_SPACE); - this.appendValueInput("time") - .setCheck(Number) - .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_MONITOR_SCROLL_INTERVAL); - this.appendValueInput('VAR') - .appendField(Blockly.Msg.HTML_COLOUR); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setInputsInline(true); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_SCROLL_IMAGE_OR_STRING_DELAY); - } -}; - -export const onboard_tft_show_frame_string = { - init: function () { - this.setColour(DISPLAY_ONBOARD_HUE); - this.appendValueInput('data') - .setCheck(String) - .appendField(Blockly.Msg.MIXLY_ESP32_MONITOR_SHOW_FRAME); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setInputsInline(true); - } -}; - export const onboard_tft_show_frame_string_delay = { init: function () { this.setColour(DISPLAY_ONBOARD_HUE); @@ -1185,47 +1175,6 @@ export const onboard_tft_display_line = { } }; -export const onboard_tft_shift = { - init: function () { - var OPERATORS = [ - [Blockly.Msg.MIXLY_UP, 'shift_up'], - [Blockly.Msg.MIXLY_DOWN, 'shift_down'], - [Blockly.Msg.MIXLY_LEFT, 'shift_left'], - [Blockly.Msg.MIXLY_RIGHT, 'shift_right'], - ]; - //this.setHelpUrl(Blockly.Msg.MATH_TRIG_HELPURL); - this.setColour(DISPLAY_ONBOARD_HUE); - // this.setOutput(true); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.appendDummyInput('') - .appendField(Blockly.Msg.DISPLAY_IMAGE_LET) - this.appendDummyInput('') - .appendField(Blockly.Msg.DISPLAY_IMAGE_LET2) - .appendField(new Blockly.FieldDropdown(OPERATORS), 'OP'); - this.appendValueInput('val') - .appendField(Blockly.Msg.DISPLAY_IMAGE_SHIFT) - .setCheck(Number); - this.appendDummyInput('') - .appendField(Blockly.Msg.DISPLAY_IMAGE_UNIT) - var thisBlock = this; - this.setTooltip(function () { - var mode = thisBlock.getFieldValue('OP'); - var mode0 = Blockly.Msg.DISPLAY_IMAGE_LET; - var mode1 = Blockly.Msg.DISPLAY_IMAGE_LET2; - var mode2 = Blockly.Msg.DISPLAY_IMAGE_LET3; - var TOOLTIPS = { - 'up': Blockly.Msg.MIXLY_UP, - 'down': Blockly.Msg.MIXLY_DOWN, - 'left': Blockly.Msg.MIXLY_LEFT, - 'right': Blockly.Msg.MIXLY_RIGHT - }; - return mode0 + mode1 + TOOLTIPS[mode] + mode2; - }); - } -}; - export const onboard_tft_get_pixel = { init: function () { this.setColour(DISPLAY_ONBOARD_HUE); @@ -1264,44 +1213,6 @@ export const onboard_tft_bright_point = { } }; - - -export const onboard_tft_clear = { - init: function () { - this.setColour(DISPLAY_ONBOARD_HUE); - this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_MICROBIT_Clear_display); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setInputsInline(true); - this.setTooltip(Blockly.Msg.MIXLY_MICROBIT_Clear_display); - } -}; - -export const onboard_tft_get_screen_pixel = { - init: function () { - this.setColour(DISPLAY_ONBOARD_HUE); - this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_ESP32_JS_MONITOR_GET_SCREEN_BRIGHTNESS); - this.setInputsInline(true); - this.setOutput(true, Number); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_JS_MONITOR_GET_SCREEN_BRIGHTNESS); - } -}; - -export const onboard_tft_bright_screen = { - init: function () { - this.setColour(DISPLAY_ONBOARD_HUE); - this.appendValueInput('x') - .setCheck(Number) - .appendField(Blockly.Msg.MIXLY_ESP32_JS_MONITOR_SET_SCREEN_BRIGHTNESS) - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setInputsInline(true); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_JS_MONITOR_SET_SCREEN_BRIGHTNESS + ' 0.0-1.0'); - } -}; - export const onboard_tft_fill = { init: function () { this.setColour(DISPLAY_ONBOARD_HUE); diff --git a/boards/default_src/micropython/generators/display_onboard.js b/boards/default_src/micropython/generators/display_onboard.js index 89e0ad04..66b5962f 100644 --- a/boards/default_src/micropython/generators/display_onboard.js +++ b/boards/default_src/micropython/generators/display_onboard.js @@ -39,18 +39,22 @@ export const display_show_image_or_string_delay = function (_, generator) { export const display_show_frame_string = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; + var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); 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"; - } else { - generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; + } else if(version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_tft"; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); + var code = "onboard_tft.frame(" + data + ",color=0xffff)\n"; + }else { + generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var code = "onboard_matrix.frame(" + data + ")\n"; } return code; } + export const display_show_frame_string_delay = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); @@ -59,6 +63,9 @@ export const display_show_frame_string_delay = function (_, generator) { 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 if(version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var code = "onboard_tft.frame(" + data + ',size = 5 ,delay = ' + time + ',color=0xffff)\n'; } else { generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var code = "onboard_matrix.frame(" + data + ',delay = ' + time + ")\n"; @@ -72,7 +79,11 @@ export const display_scroll_string = function (_, generator) { 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"; - } else { + } else if(version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_tft"; + var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); + var code = "onboard_tft.scroll(" + data + ",color=0xffff)\n"; + }else { generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); var code = "onboard_matrix.scroll(" + data + ")\n"; @@ -88,6 +99,10 @@ export const display_scroll_string_delay = function (_, generator) { 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 if(version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC); + var code = "onboard_tft.scroll(" + data + ',y = 0, size = 5,speed =' + time + ',space = ' + space + ',color= 0xffff )\n'; }else{ generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var code = "onboard_matrix.scroll(" + data + ',speed =' + time + ',space = ' + space + ")\n"; @@ -95,6 +110,29 @@ export const display_scroll_string_delay = function (_, generator) { return code; } +export const onboard_tft_scroll_string_delay = function (_, generator) { + var version = Boards.getSelectedBoardKey().split(':')[2]; + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); + var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT); + var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT); + var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT); + var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT); + var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC); + if (color.slice(0, 2) == "0x") { + var code = "onboard_tft.scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=' + color + ")\n"; + } else { + const rgbValues = color.match(/\d+/g); + const r = parseInt(rgbValues[0]); + const g = parseInt(rgbValues[1]); + const b = parseInt(rgbValues[2]); + var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0"); + var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3; + var code = "onboard_tft.scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=0x' + rgb565.toString(16) + ")\n"; + } + return code; +} + export const display_image_builtins = function (block, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; @@ -182,8 +220,10 @@ export const display_clear = function (block, generator) { if (version == 'mpython') { generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_oled"; var code = 'onboard_oled.fill(0)\n' + 'onboard_oled.show()\n'; - } - else { + }else if(version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var code = 'onboard_tft.fill(0)\n' + 'onboard_tft.show()\n'; + }else { generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var code = 'onboard_matrix.fill(0)\n' + 'onboard_matrix.show()\n'; } @@ -215,7 +255,12 @@ export const display_shift = function (a, generator) { var op = a.getFieldValue("OP"); var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC); var code = 'onboard_oled.' + op + '(' + value + ')\n'; - } else { + } else if(version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var op = a.getFieldValue("OP"); + var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC); + var code = 'onboard_tft.' + op + '(' + value + ')\n'; + }else { generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var op = a.getFieldValue("OP"); var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC); @@ -237,7 +282,13 @@ export const display_get_pixel = function (block, generator) { var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC); var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC); var code = 'onboard_oled.pixel(int(' + value_x + '), int(' + value_y + '))'; - } else { + }else if (version == 'mixgo_nova') { + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC); + var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC); + var code = 'onboard_tft.pixel(int(' + value_x + '), int(' + value_y + '))'; + } + else { generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC); var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC); @@ -248,26 +299,44 @@ export const display_get_pixel = function (block, generator) { export const display_bright_point = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; - var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); - var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT); - var dropdown_stat = generator.valueToCode(this, 'STAT', generator.ORDER_ATOMIC); - var code = 'onboard_matrix.pixel(int(' + x + '), int(' + y + '), ' + dropdown_stat + ")\n" + 'onboard_matrix.show()\n'; + if (version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); + var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT); + var code = 'onboard_tft.pixel(int(' + x + '), int(' + y + '), 0xffff)\n' + 'onboard_tft.show()\n'; + }else { + generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; + var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); + var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT); + var dropdown_stat = generator.valueToCode(this, 'STAT', generator.ORDER_ATOMIC); + var code = 'onboard_matrix.pixel(int(' + x + '), int(' + y + '), ' + dropdown_stat + ")\n" + 'onboard_matrix.show()\n'; + } return code; } export const display_get_screen_pixel = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; - var code = 'onboard_matrix.get_brightness()'; + if (version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var code = 'onboard_tft.get_brightness()'; + }else { + generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; + var code = 'onboard_matrix.get_brightness()'; + } return [code, generator.ORDER_ATOMIC]; } export const display_bright_screen = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; - var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); - var code = 'onboard_matrix.set_brightness(' + x + ')\n'; + if (version == 'mixgo_nova'){ + generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; + var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); + var code = 'onboard_tft.set_brightness(' + x + ')\n'; + }else{ + generator.definitions_['import_' + version + '_onboard_matrix'] = "from " + version + " import onboard_matrix"; + var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); + var code = 'onboard_matrix.set_brightness(' + x + ')\n'; + } return code; } @@ -645,14 +714,6 @@ export const onboard_tft_show_image_or_string_delay = function (_, generator) { return code; } -export const onboard_tft_show_frame_string = function (_, generator) { - var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_tft"; - var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); - var code = "onboard_tft.frame(" + data + ",color=0xffff)\n"; - return code; -} - export const onboard_tft_show_frame_string_delay = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; @@ -674,37 +735,6 @@ export const onboard_tft_show_frame_string_delay = function (_, generator) { return code; } -export const onboard_tft_scroll_string = function (_, generator) { - var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_oled'] = "from " + version + " import onboard_tft"; - var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); - var code = "onboard_tft.scroll(" + data + ",color=0xffff)\n"; - return code; -} - -export const onboard_tft_scroll_string_delay = function (_, generator) { - var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; - var data = generator.valueToCode(this, 'data', generator.ORDER_ASSIGNMENT); - var y = generator.valueToCode(this, 'y', generator.ORDER_ASSIGNMENT); - var size = generator.valueToCode(this, 'size', generator.ORDER_ASSIGNMENT); - var time = generator.valueToCode(this, 'time', generator.ORDER_ASSIGNMENT); - var space = generator.valueToCode(this, 'space', generator.ORDER_ASSIGNMENT); - var color = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC); - if (color.slice(0, 2) == "0x") { - var code = "onboard_tft.scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=' + color + ")\n"; - } else { - const rgbValues = color.match(/\d+/g); - const r = parseInt(rgbValues[0]); - const g = parseInt(rgbValues[1]); - const b = parseInt(rgbValues[2]); - var rgb = "0x" + ((r << 16) + (g << 8) + b).toString(16).padStart(4, "0"); - var rgb565 = (rgb & 0xf80000) >> 8 | (rgb & 0xfc00) >> 5 | (rgb & 0xff) >> 3; - var code = "onboard_tft.scroll(" + data + ',y = ' + y + ',size = ' + size + ',speed =' + time + ',space = ' + space + ',color=0x' + rgb565.toString(16) + ")\n"; - } - return code; -} - export const onboard_tft_display_shape_rect = function (block, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; @@ -772,28 +802,12 @@ export const onboard_tft_display_line = function (block, generator) { return code; } -export const onboard_tft_clear = function (block, generator) { - var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; - var code = 'onboard_tft.fill(0)\n' + 'onboard_tft.show()\n'; - return code; -} - -export const onboard_tft_shift = function (a, generator) { - var version = Boards.getSelectedBoardKey().split(':')[2]; - generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; - var op = a.getFieldValue("OP"); - var value = generator.valueToCode(a, 'val', generator.ORDER_ATOMIC); - var code = 'onboard_tft.' + op + '(' + value + ')\n'; - return code; -} - export const onboard_tft_get_pixel = function (block, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; var value_x = generator.valueToCode(block, 'x', generator.ORDER_ATOMIC); var value_y = generator.valueToCode(block, 'y', generator.ORDER_ATOMIC); - var code = 'hex(onboard_tft.pixel(int(' + value_x + '), int(' + value_y + ')))'; + var code = 'onboard_tft.pixel(int(' + value_x + '), int(' + value_y + '))'; return [code, generator.ORDER_ATOMIC]; } @@ -817,21 +831,6 @@ export const onboard_tft_bright_point = function (_, generator) { return code; } -export const onboard_tft_get_screen_pixel = function (_, generator) { - var version = Boards.getSelectedBoardKey().split(':')[2] - generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; - var code = 'onboard_tft.get_brightness()'; - return [code, generator.ORDER_ATOMIC]; -} - -export const onboard_tft_bright_screen = function (_, generator) { - var version = Boards.getSelectedBoardKey().split(':')[2] - generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; - var x = generator.valueToCode(this, 'x', generator.ORDER_ASSIGNMENT); - var code = 'onboard_tft.set_brightness(' + x + ')\n'; - return code; -} - export const onboard_tft_fill = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2] generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml index 284d1d69..4415e0c8 100644 --- a/boards/default_src/micropython_esp32c2/template.xml +++ b/boards/default_src/micropython_esp32c2/template.xml @@ -1827,7 +1827,6 @@ - 1 @@ -1835,7 +1834,6 @@ - diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml index e2096d17..46667f8d 100644 --- a/boards/default_src/micropython_esp32s3/template.xml +++ b/boards/default_src/micropython_esp32s3/template.xml @@ -1921,7 +1921,7 @@ - + Mixly @@ -1963,7 +1963,7 @@ - + Mixly @@ -2105,8 +2105,7 @@ - - + 1 @@ -2114,7 +2113,6 @@ - 0 @@ -2146,9 +2144,8 @@ - - - + + 0.5 @@ -2156,7 +2153,6 @@ - #ffffff @@ -2166,7 +2162,7 @@ - +