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

Jump to bottom

GPIO - Peripheral manager implementation #8179

Merged
merged 2 commits into from
May 11, 2023
Merged

GPIO - Peripheral manager implementation #8179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b040f6e
periman-implementation
P-R-O-C-H-Y May 10, 2023
871ed6a
fix RGB_BUILTIN and remove space
P-R-O-C-H-Y May 11, 2023
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
33 changes: 31 additions & 2 deletions cores/esp32/esp32-hal-gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

#include "esp32-hal-gpio.h"
#include "esp32-hal-periman.h"
#include "hal/gpio_hal.h"
#include "soc/soc_caps.h"

Expand Down Expand Up @@ -89,6 +90,10 @@ static InterruptHandle_t __pinInterruptHandlers[SOC_GPIO_PIN_COUNT] = {0,};

#include "driver/rtc_io.h"

static bool gpioDetachBus(void * bus){
return true;
}

extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
{
#ifdef RGB_BUILTIN
Expand All @@ -102,6 +107,14 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
log_e("Invalid pin selected");
return;
}

if(perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL){
perimanSetBusDeinit(ESP32_BUS_TYPE_GPIO, gpioDetachBus);
if(!perimanSetPinBus(pin, ESP32_BUS_TYPE_INIT, NULL)){
log_e("Deinit of previous bus failed");
return;
}
}

gpio_hal_context_t gpiohal;
gpiohal.dev = GPIO_LL_GET_HW(GPIO_PORT_0);
Expand Down Expand Up @@ -130,6 +143,12 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
log_e("GPIO config failed");
return;
}
if(perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL){
if(!perimanSetPinBus(pin, ESP32_BUS_TYPE_GPIO, (void *)(pin+1))){
//gpioDetachBus((void *)(pin+1));
return;
}
}
}

extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
Expand All @@ -142,12 +161,22 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
return;
}
#endif
gpio_set_level((gpio_num_t)pin, val);
if(perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL){
gpio_set_level((gpio_num_t)pin, val);
} else {
log_e("Pin is not set as GPIO.");
}
}

extern int ARDUINO_ISR_ATTR __digitalRead(uint8_t pin)
{
return gpio_get_level((gpio_num_t)pin);
if(perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL){
return gpio_get_level((gpio_num_t)pin);
}
else {
log_e("Pin is not set as GPIO.");
return 0;
}
}

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