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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Hosted Weblate 2022-01-17 19:51:35 +01:00
commit d2592b20d7
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/espressif/common-hal/digitalio/DigitalInOut.c
View File

@ -71,7 +71,7 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
void common_hal_digitalio_digitalinout_switch_to_input( void common_hal_digitalio_digitalinout_switch_to_input(
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) { digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
common_hal_digitalio_digitalinout_set_pull(self, pull); common_hal_digitalio_digitalinout_set_pull(self, pull);
gpio_set_direction(self->pin->number, GPIO_MODE_DEF_INPUT); gpio_set_direction(self->pin->number, GPIO_MODE_INPUT);
} }
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output( digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@ -108,11 +108,9 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
digitalio_digitalinout_obj_t *self, digitalio_digitalinout_obj_t *self,
digitalio_drive_mode_t drive_mode) { digitalio_drive_mode_t drive_mode) {
gpio_num_t number = self->pin->number; gpio_num_t number = self->pin->number;
gpio_mode_t mode; gpio_mode_t mode = GPIO_MODE_OUTPUT;
if (drive_mode == DRIVE_MODE_OPEN_DRAIN) { if (drive_mode == DRIVE_MODE_OPEN_DRAIN) {
mode = GPIO_MODE_DEF_OD; mode |= GPIO_MODE_OUTPUT_OD;
} else {
mode = GPIO_MODE_DEF_OUTPUT;
} }
esp_err_t result = gpio_set_direction(number, mode); esp_err_t result = gpio_set_direction(number, mode);
if (result != ESP_OK) { if (result != ESP_OK) {