From 351f67650a6b5e96c3c57c9b09056c3fcd33f165 Mon Sep 17 00:00:00 2001 From: fctom1215 <fctom1215@outlook.com> Date: 星期四, 27 八月 2020 18:51:05 +0800 Subject: [PATCH] 坐标 --- lib/src/main/cpp/driver_test.cpp | 4 ++-- lib/src/main/cpp/master/comm_if.cpp | 2 ++ lib/src/main/cpp/native-lib.cpp | 2 +- lib/src/main/cpp/test_items2/road_exam.cpp | 2 +- lib/src/main/cpp/rtk_module/rtk.cpp | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/src/main/cpp/driver_test.cpp b/lib/src/main/cpp/driver_test.cpp index 8bfad32..0b16c3e 100644 --- a/lib/src/main/cpp/driver_test.cpp +++ b/lib/src/main/cpp/driver_test.cpp @@ -201,8 +201,8 @@ RoadMap.roads.assign(map.roads.begin(), map.roads.end()); RoadMap.specialAreas.assign(map.specialAreas.begin(), map.specialAreas.end()); RoadMap.triggerLines.assign(map.triggerLines.begin(), map.triggerLines.end()); - - DEBUG("寰楀埌鏂扮殑璺�冨湴鍥� 璺暟閲� %d 鐗规畩鍖哄煙鏁伴噺 %d 瑙﹀彂绾挎暟閲� %d", RoadMap.roads.size(), RoadMap.specialAreas.size(), RoadMap.triggerLines.size()); + RoadMap.forbidLines.assign(map.forbidLines.begin(), map.forbidLines.end()); + DEBUG("寰楀埌鏂扮殑璺�冨湴鍥� 璺暟閲� %d 鐗规畩鍖哄煙鏁伴噺 %d 瑙﹀彂绾挎暟閲� %d 鍏朵粬绂佹绾挎暟閲� %d", RoadMap.roads.size(), RoadMap.specialAreas.size(), RoadMap.triggerLines.size(), RoadMap.forbidLines.size()); } void SetCarMeasurePoint(double *basePoint, int *axial, int *left_front_tire, diff --git a/lib/src/main/cpp/master/comm_if.cpp b/lib/src/main/cpp/master/comm_if.cpp index cb82dff..56ef347 100644 --- a/lib/src/main/cpp/master/comm_if.cpp +++ b/lib/src/main/cpp/master/comm_if.cpp @@ -1150,6 +1150,8 @@ if (itr->HasMember("type")) { const Value &s = (*itr)["type"]; forbid.type = s.GetInt(); + + DEBUG("绂佹绾� type %d", forbid.type); } if (itr->HasMember("id")) { const Value &s = (*itr)["id"]; diff --git a/lib/src/main/cpp/native-lib.cpp b/lib/src/main/cpp/native-lib.cpp index 01992b4..6259c16 100644 --- a/lib/src/main/cpp/native-lib.cpp +++ b/lib/src/main/cpp/native-lib.cpp @@ -27,7 +27,7 @@ const int RTK_PLATFORM_PORT = 12125; const uint8_t phone[] = {0x20,0x19,0x10,0x15,0x00,0x00,0x00,0x01}; -const char *VIRTUAL_RTK_IP = "192.168.1.5"; +const char *VIRTUAL_RTK_IP = "192.168.1.4"; const int VIRTUAL_RTK_PORT = 9001; static pthread_mutex_t tts_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/lib/src/main/cpp/rtk_module/rtk.cpp b/lib/src/main/cpp/rtk_module/rtk.cpp index a5c75d3..b7afde4 100644 --- a/lib/src/main/cpp/rtk_module/rtk.cpp +++ b/lib/src/main/cpp/rtk_module/rtk.cpp @@ -214,7 +214,7 @@ }*/ if (RxBufLen > 0) { -#if 1 +#if 0 const uint8_t *ptr = parseGPS(RxBuf, RxBuf + RxBufLen); if(ptr != RxBuf) { memcpy(RxBuf, ptr, RxBufLen - (ptr - RxBuf)); diff --git a/lib/src/main/cpp/test_items2/road_exam.cpp b/lib/src/main/cpp/test_items2/road_exam.cpp index 3e4d0c5..8c56d03 100644 --- a/lib/src/main/cpp/test_items2/road_exam.cpp +++ b/lib/src/main/cpp/test_items2/road_exam.cpp @@ -204,7 +204,7 @@ void TerminateRoadExam(void) { -// TerminateDummyLightExam(); + TerminateDummyLightExam(); // TerminateStopCarExam(); // TerminateOperateGearExam(); // TerminateDriveStraightExam(); -- Gitblit v1.8.0