diff --git a/build_depends.repos b/build_depends.repos index 8e7351482..6b7e58ff7 100644 --- a/build_depends.repos +++ b/build_depends.repos @@ -8,4 +8,4 @@ repositories: ros2_socketcan: type: git url: https://github.com/knzo25/ros2_socketcan - version: feat/continental_fd \ No newline at end of file + version: feat/continental_fd diff --git a/nebula_common/include/nebula_common/hesai/hesai_common.hpp b/nebula_common/include/nebula_common/hesai/hesai_common.hpp index 8f583018e..9ef149fa9 100644 --- a/nebula_common/include/nebula_common/hesai/hesai_common.hpp +++ b/nebula_common/include/nebula_common/hesai/hesai_common.hpp @@ -55,8 +55,7 @@ inline std::ostream & operator<<(std::ostream & os, HesaiSensorConfiguration con << ", FOV(Start):" << arg.cloud_min_angle << ", FOV(End):" << arg.cloud_max_angle << ", DualReturnDistanceThreshold:" << arg.dual_return_distance_threshold << ", PtpProfile:" << arg.ptp_profile << ", PtpDomain:" << std::to_string(arg.ptp_domain) - << ", PtpTransportType:" << arg.ptp_transport_type - << ", PtpSwitchType:" << arg.ptp_switch_type + << ", PtpTransportType:" << arg.ptp_transport_type << ", PtpSwitchType:" << arg.ptp_switch_type << ", HighResolutionMode:" << arg.hires_mode; return os; } diff --git a/nebula_hw_interfaces/src/nebula_hesai_hw_interfaces/hesai_hw_interface.cpp b/nebula_hw_interfaces/src/nebula_hesai_hw_interfaces/hesai_hw_interface.cpp index 7c224f3cd..ae3e862e0 100644 --- a/nebula_hw_interfaces/src/nebula_hesai_hw_interfaces/hesai_hw_interface.cpp +++ b/nebula_hw_interfaces/src/nebula_hesai_hw_interfaces/hesai_hw_interface.cpp @@ -503,7 +503,8 @@ HesaiLidarRangeAll HesaiHwInterface::GetLidarRange() return hesai_range_all; } -Status HesaiHwInterface::SetHighResolutionMode(bool enable) { +Status HesaiHwInterface::SetHighResolutionMode(bool enable) +{ std::vector request_payload; request_payload.emplace_back(enable ? 0x01 : 0x00); @@ -512,7 +513,8 @@ Status HesaiHwInterface::SetHighResolutionMode(bool enable) { return Status::OK; } -bool HesaiHwInterface::GetHighResolutionMode() { +bool HesaiHwInterface::GetHighResolutionMode() +{ auto response_or_err = SendReceive(PTC_COMMAND_GET_HIGH_RESOLUTION_MODE); auto response = response_or_err.value_or_throw(PrettyPrintPTCError(response_or_err.error_or({}))); @@ -950,7 +952,6 @@ HesaiStatus HesaiHwInterface::CheckAndSetConfig( auto hires_currently_enabled = GetHighResolutionMode(); if (hires_currently_enabled != sensor_configuration->hires_mode) { - PrintInfo("current lidar hires_mode: " + std::to_string(hires_currently_enabled)); PrintInfo( "current configuration hires_mode: " + std::to_string(sensor_configuration->hires_mode)); diff --git a/nebula_ros/launch/continental_launch_all_hw.xml b/nebula_ros/launch/continental_launch_all_hw.xml index 9e9ffe421..0255e89f9 100644 --- a/nebula_ros/launch/continental_launch_all_hw.xml +++ b/nebula_ros/launch/continental_launch_all_hw.xml @@ -17,7 +17,7 @@ - + diff --git a/nebula_ros/schema/SRR520.schema.json b/nebula_ros/schema/SRR520.schema.json index 19356adff..0c3004a64 100644 --- a/nebula_ros/schema/SRR520.schema.json +++ b/nebula_ros/schema/SRR520.schema.json @@ -60,10 +60,14 @@ "$ref": "#/definitions/SRR520" } }, - "required": ["ros__parameters"], + "required": [ + "ros__parameters" + ], "additionalProperties": false } }, - "required": ["/**"], + "required": [ + "/**" + ], "additionalProperties": false } diff --git a/nebula_ros/schema/sub/communication.json b/nebula_ros/schema/sub/communication.json index b01c22e06..f7f3b6d86 100644 --- a/nebula_ros/schema/sub/communication.json +++ b/nebula_ros/schema/sub/communication.json @@ -72,7 +72,11 @@ "ptp_profile": { "type": "string", "default": "1588v2", - "enum": ["1588v2", "802.1as", "automotive"], + "enum": [ + "1588v2", + "802.1as", + "automotive" + ], "description": "PTP profile." }, "ptp_domain": { @@ -85,13 +89,19 @@ "ptp_transport_type": { "type": "string", "default": "UDP", - "enum": ["UDP", "L2"], + "enum": [ + "UDP", + "L2" + ], "description": "1588v2 supports 'UDP' or 'L2', other profiles only L2 (HW)." }, "ptp_switch_type": { "type": "string", "default": "TSN", - "enum": ["TSN", "NON_TSN"], + "enum": [ + "TSN", + "NON_TSN" + ], "description": "For automotive profile,'TSN' or 'NON_TSN'." }, "receiver_timeout_sec": {