Skip to content

Commit a23f3dd

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 7f583d4 + 56925fc commit a23f3dd

9 files changed

Lines changed: 1169 additions & 86 deletions

‎M5StackCoreS3_CameraWebServer.jpg‎

-86.5 KB
Binary file not shown.

‎README.en.md‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[日本語](README.md)
44

5-
<img src="./M5StackCoreS3_CameraWebServer.jpg" width="480">
5+
<img src="https://user-images.githubusercontent.com/26270227/239725404-c5dd33c4-c511-4d05-a192-3d184ef4de8b.png" width="480">
66

77
## Overview
88
Porting of [espressif/arduino-esp32](https://github.com/espressif/arduino-esp32) example [CameraWebServer](https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/Camera/CameraWebServer) to M5Stack CoreS3 (GC0308).
@@ -16,6 +16,12 @@ However, If you set platform = espressif32 and framework = arduino in platformio
1616
* [gob_GC0308](https://github.com/GOB52/gob_GC0308)
1717
* WiFi connection available
1818

19+
## Build type
20+
|Env|Description|
21+
|---|---|
22+
|release|Basic settings|
23+
|release_face|Support dace detection and recognition|
24+
1925
## How to use
2026
Once executed, the IP address will be displayed on the screen and on the serial monitor.
2127
(This is an example, so the actual IP will vary depending on the environment.)
@@ -75,10 +81,21 @@ Changes the horizontal image inversion.
7581
Changes the vertical image inversion.
7682
* Color Bar
7783
Color bar display ON/OFF.
84+
85+
* Face Detection
86+
Face detection ON/OFF
87+
* Face Recognition
88+
Face Recognition ON/OFF
89+
**Note: Face recognition is a very heavy process.**
90+
7891
* Get Still
7992
Obtains a still image.
8093
* Start/Stop Stream
8194
Start/Stop receiving stream.
95+
* Enroll Face
96+
Enroll the face on the camera.
97+
Once enrolled, the face will no longer be treated as an intruder (red frame) if Face Recogintion is ON.
98+
8299
* Save
83100
Download incoming images.
84101
* X
@@ -91,7 +108,7 @@ Refer to data sheets and other sources for register and function information.
91108
**Caution** <ins>Be careful not to set inappropriate values to inappropriate registers. </ins>
92109

93110
## Changes from the original
94-
* The application is now dedicated to M5Stack Core3.
111+
* The application is now dedicated to M5Stack CoreS3.
95112
* M5Unified base to work.
96113
* Modified html for GC0308.
97114
* Functions not present in GC0308 were omitted.

‎README.md‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[English](README.en.md)
44

5-
<img src="./M5StackCoreS3_CameraWebServer.jpg" width="480">
5+
<img src="https://user-images.githubusercontent.com/26270227/239725404-c5dd33c4-c511-4d05-a192-3d184ef4de8b.png" width="480">
66

77
## 概要
88
[espressif/arduino-esp32](https://github.com/espressif/arduino-esp32) の [CameraWebServer](https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/Camera/CameraWebServer) を M5Stack CoreS3 向けに移植した物です。
@@ -16,6 +16,13 @@ platformio で platform = espressif32, framework = arduino なら同梱なので
1616
* [gob_GC0308](https://github.com/GOB52/gob_GC0308)
1717
* WiFi 接続可能な環境
1818

19+
## ビルド種別
20+
|Env|説明|
21+
|---|---|
22+
|release|基本設定|
23+
|release_face|顔検出、認識あり|
24+
25+
1926
## 使い方
2027
実行すると、画面とシリアルモニタに接続先 IP アドレスが表示されます。
2128
下記は例なので実際は環境によって IP は異なります
@@ -76,10 +83,21 @@ platformio で platform = espressif32, framework = arduino なら同梱なので
7683
垂直方向の画像反転を変更します。
7784
* Color Bar
7885
カラーバー表示の ON/OFF
86+
87+
* Face Detection
88+
顔検知機能の ON/OFF
89+
* Face Recognition
90+
顔認識機能の ON/OFF
91+
**注 顔認識は処理がとても重くなります。**
92+
7993
* Get Still
8094
静止画像取得
8195
* Start/Stop Stream
8296
ストリーム受信の開始/終了
97+
* Enroll Face
98+
カメラに写っている顔を登録します。
99+
登録すると Face Recogintion ON の時に侵入者(赤枠)扱いになりません。
100+
83101
* Save
84102
受信画像をダウンロードします。
85103
* X
@@ -92,7 +110,7 @@ platformio で platform = espressif32, framework = arduino なら同梱なので
92110
**注意** <ins>適切でない値を適切でないレジスタへ設定しないように気をつけてください。</ins>
93111

94112
## オリジナルからの変更点
95-
* M5StackCore3 専用のアプリケーションになった。
113+
* M5StackCoreS3 専用のアプリケーションになった。
96114
* M5Unified ベースで動作するようにした。
97115
* GC0308 用に html を修正した。
98116
* GC0308 に無い機能を割愛した。

‎for_face.csv‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xe000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0x3d0000,
5+
fr, data, , 0x3e0000, 0x20000,

‎platformio.ini‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,22 @@ board_build.arduino.memory_type = qio_qspi
5353
upload_speed = 1500000
5454
build_type=debug
5555
build_flags=${env.build_flags} ${option_debug.build_flags}
56+
-Wl,-Map,output.map
57+
58+
; Enable face detection/recognition
59+
[env:release_face]
60+
board = esp32s3box
61+
board_build.arduino.memory_type = qio_qspi
62+
upload_speed = 1500000
63+
build_type=release
64+
build_flags=${env.build_flags} ${option_release.build_flags} -DCWS_ENABLE_FACE
65+
board_build.partitions = for_face.csv
66+
67+
[env:debug_face]
68+
board = esp32s3box
69+
board_build.arduino.memory_type = qio_qspi
70+
upload_speed = 1500000
71+
build_type=debug
72+
build_flags=${env.build_flags} ${option_debug.build_flags} -DCWS_ENABLE_FACE
73+
-Wl,-Map,output.map
74+
board_build.partitions = for_face.csv

0 commit comments

Comments
 (0)