Merge branch 'main' into at128_top_of_second_diag

tier4 · Nov 29, 2023 · c13eaa0 · c13eaa0
2 parents a0b14d4 + 7e28d15
commit c13eaa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -30,6 +30,7 @@
     "vccint",
     "Vccint",
     "XT",
-    "XTM"
+    "XTM",
+    "DHAVE"
   ]
 }
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
@@ -3202,16 +3202,10 @@ int HesaiHwInterface::NebulaModelToHesaiModelNo(nebula::drivers::SensorModel mod
       return 40;
     case SensorModel::HESAI_PANDARAT128:
       return 48;
-    case SensorModel::VELODYNE_VLS128:
-    case SensorModel::VELODYNE_HDL64:
-    case SensorModel::VELODYNE_VLP32:
-    case SensorModel::VELODYNE_VLP32MR:
-    case SensorModel::VELODYNE_HDL32:
-    case SensorModel::VELODYNE_VLP16:
-    case SensorModel::UNKNOWN:
+    // All other vendors and unknown sensors
+    default:
       return -1;
   }
-  return -1;
 }
 void HesaiHwInterface::SetTargetModel(int model) { target_model_no = model; }
 void HesaiHwInterface::SetTargetModel(nebula::drivers::SensorModel model) { target_model_no = NebulaModelToHesaiModelNo(model); }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
         "vccint",
         "Vccint",
         "XT",
-        "XTM"
+        "XTM",
+        "DHAVE"
       ]
     }