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

feat(3rd_party_board):Add GPIO pin mappings for M5Stack CamS3 Unit and select OPI PSRAM by default #9688

Merged
merged 8 commits into from
May 27, 2024
Merged

feat(3rd_party_board):Add GPIO pin mappings for M5Stack CamS3 Unit and select OPI PSRAM by default #9688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7064677
feat(camera): Add GPIO pin numbers for M5Stack CamS3 Unit
tarosay May 26, 2024
5aed5aa
docs(troubleshooting): Update guide for M5UnitCamS3 PSRAM configuration
tarosay May 26, 2024
c754c76
Merge branch 'espressif:master' into master
tarosay May 27, 2024
5e3ebbd
fix(): Remove QSPI option from M5Stack CamS3
P-R-O-C-H-Y May 27, 2024
4dca1db
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] May 27, 2024
6165bfd
fix(): Make OPI PSRAM option as default
P-R-O-C-H-Y May 27, 2024
185be06
Merge branch 'master' of https://github.com/tarosay/arduino-esp32 int…
P-R-O-C-H-Y May 27, 2024
5503188
fix(): Revert troubleshooting addition
P-R-O-C-H-Y May 27, 2024
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
11 changes: 4 additions & 7 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19365,7 +19365,7 @@ m5stack_unit_cams3.build.partitions=default
m5stack_unit_cams3.build.defines=
m5stack_unit_cams3.build.loop_core=
m5stack_unit_cams3.build.event_core=
m5stack_unit_cams3.build.psram_type=qspi
m5stack_unit_cams3.build.psram_type=opi
m5stack_unit_cams3.build.memory_type={build.boot}_{build.psram_type}

## IDE 2.0 Seems to not update the value
Expand All @@ -19381,15 +19381,12 @@ m5stack_unit_cams3.menu.JTAGAdapter.bridge=ESP USB Bridge
m5stack_unit_cams3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
m5stack_unit_cams3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1

m5stack_unit_cams3.menu.PSRAM.enabled=QSPI PSRAM
m5stack_unit_cams3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
m5stack_unit_cams3.menu.PSRAM.enabled.build.psram_type=qspi
m5stack_unit_cams3.menu.PSRAM.disabled=Disabled
m5stack_unit_cams3.menu.PSRAM.disabled.build.defines=
m5stack_unit_cams3.menu.PSRAM.disabled.build.psram_type=qspi
m5stack_unit_cams3.menu.PSRAM.opi=OPI PSRAM
m5stack_unit_cams3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
m5stack_unit_cams3.menu.PSRAM.opi.build.psram_type=opi
m5stack_unit_cams3.menu.PSRAM.disabled=Disabled
m5stack_unit_cams3.menu.PSRAM.disabled.build.defines=
m5stack_unit_cams3.menu.PSRAM.disabled.build.psram_type=qspi

m5stack_unit_cams3.menu.FlashMode.qio=QIO 80MHz
m5stack_unit_cams3.menu.FlashMode.qio.build.flash_mode=dio
Expand Down
1 change: 1 addition & 0 deletions libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
//#define CAMERA_MODEL_M5STACK_WIDE // Has PSRAM
//#define CAMERA_MODEL_M5STACK_ESP32CAM // No PSRAM
//#define CAMERA_MODEL_M5STACK_UNITCAM // No PSRAM
//#define CAMERA_MODEL_M5STACK_CAMS3_UNIT // Has PSRAM
//#define CAMERA_MODEL_AI_THINKER // Has PSRAM
//#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
//#define CAMERA_MODEL_XIAO_ESP32S3 // Has PSRAM
Expand Down
21 changes: 21 additions & 0 deletions libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,27 @@
#define HREF_GPIO_NUM 26
#define PCLK_GPIO_NUM 21

#elif defined(CAMERA_MODEL_M5STACK_CAMS3_UNIT)
#define PWDN_GPIO_NUM -1
#define RESET_GPIO_NUM 21
#define XCLK_GPIO_NUM 11
#define SIOD_GPIO_NUM 17
#define SIOC_GPIO_NUM 41

#define Y9_GPIO_NUM 13
#define Y8_GPIO_NUM 4
#define Y7_GPIO_NUM 10
#define Y6_GPIO_NUM 5
#define Y5_GPIO_NUM 7
#define Y4_GPIO_NUM 16
#define Y3_GPIO_NUM 15
#define Y2_GPIO_NUM 6
#define VSYNC_GPIO_NUM 42
#define HREF_GPIO_NUM 18
#define PCLK_GPIO_NUM 12

#define LED_GPIO_NUM 14

#elif defined(CAMERA_MODEL_AI_THINKER)
#define PWDN_GPIO_NUM 32
#define RESET_GPIO_NUM -1
Expand Down