Merge branch 'add_o3r_ods_rendered_zones_buffer_id' into 'main'

Added O3R_ODS_RENDERED_ZONES buffer_id See merge request syntron/support/csr/ifm3d/ifm3d!393
ifm · Aug 2, 2024 · bb9af25 · bb9af25
2 parents 8b59e86 + 262b94c
commit bb9af25
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - The documentation about the different available `buffer_id` has been updated to provide the complete list for each compatible device.
+- add `O3R_ODS_RENDERED_ZONES` `buffer_id`
 
 ## 1.6.0 - 2024-06-10
 ### Changed

diff --git a/modules/framegrabber/include/ifm3d/fg/frame.h b/modules/framegrabber/include/ifm3d/fg/frame.h
@@ -194,6 +194,7 @@ namespace ifm3d
     O3R_MCC_LIVE_IMAGE,
     O3R_MCC_MOTION_IMAGE,
     O3R_MCC_STATIC_IMAGE,
+    O3R_ODS_RENDERED_ZONES,
 
     // clang-format on
   };

diff --git a/modules/framegrabber/src/libifm3d_framegrabber/schema.cpp b/modules/framegrabber/src/libifm3d_framegrabber/schema.cpp
@@ -108,6 +108,10 @@ const std::map<ifm3d::buffer_id, const ifm3d::json> o3r_schema_map{
    {{"type", "records"},
     {"id", "O3R_MCC_STATIC_IMAGE"},
     {"elements", {{{"type", "blob"}, {"id", "O3R_RESULT_ARRAY2D"}}}}}},
+  {ifm3d::buffer_id::O3R_ODS_RENDERED_ZONES,
+   {{"type", "records"},
+    {"id", "O3R_ODS_RENDERED_ZONES"},
+    {"elements", {{{"type", "blob"}, {"id", "O3R_RESULT_ARRAY2D"}}}}}},
 };
 
 ifm3d::json

diff --git a/modules/pybind11/src/bindings/frame.h b/modules/pybind11/src/bindings/frame.h
@@ -53,8 +53,9 @@ bind_frame(pybind11::module_& m, pybind11::module_& ifm3dpy)
     .value("O3R_ODS_OCCUPANCY_GRID", ifm3d::buffer_id::O3R_ODS_OCCUPANCY_GRID)      
     .value("O3R_ODS_INFO", ifm3d::buffer_id::O3R_ODS_INFO)          
     .value("O3R_RESULT_JSON", ifm3d::buffer_id::O3R_RESULT_JSON)          
-    .value("O3R_RESULT_ARRAY2D", ifm3d::buffer_id::O3R_RESULT_ARRAY2D)        
-    .value("O3R_RESULT_IMU", ifm3d::buffer_id::O3R_RESULT_IMU)      
+    .value("O3R_RESULT_ARRAY2D", ifm3d::buffer_id::O3R_RESULT_ARRAY2D)
+    .value("O3R_RESULT_IMU", ifm3d::buffer_id::O3R_RESULT_IMU)    
+    .value("O3R_ODS_RENDERED_ZONES", ifm3d::buffer_id::O3R_ODS_RENDERED_ZONES)
     .value("XYZ", ifm3d::buffer_id::XYZ)      
     .value("EXPOSURE_TIME", ifm3d::buffer_id::EXPOSURE_TIME)      
     .value("ILLUMINATION_TEMP", ifm3d::buffer_id::ILLUMINATION_TEMP);