[Bugfix][T106BUG-143]when registering callback by 1 or 3 will reported
error.
Only Configure:No;
Affected branch:master;
Affected module:Gnss;
Is it affected on both ZXIC and MTK: only ZXIC;
Self-test: Yes;
Doc Update:No
Change-Id: I9d79f801faf9433e230ddd03f99e323d973d43da
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/include/mbtk_gnss_internal.h b/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/include/mbtk_gnss_internal.h
index 118ebe0..eb7002c 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/include/mbtk_gnss_internal.h
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/include/mbtk_gnss_internal.h
@@ -136,9 +136,9 @@
typedef enum
{
- E_MT_LOC_MSG_ID_LOCATION_INFO, /**< pv_data = &QL_LOC_LOCATION_INFO_T */
- E_MT_LOC_MSG_ID_NMEA_INFO, /**< pv_data = &QL_LOC_NMEA_INFO_T */
-}e_msg_id_t;
+ E_MT_LOC_MSG_ID_LOCATION_INFO = 1, /**< pv_data = &QL_LOC_LOCATION_INFO_T */
+ E_MT_LOC_MSG_ID_NMEA_INFO = 3, /**< pv_data = &QL_LOC_NMEA_INFO_T */
+}e_msg_id_t; //0,2reserve
#define QL_LOC_MAX_SEVER_ADDR_LENGTH 255 /** Maximum generic server address length for the host name. */
typedef struct
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/src/mbtk_gnss.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/src/mbtk_gnss.cpp
index b90ff63..c2f3056 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/src/mbtk_gnss.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-gnss/src/mbtk_gnss.cpp
@@ -144,7 +144,6 @@
(n[1] = strstr_n(&data[n[0]], "*")) &&
(n[1] > 1)) {
memcpy(out_data, &data[n[0]], n[1] - 1);
- printf("%s\n",out_data);
} else {
gnss_log("%s %d : error [%d]\n" , __func__, __LINE__, n[1]);
gnss_log("error: [%d] %s\n", num, data);
@@ -659,15 +658,12 @@
size_to_wr = buf_len - size;
if( size_to_wr > MBTK_UART_SEND_BUFFER_MAX)
size_to_wr = MBTK_UART_SEND_BUFFER_MAX;
- printf("write 0\n");
size_written = write(fd, &buf[size], size_to_wr);
- printf("write 1\n");
if (size_written==-1)
{
return -1;
}
printf("send cmd: %s\n", &buf[size]);
- printf("%d\n",fd);
size += size_written;
if(size_written != size_to_wr)
{
@@ -742,7 +738,6 @@
{
while(mbtk_gnss_handle->getap_status){
// 在读AP_DATA星历时，不能输出NMEA
- printf("g");
usleep(100000);
}
if(nmea_state == 1)
@@ -751,7 +746,7 @@
ret = mopen_gnss_read(gnss_handle->dev_fd, buf, MBTK_UART_RECV_BUFFER_SIZE);
nmea_reading = 0;
if(ret > 0) {
- printf("read: [%d] %s\n", ret, buf);
+ printf("%s\n",buf);
ring_buffer_queue_arr(&gnss_handle->ring_buffer, buf, ret);
memset(buf, 0, sizeof(buf));
} else {
@@ -934,7 +929,6 @@
goto err;
} else if (B9600 == ret) {
ret = mopen_uart_change(mbtk_gnss_handle->dev_fd, 1);
- printf("1\n");
if(ret)
{
printf("GNSS Uart set B115200 error\n");
@@ -1086,7 +1080,6 @@
}
ret = lynq_gnss_send_cmd(h_gnss, send_buf, strlen(send_buf));
- printf("%s \n",h_gnss);
if(ret < 0)
{
printf("%s FAIL. ret:%d\n", __FUNCTION__, ret);
@@ -1158,16 +1151,13 @@
printf("%s handler invalid.\n", __func__);
return -1;
}
- printf("ant 0\n");
ret = lynq_gnss_send_cmd(h_gnss, cmd1_buf, strlen(cmd1_buf));
- printf("ant 1\n");
if(ret < 0)
{
gnss_log("%s FAIL. ret:%d\n", __func__, ret);
return -1;
}
ret = lynq_gnss_send_cmd(h_gnss, cmd2_buf, strlen(cmd2_buf));
- printf("ant 2\n");
if(ret < 0)
{
gnss_log("%s FAIL. ret:%d\n", __func__, ret);
@@ -1204,7 +1194,6 @@
return -1;
}
gnss_handle->gnss_handler_func = handler_ptr;
- printf("okok\n");
return 0;
}
@@ -1277,7 +1266,6 @@
{
if(fgets(buffer, 256, pipe))
{
- printf("%s", buffer);
memset(buffer, 0, sizeof(buffer));
}
}