From f1ff7e339eca91b114497d3e847fa1fc33baccc4 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 21 九月 2020 10:58:58 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/master/comm_if.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/src/main/cpp/master/comm_if.cpp b/lib/src/main/cpp/master/comm_if.cpp
index 7ffd67d..ca951fa 100644
--- a/lib/src/main/cpp/master/comm_if.cpp
+++ b/lib/src/main/cpp/master/comm_if.cpp
@@ -65,8 +65,9 @@
#define ID_SM_DISTANCE 0x0020
#define ID_SM_CARSENSOR 0x0013
-#define ID_MS_ROAD_BRIEF 0x0015 // 绉戠洰涓夐」鐩爣瀹氾紝杩涘嚭鏌愭潯璺殑鎻愮ず
-#define ID_MS_CROSSING_BRIEF 0x0016 // 绉戠洰涓夐」鐩爣瀹氾紝鎺ヨ繎/椹剁鏌愬悇璺彛鐨勬彁绀�
+#define ID_SM_ROAD_BRIEF 0x0015 // 绉戠洰涓夐」鐩爣瀹氾紝杩涘嚭鏌愭潯璺殑鎻愮ず
+#define ID_SM_CROSSING_BRIEF 0x0016 // 绉戠洰涓夐」鐩爣瀹氾紝鎺ヨ繎/椹剁鏌愬悇璺彛鐨勬彁绀�
+#define ID_MS_INQ_ROAD_CROSSING 0x8018 // Master鏌ヨ褰撳墠璺鍜岃矾鍙�
#define MA_OUT_GPS_BRIEF 0x0001
#define MA_OUT_RTK_BRIEF 0x0002
@@ -456,7 +457,7 @@
writer.Int(brief->status);
writer.EndObject();
- SendMsgToMainProcIndep(ID_MS_ROAD_BRIEF, sb.GetString());
+ SendMsgToMainProcIndep(ID_SM_ROAD_BRIEF, sb.GetString());
}
void MA_SendCrossingStatus(const struct crossingStatusBrief *brief)
@@ -473,7 +474,7 @@
writer.Int(brief->status);
writer.EndObject();
- SendMsgToMainProcIndep(ID_MS_CROSSING_BRIEF, sb.GetString());
+ SendMsgToMainProcIndep(ID_SM_CROSSING_BRIEF, sb.GetString());
}
void MA_SendExamWrong(vector<ExamFault> &ExamFaultList)
@@ -1685,6 +1686,10 @@
}
break;
}
+ case ID_MS_INQ_ROAD_CROSSING: {
+ MasterInqRoadStatus();
+ break;
+ }
default:break;
}
}
--
Gitblit v1.8.0