diff --git a/python/bindings.cc b/python/bindings.cc index e6416028..4c70296d 100644 --- a/python/bindings.cc +++ b/python/bindings.cc @@ -541,7 +541,8 @@ PYBIND11_MODULE(_libmultisense, m) { .value("CMV4000_COLOR", multisense::MultiSenseInfo::DeviceInfo::ImagerType::CMV4000_COLOR) .value("FLIR_TAU2", multisense::MultiSenseInfo::DeviceInfo::ImagerType::FLIR_TAU2) .value("AR0234_GREY", multisense::MultiSenseInfo::DeviceInfo::ImagerType::AR0234_GREY) - .value("AR0239_COLOR", multisense::MultiSenseInfo::DeviceInfo::ImagerType::AR0239_COLOR); + .value("AR0239_COLOR", multisense::MultiSenseInfo::DeviceInfo::ImagerType::AR0239_COLOR) + .value("TENUM1280", multisense::MultiSenseInfo::DeviceInfo::ImagerType::TENUM1280); // MultiSenseInfo::DeviceInfo::LightingType py::enum_(m, "LightingType") diff --git a/source/Legacy/details/channel.cc b/source/Legacy/details/channel.cc index 4c7463c0..99041cc0 100644 --- a/source/Legacy/details/channel.cc +++ b/source/Legacy/details/channel.cc @@ -621,6 +621,7 @@ uint32_t impl::imagerApiToWire(uint32_t a) case system::DeviceInfo::IMAGER_TYPE_AR0234_GREY: return wire::SysDeviceInfo::IMAGER_TYPE_AR0234_GREY; case system::DeviceInfo::IMAGER_TYPE_AR0239_COLOR: return wire::SysDeviceInfo::IMAGER_TYPE_AR0239_COLOR; case system::DeviceInfo::IMAGER_TYPE_FLIR_TAU2: return wire::SysDeviceInfo::IMAGER_TYPE_FLIR_TAU2; + case system::DeviceInfo::IMAGER_TYPE_TENUM1280: return wire::SysDeviceInfo::IMAGER_TYPE_TENUM1280; default: CRL_DEBUG("unknown API imager type \"%d\"\n", a); return a; // pass through @@ -637,6 +638,7 @@ uint32_t impl::imagerWireToApi(uint32_t w) case wire::SysDeviceInfo::IMAGER_TYPE_AR0234_GREY: return system::DeviceInfo::IMAGER_TYPE_AR0234_GREY; case wire::SysDeviceInfo::IMAGER_TYPE_AR0239_COLOR: return system::DeviceInfo::IMAGER_TYPE_AR0239_COLOR; case wire::SysDeviceInfo::IMAGER_TYPE_FLIR_TAU2: return system::DeviceInfo::IMAGER_TYPE_FLIR_TAU2; + case wire::SysDeviceInfo::IMAGER_TYPE_TENUM1280: return system::DeviceInfo::IMAGER_TYPE_TENUM1280; default: CRL_DEBUG("unknown WIRE imager type \"%d\"\n", w); return w; // pass through diff --git a/source/LibMultiSense/details/legacy/info.cc b/source/LibMultiSense/details/legacy/info.cc index 2909afc3..0ae84f78 100644 --- a/source/LibMultiSense/details/legacy/info.cc +++ b/source/LibMultiSense/details/legacy/info.cc @@ -99,6 +99,8 @@ MultiSenseInfo::DeviceInfo convert(const crl::multisense::details::wire::SysDevi {output.imager_type = MultiSenseInfo::DeviceInfo::ImagerType::AR0234_GREY; break;} case wire::SysDeviceInfo::IMAGER_TYPE_AR0239_COLOR: {output.imager_type = MultiSenseInfo::DeviceInfo::ImagerType::AR0239_COLOR; break;} + case wire::SysDeviceInfo::IMAGER_TYPE_TENUM1280: + {output.imager_type = MultiSenseInfo::DeviceInfo::ImagerType::TENUM1280; break;} default: {CRL_EXCEPTION("Unsupported imager type");} } @@ -202,6 +204,8 @@ crl::multisense::details::wire::SysDeviceInfo convert(const MultiSenseInfo::Devi {output.imagerType = wire::SysDeviceInfo::IMAGER_TYPE_AR0234_GREY; break;} case MultiSenseInfo::DeviceInfo::ImagerType::AR0239_COLOR: {output.imagerType = wire::SysDeviceInfo::IMAGER_TYPE_AR0239_COLOR; break;} + case MultiSenseInfo::DeviceInfo::ImagerType::TENUM1280: + {output.imagerType = wire::SysDeviceInfo::IMAGER_TYPE_TENUM1280; break;} default: {CRL_EXCEPTION("Unsupported hardware revision");} } diff --git a/source/LibMultiSense/include/MultiSense/MultiSenseSerialization.hh b/source/LibMultiSense/include/MultiSense/MultiSenseSerialization.hh index b67513c9..cadcb05e 100644 --- a/source/LibMultiSense/include/MultiSense/MultiSenseSerialization.hh +++ b/source/LibMultiSense/include/MultiSense/MultiSenseSerialization.hh @@ -200,7 +200,8 @@ NLOHMANN_JSON_SERIALIZE_ENUM(MultiSenseInfo::DeviceInfo::ImagerType, { {MultiSenseInfo::DeviceInfo::ImagerType::CMV4000_COLOR, "CMV4000_COLOR"}, {MultiSenseInfo::DeviceInfo::ImagerType::FLIR_TAU2, "FLIR_TAU2"}, {MultiSenseInfo::DeviceInfo::ImagerType::AR0234_GREY, "AR0234_GREY"}, - {MultiSenseInfo::DeviceInfo::ImagerType::AR0239_COLOR, "AR0239_COLOR"} + {MultiSenseInfo::DeviceInfo::ImagerType::AR0239_COLOR, "AR0239_COLOR"}, + {MultiSenseInfo::DeviceInfo::ImagerType::TENUM1280, "TENUM1280"} }) NLOHMANN_JSON_SERIALIZE_ENUM(MultiSenseInfo::DeviceInfo::LightingType, { diff --git a/source/LibMultiSense/test/info_test.cc b/source/LibMultiSense/test/info_test.cc index 545446e1..ec4375f3 100644 --- a/source/LibMultiSense/test/info_test.cc +++ b/source/LibMultiSense/test/info_test.cc @@ -252,6 +252,8 @@ void check_equal(const crl::multisense::details::wire::SysDeviceInfo &wire, ASSERT_EQ(info.imager_type, MultiSenseInfo::DeviceInfo::ImagerType::AR0234_GREY); break; case wire::SysDeviceInfo::IMAGER_TYPE_AR0239_COLOR: ASSERT_EQ(info.imager_type, MultiSenseInfo::DeviceInfo::ImagerType::AR0239_COLOR); break; + case wire::SysDeviceInfo::IMAGER_TYPE_TENUM1280: + ASSERT_EQ(info.imager_type, MultiSenseInfo::DeviceInfo::ImagerType::TENUM1280); break; default: {CRL_EXCEPTION("Unsupported imager type");} } ASSERT_EQ(wire.imagerWidth, info.imager_width); diff --git a/source/Wire/include/wire/SysDeviceInfoMessage.hh b/source/Wire/include/wire/SysDeviceInfoMessage.hh index c45b4710..9735e329 100644 --- a/source/Wire/include/wire/SysDeviceInfoMessage.hh +++ b/source/Wire/include/wire/SysDeviceInfoMessage.hh @@ -115,12 +115,11 @@ public: static CRL_CONSTEXPR uint32_t IMAGER_TYPE_IMX104_COLOR = 100; static CRL_CONSTEXPR uint32_t IMAGER_TYPE_AR0234_GREY = 200; static CRL_CONSTEXPR uint32_t IMAGER_TYPE_AR0239_COLOR = 202; + static CRL_CONSTEXPR uint32_t IMAGER_TYPE_TENUM1280 = 300; static CRL_CONSTEXPR uint32_t LENS_TYPE_STANDARD = 1; static CRL_CONSTEXPR uint32_t LENS_TYPE_FISHEYE = 2; - - static CRL_CONSTEXPR uint32_t LIGHTING_TYPE_NONE = 0; static CRL_CONSTEXPR uint32_t LIGHTING_TYPE_INTERNAL = 1; static CRL_CONSTEXPR uint32_t LIGHTING_TYPE_SL_INTERNAL = 1; // Legacy