From 8b769ccc332bdbcf2d824a24719c49f7d49406e6 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 10:54:06 +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 | 83 ++++--------------- .../micropython_esp32c2/generators/inout.js | 31 ------- .../micropython_esp32c3/blocks/inout.js | 83 ++++--------------- .../micropython_esp32c3/generators/inout.js | 31 ------- .../micropython_esp32s2/blocks/inout.js | 83 ++++--------------- .../micropython_esp32s2/generators/inout.js | 31 ------- .../micropython_esp32s3/blocks/inout.js | 83 ++++--------------- .../micropython_esp32s3/generators/inout.js | 31 ------- 8 files changed, 64 insertions(+), 392 deletions(-) diff --git a/boards/default_src/micropython_esp32c2/blocks/inout.js b/boards/default_src/micropython_esp32c2/blocks/inout.js index 63d867a1..97343435 100644 --- a/boards/default_src/micropython_esp32c2/blocks/inout.js +++ b/boards/default_src/micropython_esp32c2/blocks/inout.js @@ -46,22 +46,6 @@ export const inout_digital_read = { } }; -export const inout_pwm_analog_write = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_VALUE2) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_TOOLTIP); - } -}; - export const inout_analog_write = { init: function () { this.setColour(BASE_HUE); @@ -100,22 +84,6 @@ export const inout_analog_write_set = { } }; -export const inout_pwm_analog_write_set_freq = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); - } -}; - export const inout_analog_read = { init: function () { this.setColour(BASE_HUE); @@ -223,40 +191,6 @@ export const inout_digital_init = { } }; -export const inout_pwm_analog_write_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('pwm#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .appendField(new Blockly.FieldDropdown(profile.default.pwm_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_PWM_ANALOG_WRITE_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'pwm#' ? 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_analog_write_init = { init: function () { this.setColour(BASE_HUE); @@ -359,8 +293,23 @@ export const inout_pin_pressed_init = { } }; +export const inout_analog_write_set_freq = { + init: function () { + this.setColour(BASE_HUE); + this.appendValueInput("PIN", Number) + .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) + .setCheck(Number); + this.appendValueInput("NUM", Number) + .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) + .setCheck(Number); + this.setInputsInline(true); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); + } +}; + export const inout_pinMode = inout_digital_init; -export const inout_analog_write_set_freq = inout_pwm_analog_write_set_freq; export const pin_pressed_init = inout_pin_pressed_init; export const pin_pressed = inout_pin_pressed; export const controls_pin_attachInterrupt = inout_pin_attachInterrupt; diff --git a/boards/default_src/micropython_esp32c2/generators/inout.js b/boards/default_src/micropython_esp32c2/generators/inout.js index 9eece0e5..b6facc3a 100644 --- a/boards/default_src/micropython_esp32c2/generators/inout.js +++ b/boards/default_src/micropython_esp32c2/generators/inout.js @@ -26,17 +26,6 @@ export const inout_digital_read = function (_, generator) { return [code, generator.ORDER_ATOMIC]; } -//ok -export const inout_pwm_analog_write = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //var dropdown_stat = this.getFieldValue('STAT'); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - //generator.setups_['setup_output'+dropdown_pin] = 'pinMode('+dropdown_pin+', OUTPUT);'; - var code = dropdown_pin + '.duty(' + value_num + ')\n'; - return code; -} - //ok export const inout_analog_write = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -59,17 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -export const inout_pwm_analog_write_set_freq = function (_, generator) { - //generator.definitions_['import_machine_Pin'] = "from machine import Pin"; - // generator.definitions_['import_machine_PWM'] = "from machine import PWM"; - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - var code = dropdown_pin + '.freq(' + value_num + ')\n'; - //var code = 'pin' + dropdown_pin + '.set_analog_period(' + value_num + ')\n'; - return code; -} - //ok export const inout_analog_read = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -110,15 +88,6 @@ export const inout_digital_init = function (_, generator) { return code; } -export const inout_pwm_analog_write_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'pwm#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'pwm#') ? 'pwm' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.PWM(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - //ok export const inout_analog_write_init = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; diff --git a/boards/default_src/micropython_esp32c3/blocks/inout.js b/boards/default_src/micropython_esp32c3/blocks/inout.js index ac7bd741..c71ce8c6 100644 --- a/boards/default_src/micropython_esp32c3/blocks/inout.js +++ b/boards/default_src/micropython_esp32c3/blocks/inout.js @@ -43,22 +43,6 @@ export const inout_digital_read = { } }; -export const inout_pwm_analog_write = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_VALUE2) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_TOOLTIP); - } -}; - export const inout_analog_write = { init: function () { this.setColour(BASE_HUE); @@ -97,22 +81,6 @@ export const inout_analog_write_set = { } }; -export const inout_pwm_analog_write_set_freq = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); - } -}; - export const inout_analog_read = { init: function () { this.setColour(BASE_HUE); @@ -220,40 +188,6 @@ export const inout_digital_init = { } }; -export const inout_pwm_analog_write_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('pwm#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .appendField(new Blockly.FieldDropdown(profile.default.pwm_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_PWM_ANALOG_WRITE_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'pwm#' ? 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_analog_write_init = { init: function () { this.setColour(BASE_HUE); @@ -356,8 +290,23 @@ export const inout_pin_pressed_init = { } }; +export const inout_analog_write_set_freq = { + init: function () { + this.setColour(BASE_HUE); + this.appendValueInput("PIN", Number) + .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) + .setCheck(Number); + this.appendValueInput("NUM", Number) + .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) + .setCheck(Number); + this.setInputsInline(true); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); + } +}; + export const inout_pinMode = inout_digital_init; -export const inout_analog_write_set_freq = inout_pwm_analog_write_set_freq; export const pin_pressed_init = inout_pin_pressed_init; export const pin_pressed = inout_pin_pressed; export const controls_pin_attachInterrupt = inout_pin_attachInterrupt; diff --git a/boards/default_src/micropython_esp32c3/generators/inout.js b/boards/default_src/micropython_esp32c3/generators/inout.js index bc9be701..62320f11 100644 --- a/boards/default_src/micropython_esp32c3/generators/inout.js +++ b/boards/default_src/micropython_esp32c3/generators/inout.js @@ -26,17 +26,6 @@ export const inout_digital_read = function (_, generator) { return [code, generator.ORDER_ATOMIC]; } -// ok -export const inout_pwm_analog_write = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //var dropdown_stat = this.getFieldValue('STAT'); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - //generator.setups_['setup_output'+dropdown_pin] = 'pinMode('+dropdown_pin+', OUTPUT);'; - var code = dropdown_pin + '.duty(' + value_num + ')\n'; - return code; -} - // ok export const inout_analog_write = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -59,17 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -export const inout_pwm_analog_write_set_freq = function (_, generator) { - //generator.definitions_['import_machine_Pin'] = "from machine import Pin"; - // generator.definitions_['import_machine_PWM'] = "from machine import PWM"; - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - var code = dropdown_pin + '.freq(' + value_num + ')\n'; - //var code = 'pin' + dropdown_pin + '.set_analog_period(' + value_num + ')\n'; - return code; -} - // ok export const inout_analog_read = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -110,15 +88,6 @@ export const inout_digital_init = function (_, generator) { return code; } -export const inout_pwm_analog_write_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'pwm#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'pwm#') ? 'pwm' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.PWM(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - // ok export const inout_analog_write_init = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; diff --git a/boards/default_src/micropython_esp32s2/blocks/inout.js b/boards/default_src/micropython_esp32s2/blocks/inout.js index 870af644..6b2e74c5 100644 --- a/boards/default_src/micropython_esp32s2/blocks/inout.js +++ b/boards/default_src/micropython_esp32s2/blocks/inout.js @@ -43,22 +43,6 @@ export const inout_digital_read = { } }; -export const inout_pwm_analog_write = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_VALUE2) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_TOOLTIP); - } -}; - export const inout_analog_write = { init: function () { this.setColour(BASE_HUE); @@ -97,22 +81,6 @@ export const inout_analog_write_set = { } }; -export const inout_pwm_analog_write_set_freq = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); - } -}; - export const inout_analog_read = { init: function () { this.setColour(BASE_HUE); @@ -216,40 +184,6 @@ export const inout_digital_init = { } }; -export const inout_pwm_analog_write_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('pwm#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .appendField(new Blockly.FieldDropdown(profile.default.pwm_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_PWM_ANALOG_WRITE_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'pwm#' ? 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_analog_write_init = { init: function () { this.setColour(BASE_HUE); @@ -352,8 +286,23 @@ export const inout_pin_pressed_init = { } }; +export const inout_analog_write_set_freq = { + init: function () { + this.setColour(BASE_HUE); + this.appendValueInput("PIN", Number) + .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) + .setCheck(Number); + this.appendValueInput("NUM", Number) + .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) + .setCheck(Number); + this.setInputsInline(true); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); + } +}; + export const inout_pinMode = inout_digital_init; -export const inout_analog_write_set_freq = inout_pwm_analog_write_set_freq; export const pin_pressed_init = inout_pin_pressed_init; export const pin_pressed = inout_pin_pressed; export const controls_pin_attachInterrupt = inout_pin_attachInterrupt; diff --git a/boards/default_src/micropython_esp32s2/generators/inout.js b/boards/default_src/micropython_esp32s2/generators/inout.js index bc9be701..62320f11 100644 --- a/boards/default_src/micropython_esp32s2/generators/inout.js +++ b/boards/default_src/micropython_esp32s2/generators/inout.js @@ -26,17 +26,6 @@ export const inout_digital_read = function (_, generator) { return [code, generator.ORDER_ATOMIC]; } -// ok -export const inout_pwm_analog_write = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //var dropdown_stat = this.getFieldValue('STAT'); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - //generator.setups_['setup_output'+dropdown_pin] = 'pinMode('+dropdown_pin+', OUTPUT);'; - var code = dropdown_pin + '.duty(' + value_num + ')\n'; - return code; -} - // ok export const inout_analog_write = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -59,17 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -export const inout_pwm_analog_write_set_freq = function (_, generator) { - //generator.definitions_['import_machine_Pin'] = "from machine import Pin"; - // generator.definitions_['import_machine_PWM'] = "from machine import PWM"; - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - var code = dropdown_pin + '.freq(' + value_num + ')\n'; - //var code = 'pin' + dropdown_pin + '.set_analog_period(' + value_num + ')\n'; - return code; -} - // ok export const inout_analog_read = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -110,15 +88,6 @@ export const inout_digital_init = function (_, generator) { return code; } -export const inout_pwm_analog_write_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'pwm#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'pwm#') ? 'pwm' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.PWM(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - // ok export const inout_analog_write_init = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; diff --git a/boards/default_src/micropython_esp32s3/blocks/inout.js b/boards/default_src/micropython_esp32s3/blocks/inout.js index 870af644..6b2e74c5 100644 --- a/boards/default_src/micropython_esp32s3/blocks/inout.js +++ b/boards/default_src/micropython_esp32s3/blocks/inout.js @@ -43,22 +43,6 @@ export const inout_digital_read = { } }; -export const inout_pwm_analog_write = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_VALUE2) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_TOOLTIP); - } -}; - export const inout_analog_write = { init: function () { this.setColour(BASE_HUE); @@ -97,22 +81,6 @@ export const inout_analog_write_set = { } }; -export const inout_pwm_analog_write_set_freq = { - init: function () { - this.setColour(BASE_HUE); - this.appendValueInput("PIN", Number) - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - .setCheck(Number); - this.appendValueInput("NUM", Number) - .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) - .setCheck(Number); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); - } -}; - export const inout_analog_read = { init: function () { this.setColour(BASE_HUE); @@ -216,40 +184,6 @@ export const inout_digital_init = { } }; -export const inout_pwm_analog_write_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('pwm#'), 'PIN_OBJ') - .appendField(Blockly.Msg.MIXLY_MICROPYTHON_AS) - this.appendDummyInput("") - .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) - // .appendField('pwm') - // .appendField(new Blockly.FieldDropdown(profile.default.pwm_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_PWM_ANALOG_WRITE_INIT_TOOLTIP); - }, - getVars: function () { - return [this.getFieldValue('PIN_OBJ') == 'pwm#' ? 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_analog_write_init = { init: function () { this.setColour(BASE_HUE); @@ -352,8 +286,23 @@ export const inout_pin_pressed_init = { } }; +export const inout_analog_write_set_freq = { + init: function () { + this.setColour(BASE_HUE); + this.appendValueInput("PIN", Number) + .appendField("PWM" + Blockly.Msg.MIXLY_Analog_PINMODEOUT) + .setCheck(Number); + this.appendValueInput("NUM", Number) + .appendField(Blockly.Msg.MIXLY_FREQUENCY + Blockly.Msg.MIXLY_STAT) + .setCheck(Number); + this.setInputsInline(true); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + this.setTooltip(Blockly.Msg.MIXLY_ESP32_INOUT_PWM_ANALOG_WRITE_SET_FREQ_TOOLTIP); + } +}; + export const inout_pinMode = inout_digital_init; -export const inout_analog_write_set_freq = inout_pwm_analog_write_set_freq; export const pin_pressed_init = inout_pin_pressed_init; export const pin_pressed = inout_pin_pressed; export const controls_pin_attachInterrupt = inout_pin_attachInterrupt; diff --git a/boards/default_src/micropython_esp32s3/generators/inout.js b/boards/default_src/micropython_esp32s3/generators/inout.js index bc9be701..62320f11 100644 --- a/boards/default_src/micropython_esp32s3/generators/inout.js +++ b/boards/default_src/micropython_esp32s3/generators/inout.js @@ -26,17 +26,6 @@ export const inout_digital_read = function (_, generator) { return [code, generator.ORDER_ATOMIC]; } -// ok -export const inout_pwm_analog_write = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - //var dropdown_stat = this.getFieldValue('STAT'); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - //generator.setups_['setup_output'+dropdown_pin] = 'pinMode('+dropdown_pin+', OUTPUT);'; - var code = dropdown_pin + '.duty(' + value_num + ')\n'; - return code; -} - // ok export const inout_analog_write = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -59,17 +48,6 @@ export const inout_analog_write_set = function (_, generator) { return code; } -export const inout_pwm_analog_write_set_freq = function (_, generator) { - //generator.definitions_['import_machine_Pin'] = "from machine import Pin"; - // generator.definitions_['import_machine_PWM'] = "from machine import PWM"; - generator.definitions_['import_machine'] = 'import machine'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var value_num = generator.valueToCode(this, 'NUM', generator.ORDER_ATOMIC); - var code = dropdown_pin + '.freq(' + value_num + ')\n'; - //var code = 'pin' + dropdown_pin + '.set_analog_period(' + value_num + ')\n'; - return code; -} - // ok export const inout_analog_read = function (_, generator) { generator.definitions_['import_machine'] = 'import machine'; @@ -110,15 +88,6 @@ export const inout_digital_init = function (_, generator) { return code; } -export const inout_pwm_analog_write_init = function (_, generator) { - generator.definitions_['import_machine'] = 'import machine'; - var pin_obj = this.getFieldValue('PIN_OBJ') || 'pwm#'; - var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC); - var varName = (pin_obj == 'pwm#') ? 'pwm' + dropdown_pin : generator.variableDB_.getName(pin_obj, Blockly.Variables.NAME_TYPE); - var code = varName + ' = machine.PWM(machine.Pin(' + dropdown_pin + '))\n'; - return code; -} - // ok export const inout_analog_write_init = function (_, generator) { generator.definitions_['import_machine'] = 'import machine';