djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented 'claim_pin' methodology; updated 'open_drain' handling

Browse Source
This commit is contained in:
sommersoft 2018-04-28 17:27:23 +00:00
parent 4e1f7d43eb
commit 396e4ffc34
4 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/esp8266/common-hal/analogio/AnalogIn.c
View File

@ -36,14 +36,12 @@
#include "user_interface.h" #include "user_interface.h"
volatile bool adc_in_use __attribute__((aligned(4))) = false;
void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self, void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
const mcu_pin_obj_t *pin) { const mcu_pin_obj_t *pin) {
if (pin != &pin_TOUT) { if (pin != &pin_TOUT) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Pin %q does not have ADC capabilities", pin->name)); nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Pin %q does not have ADC capabilities", pin->name));
} }
adc_in_use = true; claim_pin(pin);
} }
bool common_hal_analogio_analogin_deinited(analogio_analogin_obj_t* self) { 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) {
if (common_hal_analogio_analogin_deinited(self)) { if (common_hal_analogio_analogin_deinited(self)) {
return; return;
} }
adc_in_use = false; reset_pin(&pin_TOUT);
self->deinited = true; self->deinited = true;
} }

21
ports/esp8266/common-hal/digitalio/DigitalInOut.c
View File

@ -44,7 +44,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
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 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
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
gpio16_in_use = true; claim_pin(pin);
} else { } else {
PIN_FUNC_SELECT(self->pin->peripheral, self->pin->gpio_function); PIN_FUNC_SELECT(self->pin->peripheral, self->pin->gpio_function);
} }
@ -65,10 +65,7 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t* self
PIN_FUNC_SELECT(self->pin->peripheral, 0); PIN_FUNC_SELECT(self->pin->peripheral, 0);
PIN_PULLUP_DIS(self->pin->peripheral); PIN_PULLUP_DIS(self->pin->peripheral);
} else { } else {
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 reset_pin(self->pin);
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
gpio16_in_use = false;
} }
self->pin = mp_const_none; self->pin = mp_const_none;
} }
@ -113,12 +110,12 @@ void common_hal_digitalio_digitalinout_set_value(
digitalio_digitalinout_obj_t* self, bool value) { digitalio_digitalinout_obj_t* self, bool value) {
if (self->pin->gpio_number == 16) { if (self->pin->gpio_number == 16) {
if (self->open_drain && value) { if (self->open_drain && value) {
// configure GPIO16 as input with output register holding 0 // 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(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_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_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1)); // input
WRITE_PERI_REG(RTC_GPIO_OUT, (READ_PERI_REG(RTC_GPIO_OUT) & ~1)); // out=0 WRITE_PERI_REG(RTC_GPIO_OUT, (READ_PERI_REG(RTC_GPIO_OUT) & 1)); // out=1
return; return;
} else { } else {
int out_en = self->output; int out_en = self->output;
WRITE_PERI_REG(PAD_XPD_DCDC_CONF, (READ_PERI_REG(PAD_XPD_DCDC_CONF) & 0xffffffbc) | 1); 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(
return GPIO_INPUT_GET(self->pin->gpio_number); return GPIO_INPUT_GET(self->pin->gpio_number);
} else { } else {
if (self->pin->gpio_number == 16) { if (self->pin->gpio_number == 16) {
if (self->open_drain && (READ_PERI_REG(RTC_GPIO_OUT) | READ_PERI_REG(RTC_GPIO_ENABLE)) == 0) { if (self->open_drain && READ_PERI_REG(RTC_GPIO_ENABLE) == 0) {
return true; return true;
} else { } else {
return READ_PERI_REG(RTC_GPIO_OUT) & 1; return READ_PERI_REG(RTC_GPIO_OUT) & 1;

34
ports/esp8266/common-hal/microcontroller/Pin.c
View File

@ -32,25 +32,47 @@
#include "eagle_soc.h" #include "eagle_soc.h"
extern volatile bool adc_in_use; bool adc_in_use;
volatile bool gpio16_in_use __attribute__((aligned(4))) = false; bool gpio16_in_use;
bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) { bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
if (pin == &pin_TOUT) { if (pin == &pin_TOUT) {
return !adc_in_use; return !adc_in_use;
} }
if (pin == &pin_XPD_DCDC) {
return !gpio16_in_use;
}
if (pin->gpio_number == NO_GPIO) { if (pin->gpio_number == NO_GPIO) {
return false; return false;
} }
if (pin->gpio_number == 16) {
return !gpio16_in_use;
}
return (READ_PERI_REG(pin->peripheral) & return (READ_PERI_REG(pin->peripheral) &
(PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)) == 0 && (PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)) == 0 &&
(GPIO_REG_READ(GPIO_ENABLE_ADDRESS) & (1 << pin->gpio_number)) == 0 && (GPIO_REG_READ(GPIO_ENABLE_ADDRESS) & (1 << pin->gpio_number)) == 0 &&
(READ_PERI_REG(pin->peripheral) & PERIPHS_IO_MUX_PULLUP) == 0; (READ_PERI_REG(pin->peripheral) & PERIPHS_IO_MUX_PULLUP) == 0;
} }
void claim_pin(const mcu_pin_obj_t* pin) {
if (pin == &pin_XPD_DCDC) {
gpio16_in_use = true;
}
if (pin == &pin_TOUT) {
adc_in_use = true;
}
}
void reset_pin(const mcu_pin_obj_t* pin) {
if (pin == &pin_XPD_DCDC) {
// Set GPIO16 as input
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
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
gpio16_in_use = false;
}
if (pin == &pin_TOUT) {
adc_in_use = false;
}
}
void reset_pins(void) { void reset_pins(void) {
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
// 5 is RXD, 6 is TXD // 5 is RXD, 6 is TXD
@ -67,5 +89,7 @@ void reset_pins(void) {
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 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
WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable WRITE_PERI_REG(RTC_GPIO_CONF, READ_PERI_REG(RTC_GPIO_CONF) & ~1); //mux configuration for out enable
WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable WRITE_PERI_REG(RTC_GPIO_ENABLE, READ_PERI_REG(RTC_GPIO_ENABLE) & ~1); //out disable
adc_in_use = false;
gpio16_in_use = false; gpio16_in_use = false;
} }

2
ports/esp8266/common-hal/microcontroller/Pin.h
View File

@ -41,6 +41,8 @@ typedef struct {
#define NO_GPIO 0xff #define NO_GPIO 0xff
#define SPECIAL_CASE 0xfe #define SPECIAL_CASE 0xfe
void claim_pin(const mcu_pin_obj_t* pin);
void reset_pin(const mcu_pin_obj_t* pin);
void reset_pins(void); void reset_pins(void);
#endif // MICROPY_INCLUDED_ESP8266_COMMON_HAL_MICROCONTROLLER_PIN_H #endif // MICROPY_INCLUDED_ESP8266_COMMON_HAL_MICROCONTROLLER_PIN_H