From dc2a01d4764efd33a23afcaf4f1d7543dc35c4fa Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期三, 19 二月 2020 15:32:57 +0800
Subject: [PATCH] 上坡地图修正
---
lib/src/main/cpp/test_items/stop_and_start.cpp | 10 ++++------
1 files changed, 4 insertions(+), 6 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 9c0c69e..8ce210b 100644
--- a/lib/src/main/cpp/test_items/stop_and_start.cpp
+++ b/lib/src/main/cpp/test_items/stop_and_start.cpp
@@ -26,7 +26,7 @@
const double EPSILON = 1e-3;
-static bool SASTesting = false;
+static bool testing = false;
static double slideDistance;
static PointF stopPoint;
@@ -49,7 +49,7 @@
void StartSAS(int moveDirect, const struct RtkTime *rtkTime)
{
DEBUG("杩涘叆鍧¤捣椤圭洰");
- SASTesting = true;
+ testing = true;
slideDistance = 0.0;
prevMoveDirect = moveDirect;
@@ -68,8 +68,6 @@
int TestSAS(const Polygon *map, const car_model *car, const car_model *carPrev, double speed, int moveDirect, const struct RtkTime *rtkTime)
{
- int status = 0;
-
if (CrashRedLine(map, car)) {
// 杞﹁疆鍘嬬嚎锛屼笉鍚堟牸
if (!occurCrashRedLine) {
@@ -83,7 +81,7 @@
if (ExitTestArea(map, car)) {
// 椹剁娴嬭瘯鍖�
- status = 1;
+ testing = false;
}
if (prevMoveDirect != moveDirect) {
@@ -173,7 +171,7 @@
}
}
- return status;
+ return testing ? 0 : 1;
}
// 杞﹁疆鏄惁鍘嬭竟绾�
--
Gitblit v1.8.0