From eb645b6bf08ec50459c737821e63ee20dea4486d Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期三, 22 一月 2020 13:24:07 +0800
Subject: [PATCH] updatecrrDOC1
---
lib/src/main/cpp/test_items/park_bottom.cpp | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/src/main/cpp/test_items/park_bottom.cpp b/lib/src/main/cpp/test_items/park_bottom.cpp
index 9c4d4ba..2b87406 100644
--- a/lib/src/main/cpp/test_items/park_bottom.cpp
+++ b/lib/src/main/cpp/test_items/park_bottom.cpp
@@ -83,6 +83,7 @@
// 鏄惁瓒呮椂
if (parkTimeout) {
// 涓嶅悎鏍硷細鍔ㄤ綔瓒呮椂
+ DEBUG("涓嶅悎鏍硷細鍔ㄤ綔瓒呮椂");
err.push_back(10);
AddExamFault(10, rtkTime);
status = -1;
@@ -90,6 +91,7 @@
// 鏄惁鍘嬬嚎
if (CrashRedLine(map, car)) {
// 涓嶅悎鏍硷細杞﹁韩鍑虹嚎
+ DEBUG("涓嶅悎鏍硷細杞﹁韩鍑虹嚎");
err.push_back(7);
AddExamFault(7, rtkTime);
status = -1;
@@ -110,6 +112,7 @@
if (run_status > 0) {
if (stopCar2S && currTarget != FIRST_TOUCH_CTRL_LINE) {
// 鎵�5鍒嗭細涓�斿仠杞﹁秴杩�2绉�
+ DEBUG("鎵�5鍒嗭細涓�斿仠杞﹁秴杩�2绉�");
err.push_back(11);
AddExamFault(11, rtkTime);
}
@@ -127,6 +130,7 @@
DEBUG("鏉ラ亾鍦虹帺鐨�");
} else {
// 涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堢洿鎺ヨ窇鍑烘祴璇曞尯浜嗭級
+ DEBUG("涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堢洿鎺ヨ窇鍑烘祴璇曞尯浜嗭級");
err.push_back(6);
AddExamFault(6, rtkTime);
status = -1;
@@ -166,6 +170,7 @@
status = 1;
} else if (the_ctrl_line_crossed != 0) {
// 涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堟湭鍥炲埌璧峰鐐癸級
+ DEBUG("涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堟湭鍥炲埌璧峰鐐癸級");
err.push_back(6);
AddExamFault(6, rtkTime);
status = -1;
@@ -187,6 +192,7 @@
if (first_ctrl_line_id > 0 && first_ctrl_line_id == the_ctrl_line_crossed) {
// 涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堣瘯鍥惧仛2娆″悓鏂瑰悜鐨勫�掑簱锛�
+ DEBUG("涓嶅悎鏍硷細鏈寜瑙勫畾绾胯矾琛岄┒锛堣瘯鍥惧仛2娆″悓鏂瑰悜鐨勫�掑簱锛�");
err.push_back(6);
AddExamFault(6, rtkTime);
status = -1;
@@ -208,6 +214,7 @@
DEBUG("绗簩娆″�掑簱");
} else if (currTarget != THIRD_TOUCH_CTRL_LINE) {
// 涓嶅悎鏍硷細鍊掕溅鍓嶏紝2鍓嶈疆娌￠┒杩囨帶鍒剁嚎
+ DEBUG("涓嶅悎鏍硷細鍊掕溅鍓嶏紝2鍓嶈疆娌￠┒杩囨帶鍒剁嚎");
err.push_back(9);
AddExamFault(9, rtkTime);
status = -1;
@@ -227,6 +234,7 @@
if (run_status < 0) {
if (stopCar2S) {
// 鎵�5鍒嗭細涓�斿仠杞�
+ DEBUG("鎵�5鍒嗭細涓�斿仠杞�");
err.push_back(11);
AddExamFault(11, rtkTime);
}
@@ -245,6 +253,7 @@
if (carStopEvent) {
if (!carParkSuccess) {
// 涓嶅悎鏍硷細鍊掑簱涓嶅叆
+ DEBUG("涓嶅悎鏍硷細鍊掑簱涓嶅叆");
err.push_back(8);
AddExamFault(8, rtkTime);
status = -1;
@@ -301,14 +310,12 @@
p2.Y = (prev_car->carXY[car->left_front_tire[TIRE_OUTSIDE]].Y + prev_car->carXY[car->left_front_tire[TIRE_INSIDE]].Y) / 2;
MakeLine(&track1, &p1, &p2);
if (IntersectionOf(track1, leftCtrlLine) == GM_Intersection &&
- IntersectionOfLine(map->point[0], map->point[1], p1) == -1
- /*IntersectionOf(p1, map) == GM_None*/) {
+ IntersectionOfLine(map->point[0], map->point[1], p1) == -1) {
leftTireCrossLeftLine = true;
DEBUG("宸﹁疆璺ㄨ秺宸︽帶鍒剁嚎");
}
if (IntersectionOf(track1, rightCtrlLine) == GM_Intersection &&
- IntersectionOfLine(map->point[6], map->point[7], p1) == -1
- /*IntersectionOf(p1, map) == GM_None*/) {
+ IntersectionOfLine(map->point[6], map->point[7], p1) == -1) {
leftTireCrossRightLine = true;
DEBUG("宸﹁疆璺ㄨ秺鍙虫帶鍒剁嚎");
}
@@ -319,14 +326,12 @@
p2.Y = (prev_car->carXY[car->right_front_tire[TIRE_OUTSIDE]].Y + prev_car->carXY[car->right_front_tire[TIRE_INSIDE]].Y) / 2;
MakeLine(&track1, &p1, &p2);
if (IntersectionOf(track1, leftCtrlLine) == GM_Intersection &&
- IntersectionOfLine(map->point[0], map->point[1], p1) == -1
- /*IntersectionOf(p1, map) == GM_None*/) {
+ IntersectionOfLine(map->point[0], map->point[1], p1) == -1) {
rightTireCrossLeftLine = true;
DEBUG("鍙宠疆璺ㄨ秺宸︽帶鍒剁嚎");
}
if (IntersectionOf(track1, rightCtrlLine) == GM_Intersection &&
- IntersectionOfLine(map->point[6], map->point[7], p1) == -1
- /*IntersectionOf(p1, map) == GM_None*/) {
+ IntersectionOfLine(map->point[6], map->point[7], p1) == -1) {
rightTireCrossRightLine = true;
DEBUG("鍙宠疆璺ㄨ秺鍙虫帶鍒剁嚎");
}
--
Gitblit v1.8.0