Version 0.40.10 (#169)

* Version 0.40.10 * Updated release notes * Added updated release notes
IntelRealSense · Jan 1, 2025 · acea384 · acea384
1 parent 2cb30b9
commit acea384
Show file tree

Hide file tree

Showing 33 changed files with 546 additions and 614 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,11 +72,15 @@ option(RSID_DOXYGEN "Build doxygen docs" OFF)
 option(RSID_SECURE "Enable secure communication with device" OFF)
 option(RSID_TOOLS "Build additional tools" ON)
 option(RSID_PY "Build python wrapper" OFF)
-
+option(RSID_NETWORK "Enable networking. Required for license and update checker." ON)
 
 # install option
 option(RSID_INSTALL "Generate the install target and rsidConfig.cmake" OFF)
 
+if(RSID_NETWORK)
+    add_compile_definitions(RSID_NETWORK)
+endif()
+
 if(RSID_TIDY)
     set(CMAKE_CXX_CLANG_TIDY "clang-tidy")
     set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -96,13 +100,16 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${LIBS_OUTPUT_PATH}")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${LIBS_OUTPUT_PATH}")    
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
-include(cmake/libcurl.cmake)
-include(cmake/restClient.cmake)
-include(cmake/nlohmann-json.cmake)
-include(cmake/base64_hpp.cmake)
+if(RSID_NETWORK)
+    include(cmake/libcurl.cmake)
+    include(cmake/restClient.cmake)
+    include(cmake/nlohmann-json.cmake)
+    include(cmake/base64_hpp.cmake)
+endif()
+
 include(cmake/OS.cmake)
 include(cmake/SpdLog.cmake)
-if(MSVC)
+if(MSVC AND RSID_NETWORK)
     include(cmake/winreg.cmake)
 endif()
 

diff --git a/Readme.md b/Readme.md
@@ -45,23 +45,25 @@ $ make -j
 
 The following possible options are available for the `cmake` command
 
-| Option               | Default | Feature                                          |
-|----------------------|:-------:|:-------------------------------------------------|
-| `RSID_DEBUG_CONSOLE` |  `ON`   | Log everything to console                        |
-| `RSID_DEBUG_FILE`    |  `OFF`  | Log everything to _rsid_debug.log_ file          |
-| `RSID_DEBUG_SERIAL`  |  `OFF`  | Log all serial communication                     |
-| `RSID_DEBUG_PACKETS` |  `OFF`  | Log packet sent/received over the serial line    |
-| `RSID_DEBUG_VALUES`  |  `OFF`  | Replace default common values with debug ones    |
-| `RSID_PREVIEW`       |  `OFF`  | Enables preview feature.                         |
-| `RSID_SAMPLES`       |  `OFF`  | Build samples                                    |
-| `RSID_TIDY`          |  `OFF`  | Enable clang-tidy                                |
-| `RSID_PEDANTIC`      |  `OFF`  | Enable extra compiler warnings                   |
-| `RSID_PROTECT_STACK` |  `OFF`  | Enable stack protection compiler flags           |
-| `RSID_DOXYGEN`       |  `OFF`  | Build doxygen docs                               |
-| `RSID_SECURE`        |  `OFF`  | Enable secure communication with device          |
-| `RSID_TOOLS`         |  `ON`   | Build additional tools                           |
-| `RSID_PY`            |  `OFF`  | Build python wrapper                             |
-| `RSID_INSTALL`       |  `OFF`  | Generate the install target and rsidConfig.cmake |
+| Option               | Default | Feature                                                    |
+|----------------------|:-------:|:-----------------------------------------------------------|
+| `RSID_DEBUG_CONSOLE` |  `ON`   | Log everything to console                                  |
+| `RSID_DEBUG_FILE`    |  `OFF`  | Log everything to _rsid_debug.log_ file                    |
+| `RSID_DEBUG_SERIAL`  |  `OFF`  | Log all serial communication                               |
+| `RSID_DEBUG_PACKETS` |  `OFF`  | Log packet sent/received over the serial line              |
+| `RSID_DEBUG_VALUES`  |  `OFF`  | Replace default common values with debug ones              |
+| `RSID_PREVIEW`       |  `OFF`  | Enables preview feature.                                   |
+| `RSID_SAMPLES`       |  `OFF`  | Build samples                                              |
+| `RSID_TIDY`          |  `OFF`  | Enable clang-tidy                                          |
+| `RSID_PEDANTIC`      |  `OFF`  | Enable extra compiler warnings                             |
+| `RSID_PROTECT_STACK` |  `OFF`  | Enable stack protection compiler flags                     |
+| `RSID_DOXYGEN`       |  `OFF`  | Build doxygen docs                                         |
+| `RSID_SECURE`        |  `OFF`  | Enable secure communication with device                    |
+| `RSID_TOOLS`         |  `ON`   | Build additional tools                                     |
+| `RSID_PY`            |  `OFF`  | Build python wrapper                                       |
+| `RSID_INSTALL`       |  `OFF`  | Generate the install target and rsidConfig.cmake           |
+| `RSID_NETWORK`       |  `ON`   | Enable networking. Required for license and update checker.|
+
 
 ### Linux Post Install
 
