From 4bd08f0355b6b2cf3c027202d5ad301b4e182953 Mon Sep 17 00:00:00 2001 From: yy1717 <fctom1215@outlook.com> Date: 星期五, 31 三月 2023 17:16:22 +0800 Subject: [PATCH] 科目二修改 --- lib/src/main/cpp/rtk_module/rtk.h | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/src/main/cpp/rtk_module/rtk.h b/lib/src/main/cpp/rtk_module/rtk.h index 7d66f83..f31d204 100644 --- a/lib/src/main/cpp/rtk_module/rtk.h +++ b/lib/src/main/cpp/rtk_module/rtk.h @@ -43,13 +43,15 @@ }gpsStatus_t; typedef struct { - int YY; - int MM; - int DD; - int hh; - int mm; - int ss; - int dss; +// int YY; +// int MM; +// int DD; +// int hh; +// int mm; +// int ss; +// int dss; + + int64_t utc_time; // 鍗曚綅姣 int qf; double heading; double pitch; @@ -61,8 +63,8 @@ std::stringstream sst; sst<<"RTK:"<<"qf="<<qf - <<" "<<2000+YY<<intw(MM, 2)<<intw(DD, 2)<<intw(hh,2)<<intw(mm, 2)<<intw(ss, 2)<<"."<<intw(dss, 2) - <<" heading="<<round(heading, 3) +// <<" "<<2000+YY<<intw(MM, 2)<<intw(DD, 2)<<intw(hh,2)<<intw(mm, 2)<<intw(ss, 2)<<"."<<intw(dss, 2) + <<" yaw="<<round(heading, 3) <<" pitch="<<round(pitch, 3) <<" roll="<<round(roll, 3) <<" x="<<round(x, 3) @@ -70,7 +72,7 @@ return sst.str(); } -}rtk_info; +}rtk_info_t; void RtkCommModeSel(int mode); void ConfigRTKModule(bool ayDevice); -- Gitblit v1.8.0