2 Revize b341930213 ... ec84e22f52

Autor SHA1 Zpráva Datum
  Yishi Wang ec84e22f52 Merge remote-tracking branch 'origin/master' před 9 měsíci
  Yishi Wang e446975683 update trigger UnknownBigTargetAhead/LowSpdTruckAhead/MultiTargetAhead: update ego speed check; před 9 měsíci

+ 7 - 2
trigger/pjisuv/tpperception/UnknownBigTargetAhead/main/UnknownBigTargetAhead.go

@@ -86,9 +86,14 @@ func Rule(shareVars *sync.Map, msg *pjisuv_msgs.PerceptionObjects) string {
 		}
 		}
 	}()
 	}()
 
 
-	// 判断主车所在位置 & 行驶速度
+	// 判断主车所在位置
 	outsideWorkshopFlag, _ := shareVars.Load("OutsideWorkshopFlag")
 	outsideWorkshopFlag, _ := shareVars.Load("OutsideWorkshopFlag")
-	if !outsideWorkshopFlag.(bool) || !isEgoStationary(shareVars) {
+	if !outsideWorkshopFlag.(bool) {
+		return ""
+	}
+
+	// 判断主车行驶速度
+	if isEgoStationary(shareVars) {
 		return ""
 		return ""
 	}
 	}
 
 

+ 7 - 2
trigger/pjisuv/tpperception/lowSpdTruckAhead/main/lowSpdTruckAhead.go

@@ -67,9 +67,14 @@ func Rule(shareVars *sync.Map, msg *pjisuv_msgs.PerceptionObjects) string {
 		}
 		}
 	}()
 	}()
 
 
-	// 判断主车所在位置 & 行驶速度
+	// 判断主车所在位置
 	outsideWorkshopFlag, _ := shareVars.Load("OutsideWorkshopFlag")
 	outsideWorkshopFlag, _ := shareVars.Load("OutsideWorkshopFlag")
-	if !outsideWorkshopFlag.(bool) || !isEgoStationary(shareVars) {
+	if !outsideWorkshopFlag.(bool) {
+		return ""
+	}
+
+	// 判断主车行驶速度
+	if isEgoStationary(shareVars) {
 		return ""
 		return ""
 	}
 	}
 
 

+ 7 - 1
trigger/pjisuv/tpperception/multiTargetAhead/main/multiTrafficConeAhead.go

@@ -64,8 +64,14 @@ func Rule(shareVars *sync.Map, msg *pjisuv_msgs.PerceptionObjects) string {
 		}
 		}
 	}()
 	}()
 
 
+	// 判断主车所在位置
 	outsideWorkshopFlag, _ := shareVars.Load("OutsideWorkshopFlag")
 	outsideWorkshopFlag, _ := shareVars.Load("OutsideWorkshopFlag")
-	if !outsideWorkshopFlag.(bool) || !isEgoStationary(shareVars) {
+	if !outsideWorkshopFlag.(bool) {
+		return ""
+	}
+
+	// 判断主车行驶速度
+	if isEgoStationary(shareVars) {
 		return ""
 		return ""
 	}
 	}