Skip to content

update M5Camera pins#4021

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

Merged
me-no-dev merged 4 commits into from
May 22, 2020
Merged

update M5Camera pins #4021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c3cb8b
change m5camera pins
Gitshaoxiang May 22, 2020
a3124d1
add M5Camera version B pins
Gitshaoxiang May 22, 2020
cfa5abc
add M5Camera version B pins
Gitshaoxiang May 22, 2020
7c6e94a
Merge branch 'master' into m5camera
Gitshaoxiang May 22, 2020
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
1 change: 1 addition & 0 deletions libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#define CAMERA_MODEL_WROVER_KIT // Has PSRAM
//#define CAMERA_MODEL_ESP_EYE // Has PSRAM
//#define CAMERA_MODEL_M5STACK_PSRAM // Has PSRAM
Copy link
Member

@me-no-devme-no-devMay 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feel free to add better explanation to both boards, so it is easier for users to distinguish. Like "manufactured before ..." or something else.

Copy link
ContributorAuthor

@GitshaoxiangGitshaoxiangMay 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think it is enough. i add the "version B" note. our user will know it. actually , we just saled few old version. most is version B. that is why i hope change it not add a new version. but add a version B define is a good solution. could you meger the PR.?

//#define CAMERA_MODEL_M5STACK_V2_PSRAM // M5Camera version B Has PSRAM
//#define CAMERA_MODEL_M5STACK_WIDE // Has PSRAM
//#define CAMERA_MODEL_AI_THINKER // Has PSRAM
//#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
Expand Down
19 changes: 19 additions & 0 deletions libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,25 @@
#define HREF_GPIO_NUM 26
#define PCLK_GPIO_NUM 21

#elif defined(CAMERA_MODEL_M5STACK_V2_PSRAM)
#define PWDN_GPIO_NUM -1
#define RESET_GPIO_NUM 15
#define XCLK_GPIO_NUM 27
#define SIOD_GPIO_NUM 22
#define SIOC_GPIO_NUM 23

#define Y9_GPIO_NUM 19
#define Y8_GPIO_NUM 36
#define Y7_GPIO_NUM 18
#define Y6_GPIO_NUM 39
#define Y5_GPIO_NUM 5
#define Y4_GPIO_NUM 34
#define Y3_GPIO_NUM 35
#define Y2_GPIO_NUM 32
#define VSYNC_GPIO_NUM 25
#define HREF_GPIO_NUM 26
#define PCLK_GPIO_NUM 21

#elif defined(CAMERA_MODEL_M5STACK_WIDE)
#define PWDN_GPIO_NUM -1
#define RESET_GPIO_NUM 15
Expand Down