Merge branch 'test-reg' of https://github.com/stereolabs/zed-open-capture into test-reg

obraun-sl · obraun-sl · commit fa3c375ffe2d · 2021-04-23T20:51:38.000+02:00
diff --git a/examples/zed_oc_control_example.cpp b/examples/zed_oc_control_example.cpp
@@ -111,8 +111,8 @@ int main(int argc, char *argv[])
 
     // ----> Set Video parameters
     sl_oc::video::VideoParams params;
-    params.res = sl_oc::video::RESOLUTION::HD1080;
-    params.fps = sl_oc::video::FPS::FPS_30;
+    params.res = sl_oc::video::RESOLUTION::HD2K;
+    params.fps = sl_oc::video::FPS::FPS_15;
     params.verbose = verbose;
     // <---- Set Video parameters
 
@@ -222,10 +222,19 @@ void handleKeyboard( sl_oc::video::VideoCapture &cap, int key )
     {
     case 'L':
     {
-        logging = cap.enableAecAgcSensLogging( !logging );
+        logging = cap.enableAecAgcSensLogging( !logging, 5 );
         std::cout << std::string("*** AEC/AGC registers loggin: ") << (logging?std::string("ENABLED"):std::string("DISABLED")) << std::endl;
     }
         break;
+
+    case 'f':
+    case 'F':
+    {
+        bool res = cap.resetAGCAECregisters();
+        std::cout << std::string("*** AEC/AGC registers reset: ") << (res?std::string("OK"):std::string("KO")) << std::endl;
+    }
+        break;
+
     case 'l':
     {
         bool led;
@@ -312,6 +321,7 @@ void handleKeyboard( sl_oc::video::VideoCapture &cap, int key )
         std::cout << " * '-' -> Decrease the current control value" << std::endl;
         std::cout << " * '0' .. '9' -> Set the current control value" << std::endl;
         std::cout << " * 'L' -> Toggle AGC/AEC registers logging" << std::endl;
+        std::cout << " * 'f' -> Fix AGC/AEC registers" << std::endl;
     }
 }
 
diff --git a/include/videocapture.hpp b/include/videocapture.hpp
@@ -379,6 +379,8 @@ class SL_OC_EXPORT VideoCapture
     inline void setReadyToSync(){ mSensReadyToSync=true; }
 #endif
 
+        bool resetAGCAECregisters();
+
 private:
     void grabThreadFunc();  //!< The frame grabbing thread function
 
@@ -453,6 +455,8 @@ class SL_OC_EXPORT VideoCapture
     void saveLogDataLeft();
     void saveLogDataRight();
 
+
+
 private:
     // Flags
     bool mNewFrame=false;               //!< Indicates if a new frame is available
diff --git a/src/videocapture.cpp b/src/videocapture.cpp
@@ -2091,6 +2091,17 @@ void VideoCapture::saveLogDataRight()
     }
 }
 
+bool VideoCapture::resetAGCAECregisters() {
+    int res = 0;
+
+    res += ll_write_sensor_register( 0, 1, 0x3503, 0x04);
+    res += ll_write_sensor_register( 1, 1, 0x3503, 0x04);
+    res += ll_write_sensor_register( 0, 1, 0x3505, 0x00);
+    res += ll_write_sensor_register( 1, 1, 0x3505, 0x00);
+
+    return res==0;
+}
+
 #ifdef SENSORS_MOD_AVAILABLE
 bool VideoCapture::enableSensorSync( sensors::SensorCapture* sensCap )
 {

Original file line number	Diff line number	Diff line change
`@@ -2091,6 +2091,17 @@ void VideoCapture::saveLogDataRight()`
`2091`	`2091`	`}`
`2092`	`2092`	`}`
`2093`	`2093`
	`2094`	`+bool VideoCapture::resetAGCAECregisters() {`
	`2095`	`+ int res = 0;`
	`2096`	`+`
	`2097`	`+ res += ll_write_sensor_register( 0, 1, 0x3503, 0x04);`
	`2098`	`+ res += ll_write_sensor_register( 1, 1, 0x3503, 0x04);`
	`2099`	`+ res += ll_write_sensor_register( 0, 1, 0x3505, 0x00);`
	`2100`	`+ res += ll_write_sensor_register( 1, 1, 0x3505, 0x00);`
	`2101`	`+`
	`2102`	`+ return res==0;`
	`2103`	`+}`
	`2104`	`+`
`2094`	`2105`	`#ifdef SENSORS_MOD_AVAILABLE`
`2095`	`2106`	`bool VideoCapture::enableSensorSync( sensors::SensorCapture* sensCap )`
`2096`	`2107`	`{`