Merge branch 'develop' of github.com:us4useu/arrus into develop

us4useu · Mar 17, 2022 · 577bcf5 · 577bcf5
2 parents 0fee473 + 9bac8ed
commit 577bcf5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,7 +87,7 @@ set(ARRUS_DOCS_INSTALL_DIR docs)
 ################################################################################
 # Common dependencies
 ################################################################################
-find_package(Us4 0.7.2 EXACT REQUIRED US4OEM HV256 DBARLite)
+find_package(Us4 0.8.2 EXACT REQUIRED US4OEM HV256 DBARLite)
 find_package(Boost REQUIRED)
 set(Boost_USE_STATIC_LIBS ON)
 find_package(Protobuf REQUIRED)

diff --git a/arrus/cfg/default.dict b/arrus/cfg/default.dict
@@ -871,9 +871,9 @@ probe_models: [
             end: 10e6
         },
         voltage_range: {
-			begin: 0,
-			end: 75
-		}
+	    begin: 0,
+	    end: 90
+	}
     },
     {
         id: {
@@ -1016,7 +1016,7 @@ probe_models: [
         },
         voltage_range: {
 	    begin: 0,
-	    end: 75
+	    end: 90
 	}
     }
 ]

diff --git a/arrus/core/devices/us4r/tests/MockIUs4OEM.h b/arrus/core/devices/us4r/tests/MockIUs4OEM.h
@@ -121,6 +121,25 @@ class MockIUs4OEM : public IUs4OEM {
     MOCK_METHOD(void, ResetCallbacks, (), (override));
     MOCK_METHOD(float, GetFPGATemp, (), (override));
     MOCK_METHOD(void, WaitForPendingTransfers, (), (override));
+    MOCK_METHOD(void, ClearUCDFaults, (), (override));
+    MOCK_METHOD(unsigned short, GetUCDStatus, (), (override));
+    MOCK_METHOD(unsigned char, GetUCDStatusByte, (), (override));
+    MOCK_METHOD(float, GetUCDTemp, (), (override));
+    MOCK_METHOD(float, GetUCDExtTemp, (), (override));
+    MOCK_METHOD(float, GetUCDVOUT, (unsigned char), (override));
+    MOCK_METHOD(float, GetUCDIOUT, (unsigned char), (override));
+    MOCK_METHOD(unsigned char, GetUCDVOUTStatus, (unsigned char), (override));
+    MOCK_METHOD(unsigned char, GetUCDIOUTStatus, (unsigned char), (override));
+    MOCK_METHOD(unsigned char, GetUCDCMLStatus, (unsigned char), (override));
+    MOCK_METHOD(std::vector<unsigned char>, GetUCDMFRStatus, (unsigned char), (override));
+    MOCK_METHOD(std::vector<unsigned char>, GetUCDRunTime, (), (override));
+    MOCK_METHOD(std::vector<unsigned char>, GetUCDBlackBox, (), (override));
+    MOCK_METHOD(std::vector<unsigned char>, GetUCDLog, (), (override));
+    MOCK_METHOD(void, ClearUCDLog, (), (override));
+    MOCK_METHOD(bool, CheckUCDLogNotEmpty, (), (override));
+    MOCK_METHOD(void, ClearUCDBlackBox, (), (override));
+    MOCK_METHOD(void, SetTxFrequencyRange, (int), (override));
+    MOCK_METHOD(int, GetTxFrequencyRange, (), (override));
 };
 
 #define GET_MOCK_PTR(sptr) *(MockIUs4OEM *) (sptr.get())

diff --git a/cmake/python.cmake b/cmake/python.cmake
@@ -99,7 +99,7 @@ function(install_sphinx_package TARGET_NAME VENV_TARGET)
         COMMAND
             # TODO install only necessary packages (e.g. breathe is not needed by python docs generator)
             ${INSTALL_VENV_EXECUTABLE} -m pip install sphinx==3.3.1 sphinx_rtd_theme==0.5.0 six breathe docutils==0.16
-            "git+git://github.com/pjarosik/matlabdomain@master#egg=sphinxcontrib-matlabdomain"
+            "git+https://github.com/pjarosik/matlabdomain@master#egg=sphinxcontrib-matlabdomain"
         DEPENDS
             ${VENV_TARGET}
         WORKING_DIRECTORY