Skip to content

Commit 77fc210

Browse files
laridelaride
committed
fix: use ESP-IDF 5.5
1 parent cbb5a7c commit 77fc210

File tree

14 files changed

+164
-158
lines changed

14 files changed

+164
-158
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
include: ${{ fromJson(needs.prepare.outputs.variants) }}
9393
runs-on: ubuntu-latest
9494
container:
95-
image: espressif/idf:release-v5.4
95+
image: espressif/idf:release-v5.5
9696
steps:
9797
- name: Checkout
9898
uses: actions/checkout@v4

‎main/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,9 @@ if(CONFIG_IDF_TARGET_ESP32)
579579
"audio/codecs/es8388_audio_codec.cc"
580580
"audio/codecs/es8389_audio_codec.cc"
581581
"led/gpio_led.cc"
582+
"${CMAKE_CURRENT_SOURCE_DIR}/boards/common/esp32_camera.cc"
583+
"display/lvgl_display/jpg/image_to_jpeg.cpp"
584+
"display/lvgl_display/jpg/jpeg_encoder.cpp"
582585
)
583586
endif()
584587

‎main/boards/common/esp32_camera.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#ifndef ESP32_CAMERA_H
1+
#include "sdkconfig.h"
2+
3+
#if (not defined(ESP32_CAMERA_H)) && (not defined(CONFIG_IDF_TARGET_ESP32))
24
#define ESP32_CAMERA_H
35

46
#include <lvgl.h>

‎main/boards/df-k10/config.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false
4343

4444
/* DFRobot K10 Camera pins */
45-
#define PWDN_GPIO_NUM -1
46-
#define RESET_GPIO_NUM -1
47-
#define XCLK_GPIO_NUM 7
45+
#define PWDN_GPIO_NUM GPIO_NUM_NC
46+
#define RESET_GPIO_NUM GPIO_NUM_NC
47+
#define XCLK_GPIO_NUM GPIO_NUM_7
4848

49-
#define VSYNC_GPIO_NUM 4
50-
#define HREF_GPIO_NUM 5
51-
#define PCLK_GPIO_NUM 17
52-
#define SIOD_GPIO_NUM 20
53-
#define SIOC_GPIO_NUM 19
49+
#define VSYNC_GPIO_NUM GPIO_NUM_4
50+
#define HREF_GPIO_NUM GPIO_NUM_5
51+
#define PCLK_GPIO_NUM GPIO_NUM_17
52+
#define SIOD_GPIO_NUM GPIO_NUM_20
53+
#define SIOC_GPIO_NUM GPIO_NUM_19
5454

5555
/* Camera pins */
5656
#define CAMERA_PIN_PWDN PWDN_GPIO_NUM
@@ -59,14 +59,14 @@
5959
#define CAMERA_PIN_SIOD SIOD_GPIO_NUM
6060
#define CAMERA_PIN_SIOC SIOC_GPIO_NUM
6161

62-
#define CAMERA_PIN_D9 6
63-
#define CAMERA_PIN_D8 15
64-
#define CAMERA_PIN_D7 16
65-
#define CAMERA_PIN_D6 18
66-
#define CAMERA_PIN_D5 9
67-
#define CAMERA_PIN_D4 11
68-
#define CAMERA_PIN_D3 10
69-
#define CAMERA_PIN_D2 8
62+
#define CAMERA_PIN_D9 GPIO_NUM_6
63+
#define CAMERA_PIN_D8 GPIO_NUM_15
64+
#define CAMERA_PIN_D7 GPIO_NUM_16
65+
#define CAMERA_PIN_D6 GPIO_NUM_18
66+
#define CAMERA_PIN_D5 GPIO_NUM_9
67+
#define CAMERA_PIN_D4 GPIO_NUM_11
68+
#define CAMERA_PIN_D3 GPIO_NUM_10
69+
#define CAMERA_PIN_D2 GPIO_NUM_8
7070
#define CAMERA_PIN_VSYNC VSYNC_GPIO_NUM
7171
#define CAMERA_PIN_HREF HREF_GPIO_NUM
7272
#define CAMERA_PIN_PCLK PCLK_GPIO_NUM

‎main/boards/df-s3-ai-cam/config.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
#define RESET_FACTORY_BUTTON_GPIO GPIO_NUM_NC
2323

