Browse Source

Linux_SDK_V1.0.3

thead_admin 1 year ago
parent
commit
62ab0ecab1

+ 5 - 4
drivers/CMakeLists.txt

@@ -72,13 +72,14 @@ add_definitions(-DMRV_STITCHING_VERSION=2)
 
 add_compile_options(-Werror=implicit-function-declaration)
 
+set(DEPEND_LIBS
+    isi
+    hal
+)
+
 add_subdirectory(IMX219)
 add_subdirectory(SC2310)
 add_subdirectory(SC132GS)
 add_subdirectory(GC5035)
 add_subdirectory(GC02M1B)
 add_subdirectory(IMX334)
-
-link_libraries(${PROJECT_NAME} isi )
-
-#target_link_libraries()

+ 1 - 1
drivers/GC02M1B/3aconfig_GC02M1B.json

@@ -131,7 +131,7 @@
                     "hdr" : false,
                     "enable" : [1, 1, 1, 1, 1, 1],
                     "gains" : [1, 2, 4, 8, 16, 32],
-                    "contrast" : [1.2, 1.1, 1, 1, 1, 1],
+                    "contrast" : [1.6, 1.6, 1.6, 1.6, 1.6, 1.6],
                     "brightness" : [0, 0, 0, 0, 0, 0],
                     "saturation" : [1.2, 1.05, 0.92, 0.80, 0.75, 0.6],
                     "hue" : [0, 0, 0, 0, 0, 0],

+ 2 - 1
drivers/GC02M1B/CMakeLists.txt

@@ -28,7 +28,8 @@ add_custom_target(${module}.drv
                   DEPENDS ${module}
                   COMMENT "Copying ${module} driver module"
                   )
-    
+target_link_libraries(${module} ${DEPEND_LIBS} )
+add_dependencies(${module} ${DEPEND_LIBS})    
 #install(FILES       ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/lib/lib${module}.so.${${module}_INTERFACE_CURRENT}
 #                  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 #                  RENAME      ${module}.drv

+ 2 - 1
drivers/GC5035/CMakeLists.txt

@@ -28,7 +28,8 @@ add_custom_target(${module}.drv
                   DEPENDS ${module}
                   COMMENT "Copying ${module} driver module"
                   )
-    
+target_link_libraries(${module} ${DEPEND_LIBS} )
+add_dependencies(${module} ${DEPEND_LIBS})    
 #install(FILES       ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/lib/lib${module}.so.${${module}_INTERFACE_CURRENT}
 #                  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 #                  RENAME      ${module}.drv

+ 2 - 1
drivers/IMX219/CMakeLists.txt

@@ -28,7 +28,8 @@ add_custom_target(${module}.drv
                   DEPENDS ${module}
                   COMMENT "Copying ${module} driver module"
                   )
-    
+target_link_libraries(${module} ${DEPEND_LIBS} )
+add_dependencies(${module} ${DEPEND_LIBS})
 #install(FILES       ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/lib/lib${module}.so.${${module}_INTERFACE_CURRENT}
 #                  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 #                  RENAME      ${module}.drv

+ 2 - 1
drivers/IMX334/CMakeLists.txt

@@ -28,7 +28,8 @@ add_custom_target(${module}.drv
                   DEPENDS ${module}
                   COMMENT "Copying ${module} driver module"
                   )
-    
+target_link_libraries(${module} ${DEPEND_LIBS} )
+add_dependencies(${module} ${DEPEND_LIBS})    
 #install(FILES       ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/lib/lib${module}.so.${${module}_INTERFACE_CURRENT}
 #                  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 #                  RENAME      ${module}.drv

+ 2 - 1
drivers/SC132GS/CMakeLists.txt

@@ -28,7 +28,8 @@ add_custom_target(${module}.drv
                   DEPENDS ${module}
                   COMMENT "Copying ${module} driver module"
                   )
