Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions main/boards/common/esp32_camera.cc
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {

ESP_LOGD(
TAG,
"VIDIOC_QUERYCAP: driver=%s, card=%s, bus_info=%s, version=0x%08x, capabilities=0x%08x, device_caps=0x%08x",
"VIDIOC_QUERYCAP: driver=%s, card=%s, bus_info=%s, version=0x%08lx, capabilities=0x%08lx, device_caps=0x%08lx",
cap.driver, cap.card, cap.bus_info, cap.version, cap.capabilities, cap.device_caps);

struct v4l2_format format = {};
Expand All @@ -132,7 +132,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
video_fd_ = -1;
return;
}
ESP_LOGD(TAG, "VIDIOC_G_FMT: pixelformat=0x%08x, width=%d, height=%d", format.fmt.pix.pixelformat,
ESP_LOGD(TAG, "VIDIOC_G_FMT: pixelformat=0x%08lx, width=%ld, height=%ld", format.fmt.pix.pixelformat,
format.fmt.pix.width, format.fmt.pix.height);
CAM_PRINT_FOURCC(format.fmt.pix.pixelformat);

Expand Down Expand Up @@ -163,7 +163,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
}
};
while (ioctl(video_fd_, VIDIOC_ENUM_FMT, &fmtdesc) == 0) {
ESP_LOGD(TAG, "VIDIOC_ENUM_FMT: pixelformat=0x%08x, description=%s", fmtdesc.pixelformat, fmtdesc.description);
ESP_LOGD(TAG, "VIDIOC_ENUM_FMT: pixelformat=0x%08lx, description=%s", fmtdesc.pixelformat, fmtdesc.description);
CAM_PRINT_FOURCC(fmtdesc.pixelformat);
int rank = get_rank(fmtdesc.pixelformat);
if (rank < best_rank) {
Expand All @@ -185,7 +185,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
return;
}

ESP_LOGD(TAG, "selected pixel format: 0x%08x", setformat.fmt.pix.pixelformat);
ESP_LOGD(TAG, "selected pixel format: 0x%08lx", setformat.fmt.pix.pixelformat);

if (ioctl(video_fd_, VIDIOC_S_FMT, &setformat) != 0) {
ESP_LOGE(TAG, "VIDIOC_S_FMT failed, errno=%d(%s)", errno, strerror(errno));
Expand Down Expand Up @@ -392,7 +392,7 @@ bool Esp32Camera::Capture() {
break;
}
default:
ESP_LOGE(TAG, "unsupported sensor format: 0x%08x", sensor_format_);
ESP_LOGE(TAG, "unsupported sensor format: 0x%08lx", sensor_format_);
return false;
}
}
Expand Down Expand Up @@ -511,7 +511,7 @@ bool Esp32Camera::Capture() {
break;
}
default:
ESP_LOGE(TAG, "unsupported frame format: 0x%08x", frame_.format);
ESP_LOGE(TAG, "unsupported frame format: 0x%08lx", frame_.format);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ dependencies:

## Required IDF version
idf:
version: '>=5.5.0'
version: '>=5.4.0'
3 changes: 3 additions & 0 deletions scripts/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ def upload_dir_to_oss(source_dir, target_dir):
bucket = oss2.Bucket(auth, os.environ['OSS_ENDPOINT'], os.environ['OSS_BUCKET_NAME'])
for filename in os.listdir(source_dir):
oss_key = os.path.join(target_dir, filename)
# check if is file
if not os.path.isfile(os.path.join(source_dir, filename)):
continue
print('uploading', oss_key)
bucket.put_object(oss_key, open(os.path.join(source_dir, filename), 'rb'))

Expand Down
Loading