From 09b0098b3b092cb28435c8d550c2f7b30bf53e0a Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期三, 15 一月 2020 18:28:14 +0800
Subject: [PATCH] updatec
---
lib/src/main/cpp/test_items/park_bottom.cpp | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lib/src/main/cpp/test_items/park_bottom.cpp b/lib/src/main/cpp/test_items/park_bottom.cpp
index a9b71f3..e25b216 100644
--- a/lib/src/main/cpp/test_items/park_bottom.cpp
+++ b/lib/src/main/cpp/test_items/park_bottom.cpp
@@ -70,7 +70,7 @@
DEBUG("ParkBottom End");
}
-int TestParkBottom(vector<int>&err, const Polygon *map, const car_model *car, const car_model *carPrev, double speed, int run_status)
+int TestParkBottom(vector<int>&err, const Polygon *map, const car_model *car, const car_model *carPrev, double speed, int run_status, const struct RtkTime *rtkTime)
{
int status = 0;
@@ -84,14 +84,14 @@
if (parkTimeout) {
// 涓嶅悎鏍硷細鍔ㄤ綔瓒呮椂
err.push_back(10);
-
-
+ AddExamFault(10, rtkTime);
status = -1;
}
// 鏄惁鍘嬬嚎
if (CrashRedLine(map, car)) {
// 涓嶅悎鏍硷細杞﹁韩鍑虹嚎
err.push_back(7);
+ AddExamFault(7, rtkTime);
status = -1;
}
@@ -111,6 +111,7 @@
if (stopCar2S && currTarget != FIRST_TOUCH_CTRL_LINE) {
// 鎵�5鍒嗭細涓�斿仠杞﹁秴杩�2绉�
err.push_back(11);
+ AddExamFault(11, rtkTime);
}
if (!((leftTireCrossLeftLine && rightTireCrossLeftLine) ||
@@ -127,6 +128,7 @@
} else {
// 涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堢洿鎺ヨ窇鍑烘祴璇曞尯浜嗭級
err.push_back(6);
+ AddExamFault(6, rtkTime);
status = -1;
DEBUG("鐩存帴璺戝嚭娴嬭瘯鍖轰簡");
}
@@ -165,6 +167,7 @@
} else if (the_ctrl_line_crossed != 0) {
// 涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堟湭鍥炲埌璧峰鐐癸級
err.push_back(6);
+ AddExamFault(6, rtkTime);
status = -1;
}
}
@@ -185,6 +188,7 @@
if (first_ctrl_line_id > 0 && first_ctrl_line_id == the_ctrl_line_crossed) {
// 涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堣瘯鍥惧仛2娆″悓鏂瑰悜鐨勫�掑簱锛�
err.push_back(6);
+ AddExamFault(6, rtkTime);
status = -1;
} else if (the_ctrl_line_crossed > 0 && first_ctrl_line_id == 0) {
first_ctrl_line_id = the_ctrl_line_crossed;
@@ -205,6 +209,7 @@
} else if (currTarget != THIRD_TOUCH_CTRL_LINE) {
// 涓嶅悎鏍硷細鍊掕溅鍓嶏紝2鍓嶈疆娌￠┒杩囨帶鍒剁嚎
err.push_back(9);
+ AddExamFault(9, rtkTime);
status = -1;
}
if (carStopEvent)
@@ -223,6 +228,7 @@
if (stopCar2S) {
// 鎵�5鍒嗭細涓�斿仠杞�
err.push_back(11);
+ AddExamFault(11, rtkTime);
}
carStopEvent = false;
@@ -240,6 +246,7 @@
if (!carParkSuccess) {
// 涓嶅悎鏍硷細鍊掑簱涓嶅叆
err.push_back(8);
+ AddExamFault(8, rtkTime);
status = -1;
} else if (currTarget == FIRST_PARK) {
currTarget = SECOND_TOUCH_CTRL_LINE;
--
Gitblit v1.8.0