Skip to content

Commit 3f54330

Browse files
78Xiaoxia
andauthored
Set minimal IDF version to 5.4.0 (#1339)
* version.py: not upload directory * Downgrade IDF version to 5.4.0 --------- Co-authored-by: Xiaoxia <[email protected]>
1 parent 99a4fc9 commit 3f54330

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

main/boards/common/esp32_camera.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
121121

122122
ESP_LOGD(
123123
TAG,
124-
"VIDIOC_QUERYCAP: driver=%s, card=%s, bus_info=%s, version=0x%08x, capabilities=0x%08x, device_caps=0x%08x",
124+
"VIDIOC_QUERYCAP: driver=%s, card=%s, bus_info=%s, version=0x%08lx, capabilities=0x%08lx, device_caps=0x%08lx",
125125
cap.driver, cap.card, cap.bus_info, cap.version, cap.capabilities, cap.device_caps);
126126

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

@@ -163,7 +163,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
163163
}
164164
};
165165
while (ioctl(video_fd_, VIDIOC_ENUM_FMT, &fmtdesc) == 0) {
166-
ESP_LOGD(TAG, "VIDIOC_ENUM_FMT: pixelformat=0x%08x, description=%s", fmtdesc.pixelformat, fmtdesc.description);
166+
ESP_LOGD(TAG, "VIDIOC_ENUM_FMT: pixelformat=0x%08lx, description=%s", fmtdesc.pixelformat, fmtdesc.description);
167167
CAM_PRINT_FOURCC(fmtdesc.pixelformat);
168168
int rank = get_rank(fmtdesc.pixelformat);
169169
if (rank < best_rank) {
@@ -185,7 +185,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
185185
return;
186186
}
187187

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

190190
if (ioctl(video_fd_, VIDIOC_S_FMT, &setformat) != 0) {
191191
ESP_LOGE(TAG, "VIDIOC_S_FMT failed, errno=%d(%s)", errno, strerror(errno));
@@ -392,7 +392,7 @@ bool Esp32Camera::Capture() {
392392
break;
393393
}
394394
default:
395-
ESP_LOGE(TAG, "unsupported sensor format: 0x%08x", sensor_format_);
395+
ESP_LOGE(TAG, "unsupported sensor format: 0x%08lx", sensor_format_);
396396
return false;
397397
}
398398
}
@@ -511,7 +511,7 @@ bool Esp32Camera::Capture() {
511511
break;
512512
}
513513
default:
514-
ESP_LOGE(TAG, "unsupported frame format: 0x%08x", frame_.format);
514+
ESP_LOGE(TAG, "unsupported frame format: 0x%08lx", frame_.format);
515515
return false;
516516
}
517517

main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ dependencies:
9898

9999
## Required IDF version
100100
idf:
101-
version: '>=5.5.0'
101+
version: '>=5.4.0'

scripts/versions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ def upload_dir_to_oss(source_dir, target_dir):
170170
bucket = oss2.Bucket(auth, os.environ['OSS_ENDPOINT'], os.environ['OSS_BUCKET_NAME'])
171171
for filename in os.listdir(source_dir):
172172
oss_key = os.path.join(target_dir, filename)
173+
# check if is file
174+
if not os.path.isfile(os.path.join(source_dir, filename)):
175+
continue
173176
print('uploading', oss_key)
174177
bucket.put_object(oss_key, open(os.path.join(source_dir, filename), 'rb'))
175178

0 commit comments

Comments
 (0)