From a3dbab66e129ef8fb721644ee86e37591ddce246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Mon, 24 Mar 2025 14:54:45 +0800 Subject: [PATCH] =?UTF-8?q?Update(boards):=20=E4=B8=BA=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=9D=97=E6=B7=BB=E5=8A=A0deprecated=E6=A0=87=E5=BF=97?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E5=9C=A8=E6=9C=AA=E6=9D=A5=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micropython/blocks/display_onboard.js | 105 +++++++++++++++--- .../micropython/generators/display_onboard.js | 46 ++++++-- 2 files changed, 126 insertions(+), 25 deletions(-) diff --git a/boards/default_src/micropython/blocks/display_onboard.js b/boards/default_src/micropython/blocks/display_onboard.js index f0188a1c..7e3e2620 100644 --- a/boards/default_src/micropython/blocks/display_onboard.js +++ b/boards/default_src/micropython/blocks/display_onboard.js @@ -832,8 +832,6 @@ export const mpython_pbm_image = { ["Water_level_1", "Water_level_1"], ["Water_level_2", "Water_level_2"], ["Water_level_3", "Water_level_3"], - - ], "type": "field_dropdown" } @@ -941,19 +939,6 @@ export const bitbot_display_image_create = { } }; -//mixgo_nova onboard tft below: -export const onboard_tft_show_image = { - init: function () { - this.setColour(DISPLAY_ONBOARD_HUE); - this.appendValueInput('data') - .appendField(Blockly.Msg.OLED_BITMAP); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setInputsInline(true); - this.setTooltip(Blockly.Msg.OLED_BITMAP_OR_STRING); - } -}; - export const onboard_tft_show_image_xy = { init: function () { this.setColour(DISPLAY_ONBOARD_HUE); @@ -1368,4 +1353,94 @@ export const draw_pointer = { this.setInputsInline(true); this.setTooltip(Blockly.Msg.DRAW_POINTER_TOOLTIP); } +}; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_show_image = { + init: function () { + this.setColour(DISPLAY_ONBOARD_HUE); + this.appendValueInput('data') + .appendField(Blockly.Msg.OLED_BITMAP); + this.appendDummyInput() + .appendField(`(${Blockly.Msg.MIXLY_DEPRECATED})`); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + this.setInputsInline(true); + this.setTooltip(Blockly.Msg.OLED_BITMAP_OR_STRING); + this.setWarningText(Blockly.Msg.MIXLY_DEPRECATED_WARNING_TEXT); + } +}; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_scroll_string = { + init: function () { + display_scroll_string.init.call(this); + this.appendDummyInput() + .appendField(`(${Blockly.Msg.MIXLY_DEPRECATED})`); + this.setWarningText(Blockly.Msg.MIXLY_DEPRECATED_WARNING_TEXT); + } +}; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_show_frame_string = { + init: function () { + display_show_frame_string.init.call(this); + this.appendDummyInput() + .appendField(`(${Blockly.Msg.MIXLY_DEPRECATED})`); + this.setWarningText(Blockly.Msg.MIXLY_DEPRECATED_WARNING_TEXT); + } +}; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_shift = { + init: function () { + display_shift.init.call(this); + this.appendDummyInput() + .appendField(`(${Blockly.Msg.MIXLY_DEPRECATED})`); + this.setWarningText(Blockly.Msg.MIXLY_DEPRECATED_WARNING_TEXT); + } +}; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_get_screen_pixel = { + init: function () { + display_get_screen_pixel.init.call(this); + this.appendDummyInput() + .appendField(`(${Blockly.Msg.MIXLY_DEPRECATED})`); + this.setWarningText(Blockly.Msg.MIXLY_DEPRECATED_WARNING_TEXT); + } +}; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_bright_screen = { + init: function () { + display_bright_screen.init.call(this); + this.appendDummyInput() + .appendField(`(${Blockly.Msg.MIXLY_DEPRECATED})`); + this.setWarningText(Blockly.Msg.MIXLY_DEPRECATED_WARNING_TEXT); + } +}; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_clear = { + init: function () { + display_clear.init.call(this); + this.appendDummyInput() + .appendField(`(${Blockly.Msg.MIXLY_DEPRECATED})`); + this.setWarningText(Blockly.Msg.MIXLY_DEPRECATED_WARNING_TEXT); + } }; \ No newline at end of file diff --git a/boards/default_src/micropython/generators/display_onboard.js b/boards/default_src/micropython/generators/display_onboard.js index 66b5962f..01ac7486 100644 --- a/boards/default_src/micropython/generators/display_onboard.js +++ b/boards/default_src/micropython/generators/display_onboard.js @@ -659,15 +659,6 @@ export const bitbot_display_image_create = function (block, generator) { return [code, generator.ORDER_ATOMIC]; } -//mixgo_nova onboard tft below: -export const onboard_tft_show_image = 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 code = "onboard_tft.image(" + data + ", color=0xffff)\n"; - return code; -} - export const onboard_tft_show_image_xy = function (_, generator) { var version = Boards.getSelectedBoardKey().split(':')[2]; generator.definitions_['import_' + version + '_onboard_tft'] = "from " + version + " import onboard_tft"; @@ -945,4 +936,39 @@ export const draw_pointer = function(_, generator) { var angle = generator.valueToCode(this, 'angle', generator.ORDER_ASSIGNMENT); var code = "onboard_matrix.pointern(angle=" + angle + ")\n"; return code; -} \ No newline at end of file +} + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_show_image = display_show_image; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_scroll_string = display_scroll_string; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_show_frame_string = display_get_screen_pixel; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_shift = display_shift; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_get_screen_pixel = display_get_screen_pixel; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_bright_screen = display_bright_screen; + +/** + * @deprecated To be removed in the future + */ +export const onboard_tft_clear = display_clear; \ No newline at end of file