Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
Mar 9, 2025
+6 −8
Merged

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

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
130dbd6
feat(gpio): allows mixing digital and analog read/write operations
SuGlider Feb 26, 2025
8bdee60
fix(gpio): simple mistake in calling __pinMode() fnuction
SuGlider Feb 26, 2025
993ddd9
fix(gpio): simple mistake in calling __pinMode() fnuction
SuGlider Feb 26, 2025
54895fc
Merge branch 'master' into mixing_digital_analog_read_write
SuGlider Feb 26, 2025
b34be47
feat(gpio): update the log message to tell the solution for the error.
SuGlider Feb 27, 2025
97d78bc
feat(gpio): warn user about digitalRead() used with non GPIO pin
SuGlider Feb 27, 2025
8cd18ac
fix(gpio): wrong peripheral manager test case
SuGlider Feb 28, 2025
7e008c8
Merge branch 'master' into mixing_digital_analog_read_write
SuGlider Mar 5, 2025
d3a02f0
Merge branch 'master' into mixing_digital_analog_read_write
SuGlider Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat(gpio): allows mixing digital and analog read/write operations
  • Loading branch information
@SuGlider
SuGlider authored Feb 26, 2025
commit 130dbd6e6649edf1e0b5ed15d7f22e0b845087ab
17 changes: 8 additions & 9 deletions cores/esp32/esp32-hal-gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
return;
}
#endif // RGB_BUILTIN
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL) {
gpio_set_level((gpio_num_t)pin, val);
} else {
log_e("IO %i is not set as GPIO.", pin);
// if the pin is not in GPIO mode, make it happen
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL) {
__pinMode(uint8_t pin, OUTPUT);
}
gpio_set_level((gpio_num_t)pin, val);
}

extern int ARDUINO_ISR_ATTR __digitalRead(uint8_t pin) {
Expand All @@ -184,12 +184,11 @@ extern int ARDUINO_ISR_ATTR __digitalRead(uint8_t pin) {
}
#endif

if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL) {
return gpio_get_level((gpio_num_t)pin);
} else {
log_e("IO %i is not set as GPIO.", pin);
return 0;
// if the pin is not in GPIO mode, make it happen
if (perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL) {
__pinMode(uint8_t pin, INPUT);
}
return gpio_get_level((gpio_num_t)pin);
}

static void ARDUINO_ISR_ATTR __onPinInterrupt(void *arg) {
Expand Down
Loading