From 367515d792d493600b332b73af4ef7353837e197 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 21 一月 2021 10:58:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lib/src/main/cpp/test_items2/dummy_light.cpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/src/main/cpp/test_items2/dummy_light.cpp b/lib/src/main/cpp/test_items2/dummy_light.cpp
index 144b545..3f68f1f 100644
--- a/lib/src/main/cpp/test_items2/dummy_light.cpp
+++ b/lib/src/main/cpp/test_items2/dummy_light.cpp
@@ -77,6 +77,7 @@
AppTimer_delete(CheckSolution);
}
+// 璁板綍涓棿杩囩▼
void handleLigthExam(uint16_t id, int value)
{
if (testing) {
@@ -90,10 +91,9 @@
}
}
+// 妫�鏌ユ渶缁堢姸鎬�
static void CheckSolution(union sigval sig)
{
- int question = sig.sival_int;
-
AppTimer_delete(CheckSolution);
if (content[question].process.size() > 0) {
@@ -112,7 +112,7 @@
}
for (int i = 0; i < content[question].solution.size(); ++i) {
- if (ReadCarStatus((content[question].solution[i]>>8)&0xFF) != content[question].solution[i] & 0xFF) {
+ if (ReadCarStatus((content[question].solution[i]>>8)&0xFF) != (content[question].solution[i] & 0xFF)) {
AddExamFault(content[question].wrongCode, &currRtkTime);
break;
}
@@ -126,6 +126,7 @@
static void ExamDummyLight(void)
{
if (testing && question < contentNum) {
+ DEBUG("鐏厜棰樼洰锛� %s", content[question].tts.c_str());
PlayTTS(content[question].tts, DummyLightTTSDone);
} else {
testing = false;
--
Gitblit v1.8.0