Merge "[Feature][ZXW-83]autosuspend service // Only Configure: No Affected branch: unknown Affected module: unknown Is it affected on both ZXIC and MTK: ZXIC and MTK Self-test: Yes Doc Update: No"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc.conf b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc.conf
index 333a235..d5acfcc 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc.conf
+++ b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc.conf
@@ -222,6 +222,7 @@
mobiletek-tester-rdit \
lynq-qser-voice-demo \
lynq-qser-fota-demo \
+ lynq-qser-gnss-demo \
"
zxic_app_open += "${@bb.utils.contains('CONFIG_TEL_API_SUPPORT', 'RIL', 'rild', '', d)}"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-qser-gnss-demo/lynq-qser-gnss-demo.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-qser-gnss-demo/lynq-qser-gnss-demo.bb
new file mode 100755
index 0000000..a14707b
--- /dev/null
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/lynq-qser-gnss-demo/lynq-qser-gnss-demo.bb
@@ -0,0 +1,35 @@
+#inherit externalsrc package
+#inherit externalsrc package systemd
+DESCRIPTION = "lynq-qser-gnss-demo"
+LICENSE = "CLOSED"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e07e8d88e26263e71d3a9e2aa9a2ff"
+DEPENDS += "liblynq-qser-gnss"
+#inherit workonsrc
+WORKONSRC = "${TOPDIR}/../src/lynq/packages/apps/lynq-qser-gnss-demo"
+FILESEXTRAPATHS_prepend :="${TOPDIR}/../src/lynq/packages/apps:"
+SRC_URI = " \
+ file://lynq-qser-gnss-demo \
+ "
+
+SRC-DIR = "${S}/../lynq-qser-gnss-demo"
+TARGET_CC_ARCH += "${LDFLAGS}"
+SYSTEMD_PACKAGES = "${PN}"
+#Parameters passed to do_compile()
+EXTRA_OEMAKE = "'TARGET_PLATFORM = ${TARGET_PLATFORM}'\"
+EXTRA_OEMAKE += "'MOBILETEK_RIL_CFG = ${MOBILETEK_RIL_CFG}'"
+
+EXTRA_OEMAKE += "'MOBILETEK_FOTA_CFG = ${MOBILETEK_FOTA_CFG}'"
+
+#INHIBIT_PACKAGE_STRIP = "1"
+do_compile () {
+ if test "${PACKAGE_ARCH}" = "cortexa7hf-vfp-vfpv4-neon" || test "${PACKAGE_ARCH}" = "cortexa7hf-neon-vfpv4"; then
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -mhard-float"
+ else
+ oe_runmake all -C ${SRC-DIR} ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST}"
+ fi
+}
+
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 ${SRC-DIR}/lynq-qser-gnss-demo ${D}${bindir}/
+}
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
index 0d1d63d..8cb0da3 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
@@ -394,6 +394,7 @@
strcpy(apn_list->apn[node_num].apn_name,(char *)xmlGetProp(modify_node, "apn_name"));
strcpy(apn_list->apn[node_num].username,(char *)xmlGetProp(modify_node, "username"));
strcpy(apn_list->apn[node_num].password,(char *)xmlGetProp(modify_node, "password"));
+ strcpy(apn_list->apn[node_num].apn_type,(char *)xmlGetProp(modify_node, "apn_type"));
node_num ++;
modify_node = modify_node->next;
}
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml
index 590d493..ddc89a9 100644
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<lynq_qser_data_apn>
- <apn profile_idx="0" pdp_type="3" auth_proto="0" apn_name="default" username="NULL" password="NULL" apn_type="default"/></lynq_qser_data_apn>
\ No newline at end of file
+ <apn profile_idx="0" pdp_type="3" auth_proto="0" apn_name="default" username="NULL" password="NULL" apn_type="iot_default"/></lynq_qser_data_apn>
diff --git a/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/include/lynq-qser-gnss-demo.h b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/include/lynq-qser-gnss-demo.h
new file mode 100755
index 0000000..c472cf5
--- /dev/null
+++ b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/include/lynq-qser-gnss-demo.h
@@ -0,0 +1,128 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum
+{
+ /**< 0 reserve */
+ E_MT_LOC_MSG_ID_LOCATION_INFO = 1, /**< pv_data = &QL_LOC_LOCATION_INFO_T */
+ /**< 2 reserve */
+ E_MT_LOC_MSG_ID_NMEA_INFO = 3, /**< pv_data = &QL_LOC_NMEA_INFO_T */
+}e_msg_id_t;
+
+#define MOPEN_GNSS_NMEA_MAX_LENGTH 255 /** NMEA string maximum length. */
+typedef struct
+{
+ int64_t timestamp; /**< System Timestamp, marked for when got the nmea data */
+ int length; /**< NMEA string length. */
+ char nmea[MOPEN_GNSS_NMEA_MAX_LENGTH + 1]; /**< NMEA string.*/
+}mopen_gnss_nmea_info_t; /* Message */
+
+struct mopen_location_info_t
+{
+ uint32_t size; /**< Set to the size of mcm_gps_location_t. */
+ int flags; /**< Contains GPS location flags bits. */
+ int position_source; /**< Provider indicator for HYBRID or GPS. */
+ double latitude; /**< Latitude in degrees. */
+ double longitude; /**< Longitude in degrees. */
+ double altitude; /**< Altitude in meters above the WGS 84 reference ellipsoid. */
+ float speed; /**< Speed in meters per second. */
+ float bearing; /**< Heading in degrees. */
+ float accuracy; /**< Expected accuracy in meters. */
+ int64_t timestamp; /**< Timestamp for the location fix in UTC million-second base. */
+ int32_t is_indoor; /**< Location is indoors. */
+ float floor_number; /**< Indicates the floor number. */
+};
+
+/*Instantiate callback function*/
+void cb
+(
+ uint32_t h_loc,
+ e_msg_id_t e_msg_id,
+ void *pv_data,
+ void *context_ptr
+ )
+{
+ printf("e_msg_id=%d\n", e_msg_id);
+ switch(e_msg_id)
+ {
+ case E_MT_LOC_MSG_ID_LOCATION_INFO:
+ {
+ mopen_location_info_t *pt_location = (mopen_location_info_t *)pv_data;
+ printf("**** flag=0x%X, Latitude = %f, Longitude=%f, altitude = %f, speed = %f, timestamp = %lld ****\n",
+ pt_location->flags,
+ pt_location->latitude,
+ pt_location->longitude,
+ pt_location->altitude,
+ pt_location->speed,
+ pt_location->timestamp);
+ break;
+ }
+ case E_MT_LOC_MSG_ID_NMEA_INFO:
+ {
+ mopen_gnss_nmea_info_t *pt_nmea = (mopen_gnss_nmea_info_t *)pv_data;
+
+ printf("**** NMEA info: timestamp=%lld, length=%d, nmea=%s ****\n",
+ pt_nmea->timestamp, pt_nmea->length, pt_nmea->nmea);
+ break;
+ }
+ }
+}
+
+typedef void (*gnss_handler_func_t)
+(
+ uint32_t h_loc,
+ e_msg_id_t e_msg_id,
+ void *pv_data,
+ void *context_ptr
+ );
+
+typedef enum {
+ DELETE_NOTHING = 0, /**< Delete nothing. */
+ DELETE_EPHEMERIS = 1, /**< Delete ephemeris data. */
+ DELETE_ALMANAC = 2, /**< Delete almanac data. */
+ DELETE_POSITION_TIME = 3, /**< Delete position and time data. */
+ DELETE_UTC = 4, /**< Delete UTC data. */
+ DELETE_ALL = 5, /**< Delete all location data. */
+}DELETE_AIDING_DATA_TYPE_T;
+
+typedef struct
+{
+ uint32_t year; // >1980
+ uint32_t month; // 1-12
+ uint32_t day; // 1-31
+ uint32_t hour; // 0-23
+ uint32_t minute; // 0-59
+ uint32_t second; // 0-59
+ uint32_t millisecond; // 0-999
+}LYNQ_INJECT_TIME_INTO_T; /* Message */
+
+
+void user_help(void)
+{
+ printf("\t-1 exit\n"
+ "\t1 gnss init\n"
+ "\t2 gnss deinit \n"
+ "\t3 gnss add handle function\n"
+ "\t4 gnss set single mode\n"
+ "\t5 gnss set get_para_from_nmea mode\n"
+ "\t6 gnss start\n"
+ "\t7 gnss stop\n"
+ "\t8 gnss Delete_Aiding_Data and reset\n"
+ "\t9 gnss injecttime\n"
+ "please input operator: >> ");
+}
+void delete_type(void)
+{
+ printf("\t0 DELETE_NOTHING\n"
+ "\t1 DELETE_EPHEMERIS\n"
+ "\t2 DELETE_ALMANAC\n"
+ "\t3 DELETE_POSITION_TIME \n"
+ "\t4 DELETE_UTC\n"
+ "\t5 DELETE_ALL\n"
+ "please input operator: >> ");
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/lynq-qser-gnss-demo.cpp b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/lynq-qser-gnss-demo.cpp
new file mode 100755
index 0000000..01aa10e
--- /dev/null
+++ b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/lynq-qser-gnss-demo.cpp
@@ -0,0 +1,213 @@
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <termios.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <termios.h>
+#include <time.h>
+#include <sys/ioctl.h>
+#include <dlfcn.h>
+#include <stdint.h>
+#include "lynq-qser-gnss-demo.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+int (*qser_Gnss_Init)(uint32_t *h_gnss);
+int (*qser_Gnss_Deinit)(uint32_t);
+int (*qser_AddRxIndMsgHandler)(gnss_handler_func_t handler_ptr,uint32_t);
+int (*qser_Set_Indications)(uint32_t h_gnss,e_msg_id_t);
+int (*qser_Gnss_Start)(uint32_t h_gnss);
+int (*qser_Gnss_Stop)(uint32_t h_gnss);
+int (*qser_Gnss_Delete_Aiding_Data)(uint32_t,DELETE_AIDING_DATA_TYPE_T);
+int (*qser_Gnss_InjectTime)(uint32_t,LYNQ_INJECT_TIME_INTO_T *time_info);
+void *dlHandle_gnss;
+
+int main(int argc, char *argv[])
+{
+ int ret;
+ int opt = 0;
+ char *lynqLib_gnss = "/lib/liblynq-qser-gnss.so";
+ char dev_file[12] = {0};
+ uint32_t ph_gnss;
+ dlHandle_gnss = dlopen(lynqLib_gnss, RTLD_NOW);
+ while(1)
+ {
+ printf("=========gnss main=========\n");
+ user_help();
+ scanf("%d", &opt);
+ switch (opt)
+ {
+ case -1:
+ {
+ printf("main exit\n");
+ return 0;
+ }
+
+ case 1:
+ {
+ qser_Gnss_Init=(int(*)(uint32_t *h_gnss))dlsym(dlHandle_gnss, "qser_Gnss_Init");
+ ret = qser_Gnss_Init(&ph_gnss);
+ if(ret < 0)
+ {
+ printf("mopen_gnss_client_init FAIL.\n");
+ return -1;
+ }
+ printf("mopen_gnss_client_init success , with address=%d\n", ph_gnss);
+ break;
+ }
+ case 2:
+ {
+ qser_Gnss_Deinit=(int(*)(uint32_t))dlsym(dlHandle_gnss, "qser_Gnss_Deinit");
+ ret =qser_Gnss_Deinit(ph_gnss);
+ if(ret < 0)
+ {
+ printf("mopen_gnss_client_init FAIL.\n");
+ return -1;
+ }
+ printf("mopen_gnss_client_Deinit success ");
+ return 0;
+ }
+ case 3:
+ {
+ qser_AddRxIndMsgHandler=(int(*)(gnss_handler_func_t,uint32_t))dlsym(dlHandle_gnss, "qser_AddRxIndMsgHandler");
+ ret = qser_AddRxIndMsgHandler((gnss_handler_func_t)&cb,ph_gnss);
+ if(ret < 0)
+ {
+ printf("lynq_AddRxIndMsgHandler\n");
+ qser_Gnss_Deinit(ph_gnss);
+ return -1;
+ }
+ printf("add success\n");
+ break;
+ }
+ case 4:
+ {
+ e_msg_id_t ptr2=E_MT_LOC_MSG_ID_LOCATION_INFO;
+ qser_Set_Indications=(int(*)(uint32_t h_gnss,e_msg_id_t))dlsym(dlHandle_gnss, "qser_Set_Indications");
+ ret = qser_Set_Indications(ph_gnss,ptr2);
+ if(ret < 0)
+ {
+ printf("lynq_Set_LOCATION_INFO fail\n");
+ qser_Gnss_Deinit(ph_gnss);
+ return -1;
+ }
+ printf("set location mode success\n");
+ break;
+ }
+ case 5:
+ {
+ e_msg_id_t ptr4=E_MT_LOC_MSG_ID_NMEA_INFO;
+ qser_Set_Indications=(int(*)(uint32_t h_gnss,e_msg_id_t))dlsym(dlHandle_gnss, "qser_Set_Indications");
+ ret = qser_Set_Indications(ph_gnss,ptr4);
+ if(ret < 0)
+ {
+ printf("lynq_Set_NMEA_INFO fail\n");
+ qser_Gnss_Deinit(ph_gnss);
+ return -1;
+ }
+ printf("set nmea mode success\n");
+ break;
+
+ }
+ case 6:
+ {
+ qser_Gnss_Start=(int(*)(uint32_t))dlsym(dlHandle_gnss, "qser_Gnss_Start");
+ ret = qser_Gnss_Start(ph_gnss);
+ if(ret < 0)
+ {
+ printf("lynq_Gnss_Start fail\n");
+ return -1;
+ }
+ printf("start success\n");
+ break;
+ }
+ case 7:
+ {
+ qser_Gnss_Stop=(int(*)(uint32_t))dlsym(dlHandle_gnss, "qser_Gnss_Stop");
+ ret = qser_Gnss_Stop(ph_gnss);
+ if(ret < 0)
+ {
+ printf("lynq_Gnss_Stop fail\n");
+ qser_Gnss_Deinit(ph_gnss);
+ return -1;
+ }
+ break;
+ printf("stop success\n");
+ }
+
+ case 8:
+ {
+ int opt_1;
+ DELETE_AIDING_DATA_TYPE_T ptr;
+ qser_Gnss_Delete_Aiding_Data=(int(*)(uint32_t,DELETE_AIDING_DATA_TYPE_T))dlsym(dlHandle_gnss, "qser_Gnss_Delete_Aiding_Data");
+ printf("=========delete aiding data type=========\n");
+ delete_type();
+ scanf("%d", &opt_1);
+ switch(opt_1)
+ {
+ case 0:
+ {
+ ptr = DELETE_NOTHING;//hot
+ }
+ case 1:
+ {
+ ptr = DELETE_EPHEMERIS;//warm
+ }
+ case 2:
+ {
+ ptr = DELETE_ALMANAC;
+ }
+ case 3:
+ {
+ ptr = DELETE_POSITION_TIME;
+ }
+ case 4:
+ {
+ ptr = DELETE_UTC;
+ }
+ case 5:
+ {
+ ptr = DELETE_ALL;//cold
+ }
+ }
+ ret = qser_Gnss_Delete_Aiding_Data(ph_gnss,ptr);
+ if(ret < 0)
+ {
+ printf("lynq_Gnss_Delete_Aiding_Data %d fail\n",opt_1);
+ qser_Gnss_Deinit(ph_gnss);
+ return -1;
+ }
+ printf("lynq_Gnss_Delete_Aiding_Data %d success\n",opt_1);
+ break;
+ }
+ case 9:
+ {
+ LYNQ_INJECT_TIME_INTO_T time_test;
+ qser_Gnss_InjectTime=(int(*)(uint32_t,LYNQ_INJECT_TIME_INTO_T *time_info))dlsym(dlHandle_gnss, "qser_Gnss_InjectTime");
+ ret = qser_Gnss_InjectTime(ph_gnss,&time_test);
+ if(ret < 0)
+ {
+ printf("lynq_Gnss_InjectTime fail\n");
+ qser_Gnss_Deinit(ph_gnss);
+ return -1;
+ }
+ printf("lynq_Gnss_InjectTime success\n");
+ break;
+ }
+ }
+ }
+ return 0;
+}
+#ifdef __cplusplus
+}
+#endif
diff --git a/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/makefile b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/makefile
new file mode 100755
index 0000000..637163d
--- /dev/null
+++ b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-gnss-demo/makefile
@@ -0,0 +1,50 @@
+SHELL = /bin/sh
+RM = rm -f
+
+LOCAL_CFLAGS := -Wall \
+ -std=gnu++14 \
+ -g -Os \
+ -flto \
+ -fpermissive \
+
+ifeq ($(strip $(TARGET_PLATFORM)), T106)
+LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1 -DHAVE_ENDIAN_H -DHAVE_PTHREADS -DHAVE_SYS_UIO_H -DHAVE_POSIX_FILEMAP -DHAVE_STRLCPY -DHAVE_PRCTL -DHAVE_MEMSET16 -DHAVE_MEMSET32 -DANDROID_SMP=0
+endif
+
+LOCAL_CFLAGS += -Wno-error=format-security
+
+LOCAL_PATH = .
+
+LOCAL_C_INCLUDES = \
+ -I. \
+ -I$(LOCAL_PATH)/include/ \
+ -I$(ROOT)$(includedir)/liblog \
+
+
+LOCAL_LIBS := \
+ -L. \
+ -ldl \
+ -lstdc++ \
+ -lpthread \
+
+
+SOURCES = lynq-qser-gnss-demo.cpp
+
+EXECUTABLE = lynq-qser-gnss-demo
+
+OBJECTS=$(SOURCES:.cpp=.o)
+
+OBJECTS_TOOL=$(SOURCES_TOOL:.cpp=.o)
+all: $(EXECUTABLE)
+
+$(EXECUTABLE): $(OBJECTS)
+ $(CXX) $(OBJECTS) $(LOCAL_LIBS) $(LOCAL_CFLAGS) $(LOCAL_C_INCLUDES) -o $@
+
+%.o : %.cpp
+ $(CXX) $(LOCAL_C_INCLUDES) $(LOCAL_CFLAGS) $(LOCAL_LIBS) -o $@ -c $<
+
+.PHONY: clean
+clean:
+ $(RM) $(OBJECTS) $(EXECUTABLE)
+ $(RM) $(OBJECTS_TOOL) $(EXECUTABLE)
+
diff --git a/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-voice-demo/lynq-qser-voice-demo.cpp b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-voice-demo/lynq-qser-voice-demo.cpp
index 3e69508..5f421c9 100755
--- a/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-voice-demo/lynq-qser-voice-demo.cpp
+++ b/cap/zx297520v3/src/lynq/packages/apps/lynq-qser-voice-demo/lynq-qser-voice-demo.cpp
Binary files differ