@@ -375,17 +377,7 @@ struct RSID_API DeviceConfig
         SpoofOnly = 2,         // spoof only
         RecognitionOnly = 3    // recognition only
     };
-
-    /**
-     * @enum FaceSelectionPolicy
-     * @brief To run authentication on all (up to 5) detected faces vs single (closest) face
-     */
-    enum class FaceSelectionPolicy
-    {
-        Single = 0, // default, run authentication on closest face
-        All = 1     // run authentication on all (up to 5) detected faces
-    };
-
+
     enum class DumpMode
     {
         None = 0,
@@ -395,8 +387,7 @@ struct RSID_API DeviceConfig
 
     CameraRotation camera_rotation = CameraRotation::Rotation_0_Deg;
     SecurityLevel security_level = SecurityLevel::Medium;
-    AlgoFlow algo_flow = AlgoFlow::All;
-    FaceSelectionPolicy face_selection_policy = FaceSelectionPolicy::Single;
+    AlgoFlow algo_flow = AlgoFlow::All;    
     DumpMode dump_mode = DumpMode::None;
 };
 ```

diff --git a/include/RealSenseID/AuthenticateStatus.h b/include/RealSenseID/AuthenticateStatus.h
@@ -34,6 +34,8 @@ enum class RSID_API AuthenticateStatus
     TooManySpoofs,
     InvalidFeatures,
     AmbiguiousFace,
+    /// Accessories
+    Sunglasses = 50, 
     /// serial statuses
     Ok = 100,
     Error,
@@ -43,13 +45,15 @@ enum class RSID_API AuthenticateStatus
     CrcError,
     LicenseError,
     LicenseCheck,
-    ///
+    /// Spoofs
     Spoof_2D = 120,
     Spoof_3D,
     Spoof_LR,
     Spoof_Disparity,
     Spoof_Surface,
-    Spoof_Plane_Disparity
+    Spoof_Plane_Disparity,  
+    Spoof_2D_Right,
+    /* Note: Should not exceed 127 - to be a legal ascii*/
 };
 
 /**

diff --git a/include/RealSenseID/DeviceConfig.h b/include/RealSenseID/DeviceConfig.h
@@ -44,16 +44,7 @@ struct RSID_API DeviceConfig
         RecognitionOnly = 3    // recognition only
     };
 
-    /**
-     * @enum FaceSelectionPolicy
-     * @brief Controls whether to run authentication on all (up to 5) detected faces vs single (closest) face
-     */
-    enum class FaceSelectionPolicy
-    {
-        Single = 0, // default, run authentication on closest face
-        All = 1     // run authentication on all (up to 5) detected faces
-    };
-
+
     enum class DumpMode
     {
         None = 0,        // default
@@ -79,7 +70,6 @@ struct RSID_API DeviceConfig
     CameraRotation camera_rotation = CameraRotation::Rotation_0_Deg;
     SecurityLevel security_level = SecurityLevel::Low;
     AlgoFlow algo_flow = AlgoFlow::FaceDetectionOnly;
-    FaceSelectionPolicy face_selection_policy = FaceSelectionPolicy::Single;
     DumpMode dump_mode = DumpMode::None;
     MatcherConfidenceLevel matcher_confidence_level = MatcherConfidenceLevel::Low;
 
@@ -98,7 +88,6 @@ struct RSID_API DeviceConfig
 RSID_API const char* Description(DeviceConfig::CameraRotation rotation);
 RSID_API const char* Description(DeviceConfig::SecurityLevel level);
 RSID_API const char* Description(DeviceConfig::AlgoFlow algoMode);
-RSID_API const char* Description(DeviceConfig::FaceSelectionPolicy policy);
 RSID_API const char* Description(DeviceConfig::DumpMode dump_mode);
 RSID_API const char* Description(DeviceConfig::MatcherConfidenceLevel matcher_confidence_level);
 
@@ -123,12 +112,6 @@ inline OStream& operator<<(OStream& os, const DeviceConfig::SecurityLevel& level
     return os;
 }
 
-template <typename OStream>
-inline OStream& operator<<(OStream& os, const DeviceConfig::FaceSelectionPolicy& policy)
-{
-    os << Description(policy);
-    return os;
-}
 
 template <typename OStream>
 inline OStream& operator<<(OStream& os, const DeviceConfig::DumpMode& dump_mode)

diff --git a/include/RealSenseID/EnrollStatus.h b/include/RealSenseID/EnrollStatus.h
@@ -34,6 +34,8 @@ enum class RSID_API EnrollStatus
     Spoof,
     InvalidFeatures,
     AmbiguiousFace,
+    /// Accessories
+    Sunglasses = 50,
     /// serial statuses
     Ok = 100,
     Error,
@@ -43,13 +45,14 @@ enum class RSID_API EnrollStatus
     CrcError,
     LicenseError,
     LicenseCheck,
-    ///
+    /// Spoofs
     Spoof_2D = 120,
     Spoof_3D,
     Spoof_LR,
     Spoof_Disparity,
     Spoof_Surface,
-    Spoof_Plane_Disparity
+    Spoof_Plane_Disparity,
+    Spoof_2D_Right
 };
 
 /**

diff --git a/include/RealSenseID/UpdateChecker.h b/include/RealSenseID/UpdateChecker.h
@@ -22,7 +22,13 @@ struct RSID_API ReleaseInfo {
     const char* fw_version_str = nullptr;
     const char* release_url = nullptr;
     const char* release_notes_url = nullptr;
-    ~ReleaseInfo();
+
+    ~ReleaseInfo() {
+        delete[] sw_version_str;
+        delete[] fw_version_str;
+        delete[] release_url;
+        delete[] release_notes_url;
+    }
 };
 
 class RSID_API UpdateChecker

diff --git a/include/RealSenseID/Version.h b/include/RealSenseID/Version.h
@@ -9,7 +9,7 @@
 
 #define RSID_VER_MAJOR 0
 #define RSID_VER_MINOR 40
-#define RSID_VER_PATCH 0
+#define RSID_VER_PATCH 10
 
 #define RSID_VERSION (RSID_VER_MAJOR * 10000 + RSID_VER_MINOR * 100 + RSID_VER_PATCH)
 
@@ -36,4 +36,4 @@ RSID_API const char* CompatibleFirmwareVersion();
  */
 RSID_API bool IsFwCompatibleWithHost(const std::string& fw_version);
 
-} // namespace RealSenseID
+} // namespace RealSenseID
diff --git a/release_info.json b/release_info.json
@@ -1,8 +1,8 @@
 {
-    "sw_version": 4000,
-    "sw_version_str": "0.40.0",
-    "fw_version": 700000304,
-    "fw_version_str": "7.0.0.304",
-    "release_url": "https://github.com/IntelRealSense/RealSenseID/releases/tag/v0.40.0",
-    "release_notes_url": "https://github.com/IntelRealSense/RealSenseID/blob/v0.40.0/release_notes.txt"
+    "sw_version": 4010,
+    "sw_version_str": "0.40.10",
+    "fw_version": 705000303,
+    "fw_version_str": "7.5.0.303",
+    "release_url": "https://github.com/IntelRealSense/RealSenseID/releases/tag/v0.40.10",
+    "release_notes_url": "https://github.com/IntelRealSense/RealSenseID/blob/v0.40.10/release_notes.txt"
 }
diff --git a/release_notes.txt b/release_notes.txt
@@ -1,3 +1,18 @@
+Realsense ID version 0.40.10
+-----------------------------------
+**Important:** To retain the device database, export it before upgrading. You can import it back after the upgrade using rsid-viewer
+* New firmware release - version 7.5.0.303
+	* Improved TPR for Anti-Spoofing
+	* Increased database limit to 1,000 users. 
+	* Added anti spoofing limitations to enrollment
+	* Added standby mode for lower power consumption
+* New host SW:
+	* Improved support for device databases with 1,000 users
+	* Added CMake option to compile without network support (`-DRSID_NETWORK=OFF`)
+	* Added Set/Get color gains to python API
+	* Removed support for multi-face authentication
+
+
 Realsense ID version 0.40.0
 -----------------------------------
 * New firmware release - version 7.0.0.304

diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
@@ -32,10 +32,5 @@ if (RSID_PREVIEW)
     # snapshot preview
     add_executable(preview-snapshot-cpp-sample preview_snapshot.cc)
     target_link_libraries(preview-snapshot-cpp-sample PRIVATE rsid)
-    set_target_properties(preview-snapshot-cpp-sample PROPERTIES FOLDER "samples/cpp")
-
-    # face-rects
-    add_executable(multi-faces-cpp-sample multi-faces.cc)
-    target_link_libraries(multi-faces-cpp-sample PRIVATE rsid)
-    set_target_properties(multi-faces-cpp-sample PROPERTIES FOLDER "samples/cpp")    
+    set_target_properties(preview-snapshot-cpp-sample PROPERTIES FOLDER "samples/cpp")   
 endif()