commit fa7c1fc6e750a4c51ac12c7b4d1afe242a806845
author r.xiao <r.xiao@mobiletek.cn> Wed Jul 03 23:22:33 2024 -0700
committer r.xiao <r.xiao@mobiletek.cn> Wed Jul 03 23:22:33 2024 -0700
tree 30d6f40a3679c437f3867bb2ab25aa6bdedc9f8c
parent d888d2b10030cab488bd3f6d910e10844a65e6b5

修复rssi值异常

Change-Id: Id82a8ac2ec6eaca6168b35984248f5f1665cb7f5

mbtk/liblynq_lib/src/lynq_network.c

diff --git a/mbtk/liblynq_lib/src/lynq_network.c b/mbtk/liblynq_lib/src/lynq_network.c
old mode 100644
new mode 100755
index f53c8dc..be3816e
--- a/mbtk/liblynq_lib/src/lynq_network.c
+++ b/mbtk/liblynq_lib/src/lynq_network.c
@@ -296,34 +296,41 @@
            *net_data == MBTK_RADIO_TECH_GSM_EGPRS)              //GSM
         {
             msg_buf.gsm_sig_info_valid = TRUE;
+            msg_buf.gsm_sig_info.rssi = *(net_data + 1);
         }
         else if(*net_data == MBTK_RADIO_TECH_E_UTRAN)     //LTE
         {
             msg_buf.lte_sig_info_valid = TRUE;
+            msg_buf.lte_sig_info.rssi = *(net_data + 1);
+            msg_buf.lte_sig_info.rsrp = *(net_data + 7);//signalstrength.rsrp;
+            msg_buf.lte_sig_info.rsrq = *(net_data + 6);//signalstrength.rsrq;
+            msg_buf.lte_sig_info.snr = 0x7FFFFFFFF; //signalstrength.rssnr;(当前mbtk没有该参数)
         }
         else if (*net_data == MBTK_RADIO_TECH_UTRAN || *net_data == MBTK_RADIO_TECH_UTRAN_HSDPA || \
                  *net_data == MBTK_RADIO_TECH_UTRAN_HSUPA || *net_data == MBTK_RADIO_TECH_UTRAN_HSDPA_HSUPA ||  \
                  *net_data == MBTK_RADIO_TECH_UTRAN_HSPA )//WCDMA
         {
             msg_buf.wcdma_sig_info_valid = TRUE;
+            msg_buf.wcdma_sig_info.rssi = *(net_data + 1);//signalstrength.rssi;
+            msg_buf.wcdma_sig_info.ecio = *(net_data + 5);//signalstrength.ecno;
         }
 
         //msg_buf.gsm_sig_info_valid = TRUE;//signalstrength.gw_sig_valid;
-        msg_buf.gsm_sig_info.rssi = *(net_data + 1);//signalstrength.rssi;
+        //msg_buf.gsm_sig_info.rssi = *(net_data + 1);//signalstrength.rssi;
         //printf("rssi = %d\n", *(net_data + 1));
         //msg_buf.wcdma_sig_info_valid = TRUE;//.wcdma_sig_valid;
-        msg_buf.wcdma_sig_info.rssi = *(net_data + 4);//signalstrength.rscp;
+        //msg_buf.wcdma_sig_info.rssi = *(net_data + 1);//signalstrength.rssi;
         //printf("rscp = %d\n", *(net_data + 4));
-        msg_buf.wcdma_sig_info.ecio = *(net_data + 5);//signalstrength.ecno;
+        //msg_buf.wcdma_sig_info.ecio = *(net_data + 5);//signalstrength.ecno;
         //printf("ecno = %d\n", *(net_data + 5));
-        msg_buf.tdscdma_sig_info_valid = FALSE;
         //msg_buf.lte_sig_info_valid = TRUE;//signalstrength.lte_sig_valid;
-        msg_buf.lte_sig_info.rssi = -125;
-        msg_buf.lte_sig_info.rsrp = *(net_data + 7);//signalstrength.rsrp;
+        //msg_buf.lte_sig_info.rssi = *(net_data + 1);
+        //msg_buf.lte_sig_info.rsrp = *(net_data + 7);//signalstrength.rsrp;
         //printf("rsrp = %d\n", *(net_data + 7));
-        msg_buf.lte_sig_info.rsrq = *(net_data + 6);//signalstrength.rsrq;
+        //msg_buf.lte_sig_info.rsrq = *(net_data + 6);//signalstrength.rsrq;
         //printf("rsrq = %d\n", *(net_data + 6));
-        msg_buf.lte_sig_info.snr = 0x7FFFFFFFF; //signalstrength.rssnr;(当前mbtk没有该参数)
+        //msg_buf.lte_sig_info.snr = 0x7FFFFFFFF; //signalstrength.rssnr;(当前mbtk没有该参数)
+        msg_buf.tdscdma_sig_info_valid = FALSE;
         msg_buf.cdma_sig_info_valid = FALSE;
         msg_buf.hdr_sig_info_valid = FALSE;
         msg_buf.nr_sig_info_valid = FALSE;//(当前mbtk没有该参数)
@@ -839,14 +846,14 @@
             pt_info->lte_sig_info.rsrp = signal.rsrp;
             pt_info->lte_sig_info.rsrq = signal.rsrq;
             pt_info->lte_sig_info.snr = 0x7FFFFFFFF;                  //->MBTK接口无该参数(对应参数为rssnr，该值INT_MAX：0x7FFFFFFFF表示无效值)，写死值为0x7FFFFFFFF 
-            pt_info->lte_sig_info.rssi = -125;
+            pt_info->lte_sig_info.rssi = signal.rssi;
         }
         else if (signal.type == MBTK_RADIO_TECH_UTRAN || signal.type == MBTK_RADIO_TECH_UTRAN_HSDPA || \
                  signal.type == MBTK_RADIO_TECH_UTRAN_HSUPA || signal.type == MBTK_RADIO_TECH_UTRAN_HSDPA_HSUPA ||  \
                  signal.type == MBTK_RADIO_TECH_UTRAN_HSPA )//WCDMA
         {
             pt_info->wcdma_sig_info_valid = TRUE;
-            pt_info->wcdma_sig_info.rssi = signal.rscp;
+            pt_info->wcdma_sig_info.rssi = signal.rssi;
             pt_info->wcdma_sig_info.ecio = signal.ecno;
         }
         else