Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update espressif port #5796

Merged
merged 1 commit into from
Dec 30, 2021
+8 −5
Merged

Update espressif port #5796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ports/espressif/common-hal/analogio/AnalogOut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
#include "shared-bindings/microcontroller/Pin.h"
#include "supervisor/shared/translate.h"

#ifdef CONFIG_IDF_TARGET_ESP32S2
#include "components/driver/include/driver/dac_common.h"
#endif

#include "common-hal/microcontroller/Pin.h"

Expand All @@ -56,7 +58,11 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
}

bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
#ifdef CONFIG_IDF_TARGET_ESP32S2
return self->channel == DAC_CHANNEL_MAX;
#else
return false;
#endif
}

void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/esp-idf
Open in desktop
Submodule esp-idf updated 449 files
5 changes: 1 addition & 4 deletions ports/espressif/mpconfigport.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= 1
CIRCUITPY_FREQUENCYIO ?= 1
CIRCUITPY_IMAGECAPTURE ?= 1
CIRCUITPY_I2CPERIPHERAL ?= 1
CIRCUITPY_RGBMATRIX ?= 1
CIRCUITPY_ROTARYIO ?= 1
CIRCUITPY_NVM ?= 1
CIRCUITPY_PS2IO ?= 1
Expand All @@ -43,13 +44,9 @@ CIRCUITPY_IMAGECAPTURE = 0
CIRCUITPY_PARALLELDISPLAY = 0
CIRCUITPY_TOUCHIO ?= 1
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
CIRCUITPY_RGBMATRIX ?= 0
else ifeq ($(IDF_TARGET),esp32s3)
CIRCUITPY_IMAGECAPTURE = 0
CIRCUITPY_PARALLELDISPLAY = 0
CIRCUITPY_RGBMATRIX ?= 0
else
CIRCUITPY_RGBMATRIX ?= 1
endif

# From ESP32-S2/S3 Technical Reference Manual:
Expand Down