Skip to content

Commit 396e4ff

Browse files
sommersoftsommersoft
committed
implemented 'claim_pin' methodology; updated 'open_drain' handling
1 parent 4e1f7d4 commit 396e4ff

4 files changed

Lines changed: 44 additions & 23 deletions

File tree

‎ports/esp8266/common-hal/analogio/AnalogIn.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@
3636

3737
#include "user_interface.h"
3838

39-
volatile bool adc_in_use __attribute__((aligned(4))) = false;
40-
4139
void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
4240
const mcu_pin_obj_t *pin) {
4341
if (pin != &pin_TOUT) {
4442
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Pin %q does not have ADC capabilities", pin->name));
4543
}
46-
adc_in_use = true;
44+
claim_pin(pin);
4745
}
4846

4947
bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t* self) {
@@ -54,7 +52,7 @@ void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t* self) {
5452
if (common_hal_analogio_analogin_deinited(self)) {
5553
return;
5654
}
57-
adc_in_use = false;
55+
reset_pin(&pin_TOUT);
5856
self->deinited = true;
5957
}
6058

‎ports/esp8266/common-hal/digitalio/DigitalInOut.c‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
4444
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1); // mux configuration for XPD_DCDC and rtc_gpio0 connection
4545
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
4646
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
47-
gpio16_in_use = true;
47+
claim_pin(pin);
4848
} else {
4949
PIN_FUNC_SELECT(self->pin->peripheral, self->pin->gpio_function);
5050
}
@@ -65,10 +65,7 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t* self
6565
PIN_FUNC_SELECT(self->pin->peripheral, 0);
6666
PIN_PULLUP_DIS(self->pin->peripheral);
6767
} else {
68-
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1); // mux configuration for XPD_DCDC and rtc_gpio0 connection
69-
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
70-
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
71-
gpio16_in_use = false;
68+
reset_pin(self->pin);
7269
}
7370
self->pin = mp_const_none;
7471
}
@@ -113,12 +110,12 @@ void common_hal_digitalio_digitalinout_set_value(
113110
digitalio_digitalinout_obj_t* self, bool value) {
114111
if (self->pin->gpio_number == 16) {
115112
if (self->open_drain && value) {
116-
// configure GPIO16 as input with output register holding 0
117-
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1);
118-
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1);
119-
WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1)); // input
120-
WRITE_PERI_REG(RTC_GPIO_OUT, (READ_PERI_REG(RTC_GPIO_OUT) & ~1)); // out=0
121-
return;
113+
// configure GPIO16 as input with output register holding 0
114+
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1);
115+
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1);
116+
WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1)); // input
117+
WRITE_PERI_REG(RTC_GPIO_OUT, (READ_PERI_REG(RTC_GPIO_OUT) & 1)); // out=1
118+
return;
122119
} else {
123120
int out_en = self->output;
124121
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1);
@@ -158,7 +155,7 @@ bool common_hal_digitalio_digitalinout_get_value(
158155
return GPIO_INPUT_GET(self->pin->gpio_number);
159156
} else {
160157
if (self->pin->gpio_number == 16) {
161-
if (self->open_drain && (READ_PERI_REG(RTC_GPIO_OUT) | READ_PERI_REG(RTC_GPIO_ENABLE)) == 0) {
158+
if (self->open_drain && READ_PERI_REG(RTC_GPIO_ENABLE) == 0) {
162159
return true;
163160
} else {
164161
return READ_PERI_REG(RTC_GPIO_OUT) & 1;

‎ports/esp8266/common-hal/microcontroller/Pin.c‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,45 @@
3232

3333
#include "eagle_soc.h"
3434

35-
extern volatile bool adc_in_use;
36-
volatile bool gpio16_in_use __attribute__((aligned(4))) = false;
35+
bool adc_in_use;
36+
bool gpio16_in_use;
3737

3838
bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
3939
if (pin == &pin_TOUT) {
4040
return !adc_in_use;
4141
}
42+
if (pin == &pin_XPD_DCDC) {
43+
return !gpio16_in_use;
44+
}
4245
if (pin->gpio_number == NO_GPIO) {
4346
return false;
4447
}
45-
if (pin->gpio_number == 16) {
46-
return !gpio16_in_use;
47-
}
4848
return (READ_PERI_REG(pin->peripheral) &
4949
(PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)) == 0 &&
5050
(GPIO_REG_READ(GPIO_ENABLE_ADDRESS) & (1 << pin->gpio_number)) == 0 &&
51-
(READ_PERI_REG(pin->peripheral) & PERIPHS_IO_MUX_PULLUP) == 0;
51+
(READ_PERI_REG(pin->peripheral) & PERIPHS_IO_MUX_PULLUP) == 0;
52+
}
53+
54+
void claim_pin(const mcu_pin_obj_t* pin) {
55+
if (pin == &pin_XPD_DCDC) {
56+
gpio16_in_use = true;
57+
}
58+
if (pin == &pin_TOUT) {
59+
adc_in_use = true;
60+
}
61+
}
62+
63+
void reset_pin(const mcu_pin_obj_t* pin) {
64+
if (pin == &pin_XPD_DCDC) {
65+
// Set GPIO16 as input
66+
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1); // mux configuration for XPD_DCDC and rtc_gpio0 connection
67+
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
68+
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
69+
gpio16_in_use = false;
70+
}
71+
if (pin == &pin_TOUT) {
72+
adc_in_use = false;
73+
}
5274
}
5375

5476
void reset_pins(void) {
@@ -67,5 +89,7 @@ void reset_pins(void) {
6789
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1); // mux configuration for XPD_DCDC and rtc_gpio0 connection
6890
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
6991
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
92+
93+
adc_in_use = false;
7094
gpio16_in_use = false;
71-
}
95+
}

‎ports/esp8266/common-hal/microcontroller/Pin.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ typedef struct {
4141
#define NO_GPIO 0xff
4242
#define SPECIAL_CASE 0xfe
4343

44+
void claim_pin(const mcu_pin_obj_t* pin);
45+
void reset_pin(const mcu_pin_obj_t* pin);
4446
void reset_pins(void);
4547

4648
#endif // MICROPY_INCLUDED_ESP8266_COMMON_HAL_MICROCONTROLLER_PIN_H

0 commit comments

Comments
 (0)