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/driver_test.cpp | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/lib/src/main/cpp/driver_test.cpp b/lib/src/main/cpp/driver_test.cpp
index e1df9bb..29b76ee 100644
--- a/lib/src/main/cpp/driver_test.cpp
+++ b/lib/src/main/cpp/driver_test.cpp
@@ -520,7 +520,15 @@
{
DEBUG("鑾峰彇妯℃嫙璺�冪伅鍏夋祴璇曢」鐩� N = %d %d", n, ExamStart);
- static const int cov[] = {0,
+ static const int CONV_TABLE[] = {(FLASH_BEAM_LAMP<<8)+OFF_LIGHT,
+ (TURN_SIGNAL_LAMP<<8)+OFF_LIGHT,
+ (TURN_SIGNAL_LAMP<<8)+OFF_LIGHT,
+ (TURN_SIGNAL_LAMP<<8)+OFF_LIGHT,
+ (FOG_LAMP<<8)+OFF_LIGHT,
+ (CLEARANCE_LAMP<<8)+OFF_LIGHT,
+ (MAIN_BEAM_LAMP<<8)+OFF_LIGHT,
+ (DIPPED_BEAM_LAMP<<8)+OFF_LIGHT,
+ 0,
(DIPPED_BEAM_LAMP<<8)+DIPPED_BEAM_LIGHT,
(MAIN_BEAM_LAMP<<8)+MAIN_BEAM_LIGHT,
(CLEARANCE_LAMP<<8)+CLEARANCE_LIGHT,
@@ -529,6 +537,8 @@
(TURN_SIGNAL_LAMP<<8)+RIGHT_TURN_LIGHT,
(TURN_SIGNAL_LAMP<<8)+HAZARD_LIGHTS,
(FLASH_BEAM_LAMP<<8)+FLASH_BEAM_LIGHT};
+
+ const int *cov = CONV_TABLE + 8;
if (ExamStart) return;
@@ -547,10 +557,10 @@
DummyLightContent[i].wrongCode = cfg[i].wrongCode;
// Sensor Name<<8 + Sensor Status
for (int j = 0; j < cfg[i].process.size(); ++j) {
- DummyLightContent[i].process[j] = cov[cfg[i].process[j]];
+ DummyLightContent[i].process.push_back(cov[cfg[i].process[j]]);
}
for (int j = 0; j < cfg[i].solution.size(); ++j) {
- DummyLightContent[i].solution[j] = cov[cfg[i].solution[j]];
+ DummyLightContent[i].solution.push_back(cov[cfg[i].solution[j]]);
}
}
}
@@ -746,7 +756,7 @@
"杩戝厜鐏�",
"闆剧伅",
"绀哄粨鐏�",
- "杩滆繎鍏�",
+ "闂伅鎻愮ず",
"杩滃厜鐏�",
"瀹夊叏甯�",
"鍚姩寮曟搸",
--
Gitblit v1.8.0