From 32e789cf43a39565a506da32f2a952c8398aa4c0 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期三, 19 二月 2020 23:16:21 +0800
Subject: [PATCH] GPS信息合并到RTK中，以RTK包，发送
---
lib/src/main/cpp/rtk_module/rtk.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/src/main/cpp/rtk_module/rtk.cpp b/lib/src/main/cpp/rtk_module/rtk.cpp
index b19a6e8..35ee10b 100644
--- a/lib/src/main/cpp/rtk_module/rtk.cpp
+++ b/lib/src/main/cpp/rtk_module/rtk.cpp
@@ -153,7 +153,7 @@
for (int i = 0; i < sizeof(GPSITEMS)/ sizeof(GPSITEMS[0]); ++i) {
char cmd[64];
- sprintf(cmd, "log com1 %s ontime 1\r\n", GPSITEMS[i]);
+ sprintf(cmd, "log com1 %s ontime %0.1f\r\n", GPSITEMS[i], 1.0/(double)freq);
WriteSerialPort(RTK_MODULE_UART, cmd, strlen(cmd));
}
@@ -277,7 +277,6 @@
{
DEBUG("handleGPRMC num = %d", s->nmea_num);
-
if (s->nmea_num >= 9) {
int hh = str2int(s->nmea_value[0].data, 2);
int mm = str2int(s->nmea_value[0].data + 2, 2);
@@ -294,6 +293,10 @@
gpsStatus.speed = speed * 1.85184; // 鑺� -> 鍏噷
+ double trackTure;
+ str2float(&trackTure, s->nmea_value[7].data, s->nmea_value[7].length);
+ gpsStatus.trackTure = trackTure;
+
if (hh == gpsStatus.hh && mm == gpsStatus.mm && ss == gpsStatus.ss && mss == gpsStatus.mss) {
// 鍚屾鐨凣GA娑堟伅涔熸敹闆嗕簡
PlatformStatusChanged(GPS_UPDATE_EVT, (uint8_t *)&gpsStatus, sizeof(gpsStatus));
--
Gitblit v1.8.0