From 3ce7d9cbccabf7f94d8203a98796599cd9dd5411 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期二, 11 二月 2020 17:14:27 +0800
Subject: [PATCH] 修改了上坡起步。
---
lib/src/main/cpp/test_items/park_edge.cpp | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/lib/src/main/cpp/test_items/park_edge.cpp b/lib/src/main/cpp/test_items/park_edge.cpp
index c24b64c..87993ff 100644
--- a/lib/src/main/cpp/test_items/park_edge.cpp
+++ b/lib/src/main/cpp/test_items/park_edge.cpp
@@ -98,15 +98,18 @@
if (moveStatus != prevMoveStatus) {
if (moveStatus == 0) {
- DEBUG("鍋滆溅浜�");
parkStatus = 0;
stopTimepoint = TimeMakeComposite(2000 + rtkTime->YY, rtkTime->MM, rtkTime->DD, rtkTime->hh, rtkTime->mm, rtkTime->ss);
stopTimepoint = stopTimepoint * 1000 + rtkTime->mss*10;
storeMoveStatusBeforeStop = prevMoveStatus;
+
+ DEBUG("鍋滆溅浜� %d %d %d %d %d %d %d", rtkTime->YY, rtkTime->MM, rtkTime->DD, rtkTime->hh, rtkTime->mm, rtkTime->ss, rtkTime->mss);
} else {
- DEBUG("缁х画琛岄┒");
+ DEBUG("缁х画琛岄┒ %d %d %d %d %d %d %d", rtkTime->YY, rtkTime->MM, rtkTime->DD, rtkTime->hh, rtkTime->mm, rtkTime->ss, rtkTime->mss);
uint64_t tp = TimeMakeComposite(2000 + rtkTime->YY, rtkTime->MM, rtkTime->DD, rtkTime->hh, rtkTime->mm, rtkTime->ss);
tp = tp * 1000 + rtkTime->mss * 10;
+
+ DEBUG("鍋滆溅鏃堕棿 %ld", tp - stopTimepoint);
if (moveStatus == storeMoveStatusBeforeStop) {
// 鍚屾柟鍚戝啀鍚姩锛岀户缁垽鏂槸鍚﹀仠杞﹁秴鏃�
@@ -127,6 +130,13 @@
AddExamFault(21, rtkTime);
DEBUG("绉诲簱涓嶅叆");
status = -1;
+ }
+
+ // 鍦ㄨ繖閲屾鏌ヨ浆鍚戠伅鐘舵��
+ if (true) {
+ // 涓嶅紑杞悜鐏紝鎵�10鍒�
+ AddExamFault(25, rtkTime);
+ DEBUG("鏈紑鍚浆鍚戠伅");
}
}
}
@@ -232,7 +242,6 @@
CleanPolygon(&parking);
free(car_body.point);
- DEBUG("妫�鏌ュ仠杞﹀埌浣嶇粨鏉�");
return succ;
}
--
Gitblit v1.8.0