From 1308a26e8b89ff2ef9435e609580469182bdd0c0 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 05 三月 2020 14:44:31 +0800
Subject: [PATCH] 更新地图
---
lib/src/main/cpp/driver_test.cpp | 6 ++++++
lib/src/main/cpp/rtk_platform/platform.h | 2 +-
lib/src/main/cpp/rtk_platform/platform.cpp | 10 +++-------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/src/main/cpp/driver_test.cpp b/lib/src/main/cpp/driver_test.cpp
index 443a303..c28f2a9 100644
--- a/lib/src/main/cpp/driver_test.cpp
+++ b/lib/src/main/cpp/driver_test.cpp
@@ -540,6 +540,11 @@
CurrExamStatus = EXAM_AREA_RUN;
break;
case MAP_TYPE_CURVE:
+ DEBUG("杩涘叆鏇茬嚎琛岄┒鍦哄湴");
+ MA_SendDebugInfo("杩涘叆鏇茬嚎琛岄┒鍦哄湴 %d", GetMapId(CurrExamMapIndex, MapList, MapNum));
+ StartDrivingCurve(move, &rtkTime);
+
+ CurrExamStatus = EXAM_AREA_RUN;
break;
case MAP_TYPE_TURN_90:
DEBUG("杩涘叆鐩磋杞集鍦哄湴");
@@ -563,6 +568,7 @@
testing = TestParkEdge(&MapList[CurrExamMapIndex].map, CarModel, CarModelPrev, speed, move, &rtkTime);
break;
case MAP_TYPE_CURVE:
+ testing = TestDrivingCurve(&MapList[CurrExamMapIndex].map, &MapList[CurrExamMapIndex].map2, CarModel, CarModelPrev, speed, move, &rtkTime);
break;
case MAP_TYPE_TURN_90:
testing = TestTurnA90(&MapList[CurrExamMapIndex].map, CarModel, CarModelPrev, azimuth, speed, move, &rtkTime);
diff --git a/lib/src/main/cpp/rtk_platform/platform.cpp b/lib/src/main/cpp/rtk_platform/platform.cpp
index ceaa2c6..89a15cf 100644
--- a/lib/src/main/cpp/rtk_platform/platform.cpp
+++ b/lib/src/main/cpp/rtk_platform/platform.cpp
@@ -37,7 +37,7 @@
uint16_t city;
uint8_t device_model[21];
uint8_t device_sn[17];
- char imei[16];
+ char imei[17];
}deviceInfo;
struct platformSocketInfo {
@@ -287,9 +287,7 @@
static void PlatformChangeEntry(uint32_t events, const uint8_t *data, int length)
{
if (events & PLATFORM_CONNECT_EVT) {
- char out[64];
- sprintf(out, "骞冲彴杩炴帴鎴愬姛 %s:%d", currSocket.domain_name, currSocket.port);
- DisplayText(out);
+ DEBUG("骞冲彴杩炴帴鎴愬姛 %s:%d", currSocket.domain_name, currSocket.port);
MA_RtkPlatformConnect(1, currSocket.domain_name, currSocket.port);
platformStatus.connected = 1;
@@ -301,9 +299,7 @@
}
if (events & PLATFORM_DISCONNECT_EVT) {
- char out[64];
- sprintf(out, "骞冲彴鏂紑 %s:%d", currSocket.domain_name, currSocket.port);
- DisplayText(out);
+ DEBUG("骞冲彴鏂紑 %s:%d", currSocket.domain_name, currSocket.port);
MA_RtkPlatformConnect(0, currSocket.domain_name, currSocket.port);
AppTimer_delete(ConnectPlatformLater);
diff --git a/lib/src/main/cpp/rtk_platform/platform.h b/lib/src/main/cpp/rtk_platform/platform.h
index 5ad51b7..d0c6c57 100644
--- a/lib/src/main/cpp/rtk_platform/platform.h
+++ b/lib/src/main/cpp/rtk_platform/platform.h
@@ -23,7 +23,7 @@
uint16_t city;
char device_model[21];
char device_sn[17];
- char imei[16];
+ char imei[17];
char phone[17];
char password[17];
int registered;
--
Gitblit v1.8.0