Commit efb02d3

authored

feat(gpio): allows mixing digital and analog read/write operations (#11016)

* feat(gpio): allows mixing digital and analog read/write operations * fix(gpio): simple mistake in calling __pinMode() fnuction * fix(gpio): simple mistake in calling __pinMode() fnuction * feat(gpio): update the log message to tell the solution for the error. * feat(gpio): warn user about digitalRead() used with non GPIO pin * fix(gpio): wrong peripheral manager test case

1 parent fb5f11b commit efb02d3Copy full SHA for efb02d3

File tree

1 file changed

-8

lines changed

cores/esp32
- esp32-hal-gpio.c

1 file changed

-8

lines changed

`‎cores/esp32/esp32-hal-gpio.c`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) {`
`173`	`173`	`if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL) {`
`174`	`174`	`gpio_set_level((gpio_num_t)pin, val);`
`175`	`175`	`} else {`
`176`		`- log_e("IO %i is not set as GPIO.", pin);`
	`176`	`+ log_e("IO %i is not set as GPIO. Execute digitalMode(%i, OUTPUT) first.", pin, pin);`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`
`@@ -182,14 +182,12 @@ extern int ARDUINO_ISR_ATTR __digitalRead(uint8_t pin) {`
`182`	`182`	`if (pin == RGB_BUILTIN) {`
`183`	`183`	`return RGB_BUILTIN_storage;`
`184`	`184`	`}`
`185`		`-#endif`
`186`		`-`
`187`		`- if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL) {`
`188`		`- return gpio_get_level((gpio_num_t)pin);`
`189`		`- } else {`
`190`		`- log_e("IO %i is not set as GPIO.", pin);`
`191`		`- return 0;`
	`185`	`+#endif // RGB_BUILTIN`
	`186`	`+ // This work when the pin is set as GPIO and in INPUT mode. For all other pin functions, it may return inconsistent response`
	`187`	`+ if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL) {`
	`188`	`+ log_w("IO %i is not set as GPIO. digitalRead() may return an inconsistent value.");`
`192`	`189`	`}`
	`190`	`+ return gpio_get_level((gpio_num_t)pin);`
`193`	`191`	`}`
`194`	`192`
`195`	`193`	`static void ARDUINO_ISR_ATTR __onPinInterrupt(void *arg) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit efb02d3

File tree

1 file changed

1 file changed

`‎cores/esp32/esp32-hal-gpio.c`

0 commit comments