-    
+target_link_libraries(${module} ${DEPEND_LIBS} )
+add_dependencies(${module} ${DEPEND_LIBS})    
 #install(FILES       ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/lib/lib${module}.so.${${module}_INTERFACE_CURRENT}
 #                  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 #                  RENAME      ${module}.drv

+ 27 - 19
drivers/SC132GS/SC132GS.c

@@ -816,29 +816,37 @@ static RESULT SC132GS_IsiSensorSetStreamingIss
         return RET_WRONG_STATE;
 
     int32_t enable = (uint32_t) on;
-    ret = SC132GS_IsiRegisterWriteIss(handle, 0x3800, 0x00);
-    if (ret != 0) {
-        return (RET_FAILURE);
-    }
 
-    ret = SC132GS_IsiRegisterWriteIss(handle, 0x3817, 0x01);
-    if (ret != 0) {
-        return (RET_FAILURE);
-    }
+    if (on == 0) {
+        ret = SC132GS_IsiRegisterWriteIss(handle, 0x3800, 0x00);
+        if (ret != 0) {
+            return (RET_FAILURE);
+        }
 
-    ret = SC132GS_IsiRegisterWriteIss(handle, 0x100, on);
-    if (ret != 0) {
-        return (RET_FAILURE);
-    }
+        ret = SC132GS_IsiRegisterWriteIss(handle, 0x3817, 0x01);
+        if (ret != 0) {
+            return (RET_FAILURE);
+        }
 
-    ret = SC132GS_IsiRegisterWriteIss(handle, 0x3800, 0x10);
-    if (ret != 0) {
-        return (RET_FAILURE);
-    }
+        ret = SC132GS_IsiRegisterWriteIss(handle, 0x100, on);
+        if (ret != 0) {
+            return (RET_FAILURE);
+        }
 
-    ret = SC132GS_IsiRegisterWriteIss(handle, 0x3800, 0x40);
-    if (ret != 0) {
-        return (RET_FAILURE);
+        ret = SC132GS_IsiRegisterWriteIss(handle, 0x3800, 0x10);
+        if (ret != 0) {
+            return (RET_FAILURE);
+        }
+
+        ret = SC132GS_IsiRegisterWriteIss(handle, 0x3800, 0x40);
+        if (ret != 0) {
+            return (RET_FAILURE);
+        }
+    } else {
+        ret = SC132GS_IsiRegisterWriteIss(handle, 0x100, on);
+        if (ret != 0) {
+            return (RET_FAILURE);
+        }
     }
 
     pSC132GSCtx->Streaming = on;

+ 1 - 0
drivers/SC132GS/SC132GS_mipi2lane_1080x1280_init.txt

@@ -5,6 +5,7 @@
 0x3018 0x32
 0x301a 0xb4
 0x301f 0x27
+0x3021 0x03
 0x3032 0x60
 0x3038 0x44
 0x3207 0x17

+ 1 - 0
drivers/SC132GS/SC132GS_mipi2lane_1080x1280_master_init.txt

@@ -5,6 +5,7 @@
 0x3018 0x32
 0x301a 0xb4
 0x301f 0x27
+0x3021 0x03
 0x3032 0x60
 0x3038 0x44
 0x3207 0x17

+ 1 - 0
drivers/SC132GS/SC132GS_mipi2lane_1080x1280_slave_init.txt

@@ -5,6 +5,7 @@
 0x3018 0x32
 0x301a 0xb4
 0x301f 0x27
+0x3021 0x03
 0x3032 0x60
 0x3038 0x44
 0x3207 0x17

+ 1 - 0
drivers/SC132GS/SC132GS_mipi2lane_960x1280_init.txt

@@ -6,6 +6,7 @@
 0x3019 0x0c
 0x301a 0xb4
 0x301f 0x91
+0x3021 0x03
 0x3032 0x60
 0x3038 0x44
 0x3207 0x17

+ 1 - 0
drivers/SC132GS/SC132GS_mipi2lane_960x1280_master_init.txt

@@ -6,6 +6,7 @@
 0x3019 0x0c
 0x301a 0xb4
 0x301f 0x91
+0x3021 0x03
 0x3032 0x60
 0x3038 0x44
 0x3207 0x17

+ 1 - 0
drivers/SC132GS/SC132GS_mipi2lane_960x1280_slave_init.txt

@@ -6,6 +6,7 @@
 0x3019 0x0c
 0x301a 0xb4
 0x301f 0x91
+0x3021 0x03
 0x3032 0x60
 0x3038 0x44
 0x3207 0x17

+ 4 - 0
drivers/SC2310/3aconfig_SC2310.json

@@ -62,6 +62,10 @@
             "indoor" : [1, 1, 1, 1, 1, 1, 1],
             "outdoor" : [1, 1, 1, 1, 1, 1, 1],
             "transition" : [1, 1, 1, 1, 1, 1, 1],
+            "lsc_ratio":{
+                "gains" : [1, 2, 4, 8, 16, 32],
+                "vignetting" : [1, 1, 1, 0.9, 0.8, 0.7]
+            },
             "avg" : 0.0
         },
         {

+ 2 - 1
drivers/SC2310/CMakeLists.txt

@@ -28,7 +28,8 @@ add_custom_target(${module}.drv
                   DEPENDS ${module}
                   COMMENT "Copying ${module} driver module"
                   )
-    
+target_link_libraries(${module} ${DEPEND_LIBS} )
+add_dependencies(${module} ${DEPEND_LIBS})
 #install(FILES       ${LIB_ROOT}/${CMAKE_BUILD_TYPE}/lib/lib${module}.so.${${module}_INTERFACE_CURRENT}
 #                  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 #                  RENAME      ${module}.drv

File diff suppressed because it is too large
+ 0 - 0
drivers/SC2310/SC2310.c


File diff suppressed because it is too large
+ 674 - 0
drivers/SC2310/SC2310_1440x1080.xml


File diff suppressed because it is too large
+ 17 - 17
drivers/SC2310/SC2310_1920x1088.xml


+ 174 - 0
drivers/SC2310/SC2310_mipi2lane_1440x1080_raw12_30fps_init.txt

@@ -0,0 +1,174 @@
+0x0103 0x01
+0x0100 0x00
+0x36e9 0x80
+0x36f9 0x80
+0x3001 0xfe
+0x3018 0x33
+0x301c 0x78
+0x301f 0x4c
+0x3031 0x0a
+0x3037 0x24
+0x3038 0x44
+0x303f 0x01
+0x3200 0x00
+0x3201 0x04
+0x3202 0x00
+0x3203 0x04
+0x3204 0x07
+0x3205 0x8b
+0x3206 0x04
+0x3207 0x43
+0x3208 0x05
+0x3209 0xA0
+0x320a 0x04
+0x320b 0x38
+0x320c 0x04
+0x320d 0x65
+0x320e 0x04
+0x320f 0xb0
+0x3211 0xF8
+0x3213 0x08
+0x3235 0x09
+0x3236 0x5e
+0x3301 0x10
+0x3302 0x10
+0x3303 0x20
+0x3306 0x60
+0x3308 0x08
+0x3309 0x40
+0x330a 0x00
+0x330b 0xd0
+0x330e 0x30
+0x3314 0x04
+0x331b 0x83
+0x331e 0x15
+0x331f 0x35
+0x3320 0x01
+0x3324 0x02
+0x3325 0x02
+0x3326 0x00
+0x3333 0x30
+0x3334 0x40
+0x333d 0x08
+0x3341 0x07
+0x3343 0x03
+0x3364 0x1d
+0x3366 0x70
+0x3367 0x08
+0x3368 0x04
+0x3369 0x00
+0x336a 0x00
+0x336b 0x00
+0x336c 0x42
+0x337f 0x03
+0x3380 0x1b
+0x33aa 0x00
+0x33b6 0x07
+0x33b7 0x07
+0x33b8 0x10
+0x33b9 0x10
+0x33ba 0x10
+0x33bb 0x07
+0x33bc 0x07
+0x33bd 0x20
+0x33be 0x20
+0x33bf 0x20
+0x360f 0x05
+0x3621 0xac
+0x3622 0xe6
+0x3623 0x18
+0x3624 0x47
+0x3630 0xc8
+0x3631 0x88
+0x3632 0x18
+0x3633 0x22
+0x3634 0x44
+0x3635 0x40
+0x3636 0x65
+0x3637 0x17
+0x3638 0x25
+0x363b 0x08
+0x363c 0x05
+0x363d 0x05
+0x3640 0x00
+0x366e 0x04
+0x3670 0x4a
+0x3671 0xf6
+0x3672 0x16
+0x3673 0x16
+0x3674 0xc8
+0x3675 0x54
+0x3676 0x18
+0x3677 0x22
+0x3678 0x33
+0x3679 0x44
+0x367a 0x40
+0x367b 0x40
+0x367c 0x40
+0x367d 0x58
+0x367e 0x40
+0x367f 0x58
+0x3696 0x83
+0x3697 0x87
+0x3698 0x9f
+0x36a0 0x58
+0x36a1 0x78
+0x36ea 0x77
+0x36eb 0x0a
+0x36ec 0x0e
+0x36ed 0x03
+0x36fa 0x28
+0x36fb 0x10
+0x3802 0x00
+0x3907 0x01
+0x3908 0x01
+0x391e 0x00
+0x391f 0xc0
+0x3933 0x28
+0x3934 0x0a
+0x3940 0x1b
+0x3941 0x40
+0x3942 0x08
+0x3943 0x0e
+0x3e00 0x00
+0x3e01 0x95
+0x3e02 0xa0
+0x3e03 0x0b
+0x3e06 0x00
+0x3e07 0x80
+0x3e08 0x03
+0x3e09 0x40
+0x3e0e 0x66
+0x3e14 0xb0
+0x3e1e 0x35
+0x3e25 0x03
+0x3e26 0x40
+0x3f00 0x0d
+0x3f04 0x02
+0x3f05 0x2a
+0x3f08 0x04
+0x4500 0x59
+0x4501 0xb4
+0x4509 0x20
+0x4603 0x00
+0x4809 0x01
+0x4837 0x31
+0x5000 0x06
+0x5780 0x7f
+0x5781 0x06
+0x5782 0x04
+0x5783 0x02
+0x5784 0x01
+0x5785 0x16
+0x5786 0x12
+0x5787 0x08
+0x5788 0x02
+0x57a0 0x00
+0x57a1 0x74
+0x57a2 0x01
+0x57a3 0xf4
+0x57a4 0xf0
+0x6000 0x00
+0x6002 0x00
+0x36e9 0x33
+0x36f9 0x31

+ 1 - 0
drivers/SC2310/SC2310_mipi2lane_1920x1080_raw10_30fps_init.txt

@@ -7,6 +7,7 @@
 0x3019 0x0c
 0x301c 0x78
 0x301f 0x40
+0x3021 0x87
 0x3031 0x0a
 0x3037 0x22
 0x3038 0x22

+ 1 - 0
drivers/SC2310/SC2310_mipi2lane_1920x1088_raw12_30fps_init.txt

@@ -4,6 +4,7 @@
 0x3018 0x33
 0x301c 0x78
 0x301f 0x77
+0x3021 0x87
 0x3031 0x0c
 0x3037 0x42
 0x3038 0x22

+ 1 - 0
drivers/SC2310/SC2310_mipi2lane_640x480_raw12_30fps_init.txt

@@ -5,6 +5,7 @@
 0x3018 0x33
 0x301c 0x78
 0x301f 0x77
+0x3021 0x87
 0x3031 0x0c
 0x3037 0x42
 0x3038 0x22

Some files were not shown because too many files changed in this diff