From 7acf3eaf4ce196136328b0a20dfb754b60958cd3 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期六, 29 八月 2020 20:59:35 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/test_items2/overtake.cpp | 4 ++--
lib/src/main/cpp/test_items2/stop_car.cpp | 4 ++--
lib/src/main/cpp/test_items2/change_lane.cpp | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/src/main/cpp/test_items2/change_lane.cpp b/lib/src/main/cpp/test_items2/change_lane.cpp
index 83e5f5e..0fb8225 100644
--- a/lib/src/main/cpp/test_items2/change_lane.cpp
+++ b/lib/src/main/cpp/test_items2/change_lane.cpp
@@ -18,7 +18,7 @@
{
maxMoveDistance = ReadOdo();
start = true;
- DEBUG("鍙橀亾寮�濮嬮噷绋� %ld", maxMoveDistance);
+ DEBUG("鍙橀亾寮�濮嬮噷绋� %f", maxMoveDistance);
}
void StartChaneLaneExam(int ori_lane)
@@ -42,7 +42,7 @@
if (ReadOdo() - maxMoveDistance > 100) {
// 瓒呰溅鏈畬鎴�
- DEBUG("鍙橀亾鍥哄畾璺濈鍐呮湭瀹屾垚 褰撳墠閲岀▼ %ld", ReadOdo());
+ DEBUG("鍙橀亾鍥哄畾璺濈鍐呮湭瀹屾垚 褰撳墠閲岀▼ %f", ReadOdo());
AddExamFault(3, rtkTime);
return false;
}
diff --git a/lib/src/main/cpp/test_items2/overtake.cpp b/lib/src/main/cpp/test_items2/overtake.cpp
index e67105f..c3e53ad 100644
--- a/lib/src/main/cpp/test_items2/overtake.cpp
+++ b/lib/src/main/cpp/test_items2/overtake.cpp
@@ -18,7 +18,7 @@
{
maxMoveDistance = ReadOdo();
setup = 1;
- DEBUG("瓒呰溅寮�濮嬮噷绋� %ld", maxMoveDistance);
+ DEBUG("瓒呰溅寮�濮嬮噷绋� %f", maxMoveDistance);
}
void StartOvertakeExam(int ori_lane)
@@ -62,7 +62,7 @@
if (ReadOdo() - maxMoveDistance > 150) {
// 瓒呰溅鏈畬鎴�
- DEBUG("瓒呰溅鍥哄畾璺濈鍐呮湭瀹屾垚 褰撳墠閲岀▼ %ld", ReadOdo());
+ DEBUG("瓒呰溅鍥哄畾璺濈鍐呮湭瀹屾垚 褰撳墠閲岀▼ %f", ReadOdo());
AddExamFault(3, rtkTime);
return false;
}
diff --git a/lib/src/main/cpp/test_items2/stop_car.cpp b/lib/src/main/cpp/test_items2/stop_car.cpp
index e5fa467..32c6899 100644
--- a/lib/src/main/cpp/test_items2/stop_car.cpp
+++ b/lib/src/main/cpp/test_items2/stop_car.cpp
@@ -42,7 +42,7 @@
}
bool TestStopCar(road_exam_map &RoadMap, int roadIndex, const car_model *car, int moveDirect, const struct RtkTime *rtkTime) {
- struct RtkTime time;
+ static struct RtkTime time;
if (setup == 0)
return true;
@@ -101,7 +101,7 @@
if (door.value == DOOR_OPEN) {
if (!OpenDoor) {
- if (rpm.value < ENGINE_MIN_ROTATE) {
+ if (rpm.value > ENGINE_MIN_ROTATE) {
// 涓嬭溅鍓嶏紝涓嶇唲鐏紝鎵�5鍒�
DEBUG("涓嬭溅鍓嶏紝涓嶇唲鐏�");
AddExamFault(40, rtkTime);
--
Gitblit v1.8.0