From 7b6dd5603277ac8fddba735c456f99d4c07e2e9b Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期三, 12 二月 2020 17:43:36 +0800
Subject: [PATCH] 修改了上坡起步。
---
lib/src/main/cpp/test_items/stop_and_start.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/src/main/cpp/test_items/stop_and_start.cpp b/lib/src/main/cpp/test_items/stop_and_start.cpp
index 266a8e3..1398ee5 100644
--- a/lib/src/main/cpp/test_items/stop_and_start.cpp
+++ b/lib/src/main/cpp/test_items/stop_and_start.cpp
@@ -118,7 +118,6 @@
// 璺濈鍋滄绾垮墠鍚庤秴鍑�50鍘樼背
AddExamFault(12, rtkTime);
DEBUG("璺濈鍋滄绾垮墠鍚庤秴鍑�50鍘樼背锛屼笉鍚堟牸");
- status = -1;
} else if (fabs(dis1) > EPSILON) {
// 鍓嶄繚闄╂病鏈変綅浜庡仠姝㈠甫鍐咃紝浣嗘病鏈夎秴鍑�50鍘樼背锛屾墸10鍒�
AddExamFault(17, rtkTime);
@@ -129,7 +128,6 @@
// 璺濈杈圭嚎瓒呭嚭50鍘樼背,涓嶅悎鏍�
AddExamFault(14, rtkTime);
DEBUG("璺濈杈圭嚎瓒呭嚭50鍘樼背");
- status = -1;
} else if (dis2 > EDGE_DISTANCE_THRESHOLD_YELLOW) {
// 璺濈杈圭嚎瓒呭嚭30鍘樼背锛屼笉鍚堟牸
AddExamFault(18, rtkTime);
@@ -183,6 +181,8 @@
}
}
}
+
+ return status;
}
// 杞﹁疆鏄惁鍘嬭竟绾�
@@ -250,6 +250,7 @@
// 鏁翠釜杞﹁締閮借椹剁璇ユ祴璇曞尯鍩�
static bool ExitTestArea(const Polygon *map, const car_model *car)
{
+ // 鍦�8->7绾跨殑鍙充晶
for (int i = 0; i < car->bodyNum; ++i) {
if (IntersectionOfLine(map->point[8], map->point[7], car->carXY[car->body[i]]) != -1)
return false;
--
Gitblit v1.8.0