From dc2a01d4764efd33a23afcaf4f1d7543dc35c4fa Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期三, 19 二月 2020 15:32:57 +0800
Subject: [PATCH] 上坡地图修正
---
lib/src/main/cpp/rtk_platform/platform.cpp | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/lib/src/main/cpp/rtk_platform/platform.cpp b/lib/src/main/cpp/rtk_platform/platform.cpp
index bd801f8..a5b4082 100644
--- a/lib/src/main/cpp/rtk_platform/platform.cpp
+++ b/lib/src/main/cpp/rtk_platform/platform.cpp
@@ -21,6 +21,7 @@
#include "../utils/xconvert.h"
#include "../utils/num.h"
#include "../driver_test.h"
+#include "../test_items/comm_test.h"
#define PARSE_BUFF_SIZE 4096
@@ -184,26 +185,6 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);//detached
pthread_create(&pid, &attr, StatusListenThread, NULL);
-
-
- AddEvnet(100, (uint8_t *)"1234567890", 11);
- AddEvnet(101, (uint8_t *)"abcd", 5);
- AddEvnet(102, (uint8_t *)"xyz", 4);
- AddEvnet(104, NULL, 0);
- AddEvnet(105, (uint8_t *)"uio", 4);
-
- while (true) {
- struct event_t *evp = FetchEvent();
-
- if (evp != NULL) {
- DEBUG("寰楀埌event %d %d", evp->id, evp->length);
-
- if (evp->data != NULL)
- DEBUG("鏁版嵁 %s", evp->data);
- RemoveEvent();
- } else
- break;
- }
}
static void ReqRtkPlatformConfigTimeout(union sigval sig)
@@ -413,6 +394,28 @@
memcpy(brief.sn, data+40, 16);
MA_SendMcuBrief(&brief);
+
+ UpdateSensor(brief.gpio, brief.speed, brief.engine);
+ }
+ if (events & CARD_UPDATE_EVT) {
+ DEBUG("CARD_UPDATE_EVT length %d", length);
+
+ int ret = -1;
+
+ for (int i = 0; i < length; ++i) {
+ if (data[i] != 0) {
+ ret = 0;
+ break;
+ }
+ }
+
+ struct cardBrief brief;
+
+ brief.result = ret;
+
+ ConvertHex2String(brief.card, data, length);
+
+ MA_SendCardBrief(&brief);
}
}
--
Gitblit v1.8.0