Merge branch 'mcm_v1.5' into 'dev'

Fix mcm error See merge request maix_sw/k230_canmv!209
kendryte · Apr 19, 2024 · 4667181 · 4667181
2 parents ead57c7 + 6838f50
commit 4667181
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/micropython_port/media/camera.py b/micropython_port/media/camera.py
@@ -19,6 +19,8 @@
 CAM_DEFAULT_INPUT_BUF_NUM = 4
 CAM_DEFAULT_OUTPUT_BUF_NUM = 6
 CAM_DEFAULT_SENSOR = OV_OV5647_MIPI_CSI0_1920X1080_30FPS_10BIT_LINEAR
+CAM_OV5647_1920X1080_CSI1_30FPS_10BIT_USEMCLK_LINEAR = OV_OV5647_MIPI_CSI1_1920X1080_30FPS_10BIT_LINEAR
+CAM_OV5647_1920X1080_CSI2_30FPS_10BIT_USEMCLK_LINEAR = OV_OV5647_MIPI_CSI2_1920X1080_30FPS_10BIT_LINEAR
 
 BOARD_NAME = os.uname()[-1]
 if BOARD_NAME == "k230d_canmv":

diff --git a/micropython_port/media/sensor.py b/micropython_port/media/sensor.py
@@ -19,6 +19,8 @@
 CAM_DEFAULT_INPUT_BUF_NUM = 4
 CAM_DEFAULT_OUTPUT_BUF_NUM = 6
 CAM_DEFAULT_SENSOR = OV_OV5647_MIPI_CSI0_1920X1080_30FPS_10BIT_LINEAR
+CAM_OV5647_1920X1080_CSI1_30FPS_10BIT_USEMCLK_LINEAR = OV_OV5647_MIPI_CSI1_1920X1080_30FPS_10BIT_LINEAR
+CAM_OV5647_1920X1080_CSI2_30FPS_10BIT_USEMCLK_LINEAR = OV_OV5647_MIPI_CSI2_1920X1080_30FPS_10BIT_LINEAR
 
 BOARD_NAME = os.uname()[-1]
 if BOARD_NAME == "k230d_canmv":