Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

camera: try to defer init of video objects#195

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
KurtE wants to merge1 commit intoarduino:main
base:main
Choose a base branch
Loading
fromKurtE:defer_camera_start
Open
Show file tree
Hide file tree
Changes fromall 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
60 changes: 59 additions & 1 deletionlibraries/Camera/src/camera.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,15 +45,73 @@ Camera::Camera() : vdev(NULL), byte_swap(false), yuv_to_gray(false) {
}
}

#if defined(CONFIG_VIDEO)
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/drivers/clock_control.h>
#include <zephyr/logging/log.h>

int camera_ext_clock_enable(void) {
int ret;
uint32_t rate;
const struct device *cam_ext_clk_dev = DEVICE_DT_GET(DT_NODELABEL(pwmclock));

if (!device_is_ready(cam_ext_clk_dev)) {
return -ENODEV;
}

ret = clock_control_on(cam_ext_clk_dev, (clock_control_subsys_t)0);
if (ret < 0) {
return ret;
}

ret = clock_control_get_rate(cam_ext_clk_dev, (clock_control_subsys_t)0, &rate);
if (ret < 0) {
return ret;
}

return 0;
}
#else
#ERROR "CONFIG_VIDEO is not defined for this variant"
#endif

bool Camera::begin(uint32_t width, uint32_t height, uint32_t pixformat, bool byte_swap) {
#if DT_HAS_CHOSEN(zephyr_camera)
this->vdev = DEVICE_DT_GET(DT_CHOSEN(zephyr_camera));
#endif

if (!this->vdev || !device_is_ready(this->vdev)) {
// start the clock
int ret;

if (!this->vdev) {
return false;
}

camera_ext_clock_enable();
delay(50);

if (!device_is_ready(this->vdev)) {
// device probably has zephyr,deferred-init
// On GIGA and Portenta H7 and probably others starts DCIM object
if ((ret = device_init(this->vdev)) < 0) {
printk("device_init camera(%p) failed:%d\n", this->vdev, ret);
return false;
}
}

// Now see if the actual camera is defined in choosen. And see if it is ready
#if DT_HAS_CHOSEN(zephyr_camera_sensor)
const struct device *camera_sensor = DEVICE_DT_GET(DT_CHOSEN(zephyr_camera_sensor));
if (!device_is_ready(camera_sensor)) {
if ((ret = device_init(camera_sensor)) < 0) {
printk("device_init camera sensor(%p) failed:%d\n", camera_sensor, ret);
return false;
}
}

#endif

switch (pixformat) {
case CAMERA_RGB565:
this->byte_swap = byte_swap;
Expand Down
32 changes: 0 additions & 32 deletionsloader/fixups.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,38 +74,6 @@ static void zephyr_input_callback(struct input_event *evt, void *user_data) {
INPUT_CALLBACK_DEFINE(NULL, zephyr_input_callback, NULL);
#endif

#if defined(CONFIG_BOARD_ARDUINO_GIGA_R1) && defined(CONFIG_VIDEO)
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/drivers/clock_control.h>
#include <zephyr/logging/log.h>

int camera_ext_clock_enable(void) {
int ret;
uint32_t rate;
const struct device *cam_ext_clk_dev = DEVICE_DT_GET(DT_NODELABEL(pwmclock));

if (!device_is_ready(cam_ext_clk_dev)) {
return -ENODEV;
}

ret = clock_control_on(cam_ext_clk_dev, (clock_control_subsys_t)0);
if (ret < 0) {
return ret;
}

ret = clock_control_get_rate(cam_ext_clk_dev, (clock_control_subsys_t)0, &rate);
if (ret < 0) {
return ret;
}

return 0;
}

SYS_INIT(camera_ext_clock_enable, POST_KERNEL, CONFIG_CLOCK_CONTROL_PWM_INIT_PRIORITY);

#endif

#if defined(CONFIG_SHARED_MULTI_HEAP)
#include <zephyr/kernel.h>
#include <zephyr/devicetree.h>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
gc2145: gc2145@3c {
compatible = "galaxycore,gc2145";
reg = <0x3c>;
zephyr,deferred-init;
reset-gpios = <&gpiod 4 GPIO_ACTIVE_LOW>;
pwdn-gpios = <&gpioa 1 GPIO_ACTIVE_LOW>;

Expand DownExpand Up@@ -148,6 +149,7 @@

&dcmi {
status = "okay";
zephyr,deferred-init;
/* ext-sdram = <&sdram1>; */
pinctrl-0 = <&dcmi_hsync_ph8 &dcmi_pixclk_pa6 &dcmi_vsync_pi5
&dcmi_d0_ph9 &dcmi_d1_ph10 &dcmi_d2_ph11 &dcmi_d3_pg11
Expand DownExpand Up@@ -320,6 +322,7 @@
/{
chosen {
zephyr,camera = &dcmi;
zephyr,camera-sensor = &gc2145;
/* zephyr,console = &board_cdc_acm_uart; */
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@
gc2145: gc2145@3c {
compatible = "galaxycore,gc2145";
reg = <0x3c>;
zephyr,deferred-init;
status = "okay";

reset-gpios = <&gpioe 3 GPIO_ACTIVE_LOW>;
Expand DownExpand Up@@ -132,6 +133,7 @@

&dcmi {
status = "okay";
zephyr,deferred-init;
/* ext-sdram = <&sdram1>; */
pinctrl-0 = <&dcmi_hsync_pa4 &dcmi_pixclk_pa6 &dcmi_vsync_pi5
&dcmi_d0_ph9 &dcmi_d1_ph10 &dcmi_d2_ph11 &dcmi_d3_ph12
Expand DownExpand Up@@ -245,6 +247,7 @@
/ {
chosen {
zephyr,camera = &dcmi;
zephyr,camera-sensor = &gc2145;
zephyr,console = &usart6;
zephyr,shell-uart = &usart6;
zephyr,cdc-acm-uart0 = &usart6;
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp