Skip to content

Commit 4daa7b5

Browse files
committed
update espressif port
- enable rgbmatrix for all esp soc - bump idf to latest commit on v4.4 branch
1 parent 8aafc73 commit 4daa7b5

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

ports/espressif/common-hal/analogio/AnalogOut.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
#include "shared-bindings/microcontroller/Pin.h"
3636
#include "supervisor/shared/translate.h"
3737

38+
#ifdef CONFIG_IDF_TARGET_ESP32S2
3839
#include "components/driver/include/driver/dac_common.h"
40+
#endif
3941

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

@@ -56,7 +58,11 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
5658
}
5759

5860
bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
61+
#ifdef CONFIG_IDF_TARGET_ESP32S2
5962
return self->channel == DAC_CHANNEL_MAX;
63+
#else
64+
return false;
65+
#endif
6066
}
6167

6268
void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {

ports/espressif/esp-idf

Submodule esp-idf updated 449 files

ports/espressif/mpconfigport.mk

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= 1
2121
CIRCUITPY_FREQUENCYIO ?= 1
2222
CIRCUITPY_IMAGECAPTURE ?= 1
2323
CIRCUITPY_I2CPERIPHERAL ?= 1
24+
CIRCUITPY_RGBMATRIX ?= 1
2425
CIRCUITPY_ROTARYIO ?= 1
2526
CIRCUITPY_NVM ?= 1
2627
CIRCUITPY_PS2IO ?= 1
@@ -43,13 +44,9 @@ CIRCUITPY_IMAGECAPTURE = 0
4344
CIRCUITPY_PARALLELDISPLAY = 0
4445
CIRCUITPY_TOUCHIO ?= 1
4546
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
46-
CIRCUITPY_RGBMATRIX ?= 0
4747
else ifeq ($(IDF_TARGET),esp32s3)
4848
CIRCUITPY_IMAGECAPTURE = 0
4949
CIRCUITPY_PARALLELDISPLAY = 0
50-
CIRCUITPY_RGBMATRIX ?= 0
51-
else
52-
CIRCUITPY_RGBMATRIX ?= 1
5350
endif
5451

5552
# From ESP32-S2/S3 Technical Reference Manual:

0 commit comments

Comments
 (0)