mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp8266: Allow GPIO16 to be used as a pin in the uPy pin HAL.

Browse Source 
Now I2C works with GPIO16 as the SCL or SDA pin.
This commit is contained in:
Damien George 2016-04-22 10:35:26 +01:00
parent a2d5d84ecc
commit 67a6d31955
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esp8266/esp_mphal.c
View File

@ -215,6 +215,16 @@ void mp_hal_signal_dupterm_input(void) {
void mp_hal_pin_config_od(mp_hal_pin_obj_t pin_id) { void mp_hal_pin_config_od(mp_hal_pin_obj_t pin_id) {
const pyb_pin_obj_t *pin = &pyb_pin_obj[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(); ETS_GPIO_INTR_DISABLE();
PIN_FUNC_SELECT(pin->periph, pin->func); PIN_FUNC_SELECT(pin->periph, pin->func);
GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(pin->phys_port)), GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(pin->phys_port)),

12
esp8266/esp_mphal.h
View File

@ -66,8 +66,14 @@ void ets_event_poll(void);
#define mp_hal_pin_obj_t uint32_t #define mp_hal_pin_obj_t uint32_t
#define mp_hal_get_pin_obj(o) mp_obj_get_pin(o) #define mp_hal_get_pin_obj(o) mp_obj_get_pin(o)
void mp_hal_pin_config_od(mp_hal_pin_obj_t pin); 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_low(p) do { \
#define mp_hal_pin_od_high(p) gpio_output_set(1 << (p), 0, 1 << (p), 0) if ((p) == 16) { WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1) | 1); } \
#define mp_hal_pin_read(p) GPIO_INPUT_GET(GPIO_ID_PIN((p))) 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_ #endif // _INCLUDED_MPHAL_H_