Camera: Call initialization function of camera devices on theCamera

SPRESENSE · Jan 25, 2022 · a12fbdd · a12fbdd
2 parents ee98950 + 9d20f2e
commit a12fbdd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Camera/Camera.cpp b/Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Camera/Camera.cpp
@@ -31,6 +31,9 @@
 
 #include <Camera.h>
 #include <arch/board/cxd56_imageproc.h>
+#include <nuttx/video/isx012.h>
+#include <nuttx/video/isx019.h>
+#include <arch/chip/cisif.h>
 
 /****************************************************************************
  * ImgBuff implementation.
@@ -498,7 +501,10 @@ CameraClass CameraClass::getInstance()
 // Public : Constructor.
 CameraClass::CameraClass(const char *path)
 {
-  video_init_stat = video_initialize(path);
+  video_init_stat = isx019_initialize();
+  video_init_stat += isx012_initialize();
+  video_init_stat += cxd56_cisif_initialize();
+  video_init_stat += video_initialize(path);
   video_fd = -1;
   video_imgs = NULL;
   video_buf_num = 0;

diff --git a/tools/configs/spresense.conf b/tools/configs/spresense.conf
@@ -1 +1 @@
-default device/adc device/camera device/charger device/emmc device/hostif device/pwm device/sdcard feature/asmp feature/audio_player feature/audio_recorder feature/audio_recognizer feature/audio_synthesizer feature/dnnrt_mp feature/fwuputils feature/gnss feature/imageproc feature/libcxx feature/lte_stub_mbedtls feature/step_counter feature/digital_filters -- +CXD56_I2C_DRIVER=n +CXD56_I2C1 +CXD56_I2C1_SCUSEQ=n +CXD56_LTE_LATE_INITIALIZE=y +CXD56_HPADC0_INPUT_GAIN_M6DB +CXD56_HPADC1_INPUT_GAIN_M6DB +CXD56_USE_SYSBUS=n -LTE_SYSCTL=y
+default device/adc device/camera device/charger device/emmc device/hostif device/pwm device/sdcard feature/asmp feature/audio_player feature/audio_recorder feature/audio_recognizer feature/audio_synthesizer feature/dnnrt_mp feature/fwuputils feature/gnss feature/imageproc feature/libcxx feature/lte_stub_mbedtls feature/step_counter feature/digital_filters -- +CXD56_I2C_DRIVER=n +CXD56_I2C1 +CXD56_I2C1_SCUSEQ=n +CXD56_LTE_LATE_INITIALIZE=y +CXD56_CAMERA_LATE_INITIALIZE=y +CXD56_HPADC0_INPUT_GAIN_M6DB +CXD56_HPADC1_INPUT_GAIN_M6DB +CXD56_USE_SYSBUS=n -LTE_SYSCTL=y
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		default device/adc device/camera device/charger device/emmc device/hostif device/pwm device/sdcard feature/asmp feature/audio_player feature/audio_recorder feature/audio_recognizer feature/audio_synthesizer feature/dnnrt_mp feature/fwuputils feature/gnss feature/imageproc feature/libcxx feature/lte_stub_mbedtls feature/step_counter feature/digital_filters -- +CXD56_I2C_DRIVER=n +CXD56_I2C1 +CXD56_I2C1_SCUSEQ=n +CXD56_LTE_LATE_INITIALIZE=y +CXD56_HPADC0_INPUT_GAIN_M6DB +CXD56_HPADC1_INPUT_GAIN_M6DB +CXD56_USE_SYSBUS=n -LTE_SYSCTL=y
		default device/adc device/camera device/charger device/emmc device/hostif device/pwm device/sdcard feature/asmp feature/audio_player feature/audio_recorder feature/audio_recognizer feature/audio_synthesizer feature/dnnrt_mp feature/fwuputils feature/gnss feature/imageproc feature/libcxx feature/lte_stub_mbedtls feature/step_counter feature/digital_filters -- +CXD56_I2C_DRIVER=n +CXD56_I2C1 +CXD56_I2C1_SCUSEQ=n +CXD56_LTE_LATE_INITIALIZE=y +CXD56_CAMERA_LATE_INITIALIZE=y +CXD56_HPADC0_INPUT_GAIN_M6DB +CXD56_HPADC1_INPUT_GAIN_M6DB +CXD56_USE_SYSBUS=n -LTE_SYSCTL=y