From eced3d013f06b623a49cb9deaba42218c4e37bb8 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期三, 15 一月 2020 10:56:05 +0800
Subject: [PATCH] update

---
 lib/src/main/cpp/driver_test.h |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/cpp/driver_test.h b/lib/src/main/cpp/driver_test.h
index 1efed4d..ddc0dab 100644
--- a/lib/src/main/cpp/driver_test.h
+++ b/lib/src/main/cpp/driver_test.h
@@ -8,8 +8,31 @@
 #include "Geometry.h"
 #include "rtk_module/rtk.h"
 
+#include <vector>
+
 #define TIRE_OUTSIDE    0
 #define TIRE_INSIDE     1
+
+using namespace std;
+
+struct car_desc_ {
+    double distance;            // 璺濈涓诲ぉ绾跨殑璺濈
+    double angle;               // 浠庝腑杞寸嚎閫嗘椂閽堝舰鎴愮殑瑙掑害
+};
+
+typedef struct {
+    PointF basePoint;               // 鐜板満娴嬮噺鐨勪富澶╃嚎鍧愭爣
+    int axial[2];
+    int left_front_tire[2];
+    int right_front_tire[2];
+    int left_rear_tire[2];
+    int right_rear_tire[2];
+    int bodyNum;
+    int *body;
+    int pointNum;
+    struct car_desc_ *carDesc;      // 缁忕幇鍦烘祴閲忕偣璁$畻鍚庣殑鍊�
+    PointF *carXY;                  // 璁$畻鍚庣殑杞﹁韩鍚勭偣鍧愭爣
+} car_model;
 
 // 鎬绘暟
 // 涓酱绾垮墠鐐�,id 0锛屼腑杞寸嚎鍚庣偣id
@@ -31,17 +54,26 @@
     carModelDesc_t *desc;
 } car_model_cache_t;
 
+struct ExamFault {
+    int sn;
+    char utc[32];
+    int wrong_id;
+};
+
+//vector<ExamFault> ExamFaultList;
+
 void DriverTestInit(void);
 void ReadDriverExamPrimer(void);
 void ClearMap(void);
 void AddMap(int id, int type, const double (*map)[2], int pointNum, const double (*map2)[2], int pointNum2);
 void SetCarMeasurePoint(double *basePoint, int *axial, int *left_front_tire,
                         int *right_front_tire, int *left_rear_tire, int *right_rear_tire,
-                        double (*point)[2], int pointNum);
+                        int *body, int bodyNum, double (*point)[2], int pointNum);
 void SetSensorCfg(int (*sensor)[2], int sensorNum);
 void StartDriverExam(int start);
-
 void UpdateRTKInfo(const rtk_info *s);
+void AddExamFault(int wrong, const char *utc);
+
 car_model_cache_t *GetCarModelCache(int node);
 
 #endif //RTKDRIVERTEST_DRIVER_TEST_H

--
Gitblit v1.8.0