Update: 移除Arduino板卡下 mixly_digitalRead 接口
目前来看,使用此接口在处理 `digitalRead` 接收参数为变量时自动 `pinMode(Var, INPUT)` 的效果并不理想,同时此接口只会默认管脚输入为 `INPUT` 类型,忽略了 `INPUT_PULLUP` 等其他情况,因此对此接口作废弃处理,而改为在 `digitalRead` 接收参数为变量时手动在`setup` 中 `pinMode`
This commit is contained in:
@@ -46,7 +46,7 @@ export const inout_digital_read = function (_, generator) {
|
||||
|
||||
export const inout_digital_read2 = function (_, generator) {
|
||||
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
|
||||
var code = "";
|
||||
var code = 'digitalRead(' + dropdown_pin + ')';
|
||||
var isVar = true;
|
||||
for (var pin of Profile.default.digital) {
|
||||
if (pin[1] === dropdown_pin) {
|
||||
@@ -54,16 +54,7 @@ export const inout_digital_read2 = function (_, generator) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (isVar) {
|
||||
var funcName = 'mixly_digitalRead';
|
||||
generator.definitions_[funcName] = 'boolean' + ' ' + funcName + '(uint8_t pin) {\n'
|
||||
+ ' pinMode(pin, INPUT);\n'
|
||||
+ ' boolean _return = digitalRead(pin);\n'
|
||||
+ ' pinMode(pin, OUTPUT);\n'
|
||||
+ ' return _return;\n'
|
||||
+ '}\n';
|
||||
code = 'mixly_digitalRead(' + dropdown_pin + ')';
|
||||
} else {
|
||||
if (!isVar) {
|
||||
if (!generator.setups_['setup_output_' + dropdown_pin]) {
|
||||
generator.setups_['setup_input_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', INPUT);';
|
||||
}
|
||||
@@ -72,7 +63,6 @@ export const inout_digital_read2 = function (_, generator) {
|
||||
delete generator.setups_['setup_input_' + dropdown_pin];
|
||||
}
|
||||
}
|
||||
code = 'digitalRead(' + dropdown_pin + ')';
|
||||
}
|
||||
return [code, generator.ORDER_ATOMIC];
|
||||
}
|
||||
|
||||
@@ -3,6 +3,11 @@
|
||||
<category name="" id="catInOut" colour="20">
|
||||
<block type="inout_highlow">
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_digital_write2">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
@@ -91,11 +96,6 @@
|
||||
</shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_shiftout">
|
||||
<value name="PIN1">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
<category name="" id="catInOut" colour="20">
|
||||
<block type="inout_highlow">
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_digital_write2">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digitalWrite"></shadow>
|
||||
@@ -113,11 +118,6 @@
|
||||
</shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_shiftout">
|
||||
<value name="PIN1">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
<category name="" id="catInOut" colour="20">
|
||||
<block type="inout_highlow">
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_digital_write2">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digitalWrite"></shadow>
|
||||
@@ -98,11 +103,6 @@
|
||||
</shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_shiftout">
|
||||
<value name="PIN1">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
|
||||
@@ -3,6 +3,11 @@
|
||||
<category name="" id="catInOut" colour="20">
|
||||
<block type="inout_highlow">
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_digital_write2">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
@@ -66,11 +71,6 @@
|
||||
</shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_pinMode">
|
||||
<value name="PIN">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
</value>
|
||||
</block>
|
||||
<block type="inout_shiftout">
|
||||
<value name="PIN1">
|
||||
<shadow type="pins_digital"></shadow>
|
||||
|
||||
Reference in New Issue
Block a user