From 7c66884c800b0b48c2b3aac2ac29ff0b4529b95e Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期二, 21 一月 2020 15:00:12 +0800
Subject: [PATCH] updatecrrDOC1

---
 lib/src/main/cpp/master/comm_if.cpp |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/cpp/master/comm_if.cpp b/lib/src/main/cpp/master/comm_if.cpp
index 798b389..f799243 100644
--- a/lib/src/main/cpp/master/comm_if.cpp
+++ b/lib/src/main/cpp/master/comm_if.cpp
@@ -48,7 +48,13 @@
 #define ID_SM_RTCM_IND           0x000F
 #define ID_SM_DEBUG_INFO        0x0010
 
-static int OnOff = 0xFFFF;
+#define MA_OUT_GPS_BRIEF        0x0001
+#define MA_OUT_RTK_BRIEF        0x0002
+#define MA_OUT_CAR_BRIEF        0x0004
+#define MA_OUT_RTCM_IND        0x0008
+#define MA_OUT_DBG_INFO        0x0010
+
+static int OnOff = 0;//0xFFFF;
 
 void MA_NdkStart(void)
 {
@@ -149,7 +155,7 @@
 
 void MA_SendGpsBrief(const struct gpsBrief *brief)
 {
-    if (!(OnOff & BV(0)))
+    if (!(OnOff & MA_OUT_GPS_BRIEF))
         return;
 
     StringBuffer sb;
@@ -179,7 +185,7 @@
 
 void MA_SendRtkBrief(const struct rtkBrief *brief)
 {
-    if (!(OnOff & BV(1)))
+    if (!(OnOff & MA_OUT_RTK_BRIEF))
         return;
 
     char a[2] = {brief->coord_x_dir, 0};
@@ -240,7 +246,7 @@
 
 void MA_SendCarPosition(const struct carBrief *brief)
 {
-    if (!(OnOff & BV(2))) return;
+    if (!(OnOff & MA_OUT_CAR_BRIEF)) return;
 
     StringBuffer sb;
     Writer<StringBuffer> writer(sb);
@@ -317,7 +323,7 @@
 
 void MA_SendRtcmInd(int length)
 {
-    if (!(OnOff & BV(3))) return;
+    if (!(OnOff & MA_OUT_RTCM_IND)) return;
 
     StringBuffer sb;
     Writer<StringBuffer> writer(sb);
@@ -332,7 +338,7 @@
 
 void MA_SendDebugInfo(const char *str, ...)
 {
-    if (!(OnOff & BV(4)))
+    if (!(OnOff & MA_OUT_DBG_INFO))
         return;
 
     va_list argp;
@@ -358,6 +364,8 @@
 {
     switch (cmd) {
         case ID_MS_RTK_PLAT_CFG: {
+            if (OnOff == 0) OnOff = MA_OUT_GPS_BRIEF + MA_OUT_RTK_BRIEF + MA_OUT_CAR_BRIEF;
+
             rtk_platform_cfg_t cfg;
             memset(&cfg, 0, sizeof(cfg));
 

--
Gitblit v1.8.0