diff --git a/common.mk b/common.mk index ddc8874..821f8f4 100644 --- a/common.mk +++ b/common.mk @@ -274,7 +274,9 @@ PRODUCT_PACKAGES += \ # GPS PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/gps/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \ $(LOCAL_PATH)/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ + $(LOCAL_PATH)/gps/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf \ $(LOCAL_PATH)/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ $(LOCAL_PATH)/gps/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ $(LOCAL_PATH)/gps/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ diff --git a/gps/apdr.conf b/gps/apdr.conf new file mode 100644 index 0000000..5a9a922 --- /dev/null +++ b/gps/apdr.conf @@ -0,0 +1,188 @@ +# AP DR SENSOR Configuration file +# +# SENSOR_SERVICE options are one of below +# accel,gyro,vehicle_accel,vehicle_gyro,pedometer,vehicle_odometry,accel_temp, +# gyro_temp,baro,mag_calib,mag_uncalib,amd,rmd. +# +# SENSOR_PROVIDER options is one of -- default,native,ssc,samlite. +# +# SENSOR_RATE = 1~100 (Hz) +# +# SENSOR_SAMPLES = 1~N +# +# SENSOR_STATISTIC_ENABLED +# bit 0: Diag Print Enabled +# bit 1: Adb Print Enabled +# SENSOR_STATISTIC_PRINT_COUNT +# Skip Number of Print +# +# QDR_DYNAMIC_LOADING = 1~3 +# Configure QDR library to be loaded +# 1: QDR3 +# 2: QDR2-GYRO +# 3: QDR2-DWT +# +# + +###################################### +# # +# QDR3 Configuration # +# # +# For QDR3, # +# comment default configuration above# +# and # +# uncomment below configuration # +# settings. # +# # +###################################### +# +SENSOR_SERVICE = accel +SENSOR_PROVIDER = native +SENSOR_RATE = 10 +SENSOR_SAMPLES = 10 +# +SENSOR_SERVICE = vehicle_speed +SENSOR_PROVIDER = native +SENSOR_RATE = 100 +SENSOR_SAMPLES = 1 +# +SENSOR_SERVICE = gyro +SENSOR_PROVIDER = native +SENSOR_RATE = 10 +SENSOR_SAMPLES = 10 +# +SENSOR_SERVICE = vehicle_gear +SENSOR_PROVIDER = native +SENSOR_RATE = 100 +SENSOR_SAMPLES = 1 +# +SENSOR_SERVICE = accel_temp +SENSOR_PROVIDER = native +SENSOR_RATE = 1 +SENSOR_SAMPLES = 1 +# +# +##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS +QDR_DYNAMIC_LOADING = 1 +##Specify CAN sensor type: Valid Options: 14(ODO), 2(ODO_DWT), 3(ODO_DWS) +QDR_CAN_TYPE = 14 +##Reporting offset before PPS boundary +QDR_REPORTING_OFFSET = 20 +# +##QDR_ENABLE_QG shall be set as 1 +QDR_ENABLE_QG = 1 +#GEAR Optimisation +QG_GEAR_ON_CHANGE=1 +# + +##Vehicle Sensor Configuration (CAN data availability) +##QDR_VEH_SENSOR_CONFIG: +## 0: VEHICLE_SENSOR_PRESENT - Vehicle Sensor is available (DEFAULT) +## 1: VEHICLE_SENSOR_OPTIONAL - Vehicle Sensor may or may not be present. +#QDR_VEH_SENSOR_CONFIG = 0 + +##Select Wheel set (E.g.: Front two wheels, Rear two wheels OR All four wheels) +##To be used for differential wheel tick OR speed service. +##This configuration is applicable when QDR_CAN_TYPE configured as +##ODO_DWS(3) or ODO_DWT(2). +##Value "0": Use Front two wheels +##Value "1": Use Rear two wheels +##Value "2": Use All four wheels +#QG_DRIVE_WHEEL_FW_RW_AW = 2 +##Max Wheel tick value above which wheel tick rolls over +##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2) +#QG_DWT_MAX_WHEEL_TICK_COUNT = 255.0 +##Configure Wheel constant for DWT based below equation +##(2 * pi * WHEEL_RADIUS / Pulses Per revolution) +##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2) +#QG_DWT_WHEEL_CONSTANT = 0.044 +# + +###################################### +# # +# QDR2-DWT Configuration # +# # +# For QDR2-DWT, # +# comment default configuration above# +# and # +# uncomment below configuration # +# settings. # +# # +###################################### +# +#SENSOR_SERVICE = vehicle_speed +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +#SENSOR_STATISTIC_ENABLED = 3 +#SENSOR_STATISTIC_PRINT_COUNT = 50 +# +#SENSOR_SERVICE = vehicle_dws +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +#SENSOR_STATISTIC_ENABLED = 3 +#SENSOR_STATISTIC_PRINT_COUNT = 50 +# +#SENSOR_SERVICE = vehicle_gear +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +#SENSOR_STATISTIC_ENABLED = 3 +#SENSOR_STATISTIC_PRINT_COUNT = 50 +# +#GNSS_POS_STATISTIC_ENABLED = 3 +#GNSS_POS_STATISTIC_PRNTCNT = 10 +#GNSS_MSR_STATISTIC_ENABLED = 3 +#GNSS_MSR_STATISTIC_PRNTCNT = 10 +# +##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS +#QDR_DYNAMIC_LOADING = 3 +##Enable/disable sensor data flashback feature +#QDR_FLASHBACK_ENABLED = 0 +##Enable/disable sensor data batching feature +#QDR_BATCHING_ENABLED = 0 +##Reporting offset before PPS boundary +#QDR_REPORTING_OFFSET = 20 +##Sensor dispatch threshold declaration +#QDR_SENSDISPATCH_MS = 30 + + +###################################### +# # +# QDR2-GYRO Configuration # +# # +# For QDR2-GYRO, # +# comment default configuration above# +# and # +# uncomment below configuration # +# settings. # +# # +###################################### +# +#SENSOR_SERVICE = vehicle_speed +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +# +#SENSOR_SERVICE = vehicle_gyro +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +# +#SENSOR_SERVICE = vehicle_gear +#SENSOR_PROVIDER = native +#SENSOR_RATE = 100 +#SENSOR_SAMPLES = 1 +# +##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS +#QDR_DYNAMIC_LOADING = 2 +##Enable/disable sensor data flashback feature +#QDR_FLASHBACK_ENABLED = 0 +##Enable/disable sensor data batching feature +#QDR_BATCHING_ENABLED = 0 +##Reporting offset before PPS boundary +#QDR_REPORTING_OFFSET = 20 +##Sensor dispatch threshold declaration +#QDR_SENSDISPATCH_MS = 30 +# diff --git a/gps/gnss_antenna_info.conf b/gps/gnss_antenna_info.conf new file mode 100644 index 0000000..79a2aef --- /dev/null +++ b/gps/gnss_antenna_info.conf @@ -0,0 +1,134 @@ +################################### +##### ANTENNA INFORMATION ##### +################################### + +################################### +# ANTENNA INFO VECTOR SIZE +################################### +# The number of antenna info +# structures in the vector. Each +# entry in this vector is a structure +# with the following elements: +# +# - CARRIER_FREQUENCY +# - PC_OFFSET +# - PC_VARIATION_CORRECTION +# - PC_VARIATION_CORRECTION_UNC +# - SIGNAL_GAIN_CORRECTION +# - SIGNAL_GAIN_CORRECTION_UNC +# +# Notes: +# CARRIER_FREQUENCY +# The carrier frequency in MHz. +# +# PC = PHASE CENTER +# PC_OFFSET is a structure with six +# elements: x, y, z and their associated uncertainties +# Phase center offset (PCO) is defined with +# respect to the origin of the Android sensor coordinate system, e.g., +# center of primary screen for mobiles +# +# PC_VARIATION_CORRECTION +# 2D vectors representing the phase center variation (PCV) corrections, +# in millimeters, at regularly spaced azimuthal angle (theta) and zenith angle +# (phi). The PCV correction is added to the phase measurement to obtain the +# corrected value. +# The azimuthal angle, theta, is defined with respect to the X axis of the +# Android sensor coordinate system, increasing toward the Y axis. The zenith +# angle, phi, is defined with respect to the Z axis of the Android Sensor +# coordinate system, increasing toward the X-Y plane. +# Each row vector (outer vectors) represents a fixed theta. The first row +# corresponds to a theta angle of 0 degrees. The last row corresponds to a +# theta angle of (360 - deltaTheta) degrees, where deltaTheta is the regular +# spacing between azimuthal angles, i.e., deltaTheta = 360 / (number of rows). +# The columns (inner vectors) represent fixed zenith angles, beginning at 0 +# degrees and ending at 180 degrees. They are separated by deltaPhi, the regular +# spacing between zenith angles, i.e., deltaPhi = 180 / (number of columns - 1). +# +# PC_VARIATION_CORRECTION_UNC +# 2D vectors of 1-sigma uncertainty in millimeters associated with the PCV +# correction values. +# +# SIGNAL_GAIN_CORRECTION +# 2D vectors representing the signal gain corrections at regularly spaced +# azimuthal angle (theta) and zenith angle (phi). The values are calculated or +# measured at the antenna feed point without considering the radio and receiver +# noise figure and path loss contribution, in dBi, i.e., decibel over isotropic +# antenna with the same total power. The signal gain correction is added the +# signal gain measurement to obtain the corrected value. +# The azimuthal angle, theta, is defined with respect to the X axis of the +# Android sensor coordinate system, increasing toward the Y axis. The zenith +# angle, phi, is defined with respect to the Z axis of the Android Sensor +# coordinate system, increasing toward the X-Y plane. +# Each row vector (outer vectors) represents a fixed theta. The first row +# corresponds to a theta angle of 0 degrees. The last row corresponds to a +# theta angle of (360 - deltaTheta) degrees, where deltaTheta is the regular +# spacing between azimuthal angles, i.e., deltaTheta = 360 / (number of rows). +# The columns (inner vectors) represent fixed zenith angles, beginning at 0 +# degrees and ending at 180 degrees. They are separated by deltaPhi, the regular +# spacing between zenith angles, i.e., deltaPhi = 180 / (number of columns - 1). +# +# SIGNAL_GAIN_CORRECTION_UNC +# 2D vectors of 1-sigma uncertainty in dBi associated with the signal +# gain correction values. +# +# The number of rows and columns could be the same for PC variation correction +# and signal gain corrections, or could be different +# If the former then NUMBER_OF_ROWS_ and NUMBER_OF_COLUMNS_ are specified once +# only, if the latter then NUMBER_OF_ROWS_ and NUMBER_OF_COLUMNS_ represent +# the number of rows/columns for PC variation correction and +# NUMBER_OF_ROWS_SGC_ and NUMBER_OF_COLUMNS_SGC_ represent the number of +# rows/columns for signal gain corrections + +ANTENNA_INFO_VECTOR_SIZE = 2 + +CARRIER_FREQUENCY_0 = 1575.42 + +PC_OFFSET_0 = 1.2 0.1 3.4 0.2 5.6 0.3 + +NUMBER_OF_ROWS_0 = 3 +NUMBER_OF_COLUMNS_0 = 4 + +PC_VARIATION_CORRECTION_0_ROW_0 = 11.22 33.44 55.66 77.88 +PC_VARIATION_CORRECTION_0_ROW_1 = 10.2 30.4 50.6 70.8 +PC_VARIATION_CORRECTION_0_ROW_2 = 12.2 34.4 56.6 78.8 + +PC_VARIATION_CORRECTION_UNC_0_ROW_0 = 0.1 0.2 0.3 0.4 +PC_VARIATION_CORRECTION_UNC_0_ROW_1 = 1.1 1.2 1.3 1.4 +PC_VARIATION_CORRECTION_UNC_0_ROW_2 = 2.1 2.2 2.3 2.4 + +SIGNAL_GAIN_CORRECTION_0_ROW_0 = 9.8 8.7 7.6 6.5 +SIGNAL_GAIN_CORRECTION_0_ROW_1 = 5.4 4.3 3.2 2.1 +SIGNAL_GAIN_CORRECTION_0_ROW_2 = 1.3 2.4 3.5 4.6 + +SIGNAL_GAIN_CORRECTION_UNC_0_ROW_0 = 0.11 0.22 0.33 0.44 +SIGNAL_GAIN_CORRECTION_UNC_0_ROW_1 = 0.55 0.66 0.77 0.88 +SIGNAL_GAIN_CORRECTION_UNC_0_ROW_2 = 0.91 0.92 0.93 0.94 + + +CARRIER_FREQUENCY_1 = 1227.6 + +PC_OFFSET_1 = 3.4 0.2 5.6 0.3 1.2 0.1 + +NUMBER_OF_ROWS_1 = 4 +NUMBER_OF_COLUMNS_1 = 2 +NUMBER_OF_ROWS_SGC_1 = 3 +NUMBER_OF_COLUMNS_SGC_1 = 4 + +PC_VARIATION_CORRECTION_1_ROW_0 = 55.66 77.88 +PC_VARIATION_CORRECTION_1_ROW_1 = 11.22 33.44 +PC_VARIATION_CORRECTION_1_ROW_2 = 56.6 78.8 +PC_VARIATION_CORRECTION_1_ROW_3 = 12.2 34.4 + +PC_VARIATION_CORRECTION_UNC_1_ROW_0 = 0.3 0.4 +PC_VARIATION_CORRECTION_UNC_1_ROW_1 = 1.1 1.2 +PC_VARIATION_CORRECTION_UNC_1_ROW_2 = 2.1 2.2 +PC_VARIATION_CORRECTION_UNC_1_ROW_3 = 0.1 0.2 + +SIGNAL_GAIN_CORRECTION_1_ROW_0 = 7.6 6.5 5.4 4.3 +SIGNAL_GAIN_CORRECTION_1_ROW_1 = 1.3 2.4 9.8 8.7 +SIGNAL_GAIN_CORRECTION_1_ROW_2 = 1.4 2.5 3.6 4.7 + +SIGNAL_GAIN_CORRECTION_UNC_1_ROW_0 = 0.91 0.92 0.55 0.66 +SIGNAL_GAIN_CORRECTION_UNC_1_ROW_1 = 0.11 0.22 0.93 0.94 +SIGNAL_GAIN_CORRECTION_UNC_1_ROW_2 = 0.95 0.96 0.33 0.44 diff --git a/gps/gps.conf b/gps/gps.conf index ab17bb7..b9324d6 100644 --- a/gps/gps.conf +++ b/gps/gps.conf @@ -324,8 +324,9 @@ CP_MTLR_ES=0 ################################################## # 0 : Enable QTI GNSS (default) # 1 : Enable QCSR SS5 -# This setting use to select between QTI GNSS -# and QCSR SS5 hardware receiver. +# 2 : Enable PDS API +# This setting use to select between QTI GNSS, +# QCSR SS5 hardware receiver, and PDS API. # By default QTI GNSS receiver is enabled. # GNSS_DEPLOYMENT = 0 @@ -367,14 +368,27 @@ BUFFER_DIAG_LOGGING = 1 # CDFW_INJECT_DATA_INTERVAL = 600000 //10 mins # CDFW_RTCM_MESSAGE_INTERVAL = 1000 //1 second # -# CDFW only honors CDFW remote API calls from CDFW_USERS -# Supported options for CDFW_USERS = intOne cv2x garden -# # If multiple sources coexist on a PL, # the prorioty sequence can be set by the integer number. # PRIORITY_1 is higher than PRIORITY_2, for example, # CDFW_SOURCE_PRIORITY_1 = INTERNAL_1 RTCM # CDFW_SOURCE_PRIORITY_2 = CV2X RTCM ################################################## -CDFW_USERS = intOne +################################################## +# RF LOSS +# The loss in 0.1 dbHz from the C/N0 at the antenna port +# These values must be configured by OEM if not +# supported in QMI LOC message +# There is one entry for each signal type +################################################## +RF_LOSS_GPS = 0 +RF_LOSS_GPS_L5 = 0 +RF_LOSS_GLO_LEFT = 0 +RF_LOSS_GLO_CENTER = 0 +RF_LOSS_GLO_RIGHT = 0 +RF_LOSS_BDS = 0 +RF_LOSS_BDS_B2A = 0 +RF_LOSS_GAL = 0 +RF_LOSS_GAL_E5 = 0 +RF_LOSS_NAVIC = 0 diff --git a/gps/lowi.conf b/gps/lowi.conf index 482fb42..6d4de75 100644 --- a/gps/lowi.conf +++ b/gps/lowi.conf @@ -22,6 +22,6 @@ # Log level # EL_LOG_OFF = 0, EL_ERROR = 1, EL_WARNING = 2, EL_INFO = 3, EL_DEBUG = 4, EL_VERBOSE = 5, EL_LOG_ALL = 100 -LOWI_LOG_LEVEL = 3 +LOWI_LOG_LEVEL = 2 LOWI_USE_LOWI_LP = 0