Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
95bbe26976
|
@ -35,7 +35,9 @@
|
||||||
#include "shared-bindings/microcontroller/Pin.h"
|
#include "shared-bindings/microcontroller/Pin.h"
|
||||||
#include "supervisor/shared/translate.h"
|
#include "supervisor/shared/translate.h"
|
||||||
|
|
||||||
|
#ifdef CONFIG_IDF_TARGET_ESP32S2
|
||||||
#include "components/driver/include/driver/dac_common.h"
|
#include "components/driver/include/driver/dac_common.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "common-hal/microcontroller/Pin.h"
|
#include "common-hal/microcontroller/Pin.h"
|
||||||
|
|
||||||
|
@ -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) {
|
bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
|
||||||
|
#ifdef CONFIG_IDF_TARGET_ESP32S2
|
||||||
return self->channel == DAC_CHANNEL_MAX;
|
return self->channel == DAC_CHANNEL_MAX;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
|
void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit ddc44956bf718540d5451e17e1becf6c7dffe5b8
|
Subproject commit 214d62b9ad859318520e38870c828278c2caee2a
|
|
@ -21,6 +21,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= 1
|
||||||
CIRCUITPY_FREQUENCYIO ?= 1
|
CIRCUITPY_FREQUENCYIO ?= 1
|
||||||
CIRCUITPY_IMAGECAPTURE ?= 1
|
CIRCUITPY_IMAGECAPTURE ?= 1
|
||||||
CIRCUITPY_I2CPERIPHERAL ?= 1
|
CIRCUITPY_I2CPERIPHERAL ?= 1
|
||||||
|
CIRCUITPY_RGBMATRIX ?= 1
|
||||||
CIRCUITPY_ROTARYIO ?= 1
|
CIRCUITPY_ROTARYIO ?= 1
|
||||||
CIRCUITPY_NVM ?= 1
|
CIRCUITPY_NVM ?= 1
|
||||||
CIRCUITPY_PS2IO ?= 1
|
CIRCUITPY_PS2IO ?= 1
|
||||||
|
@ -43,13 +44,9 @@ CIRCUITPY_IMAGECAPTURE = 0
|
||||||
CIRCUITPY_PARALLELDISPLAY = 0
|
CIRCUITPY_PARALLELDISPLAY = 0
|
||||||
CIRCUITPY_TOUCHIO ?= 1
|
CIRCUITPY_TOUCHIO ?= 1
|
||||||
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
|
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
|
||||||
CIRCUITPY_RGBMATRIX ?= 0
|
|
||||||
else ifeq ($(IDF_TARGET),esp32s3)
|
else ifeq ($(IDF_TARGET),esp32s3)
|
||||||
CIRCUITPY_IMAGECAPTURE = 0
|
CIRCUITPY_IMAGECAPTURE = 0
|
||||||
CIRCUITPY_PARALLELDISPLAY = 0
|
CIRCUITPY_PARALLELDISPLAY = 0
|
||||||
CIRCUITPY_RGBMATRIX ?= 0
|
|
||||||
else
|
|
||||||
CIRCUITPY_RGBMATRIX ?= 1
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# From ESP32-S2/S3 Technical Reference Manual:
|
# From ESP32-S2/S3 Technical Reference Manual:
|
||||||
|
|
Loading…
Reference in New Issue