diff options
| -rw-r--r-- | esp8266/esp_mphal.c | 10 | ||||
| -rw-r--r-- | esp8266/esp_mphal.h | 12 |
2 files changed, 19 insertions, 3 deletions
diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c index 686f54bc31..53c03f62da 100644 --- a/esp8266/esp_mphal.c +++ b/esp8266/esp_mphal.c @@ -215,6 +215,16 @@ void mp_hal_signal_dupterm_input(void) { void mp_hal_pin_config_od(mp_hal_pin_obj_t pin_id) { const pyb_pin_obj_t *pin = &pyb_pin_obj[pin_id]; + + if (pin->phys_port == 16) { + // configure GPIO16 as input with output register holding 0 + WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1); + WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); + WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1)); // input + WRITE_PERI_REG(RTC_GPIO_OUT, (READ_PERI_REG(RTC_GPIO_OUT) & ~1)); // out=0 + return; + } + ETS_GPIO_INTR_DISABLE(); PIN_FUNC_SELECT(pin->periph, pin->func); GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(pin->phys_port)), diff --git a/esp8266/esp_mphal.h b/esp8266/esp_mphal.h index 4dca17d0a4..a768f9de7c 100644 --- a/esp8266/esp_mphal.h +++ b/esp8266/esp_mphal.h @@ -66,8 +66,14 @@ void ets_event_poll(void); #define mp_hal_pin_obj_t uint32_t #define mp_hal_get_pin_obj(o) mp_obj_get_pin(o) void mp_hal_pin_config_od(mp_hal_pin_obj_t pin); -#define mp_hal_pin_low(p) gpio_output_set(0, 1 << (p), 1 << (p), 0) -#define mp_hal_pin_od_high(p) gpio_output_set(1 << (p), 0, 1 << (p), 0) -#define mp_hal_pin_read(p) GPIO_INPUT_GET(GPIO_ID_PIN((p))) +#define mp_hal_pin_low(p) do { \ + if ((p) == 16) { WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1) | 1); } \ + else { gpio_output_set(0, 1 << (p), 1 << (p), 0); } \ + } while (0) +#define mp_hal_pin_od_high(p) do { \ + if ((p) == 16) { WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1)); } \ + else { gpio_output_set(1 << (p), 0, 1 << (p), 0); } \ + } while (0) +#define mp_hal_pin_read(p) pin_get(p) #endif // _INCLUDED_MPHAL_H_ |