From 4faa7e8a885f419a4b6423c2a0b83c5819b99f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Tue, 15 Oct 2024 11:13:07 +0800 Subject: [PATCH] =?UTF-8?q?Update(boards):=20micropython=E6=9D=BF=E5=8D=A1?= =?UTF-8?q?=E4=B8=8B=E7=A7=BB=E9=99=A4=E4=B8=80=E4=BA=9B=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E8=A6=86=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micropython_esp32c2/blocks/inout.js | 49 ------------------- .../micropython_esp32c2/generators/inout.js | 18 ------- .../micropython_esp32c3/blocks/inout.js | 49 ------------------- .../micropython_esp32c3/generators/inout.js | 18 ------- .../micropython_esp32s2/blocks/inout.js | 49 ------------------- .../micropython_esp32s2/generators/inout.js | 18 ------- .../micropython_esp32s3/blocks/inout.js | 49 ------------------- .../micropython_esp32s3/generators/inout.js | 18 ------- 8 files changed, 268 deletions(-) diff --git a/boards/default_src/micropython_esp32c2/blocks/inout.js b/boards/default_src/micropython_esp32c2/blocks/inout.js index 97343435..0b008aab 100644 --- a/boards/default_src/micropython_esp32c2/blocks/inout.js +++ b/boards/default_src/micropython_esp32c2/blocks/inout.js @@ -84,21 +84,6 @@ export const inout_analog_write_set = { } }; -export const inout_analog_read = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET) - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - .setCheck(Number); - this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_ESP32_MACHINE_VALUE) - this.setInputsInline(true); - this.setOutput(true, Number); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_TOOLTIP); - } -}; - export const inout_analog_atten = { init: function () { this.setColour(BASE_HUE); @@ -225,40 +210,6 @@ export const inout_analog_write_init = { } }; -export const inout_analog_read_init = { - init: function () { - this.setColour(BASE_HUE); - // this.appendValueInput("PIN", Number) - // .appendField(Blockly.Msg.MIXLY_SETUP) - // .appendField("PWM"+Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .setCheck(Number); - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_SETUP) - .appendField(new Blockly.FieldTextInput('adc#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - // .appendField('adc') - // .appendField(new Blockly.FieldDropdown(profile.default.adc_pin),"PIN") - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_PIN) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'adc#' ? null : this.getFieldValue('PIN_OBJ')]; - }, - renameVar: function (oldName, newName) { - if (Blockly.Names.equals(oldName, this.getFieldValue('PIN_OBJ'))) { - this.setTitleValue(newName, 'PIN_OBJ'); - } - } -}; - export const inout_pin_pressed_init = { init: function () { this.setColour(BASE_HUE); diff --git a/boards/default_src/micropython_esp32c2/generators/inout.js b/boards/default_src/micropython_esp32c2/generators/inout.js index b6facc3a..be1d5ea8 100644 --- a/boards/default_src/micropython_esp32c2/generators/inout.js +++ b/boards/default_src/micropython_esp32c2/generators/inout.js @@ -48,15 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -//ok -export const inout_analog_read = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //generator.setups_['setup_input_'+dropdown_pin] = 'pinMode('+dropdown_pin+', INPUT);'; - var code = dropdown_pin + '.read()'; - return [code, generator.ORDER_ATOMIC]; -} - //ok export const inout_pin_pressed = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -98,15 +89,6 @@ export const inout_analog_write_init = function (_, generator) { return code; } -export const inout_analog_read_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'adc#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'adc#') ? 'adc' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.ADC(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - export const inout_analog_atten = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); diff --git a/boards/default_src/micropython_esp32c3/blocks/inout.js b/boards/default_src/micropython_esp32c3/blocks/inout.js index c71ce8c6..5f2d1a97 100644 --- a/boards/default_src/micropython_esp32c3/blocks/inout.js +++ b/boards/default_src/micropython_esp32c3/blocks/inout.js @@ -81,21 +81,6 @@ export const inout_analog_write_set = { } }; -export const inout_analog_read = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET) - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - .setCheck(Number); - this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_ESP32_MACHINE_VALUE) - this.setInputsInline(true); - this.setOutput(true, Number); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_TOOLTIP); - } -}; - export const inout_analog_atten = { init: function () { this.setColour(BASE_HUE); @@ -222,40 +207,6 @@ export const inout_analog_write_init = { } }; -export const inout_analog_read_init = { - init: function () { - this.setColour(BASE_HUE); - // this.appendValueInput("PIN", Number) - // .appendField(Blockly.Msg.MIXLY_SETUP) - // .appendField("PWM"+Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .setCheck(Number); - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_SETUP) - .appendField(new Blockly.FieldTextInput('adc#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - // .appendField('adc') - // .appendField(new Blockly.FieldDropdown(profile.default.adc_pin),"PIN") - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_PIN) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'adc#' ? null : this.getFieldValue('PIN_OBJ')]; - }, - renameVar: function (oldName, newName) { - if (Blockly.Names.equals(oldName, this.getFieldValue('PIN_OBJ'))) { - this.setTitleValue(newName, 'PIN_OBJ'); - } - } -}; - export const inout_pin_pressed_init = { init: function () { this.setColour(BASE_HUE); diff --git a/boards/default_src/micropython_esp32c3/generators/inout.js b/boards/default_src/micropython_esp32c3/generators/inout.js index 62320f11..e6dcb9ee 100644 --- a/boards/default_src/micropython_esp32c3/generators/inout.js +++ b/boards/default_src/micropython_esp32c3/generators/inout.js @@ -48,15 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -// ok -export const inout_analog_read = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //generator.setups_['setup_input_'+dropdown_pin] = 'pinMode('+dropdown_pin+', INPUT);'; - var code = dropdown_pin + '.read()'; - return [code, generator.ORDER_ATOMIC]; -} - // ok export const inout_pin_pressed = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -98,15 +89,6 @@ export const inout_analog_write_init = function (_, generator) { return code; } -export const inout_analog_read_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'adc#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'adc#') ? 'adc' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.ADC(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - export const inout_analog_atten = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); diff --git a/boards/default_src/micropython_esp32s2/blocks/inout.js b/boards/default_src/micropython_esp32s2/blocks/inout.js index 6b2e74c5..e9aa5243 100644 --- a/boards/default_src/micropython_esp32s2/blocks/inout.js +++ b/boards/default_src/micropython_esp32s2/blocks/inout.js @@ -81,21 +81,6 @@ export const inout_analog_write_set = { } }; -export const inout_analog_read = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET) - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - .setCheck(Number); - this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_ESP32_MACHINE_VALUE) - this.setInputsInline(true); - this.setOutput(true, Number); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_TOOLTIP); - } -}; - export const inout_analog_atten = { init: function () { this.setColour(BASE_HUE); @@ -218,40 +203,6 @@ export const inout_analog_write_init = { } }; -export const inout_analog_read_init = { - init: function () { - this.setColour(BASE_HUE); - // this.appendValueInput("PIN", Number) - // .appendField(Blockly.Msg.MIXLY_SETUP) - // .appendField("PWM"+Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .setCheck(Number); - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_SETUP) - .appendField(new Blockly.FieldTextInput('adc#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - // .appendField('adc') - // .appendField(new Blockly.FieldDropdown(profile.default.adc_pin),"PIN") - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_PIN) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'adc#' ? null : this.getFieldValue('PIN_OBJ')]; - }, - renameVar: function (oldName, newName) { - if (Blockly.Names.equals(oldName, this.getFieldValue('PIN_OBJ'))) { - this.setTitleValue(newName, 'PIN_OBJ'); - } - } -}; - export const inout_pin_pressed_init = { init: function () { this.setColour(BASE_HUE); diff --git a/boards/default_src/micropython_esp32s2/generators/inout.js b/boards/default_src/micropython_esp32s2/generators/inout.js index 62320f11..e6dcb9ee 100644 --- a/boards/default_src/micropython_esp32s2/generators/inout.js +++ b/boards/default_src/micropython_esp32s2/generators/inout.js @@ -48,15 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -// ok -export const inout_analog_read = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //generator.setups_['setup_input_'+dropdown_pin] = 'pinMode('+dropdown_pin+', INPUT);'; - var code = dropdown_pin + '.read()'; - return [code, generator.ORDER_ATOMIC]; -} - // ok export const inout_pin_pressed = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -98,15 +89,6 @@ export const inout_analog_write_init = function (_, generator) { return code; } -export const inout_analog_read_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'adc#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'adc#') ? 'adc' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.ADC(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - export const inout_analog_atten = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); diff --git a/boards/default_src/micropython_esp32s3/blocks/inout.js b/boards/default_src/micropython_esp32s3/blocks/inout.js index 6b2e74c5..e9aa5243 100644 --- a/boards/default_src/micropython_esp32s3/blocks/inout.js +++ b/boards/default_src/micropython_esp32s3/blocks/inout.js @@ -81,21 +81,6 @@ export const inout_analog_write_set = { } }; -export const inout_analog_read = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET) - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - .setCheck(Number); - this.appendDummyInput() - .appendField(Blockly.Msg.MIXLY_ESP32_MACHINE_VALUE) - this.setInputsInline(true); - this.setOutput(true, Number); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_TOOLTIP); - } -}; - export const inout_analog_atten = { init: function () { this.setColour(BASE_HUE); @@ -218,40 +203,6 @@ export const inout_analog_write_init = { } }; -export const inout_analog_read_init = { - init: function () { - this.setColour(BASE_HUE); - // this.appendValueInput("PIN", Number) - // .appendField(Blockly.Msg.MIXLY_SETUP) - // .appendField("PWM"+Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .setCheck(Number); - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_SETUP) - .appendField(new Blockly.FieldTextInput('adc#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField(Blockly.Msg.MIXLY_Analog_PINMODEIN) - // .appendField('adc') - // .appendField(new Blockly.FieldDropdown(profile.default.adc_pin),"PIN") - this.appendValueInput("PIN", Number) - .appendField(Blockly.Msg.MIXLY_PIN) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_ANALOG_READ_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'adc#' ? null : this.getFieldValue('PIN_OBJ')]; - }, - renameVar: function (oldName, newName) { - if (Blockly.Names.equals(oldName, this.getFieldValue('PIN_OBJ'))) { - this.setTitleValue(newName, 'PIN_OBJ'); - } - } -}; - export const inout_pin_pressed_init = { init: function () { this.setColour(BASE_HUE); diff --git a/boards/default_src/micropython_esp32s3/generators/inout.js b/boards/default_src/micropython_esp32s3/generators/inout.js index 62320f11..e6dcb9ee 100644 --- a/boards/default_src/micropython_esp32s3/generators/inout.js +++ b/boards/default_src/micropython_esp32s3/generators/inout.js @@ -48,15 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -// ok -export const inout_analog_read = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //generator.setups_['setup_input_'+dropdown_pin] = 'pinMode('+dropdown_pin+', INPUT);'; - var code = dropdown_pin + '.read()'; - return [code, generator.ORDER_ATOMIC]; -} - // ok export const inout_pin_pressed = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -98,15 +89,6 @@ export const inout_analog_write_init = function (_, generator) { return code; } -export const inout_analog_read_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'adc#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'adc#') ? 'adc' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.ADC(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - export const inout_analog_atten = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);