From 6203683433231a71fea7069d121ebd85c0b9529d Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期四, 27 八月 2020 11:53:54 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/driver_test.cpp | 6 +++---
lib/src/main/cpp/test_items2/dummy_light.cpp | 3 ++-
lib/src/main/cpp/test_common/car_sensor.cpp | 28 +++++++++++++++-------------
lib/src/main/cpp/rtk_platform/platform.cpp | 2 +-
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/lib/src/main/cpp/driver_test.cpp b/lib/src/main/cpp/driver_test.cpp
index d293ee9..ec51233 100644
--- a/lib/src/main/cpp/driver_test.cpp
+++ b/lib/src/main/cpp/driver_test.cpp
@@ -400,7 +400,7 @@
reportSeatbeltEject = false;
if (type == TEST_TYPE_ROAD_DUMMY_LIGHT) {
- exam_dummy_light = 1; //0
+ exam_dummy_light = 0; //0
}
if (type == TEST_TYPE_AREA) {
InitAreaExam();
@@ -563,7 +563,7 @@
for (int i = 0; i < 2; ++i) {
if (cs_temp[i] != cs[i]) {
- DEBUG("杞﹁締鐘舵�� %s = %d", NAME[i], cs_temp[i]);
+// DEBUG("杞﹁締鐘舵�� %s = %d", NAME[i], cs_temp[i]);
cs[i] = cs_temp[i];
}
@@ -578,7 +578,7 @@
char buff[128];
sprintf(buff, "%s锛�%s", NAME[i], VALUE[ cs_temp[i] ]);
- PlayTTS(buff, NULL);
+// PlayTTS(buff, NULL);
}
}
diff --git a/lib/src/main/cpp/rtk_platform/platform.cpp b/lib/src/main/cpp/rtk_platform/platform.cpp
index 35d7b4a..c54e6cb 100644
--- a/lib/src/main/cpp/rtk_platform/platform.cpp
+++ b/lib/src/main/cpp/rtk_platform/platform.cpp
@@ -336,7 +336,7 @@
AppTimer_delete(TriggerHeartbeat);
AppTimer_add(TriggerHeartbeat, D_SEC(30));
- PlayTTS("鍩哄噯婧愬缓绔�", NULL);
+// PlayTTS("鍩哄噯婧愬缓绔�", NULL);
} else {
platformStatus.login = 0;
}
diff --git a/lib/src/main/cpp/test_common/car_sensor.cpp b/lib/src/main/cpp/test_common/car_sensor.cpp
index 5301a21..b3a524c 100644
--- a/lib/src/main/cpp/test_common/car_sensor.cpp
+++ b/lib/src/main/cpp/test_common/car_sensor.cpp
@@ -203,7 +203,9 @@
SensorChanged(SENSOR_SURROUND_CAR_4, BX(s->surround4));
}
if (s->gear != Sensor.gear && s->gear != '#') {
- SensorChanged(GEAR, GEAR_N + s->gear);
+// SensorChanged(GEAR, GEAR_N + s->gear);
+ DEBUG("鐘舵�佹敼鍙� 鎸′綅 %d", s->gear);
+ WriteCarStatus(GEAR, s->gear + GEAR_N);
}
Sensor = *s;
@@ -415,18 +417,18 @@
}
break;
}
- case SENSOR_SHIFT_N:
- case SENSOR_SHIFT_1:
- case SENSOR_SHIFT_2:
- case SENSOR_SHIFT_3:
- case SENSOR_SHIFT_4:
- case SENSOR_SHIFT_5:
- case SENSOR_SHIFT_R: {
- if (value != 0) {
- WriteCarStatus(GEAR, id - SENSOR_SHIFT_N + GEAR_N);
- }
- break;
- }
+// case SENSOR_SHIFT_N:
+// case SENSOR_SHIFT_1:
+// case SENSOR_SHIFT_2:
+// case SENSOR_SHIFT_3:
+// case SENSOR_SHIFT_4:
+// case SENSOR_SHIFT_5:
+// case SENSOR_SHIFT_R: {
+// if (value != 0) {
+// WriteCarStatus(GEAR, id - SENSOR_SHIFT_N + GEAR_N);
+// }
+// break;
+// }
default:
break;
}
diff --git a/lib/src/main/cpp/test_items2/dummy_light.cpp b/lib/src/main/cpp/test_items2/dummy_light.cpp
index 831ecda..50f2e13 100644
--- a/lib/src/main/cpp/test_items2/dummy_light.cpp
+++ b/lib/src/main/cpp/test_items2/dummy_light.cpp
@@ -39,6 +39,7 @@
contentNum = num;
if (content != NULL && num > 0) {
+ DEBUG("鍚姩鐏厜");
currRtkTime = *rtkTime;
for (int i = 0; i < contentNum; ++i) {
@@ -172,7 +173,7 @@
switch (content[i].itemStatus) {
case TTS_NOT_START:
content[i].itemStatus = TTS_DOING;
- examTtsSeq = PlayTTS(content[i].tts, NULL);
+ examTtsSeq = PlayTTS(content[i].tts, DummyLightTTSDone);
// 绛夊緟TTS鎾斁瀹屾瘯
return;
case TTS_DOING:
--
Gitblit v1.8.0