2424
/* DFRobot Camera pins */
25-
#define PWDN_GPIO_NUM -1
26-
#define RESET_GPIO_NUM -1
27-
#define XCLK_GPIO_NUM 5
28-
#define Y9_GPIO_NUM 4
29-
#define Y8_GPIO_NUM 6
30-
#define Y7_GPIO_NUM 7
31-
#define Y6_GPIO_NUM 14
32-
#define Y5_GPIO_NUM 17
33-
#define Y4_GPIO_NUM 21
34-
#define Y3_GPIO_NUM 18
35-
#define Y2_GPIO_NUM 16
36-
#define VSYNC_GPIO_NUM 1
37-
#define HREF_GPIO_NUM 2
38-
#define PCLK_GPIO_NUM 15
39-
#define SIOD_GPIO_NUM 8
40-
#define SIOC_GPIO_NUM 9
25+
#define PWDN_GPIO_NUM GPIO_NUM_NC
26+
#define RESET_GPIO_NUM GPIO_NUM_NC
27+
#define XCLK_GPIO_NUM GPIO_NUM_5
28+
#define Y9_GPIO_NUM GPIO_NUM_4
29+
#define Y8_GPIO_NUM GPIO_NUM_6
30+
#define Y7_GPIO_NUM GPIO_NUM_7
31+
#define Y6_GPIO_NUM GPIO_NUM_14
32+
#define Y5_GPIO_NUM GPIO_NUM_17
33+
#define Y4_GPIO_NUM GPIO_NUM_21
34+
#define Y3_GPIO_NUM GPIO_NUM_18
35+
#define Y2_GPIO_NUM GPIO_NUM_16
36+
#define VSYNC_GPIO_NUM GPIO_NUM_1
37+
#define HREF_GPIO_NUM GPIO_NUM_2
38+
#define PCLK_GPIO_NUM GPIO_NUM_15
39+
#define SIOD_GPIO_NUM GPIO_NUM_8
40+
#define SIOC_GPIO_NUM GPIO_NUM_9
4141

4242
/* Camera pins */
4343
#define CAMERA_PIN_PWDN PWDN_GPIO_NUM

‎main/boards/esp32s3-korvo2-v3/config.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,23 @@
5959
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_NC
6060
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false
6161
/* Camera pins */
62-
#define CAMERA_PIN_PWDN -1
63-
#define CAMERA_PIN_RESET -1
64-
#define CAMERA_PIN_XCLK 40
65-
#define CAMERA_PIN_SIOD 17
66-
#define CAMERA_PIN_SIOC 18
62+
#define CAMERA_PIN_PWDN GPIO_NUM_NC
63+
#define CAMERA_PIN_RESET GPIO_NUM_NC
64+
#define CAMERA_PIN_XCLK GPIO_NUM_40
65+
#define CAMERA_PIN_SIOD GPIO_NUM_17
66+
#define CAMERA_PIN_SIOC GPIO_NUM_18
6767

68-
#define CAMERA_PIN_D7 39
69-
#define CAMERA_PIN_D6 41
70-
#define CAMERA_PIN_D5 42
71-
#define CAMERA_PIN_D4 12
72-
#define CAMERA_PIN_D3 3
73-
#define CAMERA_PIN_D2 14
74-
#define CAMERA_PIN_D1 47
75-
#define CAMERA_PIN_D0 13
76-
#define CAMERA_PIN_VSYNC 21
77-
#define CAMERA_PIN_HREF 38
78-
#define CAMERA_PIN_PCLK 11
68+
#define CAMERA_PIN_D7 GPIO_NUM_39
69+
#define CAMERA_PIN_D6 GPIO_NUM_41
70+
#define CAMERA_PIN_D5 GPIO_NUM_42
71+
#define CAMERA_PIN_D4 GPIO_NUM_12
72+
#define CAMERA_PIN_D3 GPIO_NUM_3
73+
#define CAMERA_PIN_D2 GPIO_NUM_14
74+
#define CAMERA_PIN_D1 GPIO_NUM_47
75+
#define CAMERA_PIN_D0 GPIO_NUM_13
76+
#define CAMERA_PIN_VSYNC GPIO_NUM_21
77+
#define CAMERA_PIN_HREF GPIO_NUM_38
78+
#define CAMERA_PIN_PCLK GPIO_NUM_11
7979

8080
#define XCLK_FREQ_HZ 20000000
8181
#endif // _BOARD_CONFIG_H_

