From e6d6b7778b0fc51908e7bf9d2eacec84ffc14aff Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期三, 28 四月 2021 22:18:59 +0800
Subject: [PATCH] 路口提示提前距离由70改为60
---
lib/src/main/cpp/driver_test.cpp | 4 ++--
lib/src/main/cpp/test_items2/through_something.cpp | 37 ++++++++++++++++++++++++++++---------
lib/src/main/cpp/test_items2/dummy_light.cpp | 3 ++-
lib/src/main/cpp/test_items2/road_exam.cpp | 6 +++---
4 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/lib/src/main/cpp/driver_test.cpp b/lib/src/main/cpp/driver_test.cpp
index ab63bb9..a25a74a 100644
--- a/lib/src/main/cpp/driver_test.cpp
+++ b/lib/src/main/cpp/driver_test.cpp
@@ -382,7 +382,7 @@
DEBUG("寰楀埌鏂扮殑璺�冨湴鍥� 璺暟閲� %d 鐗规畩鍖哄煙鏁伴噺 %d 鍏朵粬绂佹绾挎暟閲� %d 椤圭洰鏁伴噺 %d", RoadMap.roads.size(), RoadMap.specialAreas.size(), RoadMap.forbidLines.size(), RoadMap.examScheme.size());
- for (int i = 0; i < RoadMap.roads.size(); ++i) {
+ /*for (int i = 0; i < RoadMap.roads.size(); ++i) {
DEBUG("璺� id = %d", RoadMap.roads[i].id);
DEBUG("宸﹁竟绾挎鏁� %d", RoadMap.roads[i].leftEdge.size());
for (int j = 0; j < RoadMap.roads[i].leftEdge.size(); ++j) {
@@ -403,7 +403,7 @@
DEBUG("\t\t鐐瑰潗鏍� %d: %f, %f", k, RoadMap.roads[i].rightEdge[j].points[k].X, RoadMap.roads[i].rightEdge[j].points[k].Y);
}
}
- }
+ }*/
}
void SetRoadExamScheme(vector<scheme_t> &scheme)
diff --git a/lib/src/main/cpp/test_items2/dummy_light.cpp b/lib/src/main/cpp/test_items2/dummy_light.cpp
index 9697856..57ec59c 100644
--- a/lib/src/main/cpp/test_items2/dummy_light.cpp
+++ b/lib/src/main/cpp/test_items2/dummy_light.cpp
@@ -26,7 +26,7 @@
void StartDummyLightExam(struct dummy_light_exam *ptr, int num, const struct RtkTime* rtkTime)
{
- DEBUG("StartDummyLightExam");
+ DEBUG("StartDummyLightExam 椤圭洰鏁伴噺 %d", num);
content = ptr;
contentNum = num;
question = 0;
@@ -49,6 +49,7 @@
AppTimer_delete(CheckSolution);
ExamDummyLight();
} else {
+ DEBUG("鏃犵伅鍏夎�冭瘯鍐呭");
testing = false;
}
}
diff --git a/lib/src/main/cpp/test_items2/road_exam.cpp b/lib/src/main/cpp/test_items2/road_exam.cpp
index 003f787..07b4fdd 100644
--- a/lib/src/main/cpp/test_items2/road_exam.cpp
+++ b/lib/src/main/cpp/test_items2/road_exam.cpp
@@ -1187,7 +1187,7 @@
if (roadIndex < 0 || roadIndex >= RoadMap.roads.size())
return;
- if (distance > 5 && distance < 70) {
+ if (distance > 5 && distance < 60) {
// 鎻愮ず璺彛鎬庝箞璧�
if (GetCrossingStatus(roadIndex, stopIndex) == CROSSING_NOT_HINT) {
// 椤圭洰鏍囧畾妯″紡涓嬶紝杩欓噷鎻愮ず鏍囧畾鏈矾鍙ｅ姩浣�
@@ -1221,7 +1221,7 @@
}
ChangeCrossingStatus(roadIndex, stopIndex, CROSSING_HAS_HINT);
}
- } else if (distance > 75 && GetCrossingStatus(roadIndex, stopIndex) != CROSSING_NOT_HINT) {
+ } else if (distance > 65 && GetCrossingStatus(roadIndex, stopIndex) != CROSSING_NOT_HINT) {
ChangeCrossingStatus(roadIndex, stopIndex, CROSSING_NOT_HINT);
if (RoadMap.calibrate) {
@@ -1575,7 +1575,7 @@
DEBUG("瀵煎悜绫诲瀷鍒囨崲 %d", Lane.guide);
}
}
- DEBUG("currExamMapIndex = %d Lane.no = %d Lane.guide = %d (%f, %f)", currExamMapIndex, Lane.no, Lane.guide, car->carXY[car->axial[AXIAL_FRONT]].X, car->carXY[car->axial[AXIAL_FRONT]].Y);
+// DEBUG("currExamMapIndex = %d Lane.no = %d Lane.guide = %d (%f, %f)", currExamMapIndex, Lane.no, Lane.guide, car->carXY[car->axial[AXIAL_FRONT]].X, car->carXY[car->axial[AXIAL_FRONT]].Y);
if (currExamMapIndex >= 0 && Lane.guide == 0) {
BigStraightRoadFree = AnalysisRoad(RoadMap, currExamMapIndex, Lane, car);
diff --git a/lib/src/main/cpp/test_items2/through_something.cpp b/lib/src/main/cpp/test_items2/through_something.cpp
index 82f25c9..3186830 100644
--- a/lib/src/main/cpp/test_items2/through_something.cpp
+++ b/lib/src/main/cpp/test_items2/through_something.cpp
@@ -188,17 +188,36 @@
if (RoadMap.calibrate == 0) {
if (!(it->second & REDUCE_SPEED)) {
// 涓嶆寜瑙勫畾鍑忛�燂紝涓嶅悎鏍�
- DEBUG("涓嶆寜瑙勫畾鍑忛��");
+ DEBUG("璺彛 涓嶆寜瑙勫畾鍑忛��");
- if (ExamSchemeCrossing(RoadMap, road, x) == ROAD_ACTIVE_FORWARD) {
- AddExamFault(40701, rtkTime);
- } else if (ExamSchemeCrossing(RoadMap, road, x) ==
- ROAD_ACTIVE_TURN_LEFT) {
- AddExamFault(40801, rtkTime);
- } else if (ExamSchemeCrossing(RoadMap, road, x) ==
- ROAD_ACTIVE_TURN_RIGHT) {
- AddExamFault(40901, rtkTime);
+ switch (ExamSchemeCrossing(RoadMap, road, x) ) {
+ case ROAD_ACTIVE_FORWARD:
+ DEBUG("璺彛鐩磋鏈噺閫�");
+ AddExamFault(40701, rtkTime);
+ break;
+ case ROAD_ACTIVE_TURN_LEFT:
+ DEBUG("璺彛宸﹁浆鏈噺閫�");
+ AddExamFault(40801, rtkTime);
+ break;
+ case ROAD_ACTIVE_TURN_RIGHT:
+ DEBUG("璺彛鍙宠浆鏈噺閫�");
+ AddExamFault(40901, rtkTime);
+ break;
+ default:
+ DEBUG("璺彛 鏈厤缃� 鏈噺閫�");
+ break;
}
+
+
+// if (ExamSchemeCrossing(RoadMap, road, x) == ROAD_ACTIVE_FORWARD) {
+// AddExamFault(40701, rtkTime);
+// } else if (ExamSchemeCrossing(RoadMap, road, x) ==
+// ROAD_ACTIVE_TURN_LEFT) {
+// AddExamFault(40801, rtkTime);
+// } else if (ExamSchemeCrossing(RoadMap, road, x) ==
+// ROAD_ACTIVE_TURN_RIGHT) {
+// AddExamFault(40901, rtkTime);
+// }
}
if (!(it->second & STOP_CAR) && RoadMap.roads[road].stopLine[x].stopFlag) {
// 涓嶅仠杞︾灜鏈涳紝涓嶅悎鏍�
--
Gitblit v1.8.0