zwh 10 сар өмнө
parent
commit
eeef8bccce

+ 2 - 4
trigger/pjibot_guide/locate_info/locationfailed/main/main.go

@@ -1,8 +1,6 @@
 package main
 
-import (
-	"cicv-data-closedloop/pji_msgs"
-)
+import "cicv-data-closedloop/pjibot_guide_msgs"
 
 func Topic() string {
 	return "/locate_info"
@@ -12,7 +10,7 @@ func Label() string {
 	return "locationfailed"
 }
 
-func Rule(data *pji_msgs.LocateInfo) string {
+func Rule(data *pjibot_guide_msgs.LocateInfo) string {
 	if data.LocateStatus == 0 {
 		return "locationfailed"
 	}

+ 2 - 2
trigger/pjibot_guide/sys_info/cpuoveroccupied/main/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/pji_msgs"
+	"cicv-data-closedloop/pjibot_guide_msgs"
 )
 
 func Topic() string {
@@ -12,7 +12,7 @@ func Label() string {
 	return "cpuoveroccupied"
 }
 
-func Rule(data *pji_msgs.SysInfo) string {
+func Rule(data *pjibot_guide_msgs.SysInfo) string {
 	if data.CpuOccupied > 99 {
 		return "cpuoveroccupied"
 	}

+ 2 - 2
trigger/pjibot_guide/sys_info/memoveroccupied/main/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/pji_msgs"
+	"cicv-data-closedloop/pjibot_guide_msgs"
 )
 
 func Topic() string {
@@ -12,7 +12,7 @@ func Label() string {
 	return "memoveroccupied"
 }
 
-func Rule(data *pji_msgs.SysInfo) string {
+func Rule(data *pjibot_guide_msgs.SysInfo) string {
 	if data.MemOccupied > 99 {
 		return "memoveroccupied"
 	}

+ 1 - 1
trigger/pjibot_patrol/locate_info/locationfailed/main/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/pji_msgs"
+	"cicv-data-closedloop/pjibot_patrol_msgs"
 )
 
 func Topic() string {

+ 2 - 1
trigger/pjisuv/map_polygon/OutOfLane/main/OutOfLane.go

@@ -57,6 +57,7 @@ func polygonLineIntersect(polygon []pjisuv_msgs.Point64, A, B pjisuv_msgs.Point6
 			return true
 		}
 	}
+
 	return false
 }
 
@@ -73,7 +74,7 @@ func Rule(data *pjisuv_msgs.PolygonStamped, param *pjisuv_param.PjisuvParam) str
 	for i := 0; i < len(Points)-1; i++ {
 		A := Points[i]
 		B := Points[i+1]
-		if polygonLineIntersect(corners, A, B) {
+		if polygonLineIntersect(corners, A, B) && param.AutomodeOfPjVehicleFdbPub == 1 {
 			return "OutOfLane"
 		}
 	}