8000 Fix DotClock and add more tests for components · codetiger/circuitpython@5bd92c9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5bd92c9

Browse files
tannewttannewt
committed
Fix DotClock and add more tests for components
A few boards disable the "main" component I thought would indicate if a chip had a peripheral.
1 parent 7b3b564 commit 5bd92c9

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

‎ports/espressif/Makefile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,10 @@ SRC_C += common-hal/_bleio/ble_events.c
401401
endif
402402

403403
ifneq ($(CIRCUITPY_DOTCLOCKFRAMEBUFFER),0)
404-
CFLAGS += -isystem esp-idf/components/esp_lcd/include
405-
CFLAGS += -isystem esp-idf/components/esp_lcd/interface
404+
CFLAGS += \
405+
-isystem esp-idf/components/esp_lcd/include \
406+
-isystem esp-idf/components/esp_lcd/interface \
407+
-isystem esp-idf/components/esp_lcd/rgb/include
406408
endif
407409

408410
ifneq ($(CIRCUITPY_ESPCAMERA),0)
@@ -439,6 +441,14 @@ ifneq ($(CIRCUITPY_NEOPIXEL_WRITE),0)
439441
CHIP_COMPONENTS += esp_driver_rmt
440442
endif
441443

444+
ifneq ($(CIRCUITPY_PARALLELDISPLAYBUS),0)
445+
CHIP_COMPONENTS += esp_driver_i2s
446+
endif
447+
448+
ifneq ($(CIRCUITPY_PULSEIO),0)
449+
CHIP_COMPONENTS += esp_driver_rmt
450+
endif
451+
442452
ifneq ($(CIRCUITPY_COUNTIO),0)
443453
CHIP_COMPONENTS += esp_driver_pcnt
444454
endif
@@ -447,6 +457,10 @@ ifneq ($(CIRCUITPY_ROTARYIO),0)
447457
CHIP_COMPONENTS += esp_driver_pcnt
448458
endif
449459

460+
ifneq ($(CIRCUITPY_FREQUENCYIO),0)
461+
CHIP_COMPONENTS += esp_driver_pcnt
462+
endif
463+
450464
SRC_COMMON_HAL_EXPANDED = \
451465
$(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
452466
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \

‎ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "esp_log.h"
2020
#define TAG "LCD"
2121

22-
#include "components/esp_rom/include/esp_rom_sys.h"
22+
#include "esp_rom_sys.h"
2323

2424
#include "bindings/espidf/__init__.h"
2525
#include "py/objarray.h"
@@ -28,11 +28,11 @@
2828
#include "common-hal/espidf/__init__.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
3030
#include "py/runtime.h"
31-
#include "components/driver/gpio/include/driver/gpio.h"
32-
#include "components/esp_rom/include/esp_rom_gpio.h"
33-
#include "components/hal/esp32s3/include/hal/lcd_ll.h"
34-
#include "components/hal/include/hal/gpio_hal.h"
35-
#include "components/soc/esp32s3/include/soc/lcd_cam_struct.h"
31+
#include "driver/gpio.h"
32+
#include "esp_rom_gpio.h"
33+
#include "hal/lcd_ll.h"
34+
#include "hal/gpio_hal.h"
35+
#include "soc/lcd_cam_struct.h"
3636
#include "esp_heap_caps.h"
3737

3838
// should be from rom/cache.h but it wasn't working

0 commit comments

Comments
 (0)
0