From 53be5cac481ddc7927ca3f8fe75a5180f0d6567a Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期五, 27 三月 2020 00:16:33 +0800
Subject: [PATCH] 角度修正。
---
lib/src/main/cpp/test_items2/stop_car.cpp | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/src/main/cpp/test_items2/stop_car.cpp b/lib/src/main/cpp/test_items2/stop_car.cpp
index 6629623..4e93662 100644
--- a/lib/src/main/cpp/test_items2/stop_car.cpp
+++ b/lib/src/main/cpp/test_items2/stop_car.cpp
@@ -61,9 +61,9 @@
void StopCarTTSDone(int id)
{
- DEBUG("StopCarTTSDone %d", id);
// 绛夎闊虫挱鎶ュ畬姣曞悗璁℃椂
if (id == examTtsSeq) {
+ DEBUG("StopCarTTSDone %d", id);
ttsPlayEnd = 1;
}
}
@@ -88,14 +88,16 @@
rtkTime->mss * 10,
prevPointTime.hour, prevPointTime.min,
prevPointTime.sec, prevPointTime.msec * 10);
-
- moveDistance += (double)diff * (speed + prevSpeed) / 2;
- prevSpeed = speed;
- Rtk2DriveTimer(prevPointTime, rtkTime);
+ if (diff >= D_SEC(1)) {
+ moveDistance += (double)diff * (speed + prevSpeed) / 2.0 / 1000.0;
+ prevSpeed = speed;
+ Rtk2DriveTimer(prevPointTime, rtkTime);
+ DEBUG("鍋滆溅宸茶椹惰窛绂� %f", moveDistance);
+ }
if (moveDistance > 150) {
// 150绫冲唴鏈仠杞︼紝涓嶅悎鏍�
- DEBUG("鍋滆溅璺濈瓒呮爣");
+ DEBUG("鍋滆溅璺濈瓒呮爣锛岄潬杈瑰仠杞︾粨鏉�");
AddExamFault(33, rtkTime);
return -1;
}
@@ -103,7 +105,7 @@
if (moveDirect != prevMoveDirect) {
if (moveDirect == 0) {
stopTimepoint = TimeMakeComposite(rtkTime->hh, rtkTime->mm, rtkTime->ss, rtkTime->mss*10);
- DEBUG("鍋滆溅浜� %d %d %d %d %d %d %d", rtkTime->YY, rtkTime->MM, rtkTime->DD, rtkTime->hh, rtkTime->mm, rtkTime->ss, rtkTime->mss);
+ DEBUG("####### 闈犺竟鍋滆溅锛屽仠杞︿簡 %d %d %d %d %d %d %d ######", rtkTime->YY, rtkTime->MM, rtkTime->DD, rtkTime->hh, rtkTime->mm, rtkTime->ss, rtkTime->mss);
}
prevMoveDirect = moveDirect;
} else if (moveDirect == 0) {
@@ -189,6 +191,7 @@
}
}
} else if (occurOpenDoor) {
+ DEBUG("寮�杞﹂棬锛岄潬杈瑰仠杞︾粨鏉�");
return -1;
}
@@ -196,6 +199,7 @@
uint32_t tp = TimeMakeComposite(rtkTime->hh, rtkTime->mm, rtkTime->ss, rtkTime->mss*10);
if (tp - openDoorTimepoint >= OPEN_DOOR_TIMEOUT + D_SEC(5)) {
+ DEBUG("寮�闂ㄦ椂闂村ぇ浜�20绉掞紝闈犺竟鍋滆溅缁撴潫");
return -1;
}
}
--
Gitblit v1.8.0