Skip to content

No need to merge, just want to say thank you 👍 #1

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

Open
mikhail-m1 wants to merge 7 commits into
base: main
Choose a base branch
from
Open

No need to merge, just want to say thank you 👍 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0f7f8c
Update for esp32s3, add web server to example
mikhail-m1 Jun 10, 2024
ef2e100
update lib path
mikhail-m1 Jun 10, 2024
b3fda59
Rework new to config, add getters
mikhail-m1 Jul 9, 2024
f2da38f
Update source, add more parameters to new
mikhail-m1 Oct 18, 2024
1dce4c7
Fix example build
mikhail-m1 Oct 19, 2024
f1b342b
One more parameter, fix example
mikhail-m1 Nov 4, 2024
204a2ea
add Cargo.lock for example
mikhail-m1 Nov 4, 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
55 changes: 0 additions & 55 deletions .cargo/config.toml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/target
/Cargo.lock
/.embuild
/.embuild
components_esp32s3.lock
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name = "esp-camera-rs"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
esp-idf-hal = "0.43.1"
esp-idf-sys = "0.34.1"
esp-idf-hal = "0.44.1"
esp-idf-sys = "0.35"

concat-idents = "1.1.5"

[patch.crates-io]
esp-idf-sys = { git = "https://github.com/esp-rs/esp-idf-sys", branch = "master" }
Expand Down
7 changes: 6 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
# esp-camera-rs
Rust wrapper library to interface with the ESP32 camera
Rust wrapper library to interface with the ESP32 and ESP32 S3 cameras. The way to define configuration
for camera was reworked, get methods added and set methods rewrote to use macro.

See [examples/camera-example/README.md](examples/camera-example/README.md) for usage details.

Do not runt cargo build in this directory, run it in the example dir!
2 changes: 1 addition & 1 deletion esp32-camera
Open in desktop
Submodule esp32-camera updated 11 files
+1 −4 .github/workflows/build.yml
+1 −1 .github/workflows/upload_component.yml
+9 −1 CMakeLists.txt
+27 −0 Kconfig
+4 −0 driver/cam_hal.c
+1 −1 driver/esp_camera.c
+347 −0 driver/sccb-ng.c
+1 −0 driver/sccb.c
+0 −1 target/esp32/ll_cam.c
+0 −3 target/esp32s2/ll_cam.c
+4 −0 target/esp32s3/ll_cam.c
12 changes: 8 additions & 4 deletions examples/camera-example/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
[build]
target = "xtensa-esp32-espidf"
target = "xtensa-esp32s3-espidf"

[target.xtensa-esp32-espidf]
[target.xtensa-esp32s3-espidf]
linker = "ldproxy"
# runner = "espflash --monitor" # Select this runner for espflash v1.x.x
runner = "espflash flash --monitor" # Select this runner for espflash v2.x.x
runner = "espflash flash --monitor -T target/xtensa-esp32s3-espidf/release/partition-table.bin" # Select this runner for espflash v2.x.x
rustflags = [ "--cfg", "espidf_time64"] # Extending time_t for ESP IDF 5: https://github.com/esp-rs/rust/issues/110

[unstable]
build-std = ["std", "panic_abort"]

[env]
MCU="esp32"
MCU="esp32s3"
# Note: this variable is not used by the pio builder (`cargo build --features pio`)
ESP_IDF_VERSION = "v5.1.3"

# Workaround for https://github.com/esp-rs/esp-idf-template/issues/174 until
# https://github.com/esp-rs/esp-idf-hal/pull/387 gets released and the template
# updated.
CRATE_CC_NO_DEFAULTS = "1"
1 change: 0 additions & 1 deletion examples/camera-example/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.embuild/
target/
components_esp32.lock
Cargo.lock
Loading