‎main/boards/kevin-sp-v4-dev/config.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@
4343
#define ML307_RX_PIN GPIO_NUM_12
4444
#define ML307_TX_PIN GPIO_NUM_13
4545
/* Camera pins */
46-
#define CAMERA_PIN_PWDN -1
47-
#define CAMERA_PIN_RESET -1
48-
#define CAMERA_PIN_XCLK 15
49-
#define CAMERA_PIN_SIOD 4
50-
#define CAMERA_PIN_SIOC 5
46+
#define CAMERA_PIN_PWDN GPIO_NUM_NC
47+
#define CAMERA_PIN_RESET GPIO_NUM_NC
48+
#define CAMERA_PIN_XCLK GPIO_NUM_15
49+
#define CAMERA_PIN_SIOD GPIO_NUM_4
50+
#define CAMERA_PIN_SIOC GPIO_NUM_5
5151

52-
#define CAMERA_PIN_D7 16
53-
#define CAMERA_PIN_D6 17
54-
#define CAMERA_PIN_D5 18
55-
#define CAMERA_PIN_D4 12
56-
#define CAMERA_PIN_D3 10
57-
#define CAMERA_PIN_D2 8
58-
#define CAMERA_PIN_D1 9
59-
#define CAMERA_PIN_D0 11
60-
#define CAMERA_PIN_VSYNC 6
61-
#define CAMERA_PIN_HREF 7
62-
#define CAMERA_PIN_PCLK 13
52+
#define CAMERA_PIN_D7 GPIO_NUM_16
53+
#define CAMERA_PIN_D6 GPIO_NUM_17
54+
#define CAMERA_PIN_D5 GPIO_NUM_18
55+
#define CAMERA_PIN_D4 GPIO_NUM_12
56+
#define CAMERA_PIN_D3 GPIO_NUM_10
57+
#define CAMERA_PIN_D2 GPIO_NUM_8
58+
#define CAMERA_PIN_D1 GPIO_NUM_9
59+
#define CAMERA_PIN_D0 GPIO_NUM_11
60+
#define CAMERA_PIN_VSYNC GPIO_NUM_6
61+
#define CAMERA_PIN_HREF GPIO_NUM_7
62+
#define CAMERA_PIN_PCLK GPIO_NUM_13
6363

6464
#define XCLK_FREQ_HZ 20000000
6565

‎main/boards/lichuang-dev/config.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@
3838
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
3939

4040
/* Camera pins */
41-
#define CAMERA_PIN_PWDN -1
42-
#define CAMERA_PIN_RESET -1
43-
#define CAMERA_PIN_XCLK 5
44-
#define CAMERA_PIN_SIOD 1
45-
#define CAMERA_PIN_SIOC 2
46-
47-
#define CAMERA_PIN_D7 9
48-
#define CAMERA_PIN_D6 4
49-
#define CAMERA_PIN_D5 6
50-
#define CAMERA_PIN_D4 15
51-
#define CAMERA_PIN_D3 17
52-
#define CAMERA_PIN_D2 8
53-
#define CAMERA_PIN_D1 18
54-
#define CAMERA_PIN_D0 16
55-
#define CAMERA_PIN_VSYNC 3
56-
#define CAMERA_PIN_HREF 46
57-
#define CAMERA_PIN_PCLK 7
41+
#define CAMERA_PIN_PWDN GPIO_NUM_NC
42+
#define CAMERA_PIN_RESET GPIO_NUM_NC
43+
#define CAMERA_PIN_XCLK GPIO_NUM_5
44+
#define CAMERA_PIN_SIOD GPIO_NUM_1
45+
#define CAMERA_PIN_SIOC GPIO_NUM_2
46+
47+
#define CAMERA_PIN_D7 GPIO_NUM_9
48+
#define CAMERA_PIN_D6 GPIO_NUM_4
49+
#define CAMERA_PIN_D5 GPIO_NUM_6
50+
#define CAMERA_PIN_D4 GPIO_NUM_15
51+
#define CAMERA_PIN_D3 GPIO_NUM_17
52+
#define CAMERA_PIN_D2 GPIO_NUM_8
53+
#define CAMERA_PIN_D1 GPIO_NUM_18
54+
#define CAMERA_PIN_D0 GPIO_NUM_16
55+
#define CAMERA_PIN_VSYNC GPIO_NUM_3
56+
#define CAMERA_PIN_HREF GPIO_NUM_46
57+
#define CAMERA_PIN_PCLK GPIO_NUM_7
5858

5959
#define XCLK_FREQ_HZ 24000000
6060

0 commit comments

Comments
 (0)