ENH:compatible with AMS exist flag

jira:[none]

Change-Id: I6afeafe0676eded86f83838576d67233f50ee509
(cherry picked from commit a182fa1aa4a3bdd32c4ccfa26adcd92a9f1cca37)
This commit is contained in:
tao wang
2025-04-02 14:39:20 +08:00
committed by Noisyfox
parent bc402d0792
commit 426b5900ee
4 changed files with 28 additions and 9 deletions

View File

@@ -1130,6 +1130,7 @@ AMSRoadShowMode AMSControl::findFirstMode(AMSPanelPos pos) {
}
}
if (item->second->get_ams_model() == AMSModel::EXT_AMS && item->second->get_ext_type() == AMSModelOriginType::LITE_EXT) return AMSRoadShowMode::AMS_ROAD_MODE_AMS_LITE;
if (item->second->get_ams_model() == AMSModel::N3S_AMS) return AMSRoadShowMode::AMS_ROAD_MODE_SINGLE_N3S;
return AMSRoadShowMode::AMS_ROAD_MODE_SINGLE;
}
}
@@ -1400,6 +1401,10 @@ void AMSControl::SwitchAms(std::string ams_id)
}
else {
AMSRoadShowMode mode = AMSRoadShowMode::AMS_ROAD_MODE_SINGLE;
if (item->get_ams_model() == AMSModel::N3S_AMS)
mode = AMSRoadShowMode::AMS_ROAD_MODE_SINGLE_N3S;
for (auto it : pair_id) {
if (it.first == ams_id || it.second == ams_id) {
mode = AMSRoadShowMode::AMS_ROAD_MODE_DOUBLE;
@@ -1521,9 +1526,10 @@ void AMSControl::SetAmsStep(std::string ams_id, std::string canid, AMSPassRoadTy
}
//Set path length in different case
if (ams->get_can_count() == GENERIC_AMS_SLOT_NUM){
model = ams->get_ams_model();
if (ams->get_can_count() == GENERIC_AMS_SLOT_NUM) {
length = left ? 129 : 145;
model = ams->get_ams_model();
} else if (ams->get_can_count() == 1) {
for (auto it : pair_id){
if (it.first == ams_id){
@@ -1537,8 +1543,12 @@ void AMSControl::SetAmsStep(std::string ams_id, std::string canid, AMSPassRoadTy
break;
}
}
model = ams->get_ams_model();
if (!in_pair && model == N3S_AMS) {
length = left ? 129 : 232;
}
}
if (model == AMSModel::AMS_LITE){
length = left ? 145 : 45;
}