devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

Set minimal IDF version to 5.4.0 (#1339)

Browse Source 
* version.py: not upload directory

* Downgrade IDF version to 5.4.0

---------

Co-authored-by: Xiaoxia <terrence.huang@tenclass.com>
This commit is contained in:
Xiaoxia
2025-10-28 07:48:47 +08:00
committed by GitHub
parent 99a4fc94bf
commit 3f54330ac9
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/boards/common/esp32_camera.cc
View File

@@ -121,7 +121,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
ESP_LOGD( ESP_LOGD(
TAG, 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); cap.driver, cap.card, cap.bus_info, cap.version, cap.capabilities, cap.device_caps);
struct v4l2_format format = {}; struct v4l2_format format = {};
@@ -132,7 +132,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
video_fd_ = -1; video_fd_ = -1;
return; 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); format.fmt.pix.width, format.fmt.pix.height);
CAM_PRINT_FOURCC(format.fmt.pix.pixelformat); CAM_PRINT_FOURCC(format.fmt.pix.pixelformat);
@@ -163,7 +163,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
} }
}; };
while (ioctl(video_fd_, VIDIOC_ENUM_FMT, &fmtdesc) == 0) { 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); CAM_PRINT_FOURCC(fmtdesc.pixelformat);
int rank = get_rank(fmtdesc.pixelformat); int rank = get_rank(fmtdesc.pixelformat);
if (rank < best_rank) { if (rank < best_rank) {
@@ -185,7 +185,7 @@ Esp32Camera::Esp32Camera(const esp_video_init_config_t& config) {
return; 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) { if (ioctl(video_fd_, VIDIOC_S_FMT, &setformat) != 0) {
ESP_LOGE(TAG, "VIDIOC_S_FMT failed, errno=%d(%s)", errno, strerror(errno)); ESP_LOGE(TAG, "VIDIOC_S_FMT failed, errno=%d(%s)", errno, strerror(errno));
@@ -392,7 +392,7 @@ bool Esp32Camera::Capture() {
break; break;
} }
default: default:
ESP_LOGE(TAG, "unsupported sensor format: 0x%08x", sensor_format_); ESP_LOGE(TAG, "unsupported sensor format: 0x%08lx", sensor_format_);
return false; return false;
} }
} }
@@ -511,7 +511,7 @@ bool Esp32Camera::Capture() {
break; break;
} }
default: default:
ESP_LOGE(TAG, "unsupported frame format: 0x%08x", frame_.format); ESP_LOGE(TAG, "unsupported frame format: 0x%08lx", frame_.format);
return false; return false;
} }

2
main/idf_component.yml
View File

@@ -98,4 +98,4 @@ dependencies:
## Required IDF version ## Required IDF version
idf: idf:
version: '>=5.5.0' version: '>=5.4.0'

3
scripts/versions.py
View File

@@ -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']) bucket = oss2.Bucket(auth, os.environ['OSS_ENDPOINT'], os.environ['OSS_BUCKET_NAME'])
for filename in os.listdir(source_dir): for filename in os.listdir(source_dir):
oss_key = os.path.join(target_dir, filename) 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) print('uploading', oss_key)
bucket.put_object(oss_key, open(os.path.join(source_dir, filename), 'rb')) bucket.put_object(oss_key, open(os.path.join(source_dir, filename), 'rb'))