Browse Source

修改一维定时判断定位坐标是否在基站围成的矩形框内部,注释掉计算TOA的模块,软件版本还是保持:V2.1.03

zhoutao 3 days ago
parent
commit
038a2e86df

+ 1 - 1
src/modules/location/lct_coordcal.c

@@ -49,7 +49,7 @@ void lct_coordcal_init(LCT_COORDCAL_PARAM_T stLctCoordcalParam)
 
     gg_stLctCoordcalParam.dwBtsEdgeExpendLen = stLctCoordcalParam.dwBtsEdgeExpendLen;
     gg_stLctCoordcalParam.dwOneDimensionExpendLen = stLctCoordcalParam.dwOneDimensionExpendLen;
-
+    gg_stLctCoordcalParam.dwOneDimensionSquareExpendLen = stLctCoordcalParam.dwOneDimensionSquareExpendLen;
     return;
 }
 

+ 1 - 1
src/modules/location/lct_coordcal_one.c

@@ -573,7 +573,7 @@ void lct_coordcal_check_one_dimension_bts_firstpath_valid(uint8 byPredictionFlag
 // 返回值,0:不在内部,1:在内部
 uint8 lct_coordcal_check_one_dimension_inside(COORD_T stBts1Coord, COORD_T stBts2Coord, COORD_T stPredictionCoord)
 {
-    uint32 dwBtsEdgeExpendLen = gg_stLctCoordcalParam.dwOneDimensionExpendLen; // 一维计算是扩展
+    uint32 dwBtsEdgeExpendLen = gg_stLctCoordcalParam.dwOneDimensionSquareExpendLen; // 一维计算是扩展
     int32 dwMinValueX = 2147483647;
     int32 dwMaxValueX = -2147483648;
     int32 dwMinValueY = 2147483647;

+ 1 - 1
src/modules/location/lct_main.c

@@ -163,7 +163,7 @@ void lct_main(PUB_LCT_BTS_LIST_T *pstLctBtsList, PUB_LOCATION_DATA_T *pstLctData
                     lct_main_mean_original_coord(&gLct_stOriginalLctCoordList, gLct_afMeanWeight, &gLct_stMeanLctCoordList, &stMeanCoord);
 
                     // 计算第一径基本偏移量
-                    lct_toa_cal_bts_first_path_index_offset(stOptimumCoord.bySourceFlag, &gLct_stFirstPathList, &gLct_stMeanLctCoordList, gLct_dwFpBaseOffset, &gLct_dwFpBaseOffset);
+                    // lct_toa_cal_bts_first_path_index_offset(stOptimumCoord.bySourceFlag, &gLct_stFirstPathList, &gLct_stMeanLctCoordList, gLct_dwFpBaseOffset, &gLct_dwFpBaseOffset);
 
                     // 根据定位坐标修改手机相对于基站的移动趋势
                     lct_main_update_phone_tendency(&gLct_stMeanLctCoordList, gLct_astPredictionDirectionDataList);

+ 3 - 2
src/sysdefine/struct_lct.h

@@ -188,8 +188,9 @@ typedef struct
     uint32 dwOneFirstPahtSnrThres;       // 一维第一径信噪比门限(放大10倍),默认值50
     uint32 dwOneFirstPathIndexJumpThres; // 一维第一径跳变门限,默认值400
 
-    uint32 dwBtsEdgeExpendLen;      // 基站围成的矩形框向外扩展长度,默认值200
-    uint32 dwOneDimensionExpendLen; // 一维定位时向外扩展长度,默认值200
+    uint32 dwBtsEdgeExpendLen;            // 基站围成的矩形框向外扩展长度,默认值200
+    uint32 dwOneDimensionExpendLen;       // 一维定位时向外扩展长度,默认值200
+    uint32 dwOneDimensionSquareExpendLen; // 一维定位检查时向外扩展长度,默认值500,用于判断定位点是否在基站对围城的矩形框内部
 } LCT_COORDCAL_PARAM_T;
 
 // 第一径标识符枚举

+ 1 - 0
src/sysmain/sysmain.c

@@ -98,6 +98,7 @@ void sysmain_init_lct()
 
     stLctCoordcalParam.dwBtsEdgeExpendLen = 150;      // 基站围成的矩形框向外扩展长度,默认值150
     stLctCoordcalParam.dwOneDimensionExpendLen = 200; // 一维定位时向外扩展长度,默认值200
+    stLctCoordcalParam.dwOneDimensionSquareExpendLen; // 一维定位时向外扩展长度,默认值500
 
     // 选择最优定位坐标模块参数
     LCT_COORDSEL_PARAM_T stLctCoordselParam = {0};