From 62a7e543594fc9dd567d71049be1f258f4892a19 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 10:47:24 +0100
Subject: [PATCH 01/16] Introduce readability-identifier-naming check
This commit enforces naming style for Classes and global constants:
Camel_Snake_Case for Classes
UPPER_CASE for global constants
CamelCase for abstract classes
---
.clang-tidy | 11 +-
.../PVT/gnuradio_blocks/rtklib_pvt_cc.cc | 2 +-
.../PVT/gnuradio_blocks/rtklib_pvt_cc.h | 2 +-
src/algorithms/PVT/libs/gpx_printer.cc | 4 +-
src/algorithms/PVT/libs/gpx_printer.h | 2 +-
src/algorithms/PVT/libs/hybrid_ls_pvt.cc | 26 +-
src/algorithms/PVT/libs/hybrid_ls_pvt.h | 6 +-
src/algorithms/PVT/libs/kml_printer.cc | 4 +-
src/algorithms/PVT/libs/kml_printer.h | 2 +-
src/algorithms/PVT/libs/ls_pvt.cc | 8 +-
src/algorithms/PVT/libs/nmea_printer.cc | 2 +-
src/algorithms/PVT/libs/nmea_printer.h | 4 +-
src/algorithms/PVT/libs/rtklib_solver.cc | 20 +-
src/algorithms/PVT/libs/rtklib_solver.h | 6 +-
...lileo_e1_pcps_8ms_ambiguous_acquisition.cc | 2 +-
.../galileo_e1_pcps_ambiguous_acquisition.cc | 16 +-
...eo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 2 +-
...e1_pcps_quicksync_ambiguous_acquisition.cc | 2 +-
...ileo_e1_pcps_tong_ambiguous_acquisition.cc | 2 +-
...ileo_e5a_noncoherent_iq_acquisition_caf.cc | 2 +-
.../adapters/galileo_e5a_pcps_acquisition.cc | 18 +-
.../adapters/gps_l5i_pcps_acquisition.cc | 10 +-
.../pcps_assisted_acquisition_cc.cc | 2 +-
.../libs/galileo_e1_signal_processing.cc | 36 +-
.../libs/galileo_e5_signal_processing.cc | 26 +-
src/algorithms/libs/gps_l5_signal.cc | 72 ++--
src/algorithms/libs/rtcm.cc | 146 ++++----
src/algorithms/libs/rtcm.h | 18 +-
src/algorithms/libs/rtklib/rtklib.h | 4 +-
src/algorithms/libs/rtklib/rtklib_pntpos.cc | 6 +-
src/algorithms/libs/rtklib/rtklib_ppp.cc | 8 +-
src/algorithms/libs/rtklib/rtklib_rtcm3.cc | 40 +-
src/algorithms/libs/rtklib/rtklib_rtcm3.h | 14 +-
src/algorithms/libs/rtklib/rtklib_rtkcmn.cc | 28 +-
src/algorithms/libs/rtklib/rtklib_rtkpos.cc | 4 +-
src/algorithms/libs/rtklib/rtklib_rtksvr.cc | 6 +-
src/algorithms/libs/rtklib/rtklib_rtksvr.h | 4 +-
src/algorithms/libs/rtklib/rtklib_sbas.cc | 4 +-
src/algorithms/libs/rtklib/rtklib_sbas.h | 64 ++--
src/algorithms/libs/rtklib/rtklib_solution.cc | 8 +-
.../gnuradio_blocks/hybrid_observables_cc.cc | 4 +-
.../adapters/signal_generator.cc | 4 +-
.../gnuradio_blocks/signal_generator_c.cc | 38 +-
.../rtl_tcp_signal_source_c.cc | 2 +-
.../gnuradio_blocks/rtl_tcp_signal_source_c.h | 2 +-
.../signal_source/libs/gnss_sdr_valve.cc | 10 +-
.../signal_source/libs/gnss_sdr_valve.h | 4 +-
.../signal_source/libs/rtl_tcp_dongle_info.cc | 10 +-
.../signal_source/libs/rtl_tcp_dongle_info.h | 4 +-
.../galileo_telemetry_decoder_cc.cc | 36 +-
.../gps_l5_telemetry_decoder_cc.cc | 14 +-
.../gps_l5_telemetry_decoder_cc.h | 2 +-
.../sbas_l1_telemetry_decoder_cc.cc | 38 +-
.../sbas_l1_telemetry_decoder_cc.h | 22 +-
.../libs/libswiftcnav/bits.c | 10 +-
.../telemetry_decoder/libs/libswiftcnav/edc.c | 8 +-
.../galileo_e1_dll_pll_veml_tracking.cc | 2 +-
.../galileo_e1_tcp_connector_tracking.cc | 2 +-
.../adapters/galileo_e5a_dll_pll_tracking.cc | 6 +-
.../adapters/gps_l5_dll_pll_tracking.cc | 6 +-
.../gnuradio_blocks/dll_pll_veml_tracking.cc | 38 +-
.../gnuradio_blocks/dll_pll_veml_tracking.h | 4 +-
.../galileo_e1_tcp_connector_tracking_cc.cc | 22 +-
.../galileo_e1_tcp_connector_tracking_cc.h | 4 +-
.../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h | 2 +-
.../glonass_l1_ca_dll_pll_c_aid_tracking_sc.h | 2 +-
.../glonass_l1_ca_dll_pll_tracking_cc.h | 2 +-
.../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h | 2 +-
.../glonass_l2_ca_dll_pll_c_aid_tracking_sc.h | 2 +-
.../glonass_l2_ca_dll_pll_tracking_cc.h | 2 +-
.../gps_l1_ca_dll_pll_c_aid_tracking_cc.h | 2 +-
.../gps_l1_ca_dll_pll_c_aid_tracking_sc.h | 2 +-
.../gps_l1_ca_kf_tracking_cc.h | 2 +-
.../gps_l1_ca_tcp_connector_tracking_cc.cc | 2 +-
.../gps_l1_ca_tcp_connector_tracking_cc.h | 4 +-
.../tracking/libs/cpu_multicorrelator.cc | 18 +-
.../tracking/libs/cpu_multicorrelator.h | 6 +-
.../tracking/libs/cpu_multicorrelator_16sc.cc | 18 +-
.../tracking/libs/cpu_multicorrelator_16sc.h | 6 +-
.../libs/cpu_multicorrelator_real_codes.cc | 22 +-
.../libs/cpu_multicorrelator_real_codes.h | 6 +-
.../tracking/libs/tcp_communication.cc | 12 +-
.../tracking/libs/tcp_communication.h | 10 +-
.../tracking/libs/tcp_packet_data.cc | 4 +-
.../tracking/libs/tcp_packet_data.h | 6 +-
src/core/interfaces/acquisition_interface.h | 2 +-
src/core/interfaces/tracking_interface.h | 2 +-
src/core/libs/gnss_sdr_supl_client.cc | 62 ++--
src/core/libs/gnss_sdr_supl_client.h | 6 +-
src/core/libs/supl/asn-rrlp/Accuracy.c | 4 +-
src/core/libs/supl/asn-rrlp/AcquisElement.c | 20 +-
.../libs/supl/asn-rrlp/AddionalAngleFields.c | 8 +-
.../supl/asn-rrlp/AddionalDopplerFields.c | 8 +-
.../supl/asn-rrlp/AdditionalDopplerFields.c | 8 +-
src/core/libs/supl/asn-rrlp/AlertFlag.c | 4 +-
.../libs/supl/asn-rrlp/Almanac-KeplerianSet.c | 40 +-
src/core/libs/supl/asn-rrlp/Almanac.c | 4 +-
src/core/libs/supl/asn-rrlp/AlmanacElement.c | 44 +--
src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c | 4 +-
src/core/libs/supl/asn-rrlp/BCCHCarrier.c | 4 +-
src/core/libs/supl/asn-rrlp/BSIC.c | 4 +-
.../libs/supl/asn-rrlp/BadSignalElement.c | 4 +-
src/core/libs/supl/asn-rrlp/BitNumber.c | 4 +-
src/core/libs/supl/asn-rrlp/CellID.c | 4 +-
.../libs/supl/asn-rrlp/DGANSSSgnElement.c | 16 +-
src/core/libs/supl/asn-rrlp/DGPSCorrections.c | 8 +-
src/core/libs/supl/asn-rrlp/EOTDQuality.c | 8 +-
.../libs/supl/asn-rrlp/EnvironmentCharacter.c | 4 +-
.../asn-rrlp/EphemerisSubframe1Reserved.c | 16 +-
src/core/libs/supl/asn-rrlp/ErrorCodes.c | 4 +-
.../libs/supl/asn-rrlp/ExpOTDUncertainty.c | 4 +-
src/core/libs/supl/asn-rrlp/ExpectedOTD.c | 4 +-
.../asn-rrlp/Ext-GeographicalInformation.c | 4 +-
.../libs/supl/asn-rrlp/Extended-reference.c | 8 +-
src/core/libs/supl/asn-rrlp/FineRTD.c | 4 +-
src/core/libs/supl/asn-rrlp/FixType.c | 4 +-
src/core/libs/supl/asn-rrlp/FrameDrift.c | 4 +-
src/core/libs/supl/asn-rrlp/FrameNumber.c | 4 +-
.../libs/supl/asn-rrlp/GANSS-MsrSetElement.c | 4 +-
.../libs/supl/asn-rrlp/GANSS-SgnElement.c | 28 +-
.../libs/supl/asn-rrlp/GANSS-SgnTypeElement.c | 4 +-
.../libs/supl/asn-rrlp/GANSSAlmanacElement.c | 4 +-
.../libs/supl/asn-rrlp/GANSSAlmanacModel.c | 12 +-
.../libs/supl/asn-rrlp/GANSSAssistanceData.c | 4 +-
src/core/libs/supl/asn-rrlp/GANSSClockModel.c | 4 +-
src/core/libs/supl/asn-rrlp/GANSSDataBit.c | 4 +-
.../libs/supl/asn-rrlp/GANSSDataBitAssist.c | 8 +-
.../libs/supl/asn-rrlp/GANSSDiffCorrections.c | 4 +-
.../asn-rrlp/GANSSGenericAssistDataElement.c | 4 +-
.../libs/supl/asn-rrlp/GANSSIonoStormFlags.c | 20 +-
.../libs/supl/asn-rrlp/GANSSIonosphereModel.c | 12 +-
.../libs/supl/asn-rrlp/GANSSLocationInfo.c | 12 +-
src/core/libs/supl/asn-rrlp/GANSSNavModel.c | 16 +-
src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c | 4 +-
.../supl/asn-rrlp/GANSSPositioningMethod.c | 4 +-
.../supl/asn-rrlp/GANSSRefMeasurementAssist.c | 4 +-
.../asn-rrlp/GANSSRefMeasurementElement.c | 16 +-
.../libs/supl/asn-rrlp/GANSSRefTimeInfo.c | 8 +-
.../supl/asn-rrlp/GANSSSatelliteElement.c | 8 +-
src/core/libs/supl/asn-rrlp/GANSSSignalID.c | 4 +-
src/core/libs/supl/asn-rrlp/GANSSTOD.c | 4 +-
.../libs/supl/asn-rrlp/GANSSTODUncertainty.c | 4 +-
src/core/libs/supl/asn-rrlp/GANSSTODm.c | 4 +-
.../supl/asn-rrlp/GANSSTimeModelElement.c | 12 +-
src/core/libs/supl/asn-rrlp/GANSSUTCModel.c | 32 +-
src/core/libs/supl/asn-rrlp/GPS-MsrElement.c | 20 +-
.../libs/supl/asn-rrlp/GPS-MsrSetElement.c | 4 +-
.../libs/supl/asn-rrlp/GPSAssistanceData.c | 4 +-
.../asn-rrlp/GPSReferenceTimeUncertainty.c | 4 +-
src/core/libs/supl/asn-rrlp/GPSTOW23b.c | 4 +-
src/core/libs/supl/asn-rrlp/GPSTOW24b.c | 4 +-
src/core/libs/supl/asn-rrlp/GPSTOWAssist.c | 4 +-
.../asn-rrlp/GPSTimeAssistanceMeasurements.c | 12 +-
src/core/libs/supl/asn-rrlp/GPSWeek.c | 4 +-
.../libs/supl/asn-rrlp/IonosphericModel.c | 32 +-
src/core/libs/supl/asn-rrlp/LAC.c | 4 +-
src/core/libs/supl/asn-rrlp/LocErrorReason.c | 4 +-
src/core/libs/supl/asn-rrlp/LocationInfo.c | 8 +-
.../libs/supl/asn-rrlp/MeasureResponseTime.c | 4 +-
src/core/libs/supl/asn-rrlp/MethodType.c | 4 +-
src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c | 4 +-
.../libs/supl/asn-rrlp/MoreAssDataToBeSent.c | 4 +-
src/core/libs/supl/asn-rrlp/MpathIndic.c | 4 +-
.../libs/supl/asn-rrlp/MultiFrameOffset.c | 4 +-
src/core/libs/supl/asn-rrlp/MultipleSets.c | 8 +-
.../supl/asn-rrlp/NavModel-KeplerianSet.c | 64 ++--
.../libs/supl/asn-rrlp/NeighborIdentity.c | 4 +-
.../libs/supl/asn-rrlp/NumOfMeasurements.c | 4 +-
src/core/libs/supl/asn-rrlp/OCTET_STRING.c | 18 +-
.../libs/supl/asn-rrlp/OTD-MsrElementFirst.c | 8 +-
.../libs/supl/asn-rrlp/OTD-MsrElementRest.c | 8 +-
.../libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c | 4 +-
src/core/libs/supl/asn-rrlp/OTDValue.c | 4 +-
src/core/libs/supl/asn-rrlp/PDU.c | 4 +-
src/core/libs/supl/asn-rrlp/PositionData.c | 4 +-
src/core/libs/supl/asn-rrlp/PositionMethod.c | 4 +-
src/core/libs/supl/asn-rrlp/RRLP-Component.c | 4 +-
src/core/libs/supl/asn-rrlp/RefQuality.c | 4 +-
src/core/libs/supl/asn-rrlp/ReferenceFrame.c | 8 +-
.../supl/asn-rrlp/ReferenceIdentityType.c | 4 +-
.../libs/supl/asn-rrlp/ReferenceRelation.c | 4 +-
src/core/libs/supl/asn-rrlp/RelDistance.c | 4 +-
src/core/libs/supl/asn-rrlp/RelativeAlt.c | 4 +-
src/core/libs/supl/asn-rrlp/RequestIndex.c | 4 +-
.../libs/supl/asn-rrlp/RequiredResponseTime.c | 4 +-
src/core/libs/supl/asn-rrlp/RoughRTD.c | 4 +-
src/core/libs/supl/asn-rrlp/SVID.c | 4 +-
src/core/libs/supl/asn-rrlp/SVIDMASK.c | 4 +-
src/core/libs/supl/asn-rrlp/SatElement.c | 32 +-
src/core/libs/supl/asn-rrlp/SatStatus.c | 4 +-
src/core/libs/supl/asn-rrlp/SatelliteID.c | 4 +-
.../supl/asn-rrlp/SeqOf-BadSatelliteSet.c | 4 +-
.../libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c | 4 +-
.../libs/supl/asn-rrlp/SeqOfAcquisElement.c | 4 +-
.../libs/supl/asn-rrlp/SeqOfAlmanacElement.c | 4 +-
.../supl/asn-rrlp/SeqOfBadSignalElement.c | 4 +-
.../supl/asn-rrlp/SeqOfDGANSSSgnElement.c | 4 +-
.../supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c | 4 +-
.../supl/asn-rrlp/SeqOfGANSS-SgnElement.c | 4 +-
.../supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c | 4 +-
.../supl/asn-rrlp/SeqOfGANSSAlmanacElement.c | 4 +-
.../SeqOfGANSSGenericAssistDataElement.c | 4 +-
.../SeqOfGANSSRefMeasurementElement.c | 4 +-
.../asn-rrlp/SeqOfGANSSSatelliteElement.c | 4 +-
.../libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c | 4 +-
.../libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c | 4 +-
.../supl/asn-rrlp/SeqOfGPS-MsrSetElement.c | 4 +-
.../asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c | 4 +-
.../libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c | 4 +-
.../libs/supl/asn-rrlp/SeqOfNavModelElement.c | 4 +-
.../asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c | 4 +-
.../supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c | 4 +-
.../supl/asn-rrlp/SeqOfOTD-MsrElementRest.c | 4 +-
.../supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c | 4 +-
.../asn-rrlp/SeqOfReferenceIdentityType.c | 4 +-
src/core/libs/supl/asn-rrlp/SeqOfSatElement.c | 4 +-
.../libs/supl/asn-rrlp/SeqOfSgnTypeElement.c | 4 +-
.../asn-rrlp/SeqOfStandardClockModelElement.c | 4 +-
.../SeqOfSystemInfoAssistBTS-R98-ExpOTD.c | 4 +-
.../supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c | 4 +-
src/core/libs/supl/asn-rrlp/SgnTypeElement.c | 4 +-
.../supl/asn-rrlp/StandardClockModelElement.c | 24 +-
src/core/libs/supl/asn-rrlp/StdResolution.c | 4 +-
.../asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c | 4 +-
.../libs/supl/asn-rrlp/SystemInfoAssistBTS.c | 4 +-
src/core/libs/supl/asn-rrlp/SystemInfoIndex.c | 4 +-
src/core/libs/supl/asn-rrlp/TA0.c | 4 +-
src/core/libs/supl/asn-rrlp/TA1.c | 4 +-
src/core/libs/supl/asn-rrlp/TA2.c | 4 +-
src/core/libs/supl/asn-rrlp/TLMReservedBits.c | 4 +-
src/core/libs/supl/asn-rrlp/TLMWord.c | 4 +-
src/core/libs/supl/asn-rrlp/TimeSlot.c | 4 +-
src/core/libs/supl/asn-rrlp/TimeSlotScheme.c | 4 +-
src/core/libs/supl/asn-rrlp/UTCModel.c | 32 +-
src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c | 4 +-
.../supl/asn-rrlp/UncompressedEphemeris.c | 120 +++---
src/core/libs/supl/asn-rrlp/UseMultipleSets.c | 4 +-
src/core/libs/supl/asn-supl/AltitudeInfo.c | 12 +-
src/core/libs/supl/asn-supl/CPICH-Ec-N0.c | 4 +-
src/core/libs/supl/asn-supl/CPICH-RSCP.c | 4 +-
.../libs/supl/asn-supl/CdmaCellInformation.c | 32 +-
src/core/libs/supl/asn-supl/CellInfo.c | 4 +-
.../libs/supl/asn-supl/CellMeasuredResults.c | 8 +-
.../supl/asn-supl/CellMeasuredResultsList.c | 4 +-
.../libs/supl/asn-supl/CellParametersID.c | 4 +-
src/core/libs/supl/asn-supl/EncodingType.c | 4 +-
src/core/libs/supl/asn-supl/FQDN.c | 4 +-
src/core/libs/supl/asn-supl/FormatIndicator.c | 4 +-
src/core/libs/supl/asn-supl/FrequencyInfo.c | 4 +-
src/core/libs/supl/asn-supl/GeneralizedTime.c | 4 +-
.../libs/supl/asn-supl/GsmCellInformation.c | 20 +-
src/core/libs/supl/asn-supl/Horandveruncert.c | 24 +-
src/core/libs/supl/asn-supl/Horandvervel.c | 16 +-
src/core/libs/supl/asn-supl/Horvel.c | 8 +-
src/core/libs/supl/asn-supl/Horveluncert.c | 12 +-
src/core/libs/supl/asn-supl/IA5String.c | 4 +-
src/core/libs/supl/asn-supl/IPAddress.c | 12 +-
src/core/libs/supl/asn-supl/KeyIdentity.c | 4 +-
src/core/libs/supl/asn-supl/KeyIdentity4.c | 4 +-
src/core/libs/supl/asn-supl/MAC.c | 4 +-
.../libs/supl/asn-supl/MeasuredResultsList.c | 4 +-
src/core/libs/supl/asn-supl/NMR.c | 4 +-
src/core/libs/supl/asn-supl/NMRelement.c | 12 +-
src/core/libs/supl/asn-supl/Notification.c | 8 +-
.../libs/supl/asn-supl/NotificationType.c | 4 +-
src/core/libs/supl/asn-supl/OCTET_STRING.c | 18 +-
src/core/libs/supl/asn-supl/Pathloss.c | 4 +-
src/core/libs/supl/asn-supl/PosMethod.c | 4 +-
src/core/libs/supl/asn-supl/PosPayLoad.c | 16 +-
.../libs/supl/asn-supl/PositionEstimate.c | 28 +-
src/core/libs/supl/asn-supl/PrefMethod.c | 4 +-
.../libs/supl/asn-supl/PrimaryCCPCH-RSCP.c | 4 +-
.../libs/supl/asn-supl/PrimaryCPICH-Info.c | 4 +-
src/core/libs/supl/asn-supl/QoP.c | 16 +-
src/core/libs/supl/asn-supl/SETAuthKey.c | 12 +-
src/core/libs/supl/asn-supl/SETId.c | 24 +-
src/core/libs/supl/asn-supl/SLPAddress.c | 4 +-
src/core/libs/supl/asn-supl/SLPMode.c | 4 +-
src/core/libs/supl/asn-supl/SatelliteInfo.c | 4 +-
.../libs/supl/asn-supl/SatelliteInfoElement.c | 8 +-
src/core/libs/supl/asn-supl/SetSessionID.c | 4 +-
src/core/libs/supl/asn-supl/SlpSessionID.c | 4 +-
src/core/libs/supl/asn-supl/Status.c | 4 +-
src/core/libs/supl/asn-supl/StatusCode.c | 4 +-
src/core/libs/supl/asn-supl/TGSN.c | 4 +-
.../libs/supl/asn-supl/TimeslotISCP-List.c | 4 +-
src/core/libs/supl/asn-supl/TimeslotISCP.c | 4 +-
src/core/libs/supl/asn-supl/UARFCN.c | 4 +-
src/core/libs/supl/asn-supl/ULP-PDU.c | 4 +-
src/core/libs/supl/asn-supl/UTCTime.c | 4 +-
.../libs/supl/asn-supl/UTRA-CarrierRSSI.c | 4 +-
src/core/libs/supl/asn-supl/UlpMessage.c | 4 +-
src/core/libs/supl/asn-supl/Velocity.c | 4 +-
src/core/libs/supl/asn-supl/Ver.c | 4 +-
src/core/libs/supl/asn-supl/Version.c | 12 +-
src/core/libs/supl/asn-supl/VisibleString.c | 4 +-
.../libs/supl/asn-supl/WcdmaCellInformation.c | 16 +-
.../libs/supl/asn-supl/XNavigationModel.c | 16 +-
src/core/receiver/concurrent_map.h | 2 +-
src/core/receiver/concurrent_queue.h | 2 +-
src/core/receiver/control_message_factory.h | 2 +-
src/core/receiver/control_thread.cc | 4 +-
src/core/receiver/control_thread.h | 4 +-
src/core/receiver/gnss_flowgraph.cc | 4 +-
src/core/system_parameters/Beidou_B1I.h | 6 +-
src/core/system_parameters/GLONASS_L1_L2_CA.h | 12 +-
src/core/system_parameters/GPS_L1_CA.h | 6 +-
src/core/system_parameters/GPS_L2C.h | 4 +-
src/core/system_parameters/GPS_L5.h | 38 +-
src/core/system_parameters/Galileo_E1.h | 350 +++++++++---------
src/core/system_parameters/Galileo_E5a.h | 288 +++++++-------
.../beidou_dnav_ephemeris.cc | 2 +-
.../system_parameters/galileo_fnav_message.cc | 288 +++++++-------
.../galileo_navigation_message.cc | 308 +++++++--------
.../glonass_gnav_navigation_message.cc | 22 +-
src/core/system_parameters/gps_ephemeris.cc | 2 +-
src/main/main.cc | 4 +-
src/tests/single_test_main.cc | 4 +-
.../libs/rtklib_solver_dump_reader.cc | 10 +-
.../libs/rtklib_solver_dump_reader.h | 4 +-
.../libs/spirent_motion_csv_dump_reader.cc | 16 +-
.../libs/spirent_motion_csv_dump_reader.h | 6 +-
src/tests/system-tests/position_test.cc | 8 +-
src/tests/system-tests/ttff.cc | 4 +-
src/tests/test_main.cc | 4 +-
...8ms_ambiguous_acquisition_gsoc2013_test.cc | 14 +-
...cps_ambiguous_acquisition_gsoc2013_test.cc | 14 +-
...e1_pcps_ambiguous_acquisition_gsoc_test.cc | 14 +-
...ileo_e1_pcps_ambiguous_acquisition_test.cc | 4 +-
...wsr_ambiguous_acquisition_gsoc2013_test.cc | 14 +-
...ync_ambiguous_acquisition_gsoc2014_test.cc | 14 +-
...ong_ambiguous_acquisition_gsoc2013_test.cc | 14 +-
...cps_acquisition_gsoc2014_gensource_test.cc | 14 +-
...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc | 14 +-
...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 14 +-
.../gps_l1_ca_pcps_acquisition_test.cc | 2 +-
...cps_quicksync_acquisition_gsoc2014_test.cc | 14 +-
..._ca_pcps_tong_acquisition_gsoc2013_test.cc | 14 +-
.../libs/acquisition_dump_reader.cc | 10 +-
.../libs/acquisition_dump_reader.h | 8 +-
.../libs/observables_dump_reader.cc | 14 +-
.../libs/observables_dump_reader.h | 6 +-
.../libs/tlm_dump_reader.cc | 10 +-
.../libs/tlm_dump_reader.h | 4 +-
.../libs/tracking_dump_reader.cc | 10 +-
.../libs/tracking_dump_reader.h | 4 +-
.../libs/tracking_true_obs_reader.cc | 12 +-
.../libs/tracking_true_obs_reader.h | 4 +-
.../libs/true_observables_reader.cc | 10 +-
.../libs/true_observables_reader.h | 4 +-
.../pvt/nmea_printer_test.cc | 2 +-
.../signal-processing-blocks/pvt/rtcm_test.cc | 6 +-
.../cpu_multicorrelator_real_codes_test.cc | 6 +-
.../tracking/cpu_multicorrelator_test.cc | 6 +-
src/utils/front-end-cal/front_end_cal.cc | 18 +-
src/utils/front-end-cal/main.cc | 12 +-
356 files changed, 2277 insertions(+), 2268 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index dbcac08e4..cca10bf8d 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -35,12 +35,13 @@ Checks: '-*,
performance-unnecessary-copy-initialization,
performance-unnecessary-value-param,
readability-container-size-empty,
+ readability-identifier-naming,
readability-inconsistent-declaration-parameter-name,
readability-named-parameter,
readability-non-const-parameter,
readability-string-compare'
WarningsAsErrors: ''
-HeaderFilterRegex: '*.h'
+HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
FormatStyle: 'file'
CheckOptions:
@@ -100,4 +101,12 @@ CheckOptions:
value: '1'
- key: readability-inconsistent-declaration-parameter-name.Strict
value: '0'
+ - key: readability-identifier-naming.ClassCase
+ value: Camel_Snake_Case
+ - key: readability-identifier-naming.StructCase
+ value: aNy_CasE
+ - key: readability-identifier-naming.GlobalConstantCase
+ value: UPPER_CASE
+ - key: readability-identifier-naming.AbstractClassCase
+ value: CamelCase
...
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index 044d50927..fcf93d12f 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -594,7 +594,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
throw std::exception();
}
- d_pvt_solver = std::make_shared<rtklib_solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
+ d_pvt_solver = std::make_shared<Rtklib_Solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
d_pvt_solver->set_averaging_depth(1);
start = std::chrono::system_clock::now();
}
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
index 939855318..23ecb0206 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
@@ -114,7 +114,7 @@ private:
bool d_kml_output_enabled;
bool d_nmea_output_file_enabled;
- std::shared_ptr<rtklib_solver> d_pvt_solver;
+ std::shared_ptr<Rtklib_Solver> d_pvt_solver;
std::map<int, Gnss_Synchro> gnss_observables_map;
bool observables_pairCompare_min(const std::pair<int, Gnss_Synchro>& a, const std::pair<int, Gnss_Synchro>& b);
diff --git a/src/algorithms/PVT/libs/gpx_printer.cc b/src/algorithms/PVT/libs/gpx_printer.cc
index 1e2fddf01..d37b77908 100644
--- a/src/algorithms/PVT/libs/gpx_printer.cc
+++ b/src/algorithms/PVT/libs/gpx_printer.cc
@@ -155,14 +155,14 @@ bool Gpx_Printer::set_headers(const std::string& filename, bool time_tag_name)
}
-bool Gpx_Printer::print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values)
+bool Gpx_Printer::print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values)
{
double latitude;
double longitude;
double height;
positions_printed = true;
- const std::shared_ptr<rtklib_solver>& position_ = position;
+ const std::shared_ptr<Rtklib_Solver>& position_ = position;
double speed_over_ground = position_->get_speed_over_ground(); // expressed in m/s
double course_over_ground = position_->get_course_over_ground(); // expressed in deg
diff --git a/src/algorithms/PVT/libs/gpx_printer.h b/src/algorithms/PVT/libs/gpx_printer.h
index 27e9fe4ff..c584eba4c 100644
--- a/src/algorithms/PVT/libs/gpx_printer.h
+++ b/src/algorithms/PVT/libs/gpx_printer.h
@@ -58,7 +58,7 @@ public:
Gpx_Printer(const std::string& base_path = ".");
~Gpx_Printer();
bool set_headers(const std::string& filename, bool time_tag_name = true);
- bool print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values);
+ bool print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values);
bool close_file();
};
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
index 5fbc52ab8..2b1adf739 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
@@ -40,7 +40,7 @@
using google::LogMessage;
-hybrid_ls_pvt::hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file) : Ls_Pvt()
+Hybrid_Ls_Pvt::Hybrid_Ls_Pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file) : Ls_Pvt()
{
// init empty ephemeris for all the available GNSS channels
d_nchannels = nchannels;
@@ -69,7 +69,7 @@ hybrid_ls_pvt::hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag
}
-hybrid_ls_pvt::~hybrid_ls_pvt()
+Hybrid_Ls_Pvt::~Hybrid_Ls_Pvt()
{
if (d_dump_file.is_open() == true)
{
@@ -85,7 +85,7 @@ hybrid_ls_pvt::~hybrid_ls_pvt()
}
-bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double hybrid_current_time, bool flag_averaging)
+bool Hybrid_Ls_Pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double hybrid_current_time, bool flag_averaging)
{
std::map<int, Gnss_Synchro>::iterator gnss_observables_iter;
std::map<int, Galileo_Ephemeris>::iterator galileo_ephemeris_iter;
@@ -133,7 +133,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
// COMMON RX TIME PVT ALGORITHM
double Rx_time = hybrid_current_time;
- double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GALILEO_C_m_s;
+ double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GALILEO_C_M_S;
// 2- compute the clock drift using the clock model (broadcast) for this SV
SV_clock_bias_s = galileo_ephemeris_iter->second.sv_clock_drift(Tx_time);
@@ -150,7 +150,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
// 4- fill the observations vector with the corrected observables
obs.resize(valid_obs + 1, 1);
- obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + SV_clock_bias_s * GALILEO_C_m_s - this->get_time_offset_s() * GALILEO_C_m_s;
+ obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + SV_clock_bias_s * GALILEO_C_M_S - this->get_time_offset_s() * GALILEO_C_M_S;
Galileo_week_number = galileo_ephemeris_iter->second.WN_5; //for GST
GST = galileo_ephemeris_iter->second.Galileo_System_Time(Galileo_week_number, hybrid_current_time);
@@ -188,7 +188,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
// COMMON RX TIME PVT ALGORITHM MODIFICATION (Like RINEX files)
// first estimate of transmit time
double Rx_time = hybrid_current_time;
- double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_m_s;
+ double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_M_S;
// 2- compute the clock drift using the clock model (broadcast) for this SV, not including relativistic effect
SV_clock_bias_s = gps_ephemeris_iter->second.sv_clock_drift(Tx_time); //- gps_ephemeris_iter->second.d_TGD;
@@ -208,10 +208,10 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
// See IS-GPS-200E section 20.3.3.3.3.2
double sqrt_Gamma = GPS_L1_FREQ_HZ / GPS_L2_FREQ_HZ;
double Gamma = sqrt_Gamma * sqrt_Gamma;
- double P1_P2 = (1.0 - Gamma) * (gps_ephemeris_iter->second.d_TGD * GPS_C_m_s);
+ double P1_P2 = (1.0 - Gamma) * (gps_ephemeris_iter->second.d_TGD * GPS_C_M_S);
double Code_bias_m = P1_P2 / (1.0 - Gamma);
obs.resize(valid_obs + 1, 1);
- obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_m_s - Code_bias_m - this->get_time_offset_s() * GPS_C_m_s;
+ obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_M_S - Code_bias_m - this->get_time_offset_s() * GPS_C_M_S;
// SV ECEF DEBUG OUTPUT
LOG(INFO) << "(new)ECEF GPS L1 CA satellite SV ID=" << gps_ephemeris_iter->second.i_satellite_PRN
@@ -243,7 +243,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
// COMMON RX TIME PVT ALGORITHM MODIFICATION (Like RINEX files)
// first estimate of transmit time
double Rx_time = hybrid_current_time;
- double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_m_s;
+ double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_M_S;
// 2- compute the clock drift using the clock model (broadcast) for this SV
SV_clock_bias_s = gps_cnav_ephemeris_iter->second.sv_clock_drift(Tx_time);
@@ -261,7 +261,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
// 4- fill the observations vector with the corrected observables
obs.resize(valid_obs + 1, 1);
- obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_m_s + SV_clock_bias_s * GPS_C_m_s;
+ obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_M_S + SV_clock_bias_s * GPS_C_M_S;
GPS_week = gps_cnav_ephemeris_iter->second.i_GPS_week;
GPS_week = GPS_week % 1024; //Necessary due to the increase of WN bits in CNAV message (10 in GPS NAV and 13 in CNAV)
@@ -311,17 +311,17 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
DLOG(INFO) << " Executing Bancroft algorithm...";
rx_position_and_time = bancroftPos(satpos.t(), obs);
this->set_rx_pos(rx_position_and_time.rows(0, 2)); // save ECEF position for the next iteration
- this->set_time_offset_s(rx_position_and_time(3) / GPS_C_m_s); // save time for the next iteration [meters]->[seconds]
+ this->set_time_offset_s(rx_position_and_time(3) / GPS_C_M_S); // save time for the next iteration [meters]->[seconds]
}
// Execute WLS using previous position as the initialization point
rx_position_and_time = leastSquarePos(satpos, obs, W);
this->set_rx_pos(rx_position_and_time.rows(0, 2)); // save ECEF position for the next iteration
- this->set_time_offset_s(this->get_time_offset_s() + rx_position_and_time(3) / GPS_C_m_s); // accumulate the rx time error for the next iteration [meters]->[seconds]
+ this->set_time_offset_s(this->get_time_offset_s() + rx_position_and_time(3) / GPS_C_M_S); // accumulate the rx time error for the next iteration [meters]->[seconds]
DLOG(INFO) << "Hybrid Position at TOW=" << hybrid_current_time << " in ECEF (X,Y,Z,t[meters]) = " << rx_position_and_time;
- DLOG(INFO) << "Accumulated rx clock error=" << this->get_time_offset_s() << " clock error for this iteration=" << rx_position_and_time(3) / GPS_C_m_s << " [s]";
+ DLOG(INFO) << "Accumulated rx clock error=" << this->get_time_offset_s() << " clock error for this iteration=" << rx_position_and_time(3) / GPS_C_M_S << " [s]";
// Compute GST and Gregorian time
if (GST != 0.0)
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.h b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
index 248a4b34d..79313c92b 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.h
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
@@ -46,7 +46,7 @@
/*!
* \brief This class implements a simple PVT Least Squares solution
*/
-class hybrid_ls_pvt : public Ls_Pvt
+class Hybrid_Ls_Pvt : public Ls_Pvt
{
private:
int count_valid_position;
@@ -57,8 +57,8 @@ private:
double d_galileo_current_time;
public:
- hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file);
- ~hybrid_ls_pvt();
+ Hybrid_Ls_Pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file);
+ ~Hybrid_Ls_Pvt();
bool get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double hybrid_current_time, bool flag_averaging);
diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc
index f7f48aae3..790090544 100644
--- a/src/algorithms/PVT/libs/kml_printer.cc
+++ b/src/algorithms/PVT/libs/kml_printer.cc
@@ -212,7 +212,7 @@ bool Kml_Printer::set_headers(const std::string& filename, bool time_tag_name)
}
-bool Kml_Printer::print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values)
+bool Kml_Printer::print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values)
{
double latitude;
double longitude;
@@ -220,7 +220,7 @@ bool Kml_Printer::print_position(const std::shared_ptr<rtklib_solver>& position,
positions_printed = true;
- const std::shared_ptr<rtklib_solver>& position_ = position;
+ const std::shared_ptr<Rtklib_Solver>& position_ = position;
double speed_over_ground = position_->get_speed_over_ground(); // expressed in m/s
double course_over_ground = position_->get_course_over_ground(); // expressed in deg
diff --git a/src/algorithms/PVT/libs/kml_printer.h b/src/algorithms/PVT/libs/kml_printer.h
index 7909ad619..1608158b4 100644
--- a/src/algorithms/PVT/libs/kml_printer.h
+++ b/src/algorithms/PVT/libs/kml_printer.h
@@ -61,7 +61,7 @@ public:
Kml_Printer(const std::string& base_path = std::string("."));
~Kml_Printer();
bool set_headers(const std::string& filename, bool time_tag_name = true);
- bool print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values);
+ bool print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values);
bool close_file();
};
diff --git a/src/algorithms/PVT/libs/ls_pvt.cc b/src/algorithms/PVT/libs/ls_pvt.cc
index 3ca239972..5f9b9ad48 100644
--- a/src/algorithms/PVT/libs/ls_pvt.cc
+++ b/src/algorithms/PVT/libs/ls_pvt.cc
@@ -95,7 +95,7 @@ arma::vec Ls_Pvt::bancroftPos(const arma::mat& satpos, const arma::vec& obs)
{
int z = B(i, 2);
double rho = (x - pos(0)) * (x - pos(0)) + (y - pos(1)) * (y - pos(1)) + (z - pos(2)) * (z - pos(2));
- traveltime = sqrt(rho) / GPS_C_m_s;
+ traveltime = sqrt(rho) / GPS_C_M_S;
}
double angle = traveltime * 7.292115147e-5;
double cosa = cos(angle);
@@ -228,7 +228,7 @@ arma::vec Ls_Pvt::leastSquarePos(const arma::mat& satpos, const arma::vec& obs,
(X(1, i) - pos(1)) +
(X(2, i) - pos(2)) *
(X(2, i) - pos(2));
- traveltime = sqrt(rho2) / GPS_C_m_s;
+ traveltime = sqrt(rho2) / GPS_C_M_S;
//--- Correct satellite position (do to earth rotation) --------
Rot_X = Ls_Pvt::rotateSatellite(traveltime, X.col(i)); //armadillo
@@ -283,9 +283,9 @@ arma::vec Ls_Pvt::leastSquarePos(const arma::mat& satpos, const arma::vec& obs,
}
// check the consistency of the PVT solution
- if (((fabs(pos(3)) * 1000.0) / GPS_C_m_s) > GPS_STARTOFFSET_ms * 2)
+ if (((fabs(pos(3)) * 1000.0) / GPS_C_M_S) > GPS_STARTOFFSET_MS * 2)
{
- LOG(WARNING) << "Receiver time offset out of range! Estimated RX Time error [s]:" << pos(3) / GPS_C_m_s;
+ LOG(WARNING) << "Receiver time offset out of range! Estimated RX Time error [s]:" << pos(3) / GPS_C_M_S;
throw std::runtime_error("Receiver time offset out of range!");
}
return pos;
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 3d4ebc74a..bbef7b0c7 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -199,7 +199,7 @@ void Nmea_Printer::close_serial()
}
-bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr<rtklib_solver>& pvt_data, bool print_average_values)
+bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr<Rtklib_Solver>& pvt_data, bool print_average_values)
{
std::string GPRMC;
std::string GPGGA;
diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h
index 6e18d7451..6ceab023c 100644
--- a/src/algorithms/PVT/libs/nmea_printer.h
+++ b/src/algorithms/PVT/libs/nmea_printer.h
@@ -59,7 +59,7 @@ public:
/*!
* \brief Print NMEA PVT and satellite info to the initialized device
*/
- bool Print_Nmea_Line(const std::shared_ptr<rtklib_solver>& pvt_data, bool print_average_values);
+ bool Print_Nmea_Line(const std::shared_ptr<Rtklib_Solver>& pvt_data, bool print_average_values);
/*!
* \brief Default destructor.
@@ -72,7 +72,7 @@ private:
std::ofstream nmea_file_descriptor; // Output file stream for NMEA log file
std::string nmea_devname;
int nmea_dev_descriptor; // NMEA serial device descriptor (i.e. COM port)
- std::shared_ptr<rtklib_solver> d_PVT_data;
+ std::shared_ptr<Rtklib_Solver> d_PVT_data;
int init_serial(const std::string& serial_device); //serial port control
void close_serial();
std::string get_GPGGA(); // fix data
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index 7ad5da2c8..72e40d2fe 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -66,7 +66,7 @@
using google::LogMessage;
-rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t &rtk)
+Rtklib_Solver::Rtklib_Solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t &rtk)
{
// init empty ephemeris for all the available GNSS channels
d_nchannels = nchannels;
@@ -134,7 +134,7 @@ rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag
monitor_pvt.vdop = 0.0;
}
-bool rtklib_solver::save_matfile()
+bool Rtklib_Solver::save_matfile()
{
// READ DUMP FILE
std::string dump_filename = d_dump_filename;
@@ -431,7 +431,7 @@ bool rtklib_solver::save_matfile()
}
-rtklib_solver::~rtklib_solver()
+Rtklib_Solver::~Rtklib_Solver()
{
if (d_dump_file.is_open() == true)
{
@@ -458,35 +458,35 @@ rtklib_solver::~rtklib_solver()
}
-double rtklib_solver::get_gdop() const
+double Rtklib_Solver::get_gdop() const
{
return dop_[0];
}
-double rtklib_solver::get_pdop() const
+double Rtklib_Solver::get_pdop() const
{
return dop_[1];
}
-double rtklib_solver::get_hdop() const
+double Rtklib_Solver::get_hdop() const
{
return dop_[2];
}
-double rtklib_solver::get_vdop() const
+double Rtklib_Solver::get_vdop() const
{
return dop_[3];
}
-Monitor_Pvt rtklib_solver::get_monitor_pvt() const
+Monitor_Pvt Rtklib_Solver::get_monitor_pvt() const
{
return monitor_pvt;
}
-bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_map, bool flag_averaging)
+bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_map, bool flag_averaging)
{
std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
std::map<int, Galileo_Ephemeris>::const_iterator galileo_ephemeris_iter;
@@ -916,7 +916,7 @@ bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
}
else
{
- rx_position_and_time(3) = pvt_sol.dtr[0] / GPS_C_m_s; // the receiver clock offset is expressed in [meters], so we convert it into [s]
+ rx_position_and_time(3) = pvt_sol.dtr[0] / GPS_C_M_S; // the receiver clock offset is expressed in [meters], so we convert it into [s]
}
this->set_rx_pos(rx_position_and_time.rows(0, 2)); // save ECEF position for the next iteration
diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h
index a3504c796..9f8bd86f9 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.h
+++ b/src/algorithms/PVT/libs/rtklib_solver.h
@@ -74,7 +74,7 @@
/*!
* \brief This class implements a simple PVT Least Squares solution
*/
-class rtklib_solver : public Pvt_Solution
+class Rtklib_Solver : public Pvt_Solution
{
private:
rtk_t rtk_;
@@ -91,8 +91,8 @@ private:
public:
sol_t pvt_sol;
ssat_t pvt_ssat[MAXSAT];
- rtklib_solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t& rtk);
- ~rtklib_solver();
+ Rtklib_Solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t& rtk);
+ ~Rtklib_Solver();
bool get_PVT(const std::map<int, Gnss_Synchro>& gnss_observables_map, bool flag_averaging);
double get_hdop() const;
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
index 0f6449ff0..14aa840fa 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
@@ -82,7 +82,7 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
//--- Find number of samples per spreading code (4 ms) -----------------
code_length_ = round(
- fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+ fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
vector_length_ = code_length_ * static_cast<int>(sampled_ms_ / 4);
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index 5f4137f7d..24bdc155e 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -98,10 +98,10 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
}
if (acq_parameters_.use_automatic_resampler)
{
- if (acq_parameters_.fs_in > Galileo_E1_OPT_ACQ_FS_HZ)
+ if (acq_parameters_.fs_in > GALILEO_E1_OPT_ACQ_FS_HZ)
{
- acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / Galileo_E1_OPT_ACQ_FS_HZ);
- uint32_t decimation = acq_parameters_.fs_in / Galileo_E1_OPT_ACQ_FS_HZ;
+ acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / GALILEO_E1_OPT_ACQ_FS_HZ);
+ uint32_t decimation = acq_parameters_.fs_in / GALILEO_E1_OPT_ACQ_FS_HZ;
while (acq_parameters_.fs_in % decimation > 0)
{
decimation--;
@@ -110,19 +110,19 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
acq_parameters_.resampled_fs = acq_parameters_.fs_in / static_cast<int>(acq_parameters_.resampler_ratio);
}
//--- Find number of samples per spreading code (4 ms) -----------------
- code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+ code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
acq_parameters_.samples_per_ms = static_cast<float>(acq_parameters_.resampled_fs) * 0.001;
- acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
+ acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
}
else
{
//--- Find number of samples per spreading code (4 ms) -----------------
- code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+ code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
acq_parameters_.samples_per_ms = static_cast<float>(fs_in_) * 0.001;
- acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
+ acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
}
- acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(Galileo_E1_CODE_PERIOD_MS);
+ acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GALILEO_E1_CODE_PERIOD_MS);
vector_length_ = sampled_ms_ * acq_parameters_.samples_per_ms;
if (bit_transition_flag_)
{
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
index a0de0804d..eab75852e 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
@@ -82,7 +82,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition
//--- Find number of samples per spreading code (4 ms) -----------------
code_length_ = round(
- fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+ fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
vector_length_ = code_length_ * static_cast<int>(sampled_ms_ / 4);
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
index 7437faa8c..490ff99bd 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
@@ -69,7 +69,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui
/*--- Find number of samples per spreading code (4 ms) -----------------*/
code_length_ = round(
- fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+ fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
int samples_per_ms = round(code_length_ / 4.0);
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
index bdc0c3971..2f538e8f8 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
@@ -85,7 +85,7 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
//--- Find number of samples per spreading code (4 ms) -----------------
code_length_ = round(
- fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+ fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
vector_length_ = code_length_ * static_cast<int>(sampled_ms_ / 4);
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
index 8d65ea52a..277c48b91 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
@@ -91,7 +91,7 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
bit_transition_flag_ = configuration_->property(role + ".bit_transition_flag", false);
//--- Find number of samples per spreading code (1ms)-------------------------
- code_length_ = round(static_cast<double>(fs_in_) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS));
+ code_length_ = round(static_cast<double>(fs_in_) / GALILEO_E5A_CODE_CHIP_RATE_HZ * static_cast<double>(GALILEO_E5A_CODE_LENGTH_CHIPS));
vector_length_ = code_length_ * sampled_ms_;
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
index 079599926..963cfe5f3 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
@@ -96,10 +96,10 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
}
if (acq_parameters_.use_automatic_resampler)
{
- if (acq_parameters_.fs_in > Galileo_E5a_OPT_ACQ_FS_HZ)
+ if (acq_parameters_.fs_in > GALILEO_E5A_OPT_ACQ_FS_HZ)
{
- acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / Galileo_E5a_OPT_ACQ_FS_HZ);
- uint32_t decimation = acq_parameters_.fs_in / Galileo_E5a_OPT_ACQ_FS_HZ;
+ acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / GALILEO_E5A_OPT_ACQ_FS_HZ);
+ uint32_t decimation = acq_parameters_.fs_in / GALILEO_E5A_OPT_ACQ_FS_HZ;
while (acq_parameters_.fs_in % decimation > 0)
{
decimation--;
@@ -109,21 +109,21 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
}
//--- Find number of samples per spreading code -------------------------
- code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS)));
+ code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS)));
acq_parameters_.samples_per_ms = static_cast<float>(acq_parameters_.resampled_fs) * 0.001;
- acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E5a_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
+ acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E5A_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
}
else
{
acq_parameters_.resampled_fs = fs_in_;
//--- Find number of samples per spreading code -------------------------
- code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS)));
+ code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS)));
acq_parameters_.samples_per_ms = static_cast<float>(fs_in_) * 0.001;
- acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E5a_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
+ acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E5A_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
}
//--- Find number of samples per spreading code (1ms)-------------------------
- code_length_ = static_cast<unsigned int>(std::round(static_cast<double>(fs_in_) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS)));
+ code_length_ = static_cast<unsigned int>(std::round(static_cast<double>(fs_in_) / GALILEO_E5A_CODE_CHIP_RATE_HZ * static_cast<double>(GALILEO_E5A_CODE_LENGTH_CHIPS)));
vector_length_ = code_length_ * sampled_ms_;
code_ = new gr_complex[vector_length_];
@@ -144,7 +144,7 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
acq_parameters_.it_size = item_size_;
acq_parameters_.sampled_ms = sampled_ms_;
acq_parameters_.ms_per_code = 1;
- acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GALILEO_E5a_CODE_PERIOD_MS);
+ acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GALILEO_E5A_CODE_PERIOD_MS);
acq_parameters_.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4);
acq_parameters_.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0);
acq_parameters_.make_2_steps = configuration_->property(role + ".make_two_steps", false);
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
index d3b722823..69503c7bd 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
@@ -121,20 +121,20 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
}
//--- Find number of samples per spreading code -------------------------
- code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GPS_L5i_CODE_RATE_HZ / GPS_L5i_CODE_LENGTH_CHIPS)));
+ code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GPS_L5I_CODE_RATE_HZ / GPS_L5I_CODE_LENGTH_CHIPS)));
acq_parameters_.samples_per_ms = static_cast<float>(acq_parameters_.resampled_fs) * 0.001;
- acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5i_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
+ acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5I_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
}
else
{
acq_parameters_.resampled_fs = fs_in_;
//--- Find number of samples per spreading code -------------------------
- code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GPS_L5i_CODE_RATE_HZ / GPS_L5i_CODE_LENGTH_CHIPS)));
+ code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GPS_L5I_CODE_RATE_HZ / GPS_L5I_CODE_LENGTH_CHIPS)));
acq_parameters_.samples_per_ms = static_cast<float>(fs_in_) * 0.001;
- acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5i_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
+ acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5I_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
}
- acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GPS_L5i_PERIOD * 1000.0);
+ acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GPS_L5I_PERIOD * 1000.0);
vector_length_ = std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2 : 1);
code_ = new gr_complex[vector_length_];
acquisition_ = pcps_make_acquisition(acq_parameters_);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index 5e8100f59..bf7184488 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -42,7 +42,7 @@
#include <sstream>
#include <utility>
-extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
using google::LogMessage;
diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc
index 23a8d9a94..d3e92c804 100644
--- a/src/algorithms/libs/galileo_e1_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e1_signal_processing.cc
@@ -51,7 +51,7 @@ void galileo_e1_code_gen_int(int* _dest, char _Signal[3], int32_t _prn)
if (_galileo_signal.rfind("1B") != std::string::npos && _galileo_signal.length() >= 2)
{
- for (char i : Galileo_E1_B_PRIMARY_CODE[prn])
+ for (char i : GALILEO_E1_B_PRIMARY_CODE[prn])
{
hex_to_binary_converter(&_dest[index], i);
index += 4;
@@ -59,7 +59,7 @@ void galileo_e1_code_gen_int(int* _dest, char _Signal[3], int32_t _prn)
}
else if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2)
{
- for (char i : Galileo_E1_C_PRIMARY_CODE[prn])
+ for (char i : GALILEO_E1_C_PRIMARY_CODE[prn])
{
hex_to_binary_converter(&_dest[index], i);
index += 4;
@@ -70,7 +70,7 @@ void galileo_e1_code_gen_int(int* _dest, char _Signal[3], int32_t _prn)
void galileo_e1_sinboc_11_gen_int(int* _dest, const int* _prn, uint32_t _length_out)
{
- const uint32_t _length_in = Galileo_E1_B_CODE_LENGTH_CHIPS;
+ const uint32_t _length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS;
auto _period = static_cast<uint32_t>(_length_out / _length_in);
for (uint32_t i = 0; i < _length_in; i++)
{
@@ -88,7 +88,7 @@ void galileo_e1_sinboc_11_gen_int(int* _dest, const int* _prn, uint32_t _length_
void galileo_e1_sinboc_61_gen_int(int* _dest, const int* _prn, uint32_t _length_out)
{
- const uint32_t _length_in = Galileo_E1_B_CODE_LENGTH_CHIPS;
+ const uint32_t _length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS;
auto _period = static_cast<uint32_t>(_length_out / _length_in);
for (uint32_t i = 0; i < _length_in; i++)
@@ -108,7 +108,7 @@ void galileo_e1_sinboc_61_gen_int(int* _dest, const int* _prn, uint32_t _length_
void galileo_e1_code_gen_sinboc11_float(float* _dest, char _Signal[3], uint32_t _prn)
{
std::string _galileo_signal = _Signal;
- const auto _codeLength = static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS);
+ const auto _codeLength = static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS);
int32_t primary_code_E1_chips[4092]; // _codeLength not accepted by Clang
galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn); //generate Galileo E1 code, 1 sample per chip
for (uint32_t i = 0; i < _codeLength; i++)
@@ -122,7 +122,7 @@ void galileo_e1_code_gen_sinboc11_float(float* _dest, char _Signal[3], uint32_t
void galileo_e1_gen_float(float* _dest, int* _prn, char _Signal[3])
{
std::string _galileo_signal = _Signal;
- const uint32_t _codeLength = 12 * Galileo_E1_B_CODE_LENGTH_CHIPS;
+ const uint32_t _codeLength = 12 * GALILEO_E1_B_CODE_LENGTH_CHIPS;
const float alpha = sqrt(10.0 / 11.0);
const float beta = sqrt(1.0 / 11.0);
@@ -158,20 +158,20 @@ void galileo_e1_code_gen_float_sampled(float* _dest, char _Signal[3],
// This function is based on the GNU software GPS for MATLAB in Kay Borre's book
std::string _galileo_signal = _Signal;
uint32_t _samplesPerCode;
- const int32_t _codeFreqBasis = Galileo_E1_CODE_CHIP_RATE_HZ; // Hz
- auto _codeLength = static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS);
- auto* primary_code_E1_chips = static_cast<int32_t*>(volk_gnsssdr_malloc(static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
+ const int32_t _codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_HZ; // Hz
+ auto _codeLength = static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS);
+ auto* primary_code_E1_chips = static_cast<int32_t*>(volk_gnsssdr_malloc(static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
_samplesPerCode = static_cast<uint32_t>(static_cast<double>(_fs) / (static_cast<double>(_codeFreqBasis) / static_cast<double>(_codeLength)));
const int32_t _samplesPerChip = (_cboc == true) ? 12 : 2;
- const uint32_t delay = ((static_cast<int32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS) - _chip_shift) % static_cast<int32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * _samplesPerCode / Galileo_E1_B_CODE_LENGTH_CHIPS;
+ const uint32_t delay = ((static_cast<int32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS) - _chip_shift) % static_cast<int32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * _samplesPerCode / GALILEO_E1_B_CODE_LENGTH_CHIPS;
galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn); // generate Galileo E1 code, 1 sample per chip
float* _signal_E1;
- _codeLength = _samplesPerChip * Galileo_E1_B_CODE_LENGTH_CHIPS;
+ _codeLength = _samplesPerChip * GALILEO_E1_B_CODE_LENGTH_CHIPS;
_signal_E1 = new float[_codeLength];
if (_cboc == true)
@@ -203,17 +203,17 @@ void galileo_e1_code_gen_float_sampled(float* _dest, char _Signal[3],
if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2 && _secondary_flag)
{
- auto* _signal_E1C_secondary = new float[static_cast<int32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH) * _samplesPerCode];
+ auto* _signal_E1C_secondary = new float[static_cast<int32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH) * _samplesPerCode];
- for (uint32_t i = 0; i < static_cast<uint32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH); i++)
+ for (uint32_t i = 0; i < static_cast<uint32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH); i++)
{
for (unsigned k = 0; k < _samplesPerCode; k++)
{
- _signal_E1C_secondary[i * _samplesPerCode + k] = _signal_E1[k] * (Galileo_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0f : -1.0f);
+ _signal_E1C_secondary[i * _samplesPerCode + k] = _signal_E1[k] * (GALILEO_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0f : -1.0f);
}
}
- _samplesPerCode *= static_cast<int32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
+ _samplesPerCode *= static_cast<int32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
delete[] _signal_E1;
_signal_E1 = _signal_E1C_secondary;
@@ -234,13 +234,13 @@ void galileo_e1_code_gen_complex_sampled(std::complex<float>* _dest, char _Signa
bool _secondary_flag)
{
std::string _galileo_signal = _Signal;
- const int32_t _codeFreqBasis = Galileo_E1_CODE_CHIP_RATE_HZ; // Hz
+ const int32_t _codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_HZ; // Hz
auto _samplesPerCode = static_cast<uint32_t>(static_cast<double>(_fs) /
- (static_cast<double>(_codeFreqBasis) / static_cast<double>(Galileo_E1_B_CODE_LENGTH_CHIPS)));
+ (static_cast<double>(_codeFreqBasis) / static_cast<double>(GALILEO_E1_B_CODE_LENGTH_CHIPS)));
if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2 && _secondary_flag)
{
- _samplesPerCode *= static_cast<int32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
+ _samplesPerCode *= static_cast<int32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
}
auto* real_code = static_cast<float*>(volk_gnsssdr_malloc(_samplesPerCode * sizeof(float), volk_gnsssdr_get_alignment()));
diff --git a/src/algorithms/libs/galileo_e5_signal_processing.cc b/src/algorithms/libs/galileo_e5_signal_processing.cc
index baa91706f..dab7e1d77 100644
--- a/src/algorithms/libs/galileo_e5_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e5_signal_processing.cc
@@ -48,9 +48,9 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
}
if (_Signal[0] == '5' && _Signal[1] == 'Q')
{
- for (size_t i = 0; i < Galileo_E5a_Q_PRIMARY_CODE[prn].length() - 1; i++)
+ for (size_t i = 0; i < GALILEO_E5A_Q_PRIMARY_CODE[prn].length() - 1; i++)
{
- hex_to_binary_converter(a, Galileo_E5a_Q_PRIMARY_CODE[prn].at(i));
+ hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(i));
_dest[index] = std::complex<float>(0.0, float(a[0]));
_dest[index + 1] = std::complex<float>(0.0, float(a[1]));
_dest[index + 2] = std::complex<float>(0.0, float(a[2]));
@@ -58,15 +58,15 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
index = index + 4;
}
// last 2 bits are filled up zeros
- hex_to_binary_converter(a, Galileo_E5a_Q_PRIMARY_CODE[prn].at(Galileo_E5a_Q_PRIMARY_CODE[prn].length() - 1));
+ hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(GALILEO_E5A_Q_PRIMARY_CODE[prn].length() - 1));
_dest[index] = std::complex<float>(float(0.0), a[0]);
_dest[index + 1] = std::complex<float>(float(0.0), a[1]);
}
else if (_Signal[0] == '5' && _Signal[1] == 'I')
{
- for (size_t i = 0; i < Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1; i++)
+ for (size_t i = 0; i < GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1; i++)
{
- hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(i));
+ hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(i));
_dest[index] = std::complex<float>(float(a[0]), 0.0);
_dest[index + 1] = std::complex<float>(float(a[1]), 0.0);
_dest[index + 2] = std::complex<float>(float(a[2]), 0.0);
@@ -74,17 +74,17 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
index = index + 4;
}
// last 2 bits are filled up zeros
- hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1));
+ hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1));
_dest[index] = std::complex<float>(float(a[0]), 0.0);
_dest[index + 1] = std::complex<float>(float(a[1]), 0.0);
}
else if (_Signal[0] == '5' && _Signal[1] == 'X')
{
int32_t b[4];
- for (size_t i = 0; i < Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1; i++)
+ for (size_t i = 0; i < GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1; i++)
{
- hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(i));
- hex_to_binary_converter(b, Galileo_E5a_Q_PRIMARY_CODE[prn].at(i));
+ hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(i));
+ hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(i));
_dest[index] = std::complex<float>(float(a[0]), float(b[0]));
_dest[index + 1] = std::complex<float>(float(a[1]), float(b[1]));
_dest[index + 2] = std::complex<float>(float(a[2]), float(b[2]));
@@ -92,8 +92,8 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
index = index + 4;
}
// last 2 bits are filled up zeros
- hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1));
- hex_to_binary_converter(b, Galileo_E5a_Q_PRIMARY_CODE[prn].at(Galileo_E5a_Q_PRIMARY_CODE[prn].length() - 1));
+ hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1));
+ hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(GALILEO_E5A_Q_PRIMARY_CODE[prn].length() - 1));
_dest[index] = std::complex<float>(float(a[0]), float(b[0]));
_dest[index + 1] = std::complex<float>(float(a[1]), float(b[1]));
}
@@ -105,8 +105,8 @@ void galileo_e5_a_code_gen_complex_sampled(std::complex<float>* _dest, char _Sig
{
uint32_t _samplesPerCode;
uint32_t delay;
- const uint32_t _codeLength = Galileo_E5a_CODE_LENGTH_CHIPS;
- const int32_t _codeFreqBasis = Galileo_E5a_CODE_CHIP_RATE_HZ;
+ const uint32_t _codeLength = GALILEO_E5A_CODE_LENGTH_CHIPS;
+ const int32_t _codeFreqBasis = GALILEO_E5A_CODE_CHIP_RATE_HZ;
auto* _code = new std::complex<float>[_codeLength]();
diff --git a/src/algorithms/libs/gps_l5_signal.cc b/src/algorithms/libs/gps_l5_signal.cc
index f0e07ecd0..c1f234506 100644
--- a/src/algorithms/libs/gps_l5_signal.cc
+++ b/src/algorithms/libs/gps_l5_signal.cc
@@ -81,9 +81,9 @@ std::deque<bool> l5q_xb_shift(std::deque<bool> xb)
std::deque<bool> make_l5i_xa()
{
std::deque<bool> xa = {true, true, true, true, true, true, true, true, true, true, true, true, true};
- std::deque<bool> y(GPS_L5i_CODE_LENGTH_CHIPS, false);
+ std::deque<bool> y(GPS_L5I_CODE_LENGTH_CHIPS, false);
- for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
{
y[i] = xa[12];
xa = l5i_xa_shift(xa);
@@ -95,9 +95,9 @@ std::deque<bool> make_l5i_xa()
std::deque<bool> make_l5i_xb()
{
std::deque<bool> xb = {true, true, true, true, true, true, true, true, true, true, true, true, true};
- std::deque<bool> y(GPS_L5i_CODE_LENGTH_CHIPS, false);
+ std::deque<bool> y(GPS_L5I_CODE_LENGTH_CHIPS, false);
- for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
{
y[i] = xb[12];
xb = l5i_xb_shift(xb);
@@ -109,9 +109,9 @@ std::deque<bool> make_l5i_xb()
std::deque<bool> make_l5q_xa()
{
std::deque<bool> xa = {true, true, true, true, true, true, true, true, true, true, true, true, true};
- std::deque<bool> y(GPS_L5q_CODE_LENGTH_CHIPS, false);
+ std::deque<bool> y(GPS_L5Q_CODE_LENGTH_CHIPS, false);
- for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
{
y[i] = xa[12];
xa = l5q_xa_shift(xa);
@@ -123,9 +123,9 @@ std::deque<bool> make_l5q_xa()
std::deque<bool> make_l5q_xb()
{
std::deque<bool> xb = {true, true, true, true, true, true, true, true, true, true, true, true, true};
- std::deque<bool> y(GPS_L5q_CODE_LENGTH_CHIPS, false);
+ std::deque<bool> y(GPS_L5Q_CODE_LENGTH_CHIPS, false);
- for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
{
y[i] = xb[12];
xb = l5q_xb_shift(xb);
@@ -136,18 +136,18 @@ std::deque<bool> make_l5q_xb()
void make_l5i(int32_t* _dest, int32_t prn)
{
- int32_t xb_offset = GPS_L5i_INIT_REG[prn];
+ int32_t xb_offset = GPS_L5I_INIT_REG[prn];
std::deque<bool> xb = make_l5i_xb();
std::deque<bool> xa = make_l5i_xa();
- std::deque<bool> xb_shift(GPS_L5i_CODE_LENGTH_CHIPS, false);
+ std::deque<bool> xb_shift(GPS_L5I_CODE_LENGTH_CHIPS, false);
- for (int32_t n = 0; n < GPS_L5i_CODE_LENGTH_CHIPS; n++)
+ for (int32_t n = 0; n < GPS_L5I_CODE_LENGTH_CHIPS; n++)
{
- xb_shift[n] = xb[(xb_offset + n) % GPS_L5i_CODE_LENGTH_CHIPS];
+ xb_shift[n] = xb[(xb_offset + n) % GPS_L5I_CODE_LENGTH_CHIPS];
}
- std::deque<bool> out_code(GPS_L5i_CODE_LENGTH_CHIPS, false);
- for (int32_t n = 0; n < GPS_L5i_CODE_LENGTH_CHIPS; n++)
+ std::deque<bool> out_code(GPS_L5I_CODE_LENGTH_CHIPS, false);
+ for (int32_t n = 0; n < GPS_L5I_CODE_LENGTH_CHIPS; n++)
{
_dest[n] = xa[n] xor xb_shift[n];
}
@@ -156,18 +156,18 @@ void make_l5i(int32_t* _dest, int32_t prn)
void make_l5q(int32_t* _dest, int32_t prn)
{
- int32_t xb_offset = GPS_L5q_INIT_REG[prn];
+ int32_t xb_offset = GPS_L5Q_INIT_REG[prn];
std::deque<bool> xb = make_l5q_xb();
std::deque<bool> xa = make_l5q_xa();
- std::deque<bool> xb_shift(GPS_L5q_CODE_LENGTH_CHIPS, false);
+ std::deque<bool> xb_shift(GPS_L5Q_CODE_LENGTH_CHIPS, false);
- for (int32_t n = 0; n < GPS_L5q_CODE_LENGTH_CHIPS; n++)
+ for (int32_t n = 0; n < GPS_L5Q_CODE_LENGTH_CHIPS; n++)
{
- xb_shift[n] = xb[(xb_offset + n) % GPS_L5q_CODE_LENGTH_CHIPS];
+ xb_shift[n] = xb[(xb_offset + n) % GPS_L5Q_CODE_LENGTH_CHIPS];
}
- std::deque<bool> out_code(GPS_L5q_CODE_LENGTH_CHIPS, false);
- for (int32_t n = 0; n < GPS_L5q_CODE_LENGTH_CHIPS; n++)
+ std::deque<bool> out_code(GPS_L5Q_CODE_LENGTH_CHIPS, false);
+ for (int32_t n = 0; n < GPS_L5Q_CODE_LENGTH_CHIPS; n++)
{
_dest[n] = xa[n] xor xb_shift[n];
}
@@ -176,14 +176,14 @@ void make_l5q(int32_t* _dest, int32_t prn)
void gps_l5i_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
{
- auto* _code = new int32_t[GPS_L5i_CODE_LENGTH_CHIPS];
+ auto* _code = new int32_t[GPS_L5I_CODE_LENGTH_CHIPS];
if (_prn > 0 and _prn < 51)
{
make_l5i(_code, _prn - 1);
}
- for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
{
_dest[i] = std::complex<float>(1.0 - 2.0 * _code[i], 0.0);
}
@@ -194,14 +194,14 @@ void gps_l5i_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
void gps_l5i_code_gen_float(float* _dest, uint32_t _prn)
{
- auto* _code = new int32_t[GPS_L5i_CODE_LENGTH_CHIPS];
+ auto* _code = new int32_t[GPS_L5I_CODE_LENGTH_CHIPS];
if (_prn > 0 and _prn < 51)
{
make_l5i(_code, _prn - 1);
}
- for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
{
_dest[i] = 1.0 - 2.0 * static_cast<float>(_code[i]);
}
@@ -215,7 +215,7 @@ void gps_l5i_code_gen_float(float* _dest, uint32_t _prn)
*/
void gps_l5i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn, int32_t _fs)
{
- auto* _code = new int32_t[GPS_L5i_CODE_LENGTH_CHIPS];
+ auto* _code = new int32_t[GPS_L5I_CODE_LENGTH_CHIPS];
if (_prn > 0 and _prn < 51)
{
make_l5i(_code, _prn - 1);
@@ -224,14 +224,14 @@ void gps_l5i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
int32_t _samplesPerCode, _codeValueIndex;
float _ts;
float _tc;
- const int32_t _codeLength = GPS_L5i_CODE_LENGTH_CHIPS;
+ const int32_t _codeLength = GPS_L5I_CODE_LENGTH_CHIPS;
//--- Find number of samples per spreading code ----------------------------
- _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5i_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
+ _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5I_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
//--- Find time constants --------------------------------------------------
_ts = 1.0 / static_cast<float>(_fs); // Sampling period in sec
- _tc = 1.0 / static_cast<float>(GPS_L5i_CODE_RATE_HZ); // C/A chip period in sec
+ _tc = 1.0 / static_cast<float>(GPS_L5I_CODE_RATE_HZ); // C/A chip period in sec
//float aux;
for (int32_t i = 0; i < _samplesPerCode; i++)
@@ -261,14 +261,14 @@ void gps_l5i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
void gps_l5q_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
{
- auto* _code = new int32_t[GPS_L5q_CODE_LENGTH_CHIPS];
+ auto* _code = new int32_t[GPS_L5Q_CODE_LENGTH_CHIPS];
if (_prn > 0 and _prn < 51)
{
make_l5q(_code, _prn - 1);
}
- for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
{
_dest[i] = std::complex<float>(1.0 - 2.0 * _code[i], 0.0);
}
@@ -279,14 +279,14 @@ void gps_l5q_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
void gps_l5q_code_gen_float(float* _dest, uint32_t _prn)
{
- auto* _code = new int32_t[GPS_L5q_CODE_LENGTH_CHIPS];
+ auto* _code = new int32_t[GPS_L5Q_CODE_LENGTH_CHIPS];
if (_prn > 0 and _prn < 51)
{
make_l5q(_code, _prn - 1);
}
- for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+ for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
{
_dest[i] = 1.0 - 2.0 * static_cast<float>(_code[i]);
}
@@ -300,7 +300,7 @@ void gps_l5q_code_gen_float(float* _dest, uint32_t _prn)
*/
void gps_l5q_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn, int32_t _fs)
{
- auto* _code = new int32_t[GPS_L5q_CODE_LENGTH_CHIPS];
+ auto* _code = new int32_t[GPS_L5Q_CODE_LENGTH_CHIPS];
if (_prn > 0 and _prn < 51)
{
make_l5q(_code, _prn - 1);
@@ -309,14 +309,14 @@ void gps_l5q_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
int32_t _samplesPerCode, _codeValueIndex;
float _ts;
float _tc;
- const int32_t _codeLength = GPS_L5q_CODE_LENGTH_CHIPS;
+ const int32_t _codeLength = GPS_L5Q_CODE_LENGTH_CHIPS;
//--- Find number of samples per spreading code ----------------------------
- _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5q_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
+ _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5Q_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
//--- Find time constants --------------------------------------------------
_ts = 1.0 / static_cast<float>(_fs); // Sampling period in sec
- _tc = 1.0 / static_cast<float>(GPS_L5q_CODE_RATE_HZ); // C/A chip period in sec
+ _tc = 1.0 / static_cast<float>(GPS_L5Q_CODE_RATE_HZ); // C/A chip period in sec
//float aux;
for (int32_t i = 0; i < _samplesPerCode; i++)
diff --git a/src/algorithms/libs/rtcm.cc b/src/algorithms/libs/rtcm.cc
index 72015187e..43915ee3b 100644
--- a/src/algorithms/libs/rtcm.cc
+++ b/src/algorithms/libs/rtcm.cc
@@ -50,7 +50,7 @@ Rtcm::Rtcm(uint16_t port)
RTCM_port = port;
preamble = std::bitset<8>("11010011");
reserved_field = std::bitset<6>("000000");
- rtcm_message_queue = std::make_shared<concurrent_queue<std::string> >();
+ rtcm_message_queue = std::make_shared<Concurrent_Queue<std::string> >();
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(), RTCM_port);
servers.emplace_back(io_context, endpoint);
server_is_running = false;
@@ -2197,64 +2197,64 @@ int32_t Rtcm::read_MT1045(const std::string& message, Galileo_Ephemeris& gal_eph
gal_eph.SISA_3 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 8)));
index += 8;
- gal_eph.iDot_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 14))) * iDot_2_LSB;
+ gal_eph.iDot_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 14))) * I_DOT_2_LSB;
index += 14;
- gal_eph.t0c_4 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * t0c_4_LSB;
+ gal_eph.t0c_4 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * T0C_4_LSB;
index += 14;
- gal_eph.af2_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 6))) * af2_4_LSB;
+ gal_eph.af2_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 6))) * AF2_4_LSB;
index += 6;
- gal_eph.af1_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 21))) * af1_4_LSB;
+ gal_eph.af1_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 21))) * AF1_4_LSB;
index += 21;
- gal_eph.af0_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 31))) * af0_4_LSB;
+ gal_eph.af0_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 31))) * AF0_4_LSB;
index += 31;
- gal_eph.C_rs_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_rs_3_LSB;
+ gal_eph.C_rs_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_RS_3_LSB;
index += 16;
- gal_eph.delta_n_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * delta_n_3_LSB;
+ gal_eph.delta_n_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * DELTA_N_3_LSB;
index += 16;
gal_eph.M0_1 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * M0_1_LSB;
index += 32;
- gal_eph.C_uc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_uc_3_LSB;
+ gal_eph.C_uc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_UC_3_LSB;
index += 16;
- gal_eph.e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * e_1_LSB;
+ gal_eph.e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * E_1_LSB;
index += 32;
- gal_eph.C_us_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_us_3_LSB;
+ gal_eph.C_us_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_US_3_LSB;
index += 16;
- gal_eph.A_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * A_1_LSB_gal;
+ gal_eph.A_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * A_1_LSB_GAL;
index += 32;
- gal_eph.t0e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * t0e_1_LSB;
+ gal_eph.t0e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * T0E_1_LSB;
index += 14;
- gal_eph.C_ic_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_ic_4_LSB;
+ gal_eph.C_ic_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_IC_4_LSB;
index += 16;
gal_eph.OMEGA_0_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * OMEGA_0_2_LSB;
index += 32;
- gal_eph.C_is_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_is_4_LSB;
+ gal_eph.C_is_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_IS_4_LSB;
index += 16;
- gal_eph.i_0_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * i_0_2_LSB;
+ gal_eph.i_0_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * I_0_2_LSB;
index += 32;
- gal_eph.C_rc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_rc_3_LSB;
+ gal_eph.C_rc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_RC_3_LSB;
index += 16;
- gal_eph.omega_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * omega_2_LSB;
+ gal_eph.omega_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * OMEGA_2_LSB;
index += 32;
- gal_eph.OMEGA_dot_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 24))) * OMEGA_dot_3_LSB;
+ gal_eph.OMEGA_dot_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 24))) * OMEGA_DOT_3_LSB;
index += 24;
gal_eph.BGD_E1E5a_5 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 10)));
@@ -3811,7 +3811,7 @@ int32_t Rtcm::set_DF011(const Gnss_Synchro& gnss_synchro)
int32_t Rtcm::set_DF012(const Gnss_Synchro& gnss_synchro)
{
- const double lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+ const double lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
double ambiguity = std::floor(gnss_synchro.Pseudorange_m / 299792.458);
double gps_L1_pseudorange = std::round((gnss_synchro.Pseudorange_m - ambiguity * 299792.458) / 0.02);
double gps_L1_pseudorange_c = gps_L1_pseudorange * 0.02 + ambiguity * 299792.458;
@@ -3873,7 +3873,7 @@ int32_t Rtcm::set_DF017(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro&
int32_t Rtcm::set_DF018(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2)
{
- const double lambda2 = GPS_C_m_s / GPS_L2_FREQ_HZ;
+ const double lambda2 = GPS_C_M_S / GPS_L2_FREQ_HZ;
int32_t l2_phaserange_minus_l1_pseudorange = 0xFFF80000;
double ambiguity = std::floor(gnss_synchroL1.Pseudorange_m / 299792.458);
double gps_L1_pseudorange = std::round((gnss_synchroL1.Pseudorange_m - ambiguity * 299792.458) / 0.02);
@@ -4103,7 +4103,7 @@ int32_t Rtcm::set_DF041(const Gnss_Synchro& gnss_synchro)
int32_t Rtcm::set_DF042(const Gnss_Synchro& gnss_synchro)
{
- const double lambda = GLONASS_C_m_s / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
+ const double lambda = GLONASS_C_M_S / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
double ambiguity = std::floor(gnss_synchro.Pseudorange_m / 599584.92);
double glonass_L1_pseudorange = std::round((gnss_synchro.Pseudorange_m - ambiguity * 599584.92) / 0.02);
double glonass_L1_pseudorange_c = glonass_L1_pseudorange * 0.02 + ambiguity * 299792.458;
@@ -4166,7 +4166,7 @@ int32_t Rtcm::set_DF047(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro&
//TODO Need to consider frequency channel in this fields
int32_t Rtcm::set_DF048(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2)
{
- const double lambda2 = GLONASS_C_m_s / GLONASS_L2_CA_FREQ_HZ;
+ const double lambda2 = GLONASS_C_M_S / GLONASS_L2_CA_FREQ_HZ;
int32_t l2_phaserange_minus_l1_pseudorange = 0xFFF80000;
double ambiguity = std::floor(gnss_synchroL1.Pseudorange_m / 599584.92);
double glonass_L1_pseudorange = std::round((gnss_synchroL1.Pseudorange_m - ambiguity * 599584.92) / 0.02);
@@ -4846,7 +4846,7 @@ int32_t Rtcm::set_DF291(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF292(const Galileo_Ephemeris& gal_eph)
{
- auto idot = static_cast<int32_t>(std::round(gal_eph.iDot_2 / FNAV_idot_2_LSB));
+ auto idot = static_cast<int32_t>(std::round(gal_eph.iDot_2 / FNAV_IDOT_2_LSB));
DF292 = std::bitset<14>(idot);
return 0;
}
@@ -4866,7 +4866,7 @@ int32_t Rtcm::set_DF293(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF294(const Galileo_Ephemeris& gal_eph)
{
- auto af2 = static_cast<int16_t>(std::round(gal_eph.af2_4 / FNAV_af2_1_LSB));
+ auto af2 = static_cast<int16_t>(std::round(gal_eph.af2_4 / FNAV_AF2_1_LSB));
DF294 = std::bitset<6>(af2);
return 0;
}
@@ -4874,7 +4874,7 @@ int32_t Rtcm::set_DF294(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF295(const Galileo_Ephemeris& gal_eph)
{
- auto af1 = static_cast<int64_t>(std::round(gal_eph.af1_4 / FNAV_af1_1_LSB));
+ auto af1 = static_cast<int64_t>(std::round(gal_eph.af1_4 / FNAV_AF1_1_LSB));
DF295 = std::bitset<21>(af1);
return 0;
}
@@ -4882,7 +4882,7 @@ int32_t Rtcm::set_DF295(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF296(const Galileo_Ephemeris& gal_eph)
{
- int64_t af0 = static_cast<uint32_t>(std::round(gal_eph.af0_4 / FNAV_af0_1_LSB));
+ int64_t af0 = static_cast<uint32_t>(std::round(gal_eph.af0_4 / FNAV_AF0_1_LSB));
DF296 = std::bitset<31>(af0);
return 0;
}
@@ -4890,7 +4890,7 @@ int32_t Rtcm::set_DF296(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF297(const Galileo_Ephemeris& gal_eph)
{
- auto crs = static_cast<int32_t>(std::round(gal_eph.C_rs_3 / FNAV_Crs_3_LSB));
+ auto crs = static_cast<int32_t>(std::round(gal_eph.C_rs_3 / FNAV_CRS_3_LSB));
DF297 = std::bitset<16>(crs);
return 0;
}
@@ -4898,7 +4898,7 @@ int32_t Rtcm::set_DF297(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF298(const Galileo_Ephemeris& gal_eph)
{
- auto delta_n = static_cast<int32_t>(std::round(gal_eph.delta_n_3 / FNAV_deltan_3_LSB));
+ auto delta_n = static_cast<int32_t>(std::round(gal_eph.delta_n_3 / FNAV_DELTAN_3_LSB));
DF298 = std::bitset<16>(delta_n);
return 0;
}
@@ -4914,7 +4914,7 @@ int32_t Rtcm::set_DF299(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF300(const Galileo_Ephemeris& gal_eph)
{
- int32_t cuc = static_cast<uint32_t>(std::round(gal_eph.C_uc_3 / FNAV_Cuc_3_LSB));
+ int32_t cuc = static_cast<uint32_t>(std::round(gal_eph.C_uc_3 / FNAV_CUC_3_LSB));
DF300 = std::bitset<16>(cuc);
return 0;
}
@@ -4922,7 +4922,7 @@ int32_t Rtcm::set_DF300(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF301(const Galileo_Ephemeris& gal_eph)
{
- auto ecc = static_cast<uint64_t>(std::round(gal_eph.e_1 / FNAV_e_2_LSB));
+ auto ecc = static_cast<uint64_t>(std::round(gal_eph.e_1 / FNAV_E_2_LSB));
DF301 = std::bitset<32>(ecc);
return 0;
}
@@ -4930,7 +4930,7 @@ int32_t Rtcm::set_DF301(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF302(const Galileo_Ephemeris& gal_eph)
{
- auto cus = static_cast<int32_t>(std::round(gal_eph.C_us_3 / FNAV_Cus_3_LSB));
+ auto cus = static_cast<int32_t>(std::round(gal_eph.C_us_3 / FNAV_CUS_3_LSB));
DF302 = std::bitset<16>(cus);
return 0;
}
@@ -4938,7 +4938,7 @@ int32_t Rtcm::set_DF302(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF303(const Galileo_Ephemeris& gal_eph)
{
- auto sqr_a = static_cast<uint64_t>(std::round(gal_eph.A_1 / FNAV_a12_2_LSB));
+ auto sqr_a = static_cast<uint64_t>(std::round(gal_eph.A_1 / FNAV_A12_2_LSB));
DF303 = std::bitset<32>(sqr_a);
return 0;
}
@@ -4946,7 +4946,7 @@ int32_t Rtcm::set_DF303(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF304(const Galileo_Ephemeris& gal_eph)
{
- auto toe = static_cast<uint32_t>(std::round(gal_eph.t0e_1 / FNAV_t0e_3_LSB));
+ auto toe = static_cast<uint32_t>(std::round(gal_eph.t0e_1 / FNAV_T0E_3_LSB));
DF304 = std::bitset<14>(toe);
return 0;
}
@@ -4954,7 +4954,7 @@ int32_t Rtcm::set_DF304(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF305(const Galileo_Ephemeris& gal_eph)
{
- auto cic = static_cast<int32_t>(std::round(gal_eph.C_ic_4 / FNAV_Cic_4_LSB));
+ auto cic = static_cast<int32_t>(std::round(gal_eph.C_ic_4 / FNAV_CIC_4_LSB));
DF305 = std::bitset<16>(cic);
return 0;
}
@@ -4962,7 +4962,7 @@ int32_t Rtcm::set_DF305(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF306(const Galileo_Ephemeris& gal_eph)
{
- auto Omega0 = static_cast<int64_t>(std::round(gal_eph.OMEGA_0_2 / FNAV_omega0_2_LSB));
+ auto Omega0 = static_cast<int64_t>(std::round(gal_eph.OMEGA_0_2 / FNAV_OMEGA0_2_LSB));
DF306 = std::bitset<32>(Omega0);
return 0;
}
@@ -4970,7 +4970,7 @@ int32_t Rtcm::set_DF306(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF307(const Galileo_Ephemeris& gal_eph)
{
- auto cis = static_cast<int32_t>(std::round(gal_eph.C_is_4 / FNAV_Cis_4_LSB));
+ auto cis = static_cast<int32_t>(std::round(gal_eph.C_is_4 / FNAV_CIS_4_LSB));
DF307 = std::bitset<16>(cis);
return 0;
}
@@ -4978,7 +4978,7 @@ int32_t Rtcm::set_DF307(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF308(const Galileo_Ephemeris& gal_eph)
{
- auto i0 = static_cast<int64_t>(std::round(gal_eph.i_0_2 / FNAV_i0_3_LSB));
+ auto i0 = static_cast<int64_t>(std::round(gal_eph.i_0_2 / FNAV_I0_3_LSB));
DF308 = std::bitset<32>(i0);
return 0;
}
@@ -4986,7 +4986,7 @@ int32_t Rtcm::set_DF308(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF309(const Galileo_Ephemeris& gal_eph)
{
- int32_t crc = static_cast<uint32_t>(std::round(gal_eph.C_rc_3 / FNAV_Crc_3_LSB));
+ int32_t crc = static_cast<uint32_t>(std::round(gal_eph.C_rc_3 / FNAV_CRC_3_LSB));
DF309 = std::bitset<16>(crc);
return 0;
}
@@ -4994,7 +4994,7 @@ int32_t Rtcm::set_DF309(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF310(const Galileo_Ephemeris& gal_eph)
{
- auto omega = static_cast<int32_t>(std::round(gal_eph.omega_2 / FNAV_omega0_2_LSB));
+ auto omega = static_cast<int32_t>(std::round(gal_eph.omega_2 / FNAV_OMEGA0_2_LSB));
DF310 = std::bitset<32>(omega);
return 0;
}
@@ -5002,7 +5002,7 @@ int32_t Rtcm::set_DF310(const Galileo_Ephemeris& gal_eph)
int32_t Rtcm::set_DF311(const Galileo_Ephemeris& gal_eph)
{
- auto Omegadot = static_cast<int64_t>(std::round(gal_eph.OMEGA_dot_3 / FNAV_omegadot_2_LSB));
+ auto Omegadot = static_cast<int64_t>(std::round(gal_eph.OMEGA_dot_3 / FNAV_OMEGADOT_2_LSB));
DF311 = std::bitset<24>(Omegadot);
return 0;
}
@@ -5269,7 +5269,7 @@ std::string Rtcm::set_DF396(const std::map<int32_t, Gnss_Synchro>& observables)
int32_t Rtcm::set_DF397(const Gnss_Synchro& gnss_synchro)
{
- double meters_to_miliseconds = GPS_C_m_s * 0.001;
+ double meters_to_miliseconds = GPS_C_M_S * 0.001;
double rough_range_s = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
uint32_t int_ms = 0;
@@ -5294,7 +5294,7 @@ int32_t Rtcm::set_DF397(const Gnss_Synchro& gnss_synchro)
int32_t Rtcm::set_DF398(const Gnss_Synchro& gnss_synchro)
{
- double meters_to_miliseconds = GPS_C_m_s * 0.001;
+ double meters_to_miliseconds = GPS_C_M_S * 0.001;
double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
uint32_t rr_mod_ms;
if ((rough_range_m <= 0.0) || (rough_range_m > meters_to_miliseconds * 255.0))
@@ -5318,23 +5318,23 @@ int32_t Rtcm::set_DF399(const Gnss_Synchro& gnss_synchro)
if (sig == "1C")
{
- lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
}
if (sig == "2S")
{
- lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
}
if (sig == "5X")
{
- lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
}
if (sig == "1B")
{
- lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
}
if (sig == "7X")
{
- lambda = GPS_C_m_s / 1.207140e9; // Galileo_E1b_FREQ_HZ;
+ lambda = GPS_C_M_S / 1.207140e9; // Galileo_E1b_FREQ_HZ;
}
double rough_phase_range_rate_ms = std::round(-gnss_synchro.Carrier_Doppler_hz * lambda);
@@ -5354,7 +5354,7 @@ int32_t Rtcm::set_DF399(const Gnss_Synchro& gnss_synchro)
int32_t Rtcm::set_DF400(const Gnss_Synchro& gnss_synchro)
{
- double meters_to_miliseconds = GPS_C_m_s * 0.001;
+ double meters_to_miliseconds = GPS_C_M_S * 0.001;
double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
double psrng_s;
int32_t fine_pseudorange;
@@ -5381,7 +5381,7 @@ int32_t Rtcm::set_DF400(const Gnss_Synchro& gnss_synchro)
int32_t Rtcm::set_DF401(const Gnss_Synchro& gnss_synchro)
{
- double meters_to_miliseconds = GPS_C_m_s * 0.001;
+ double meters_to_miliseconds = GPS_C_M_S * 0.001;
double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
double phrng_m;
int64_t fine_phaserange;
@@ -5393,32 +5393,32 @@ int32_t Rtcm::set_DF401(const Gnss_Synchro& gnss_synchro)
if ((sig == "1C") && (sys == "G"))
{
- lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
}
if ((sig == "2S") && (sys == "G"))
{
- lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
}
if ((sig == "5X") && (sys == "E"))
{
- lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
}
if ((sig == "1B") && (sys == "E"))
{
- lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
}
if ((sig == "7X") && (sys == "E"))
{
- lambda = GPS_C_m_s / 1.207140e9; // Galileo_E1b_FREQ_HZ;
+ lambda = GPS_C_M_S / 1.207140e9; // Galileo_E1b_FREQ_HZ;
}
if ((sig == "1C") && (sys == "R"))
{
- lambda = GLONASS_C_m_s / ((GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN))));
+ lambda = GLONASS_C_M_S / ((GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN))));
}
if ((sig == "2C") && (sys == "R"))
{
// TODO Need to add slot number and freq number to gnss_syncro
- lambda = GLONASS_C_m_s / (GLONASS_L2_CA_FREQ_HZ);
+ lambda = GLONASS_C_M_S / (GLONASS_L2_CA_FREQ_HZ);
}
phrng_m = (gnss_synchro.Carrier_phase_rads / GPS_TWO_PI) * lambda - rough_range_m;
@@ -5502,32 +5502,32 @@ int32_t Rtcm::set_DF404(const Gnss_Synchro& gnss_synchro)
if ((sig_ == "1C") && (sys_ == "G"))
{
- lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
}
if ((sig_ == "2S") && (sys_ == "G"))
{
- lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
}
if ((sig_ == "5X") && (sys_ == "E"))
{
- lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
}
if ((sig_ == "1B") && (sys_ == "E"))
{
- lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
}
if ((sig_ == "7X") && (sys_ == "E"))
{
- lambda = GPS_C_m_s / 1.207140e9; // Galileo_E1b_FREQ_HZ;
+ lambda = GPS_C_M_S / 1.207140e9; // Galileo_E1b_FREQ_HZ;
}
if ((sig_ == "1C") && (sys_ == "R"))
{
- lambda = GLONASS_C_m_s / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
+ lambda = GLONASS_C_M_S / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
}
if ((sig_ == "2C") && (sys_ == "R"))
{
//TODO Need to add slot number and freq number to gnss syncro
- lambda = GLONASS_C_m_s / (GLONASS_L2_CA_FREQ_HZ);
+ lambda = GLONASS_C_M_S / (GLONASS_L2_CA_FREQ_HZ);
}
double rough_phase_range_rate = std::round(-gnss_synchro.Carrier_Doppler_hz * lambda);
double phrr = (-gnss_synchro.Carrier_Doppler_hz * lambda - rough_phase_range_rate);
@@ -5552,7 +5552,7 @@ int32_t Rtcm::set_DF404(const Gnss_Synchro& gnss_synchro)
int32_t Rtcm::set_DF405(const Gnss_Synchro& gnss_synchro)
{
- double meters_to_miliseconds = GPS_C_m_s * 0.001;
+ double meters_to_miliseconds = GPS_C_M_S * 0.001;
double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
double psrng_s;
int64_t fine_pseudorange;
@@ -5579,7 +5579,7 @@ int32_t Rtcm::set_DF405(const Gnss_Synchro& gnss_synchro)
int32_t Rtcm::set_DF406(const Gnss_Synchro& gnss_synchro)
{
int64_t fine_phaserange_ex;
- double meters_to_miliseconds = GPS_C_m_s * 0.001;
+ double meters_to_miliseconds = GPS_C_M_S * 0.001;
double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
double phrng_m;
double lambda = 0.0;
@@ -5589,32 +5589,32 @@ int32_t Rtcm::set_DF406(const Gnss_Synchro& gnss_synchro)
if ((sig_ == "1C") && (sys_ == "G"))
{
- lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
}
if ((sig_ == "2S") && (sys_ == "G"))
{
- lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+ lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
}
if ((sig_ == "5X") && (sys_ == "E"))
{
- lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
}
if ((sig_ == "1B") && (sys_ == "E"))
{
- lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+ lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
}
if ((sig_ == "7X") && (sys_ == "E"))
{
- lambda = GPS_C_m_s / 1.207140e9; // Galileo_E1b_FREQ_HZ;
+ lambda = GPS_C_M_S / 1.207140e9; // Galileo_E1b_FREQ_HZ;
}
if ((sig_ == "1C") && (sys_ == "R"))
{
- lambda = GLONASS_C_m_s / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
+ lambda = GLONASS_C_M_S / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
}
if ((sig_ == "2C") && (sys_ == "R"))
{
//TODO Need to add slot number and freq number to gnss syncro
- lambda = GLONASS_C_m_s / (GLONASS_L2_CA_FREQ_HZ);
+ lambda = GLONASS_C_M_S / (GLONASS_L2_CA_FREQ_HZ);
}
phrng_m = (gnss_synchro.Carrier_phase_rads / GPS_TWO_PI) * lambda - rough_range_m;
diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index 81f199a28..50e541020 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -596,10 +596,10 @@ private:
};
- class Rtcm_Listener
+ class RtcmListener
{
public:
- virtual ~Rtcm_Listener() = default;
+ virtual ~RtcmListener() = default;
virtual void deliver(const Rtcm_Message& msg) = 0;
};
@@ -607,7 +607,7 @@ private:
class Rtcm_Listener_Room
{
public:
- inline void join(const std::shared_ptr<Rtcm_Listener>& participant)
+ inline void join(const std::shared_ptr<RtcmListener>& participant)
{
participants_.insert(participant);
for (auto msg : recent_msgs_)
@@ -616,7 +616,7 @@ private:
}
}
- inline void leave(const std::shared_ptr<Rtcm_Listener>& participant)
+ inline void leave(const std::shared_ptr<RtcmListener>& participant)
{
participants_.erase(participant);
}
@@ -636,7 +636,7 @@ private:
}
private:
- std::set<std::shared_ptr<Rtcm_Listener> > participants_;
+ std::set<std::shared_ptr<RtcmListener> > participants_;
enum
{
max_recent_msgs = 1
@@ -646,7 +646,7 @@ private:
class Rtcm_Session
- : public Rtcm_Listener,
+ : public RtcmListener,
public std::enable_shared_from_this<Rtcm_Session>
{
public:
@@ -846,7 +846,7 @@ private:
class Queue_Reader
{
public:
- Queue_Reader(boost::asio::io_service& io_context, std::shared_ptr<concurrent_queue<std::string> >& queue, int32_t port) : queue_(queue)
+ Queue_Reader(boost::asio::io_service& io_context, std::shared_ptr<Concurrent_Queue<std::string> >& queue, int32_t port) : queue_(queue)
{
boost::asio::ip::tcp::resolver resolver(io_context);
std::string host("localhost");
@@ -877,7 +877,7 @@ private:
private:
std::shared_ptr<Tcp_Internal_Client> c;
- std::shared_ptr<concurrent_queue<std::string> >& queue_;
+ std::shared_ptr<Concurrent_Queue<std::string> >& queue_;
};
@@ -952,7 +952,7 @@ private:
};
boost::asio::io_service io_context;
- std::shared_ptr<concurrent_queue<std::string> > rtcm_message_queue;
+ std::shared_ptr<Concurrent_Queue<std::string> > rtcm_message_queue;
std::thread t;
std::thread tq;
std::list<Rtcm::Tcp_Server> servers;
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index e6eb11faa..55ba3ac03 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -1308,7 +1308,7 @@ typedef struct
} msm_h_t;
-const double chisqr[100] = {/* chi-sqr(n) (alpha=0.001) */
+const double CHISQR[100] = {/* chi-sqr(n) (alpha=0.001) */
10.8, 13.8, 16.3, 18.5, 20.5, 22.5, 24.3, 26.1, 27.9, 29.6,
31.3, 32.9, 34.5, 36.1, 37.7, 39.3, 40.8, 42.3, 43.8, 45.3,
46.8, 48.3, 49.7, 51.2, 52.6, 54.1, 55.5, 56.9, 58.3, 59.7,
@@ -1321,7 +1321,7 @@ const double chisqr[100] = {/* chi-sqr(n) (alpha=0.001) */
138, 139, 140, 142, 143, 144, 145, 147, 148, 149};
-const double lam_carr[MAXFREQ] = {/* carrier wave length (m) */
+const double LAM_CARR[MAXFREQ] = {/* carrier wave length (m) */
SPEED_OF_LIGHT / FREQ1, SPEED_OF_LIGHT / FREQ2, SPEED_OF_LIGHT / FREQ5, SPEED_OF_LIGHT / FREQ6, SPEED_OF_LIGHT / FREQ7,
SPEED_OF_LIGHT / FREQ8, SPEED_OF_LIGHT / FREQ9};
diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.cc b/src/algorithms/libs/rtklib/rtklib_pntpos.cc
index 58c1192e5..19cb48d46 100644
--- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc
@@ -488,7 +488,7 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs,
/* GPS-L1 -> L1/B1 */
if ((lam_L1 = nav->lam[obs[i].sat - 1][0]) > 0.0)
{
- dion *= std::pow(lam_L1 / lam_carr[0], 2.0);
+ dion *= std::pow(lam_L1 / LAM_CARR[0], 2.0);
}
/* tropospheric corrections */
if (!tropcorr(obs[i].time, nav, pos, azel + i * 2,
@@ -571,9 +571,9 @@ int valsol(const double *azel, const int *vsat, int n,
/* chi-square validation of residuals */
vv = dot(v, v, nv);
- if (nv > nx && vv > chisqr[nv - nx - 1])
+ if (nv > nx && vv > CHISQR[nv - nx - 1])
{
- sprintf(msg, "chi-square error nv=%d vv=%.1f cs=%.1f", nv, vv, chisqr[nv - nx - 1]);
+ sprintf(msg, "chi-square error nv=%d vv=%.1f cs=%.1f", nv, vv, CHISQR[nv - nx - 1]);
return 0;
}
/* large gdop check */
diff --git a/src/algorithms/libs/rtklib/rtklib_ppp.cc b/src/algorithms/libs/rtklib/rtklib_ppp.cc
index 9f7ee252f..83329ca48 100644
--- a/src/algorithms/libs/rtklib/rtklib_ppp.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ppp.cc
@@ -436,8 +436,8 @@ int fix_amb_ROUND(rtk_t *rtk, int *sat1, int *sat2, const int *NW, int n)
double C1, C2, B1, v1, BC, v, vc, *NC, *var, lam_NL = lam_LC(1, 1, 0), lam1, lam2;
int i, j, k, m = 0, N1, stat;
- lam1 = lam_carr[0];
- lam2 = lam_carr[1];
+ lam1 = LAM_CARR[0];
+ lam2 = LAM_CARR[1];
C1 = std::pow(lam2, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
C2 = -std::pow(lam1, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
@@ -498,8 +498,8 @@ int fix_amb_ILS(rtk_t *rtk, int *sat1, int *sat2, int *NW, int n)
double C1, C2, *B1, *N1, *NC, *D, *E, *Q, s[2], lam_NL = lam_LC(1, 1, 0), lam1, lam2;
int i, j, k, m = 0, info, stat, flgs[MAXSAT] = {0}, max_flg = 0;
- lam1 = lam_carr[0];
- lam2 = lam_carr[1];
+ lam1 = LAM_CARR[0];
+ lam2 = LAM_CARR[1];
C1 = std::pow(lam2, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
C2 = -std::pow(lam1, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
diff --git a/src/algorithms/libs/rtklib/rtklib_rtcm3.cc b/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
index 42721e641..46dbedb4d 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
@@ -385,8 +385,8 @@ int decode_type1002(rtcm_t *rtcm)
if (ppr1 != static_cast<int>(0xFFF80000))
{
rtcm->obs.data[index].P[0] = pr1;
- cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / lam_carr[0]);
- rtcm->obs.data[index].L[0] = pr1 / lam_carr[0] + cp1;
+ cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / LAM_CARR[0]);
+ rtcm->obs.data[index].L[0] = pr1 / LAM_CARR[0] + cp1;
}
rtcm->obs.data[index].LLI[0] = lossoflock(rtcm, sat, 0, lock1);
rtcm->obs.data[index].SNR[0] = snratio(cnr1 * 0.25);
@@ -475,8 +475,8 @@ int decode_type1004(rtcm_t *rtcm)
if (ppr1 != static_cast<int>(0xFFF80000))
{
rtcm->obs.data[index].P[0] = pr1;
- cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / lam_carr[0]);
- rtcm->obs.data[index].L[0] = pr1 / lam_carr[0] + cp1;
+ cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / LAM_CARR[0]);
+ rtcm->obs.data[index].L[0] = pr1 / LAM_CARR[0] + cp1;
}
rtcm->obs.data[index].LLI[0] = lossoflock(rtcm, sat, 0, lock1);
rtcm->obs.data[index].SNR[0] = snratio(cnr1 * 0.25);
@@ -488,8 +488,8 @@ int decode_type1004(rtcm_t *rtcm)
}
if (ppr2 != static_cast<int>(0xFFF80000))
{
- cp2 = adjcp(rtcm, sat, 1, ppr2 * 0.0005 / lam_carr[1]);
- rtcm->obs.data[index].L[1] = pr1 / lam_carr[1] + cp2;
+ cp2 = adjcp(rtcm, sat, 1, ppr2 * 0.0005 / LAM_CARR[1]);
+ rtcm->obs.data[index].L[1] = pr1 / LAM_CARR[1] + cp2;
}
rtcm->obs.data[index].LLI[1] = lossoflock(rtcm, sat, 1, lock2);
rtcm->obs.data[index].SNR[1] = snratio(cnr2 * 0.25);
@@ -1986,7 +1986,7 @@ int decode_ssr1_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
i += 4; /* solution id */
nsat = getbitu(rtcm->buff, i, ns);
i += ns;
- *udint = ssrudint[udi];
+ *udint = SSRUDINT[udi];
trace(4, "decode_ssr1_head: time=%s sys=%d nsat=%d sync=%d iod=%d provid=%d solid=%d\n",
time_str(rtcm->time, 2), sys, nsat, *sync, *iod, provid, solid);
@@ -2042,7 +2042,7 @@ int decode_ssr2_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
i += 4; /* solution id */
nsat = getbitu(rtcm->buff, i, ns);
i += ns;
- *udint = ssrudint[udi];
+ *udint = SSRUDINT[udi];
trace(4, "decode_ssr2_head: time=%s sys=%d nsat=%d sync=%d iod=%d provid=%d solid=%d\n",
time_str(rtcm->time, 2), sys, nsat, *sync, *iod, provid, solid);
@@ -2102,7 +2102,7 @@ int decode_ssr7_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
i += 1; /* MW consistency indicator */
nsat = getbitu(rtcm->buff, i, ns);
i += ns;
- *udint = ssrudint[udi];
+ *udint = SSRUDINT[udi];
trace(4, "decode_ssr7_head: time=%s sys=%d nsat=%d sync=%d iod=%d provid=%d solid=%d\n",
time_str(rtcm->time, 2), sys, nsat, *sync, *iod, provid, solid);
@@ -2307,37 +2307,37 @@ int decode_ssr3(rtcm_t *rtcm, int sys)
case SYS_GPS:
np = 6;
offp = 0;
- codes = codes_gps;
+ codes = CODES_GPS;
ncode = 17;
break;
case SYS_GLO:
np = 5;
offp = 0;
- codes = codes_glo;
+ codes = CODES_GLO;
ncode = 4;
break;
case SYS_GAL:
np = 6;
offp = 0;
- codes = codes_gal;
+ codes = CODES_GAL;
ncode = 19;
break;
case SYS_QZS:
np = 4;
offp = 192;
- codes = codes_qzs;
+ codes = CODES_QZS;
ncode = 13;
break;
case SYS_BDS:
np = 6;
offp = 1;
- codes = codes_bds;
+ codes = CODES_BDS;
ncode = 9;
break;
case SYS_SBS:
np = 6;
offp = 120;
- codes = codes_sbs;
+ codes = CODES_SBS;
ncode = 4;
break;
default:
@@ -2642,31 +2642,31 @@ int decode_ssr7(rtcm_t *rtcm, int sys)
case SYS_GPS:
np = 6;
offp = 0;
- codes = codes_gps;
+ codes = CODES_GPS;
ncode = 17;
break;
case SYS_GLO:
np = 5;
offp = 0;
- codes = codes_glo;
+ codes = CODES_GLO;
ncode = 4;
break;
case SYS_GAL:
np = 6;
offp = 0;
- codes = codes_gal;
+ codes = CODES_GAL;
ncode = 19;
break;
case SYS_QZS:
np = 4;
offp = 192;
- codes = codes_qzs;
+ codes = CODES_QZS;
ncode = 13;
break;
case SYS_BDS:
np = 6;
offp = 1;
- codes = codes_bds;
+ codes = CODES_BDS;
ncode = 9;
break;
default:
diff --git a/src/algorithms/libs/rtklib/rtklib_rtcm3.h b/src/algorithms/libs/rtklib/rtklib_rtcm3.h
index b907f223d..847bae424 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtcm3.h
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm3.h
@@ -64,38 +64,38 @@ const double RANGE_MS = SPEED_OF_LIGHT * 0.001; /* range in 1 ms */
/* ssr update intervals ------------------------------------------------------*/
-const double ssrudint[16] = {
+const double SSRUDINT[16] = {
1, 2, 5, 10, 15, 30, 60, 120, 240, 300, 600, 900, 1800, 3600, 7200, 10800};
/* ssr 3 and 7 signal and tracking mode ids ----------------------------------*/
-const int codes_gps[] = {
+const int CODES_GPS[] = {
CODE_L1C, CODE_L1P, CODE_L1W, CODE_L1Y, CODE_L1M, CODE_L2C, CODE_L2D, CODE_L2S,
CODE_L2L, CODE_L2X, CODE_L2P, CODE_L2W, CODE_L2Y, CODE_L2M, CODE_L5I, CODE_L5Q,
CODE_L5X};
-const int codes_glo[] = {
+const int CODES_GLO[] = {
CODE_L1C, CODE_L1P, CODE_L2C, CODE_L2P};
-const int codes_gal[] = {
+const int CODES_GAL[] = {
CODE_L1A, CODE_L1B, CODE_L1C, CODE_L1X, CODE_L1Z, CODE_L5I, CODE_L5Q, CODE_L5X,
CODE_L7I, CODE_L7Q, CODE_L7X, CODE_L8I, CODE_L8Q, CODE_L8X, CODE_L6A, CODE_L6B,
CODE_L6C, CODE_L6X, CODE_L6Z};
-const int codes_qzs[] = {
+const int CODES_QZS[] = {
CODE_L1C, CODE_L1S, CODE_L1L, CODE_L2S, CODE_L2L, CODE_L2X, CODE_L5I, CODE_L5Q,
CODE_L5X, CODE_L6S, CODE_L6L, CODE_L6X, CODE_L1X};
-const int codes_bds[] = {
+const int CODES_BDS[] = {
CODE_L1I, CODE_L1Q, CODE_L1X, CODE_L7I, CODE_L7Q, CODE_L7X, CODE_L6I, CODE_L6Q,
CODE_L6X};
-const int codes_sbs[] = {
+const int CODES_SBS[] = {
CODE_L1C, CODE_L5I, CODE_L5Q, CODE_L5X};
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
index 70b854400..35c7b3939 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
@@ -62,9 +62,9 @@
#include <sys/types.h>
-const double gpst0[] = {1980, 1, 6, 0, 0, 0}; /* gps time reference */
-const double gst0[] = {1999, 8, 22, 0, 0, 0}; /* galileo system time reference */
-const double bdt0[] = {2006, 1, 1, 0, 0, 0}; /* beidou time reference */
+const double GPST0[] = {1980, 1, 6, 0, 0, 0}; /* gps time reference */
+const double GST0[] = {1999, 8, 22, 0, 0, 0}; /* galileo system time reference */
+const double BDT0[] = {2006, 1, 1, 0, 0, 0}; /* beidou time reference */
static double timeoffset_ = 0.0;
@@ -154,7 +154,7 @@ char codepris[7][MAXFREQ][16] = {
fatalfunc_t *fatalfunc = nullptr; /* fatal callback function */
/* crc tables generated by util/gencrc ---------------------------------------*/
-const uint16_t tbl_CRC16[] = {
+const uint16_t TBL_CR_C16[] = {
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
@@ -189,7 +189,7 @@ const uint16_t tbl_CRC16[] = {
0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0};
-const unsigned int tbl_CRC24Q[] = {
+const unsigned int TBL_CR_C24_Q[] = {
0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
@@ -890,7 +890,7 @@ unsigned int rtk_crc24q(const unsigned char *buff, int len)
for (i = 0; i < len; i++)
{
- crc = ((crc << 8) & 0xFFFFFF) ^ tbl_CRC24Q[(crc >> 16) ^ buff[i]];
+ crc = ((crc << 8) & 0xFFFFFF) ^ TBL_CR_C24_Q[(crc >> 16) ^ buff[i]];
}
return crc;
}
@@ -912,7 +912,7 @@ uint16_t rtk_crc16(const unsigned char *buff, int len)
for (i = 0; i < len; i++)
{
- crc = (crc << 8) ^ tbl_CRC16[((crc >> 8) ^ buff[i]) & 0xFF];
+ crc = (crc << 8) ^ TBL_CR_C16[((crc >> 8) ^ buff[i]) & 0xFF];
}
return crc;
}
@@ -1551,7 +1551,7 @@ void time2epoch(gtime_t t, double *ep)
*-----------------------------------------------------------------------------*/
gtime_t gpst2time(int week, double sec)
{
- gtime_t t = epoch2time(gpst0);
+ gtime_t t = epoch2time(GPST0);
if (sec < -1e9 || 1e9 < sec)
{
@@ -1571,7 +1571,7 @@ gtime_t gpst2time(int week, double sec)
*-----------------------------------------------------------------------------*/
double time2gpst(gtime_t t, int *week)
{
- gtime_t t0 = epoch2time(gpst0);
+ gtime_t t0 = epoch2time(GPST0);
time_t sec = t.time - t0.time;
int w = static_cast<int>(sec / 604800);
@@ -1591,7 +1591,7 @@ double time2gpst(gtime_t t, int *week)
*-----------------------------------------------------------------------------*/
gtime_t gst2time(int week, double sec)
{
- gtime_t t = epoch2time(gst0);
+ gtime_t t = epoch2time(GST0);
if (sec < -1e9 || 1e9 < sec)
{
@@ -1611,7 +1611,7 @@ gtime_t gst2time(int week, double sec)
*-----------------------------------------------------------------------------*/
double time2gst(gtime_t t, int *week)
{
- gtime_t t0 = epoch2time(gst0);
+ gtime_t t0 = epoch2time(GST0);
time_t sec = t.time - t0.time;
int w = static_cast<int>(sec / (86400 * 7));
@@ -1631,7 +1631,7 @@ double time2gst(gtime_t t, int *week)
*-----------------------------------------------------------------------------*/
gtime_t bdt2time(int week, double sec)
{
- gtime_t t = epoch2time(bdt0);
+ gtime_t t = epoch2time(BDT0);
if (sec < -1e9 || 1e9 < sec)
{
@@ -1651,7 +1651,7 @@ gtime_t bdt2time(int week, double sec)
*-----------------------------------------------------------------------------*/
double time2bdt(gtime_t t, int *week)
{
- gtime_t t0 = epoch2time(bdt0);
+ gtime_t t0 = epoch2time(BDT0);
time_t sec = t.time - t0.time;
int w = static_cast<int>(sec / (86400 * 7));
@@ -4806,7 +4806,7 @@ void csmooth(obs_t *obs, int ns)
}
else
{
- dcp = lam_carr[j] * (p->L[j] - Lp[r - 1][s - 1][j]);
+ dcp = LAM_CARR[j] * (p->L[j] - Lp[r - 1][s - 1][j]);
Ps[r - 1][s - 1][j] = p->P[j] / ns + (Ps[r - 1][s - 1][j] + dcp) * (ns - 1) / ns;
}
if (++n[r - 1][s - 1][j] < ns)
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
index 4ff70803e..40645f9a0 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
@@ -1613,8 +1613,8 @@ int ddres(rtk_t *rtk, const nav_t *nav, double dt, const double *x,
/* double-differenced ionospheric delay term */
if (opt->ionoopt == IONOOPT_EST)
{
- fi = lami / lam_carr[0];
- fj = lamj / lam_carr[0];
+ fi = lami / LAM_CARR[0];
+ fj = lamj / LAM_CARR[0];
didxi = (f < nf ? -1.0 : 1.0) * fi * fi * im[i];
didxj = (f < nf ? -1.0 : 1.0) * fj * fj * im[j];
v[nv] -= didxi * x[II_RTK(sat[i], opt)] - didxj * x[II_RTK(sat[j], opt)];
diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
index a86425dbb..8b2e00833 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
@@ -35,7 +35,7 @@ void saveoutbuf(rtksvr_t *svr, unsigned char *buff, int n, int index)
/* write solution to output stream -------------------------------------------*/
void writesol(rtksvr_t *svr, int index)
{
- solopt_t solopt = solopt_default;
+ solopt_t solopt = SOLOPT_DEFAULT;
unsigned char buff[1024];
int i, n;
@@ -672,10 +672,10 @@ int rtksvrinit(rtksvr_t *svr)
}
for (i = 0; i < 2; i++)
{
- svr->solopt[i] = solopt_default;
+ svr->solopt[i] = SOLOPT_DEFAULT;
}
svr->navsel = svr->nsbs = svr->nsol = 0;
- rtkinit(&svr->rtk, &prcopt_default);
+ rtkinit(&svr->rtk, &PRCOPT_DEFAULT);
for (i = 0; i < 3; i++)
{
svr->nb[i] = 0;
diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.h b/src/algorithms/libs/rtklib/rtklib_rtksvr.h
index d5edbd252..9d84b13c9 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtksvr.h
+++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.h
@@ -57,7 +57,7 @@
#include "rtklib.h"
-const solopt_t solopt_default = {
+const solopt_t SOLOPT_DEFAULT = {
/* defaults solution output options */
SOLF_LLH, TIMES_GPST, 1, 3, /* posf, times, timef, timeu */
0, 1, 0, 0, 0, 0, /* degf, outhead, outopt, datum, height, geoid */
@@ -66,7 +66,7 @@ const solopt_t solopt_default = {
" ", "", 0 /* separator/program name */
};
-const prcopt_t prcopt_default = { /* defaults processing options */
+const prcopt_t PRCOPT_DEFAULT = { /* defaults processing options */
PMODE_SINGLE, 0, 2, SYS_GPS, /* mode, soltype, nf, navsys */
15.0 * D2R, {{}, {{}, {}}}, /* elmin, snrmask */
0, 1, 1, 1, /* sateph, modear, glomodear, bdsmodear */
diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.cc b/src/algorithms/libs/rtklib/rtklib_sbas.cc
index 4f63cb40a..943b271f0 100644
--- a/src/algorithms/libs/rtklib/rtklib_sbas.cc
+++ b/src/algorithms/libs/rtklib/rtklib_sbas.cc
@@ -319,12 +319,12 @@ int decode_sbstype18(const sbsmsg_t *msg, sbsion_t *sbsion)
if (0 <= band && band <= 8)
{
- p = igpband1[band];
+ p = IGPBAND1[band];
m = 8;
}
else if (9 <= band && band <= 10)
{
- p = igpband2[band - 9];
+ p = IGPBAND2[band - 9];
m = 5;
}
else
diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.h b/src/algorithms/libs/rtklib/rtklib_sbas.h
index 1ff7bf6ad..801df1202 100644
--- a/src/algorithms/libs/rtklib/rtklib_sbas.h
+++ b/src/algorithms/libs/rtklib/rtklib_sbas.h
@@ -70,50 +70,50 @@ const int WEEKOFFSET = 1024; /* gps week offset for NovAtel OEM-3 */
/* sbas igp definition -------------------------------------------------------*/
static const short
- x1[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
+ X1[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
25, 30, 35, 40, 45, 50, 55, 65, 75, 85},
- x2[] = {-55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30,
+ X2[] = {-55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30,
35, 40, 45, 50, 55},
- x3[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
+ X3[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
25, 30, 35, 40, 45, 50, 55, 65, 75},
- x4[] = {-85, -75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15,
+ X4[] = {-85, -75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15,
20, 25, 30, 35, 40, 45, 50, 55, 65, 75},
- x5[] = {-180, -175, -170, -165, -160, -155, -150, -145, -140, -135, -130, -125, -120, -115,
+ X5[] = {-180, -175, -170, -165, -160, -155, -150, -145, -140, -135, -130, -125, -120, -115,
-110, -105, -100, -95, -90, -85, -80, -75, -70, -65, -60, -55, -50, -45,
-40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25,
30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95,
100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165,
170, 175},
- x6[] = {-180, -170, -160, -150, -140, -130, -120, -110, -100, -90, -80, -70, -60, -50,
+ X6[] = {-180, -170, -160, -150, -140, -130, -120, -110, -100, -90, -80, -70, -60, -50,
-40, -30, -20, -10, 0, 10, 20, 30, 40, 50, 60, 70, 80, 90,
100, 110, 120, 130, 140, 150, 160, 170},
- x7[] = {-180, -150, -120, -90, -60, -30, 0, 30, 60, 90, 120, 150},
- x8[] = {-170, -140, -110, -80, -50, -20, 10, 40, 70, 100, 130, 160};
+ X7[] = {-180, -150, -120, -90, -60, -30, 0, 30, 60, 90, 120, 150},
+ X8[] = {-170, -140, -110, -80, -50, -20, 10, 40, 70, 100, 130, 160};
-const sbsigpband_t igpband1[9][8] = {/* band 0-8 */
- {{-180, x1, 1, 28}, {-175, x2, 29, 51}, {-170, x3, 52, 78}, {-165, x2, 79, 101},
- {-160, x3, 102, 128}, {-155, x2, 129, 151}, {-150, x3, 152, 178}, {-145, x2, 179, 201}},
- {{-140, x4, 1, 28}, {-135, x2, 29, 51}, {-130, x3, 52, 78}, {-125, x2, 79, 101},
- {-120, x3, 102, 128}, {-115, x2, 129, 151}, {-110, x3, 152, 178}, {-105, x2, 179, 201}},
- {{-100, x3, 1, 27}, {-95, x2, 28, 50}, {-90, x1, 51, 78}, {-85, x2, 79, 101},
- {-80, x3, 102, 128}, {-75, x2, 129, 151}, {-70, x3, 152, 178}, {-65, x2, 179, 201}},
- {{-60, x3, 1, 27}, {-55, x2, 28, 50}, {-50, x4, 51, 78}, {-45, x2, 79, 101},
- {-40, x3, 102, 128}, {-35, x2, 129, 151}, {-30, x3, 152, 178}, {-25, x2, 179, 201}},
- {{-20, x3, 1, 27}, {-15, x2, 28, 50}, {-10, x3, 51, 77}, {-5, x2, 78, 100},
- {0, x1, 101, 128}, {5, x2, 129, 151}, {10, x3, 152, 178}, {15, x2, 179, 201}},
- {{20, x3, 1, 27}, {25, x2, 28, 50}, {30, x3, 51, 77}, {35, x2, 78, 100},
- {40, x4, 101, 128}, {45, x2, 129, 151}, {50, x3, 152, 178}, {55, x2, 179, 201}},
- {{60, x3, 1, 27}, {65, x2, 28, 50}, {70, x3, 51, 77}, {75, x2, 78, 100},
- {80, x3, 101, 127}, {85, x2, 128, 150}, {90, x1, 151, 178}, {95, x2, 179, 201}},
- {{100, x3, 1, 27}, {105, x2, 28, 50}, {110, x3, 51, 77}, {115, x2, 78, 100},
- {120, x3, 101, 127}, {125, x2, 128, 150}, {130, x4, 151, 178}, {135, x2, 179, 201}},
- {{140, x3, 1, 27}, {145, x2, 28, 50}, {150, x3, 51, 77}, {155, x2, 78, 100},
- {160, x3, 101, 127}, {165, x2, 128, 150}, {170, x3, 151, 177}, {175, x2, 178, 200}}};
-const sbsigpband_t igpband2[2][5] = {/* band 9-10 */
- {{60, x5, 1, 72}, {65, x6, 73, 108}, {70, x6, 109, 144}, {75, x6, 145, 180},
- {85, x7, 181, 192}},
- {{-60, x5, 1, 72}, {-65, x6, 73, 108}, {-70, x6, 109, 144}, {-75, x6, 145, 180},
- {-85, x8, 181, 192}}};
+const sbsigpband_t IGPBAND1[9][8] = {/* band 0-8 */
+ {{-180, X1, 1, 28}, {-175, X2, 29, 51}, {-170, X3, 52, 78}, {-165, X2, 79, 101},
+ {-160, X3, 102, 128}, {-155, X2, 129, 151}, {-150, X3, 152, 178}, {-145, X2, 179, 201}},
+ {{-140, X4, 1, 28}, {-135, X2, 29, 51}, {-130, X3, 52, 78}, {-125, X2, 79, 101},
+ {-120, X3, 102, 128}, {-115, X2, 129, 151}, {-110, X3, 152, 178}, {-105, X2, 179, 201}},
+ {{-100, X3, 1, 27}, {-95, X2, 28, 50}, {-90, X1, 51, 78}, {-85, X2, 79, 101},
+ {-80, X3, 102, 128}, {-75, X2, 129, 151}, {-70, X3, 152, 178}, {-65, X2, 179, 201}},
+ {{-60, X3, 1, 27}, {-55, X2, 28, 50}, {-50, X4, 51, 78}, {-45, X2, 79, 101},
+ {-40, X3, 102, 128}, {-35, X2, 129, 151}, {-30, X3, 152, 178}, {-25, X2, 179, 201}},
+ {{-20, X3, 1, 27}, {-15, X2, 28, 50}, {-10, X3, 51, 77}, {-5, X2, 78, 100},
+ {0, X1, 101, 128}, {5, X2, 129, 151}, {10, X3, 152, 178}, {15, X2, 179, 201}},
+ {{20, X3, 1, 27}, {25, X2, 28, 50}, {30, X3, 51, 77}, {35, X2, 78, 100},
+ {40, X4, 101, 128}, {45, X2, 129, 151}, {50, X3, 152, 178}, {55, X2, 179, 201}},
+ {{60, X3, 1, 27}, {65, X2, 28, 50}, {70, X3, 51, 77}, {75, X2, 78, 100},
+ {80, X3, 101, 127}, {85, X2, 128, 150}, {90, X1, 151, 178}, {95, X2, 179, 201}},
+ {{100, X3, 1, 27}, {105, X2, 28, 50}, {110, X3, 51, 77}, {115, X2, 78, 100},
+ {120, X3, 101, 127}, {125, X2, 128, 150}, {130, X4, 151, 178}, {135, X2, 179, 201}},
+ {{140, X3, 1, 27}, {145, X2, 28, 50}, {150, X3, 51, 77}, {155, X2, 78, 100},
+ {160, X3, 101, 127}, {165, X2, 128, 150}, {170, X3, 151, 177}, {175, X2, 178, 200}}};
+const sbsigpband_t IGPBAND2[2][5] = {/* band 9-10 */
+ {{60, X5, 1, 72}, {65, X6, 73, 108}, {70, X6, 109, 144}, {75, X6, 145, 180},
+ {85, X7, 181, 192}},
+ {{-60, X5, 1, 72}, {-65, X6, 73, 108}, {-70, X6, 109, 144}, {-75, X6, 145, 180},
+ {-85, X8, 181, 192}}};
char *getfield(char *p, int pos);
diff --git a/src/algorithms/libs/rtklib/rtklib_solution.cc b/src/algorithms/libs/rtklib/rtklib_solution.cc
index 96ba51b1e..ab7c6a72e 100644
--- a/src/algorithms/libs/rtklib/rtklib_solution.cc
+++ b/src/algorithms/libs/rtklib/rtklib_solution.cc
@@ -67,7 +67,7 @@ const int MAXFIELD = 64; /* max number of fields in a record */
const double KNOT2M = 0.514444444; /* m/knot */
-static const int solq_nmea[] = {/* nmea quality flags to rtklib sol quality */
+static const int SOLQ_NMEA[] = {/* nmea quality flags to rtklib sol quality */
/* nmea 0183 v.2.3 quality flags: */
/* 0=invalid, 1=gps fix (sps), 2=dgps fix, 3=pps fix, 4=rtk, 5=float rtk */
/* 6=estimated (dead reckoning), 7=manual input, 8=simulation */
@@ -326,7 +326,7 @@ int decode_nmeagga(char **val, int n, sol_t *sol)
sol->time = time;
}
pos2ecef(pos, sol->rr);
- sol->stat = 0 <= solq && solq <= 8 ? solq_nmea[solq] : SOLQ_NONE;
+ sol->stat = 0 <= solq && solq <= 8 ? SOLQ_NMEA[solq] : SOLQ_NONE;
sol->ns = nrcv;
sol->type = 0; /* position type = xyz */
@@ -1005,7 +1005,7 @@ int readsolt(char *files[], int nfile, gtime_t ts, gtime_t te,
double tint, int qflag, solbuf_t *solbuf)
{
FILE *fp;
- solopt_t opt = solopt_default;
+ solopt_t opt = SOLOPT_DEFAULT;
int i;
trace(3, "readsolt: nfile=%d\n", nfile);
@@ -1537,7 +1537,7 @@ int outnmea_gga(unsigned char *buff, const sol_t *sol)
}
for (solq = 0; solq < 8; solq++)
{
- if (solq_nmea[solq] == sol->stat)
+ if (SOLQ_NMEA[solq] == sol->stat)
{
break;
}
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index f90982965..429931dd0 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -482,9 +482,9 @@ void hybrid_observables_cc::compute_pranges(std::vector<Gnss_Synchro> &data)
{
if (it->Flag_valid_word)
{
- double traveltime_s = (static_cast<double>(T_rx_TOW_ms) - it->interp_TOW_ms + GPS_STARTOFFSET_ms) / 1000.0;
+ double traveltime_s = (static_cast<double>(T_rx_TOW_ms) - it->interp_TOW_ms + GPS_STARTOFFSET_MS) / 1000.0;
//todo: check what happens during the week rollover (TOW rollover at 604800000s)
- it->RX_time = (static_cast<double>(T_rx_TOW_ms) + GPS_STARTOFFSET_ms) / 1000.0;
+ it->RX_time = (static_cast<double>(T_rx_TOW_ms) + GPS_STARTOFFSET_MS) / 1000.0;
it->Pseudorange_m = traveltime_s * SPEED_OF_LIGHT;
it->Flag_valid_pseudorange = true;
// debug code
diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc
index 91536357a..8a4d5ab8e 100644
--- a/src/algorithms/signal_generator/adapters/signal_generator.cc
+++ b/src/algorithms/signal_generator/adapters/signal_generator.cc
@@ -90,11 +90,11 @@ SignalGenerator::SignalGenerator(ConfigurationInterface* configuration,
{
if (signal1[0].at(0) == '5')
{
- vector_length = round(static_cast<float>(fs_in) / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS));
+ vector_length = round(static_cast<float>(fs_in) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS));
}
else
{
- vector_length = round(static_cast<float>(fs_in) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)) * Galileo_E1_C_SECONDARY_CODE_LENGTH;
+ vector_length = round(static_cast<float>(fs_in) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)) * GALILEO_E1_C_SECONDARY_CODE_LENGTH;
}
}
else if (std::find(system.begin(), system.end(), "G") != system.end())
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 84a90d555..37c3ca36f 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -107,39 +107,39 @@ void signal_generator_c::init()
current_data_bit_int_.push_back(1);
current_data_bits_.emplace_back(1, 0);
ms_counter_.push_back(0);
- data_modulation_.push_back((Galileo_E5a_I_SECONDARY_CODE.at(0) == '0' ? 1 : -1));
- pilot_modulation_.push_back((Galileo_E5a_Q_SECONDARY_CODE[PRN_[sat]].at(0) == '0' ? 1 : -1));
+ data_modulation_.push_back((GALILEO_E5A_I_SECONDARY_CODE.at(0) == '0' ? 1 : -1));
+ pilot_modulation_.push_back((GALILEO_E5A_Q_SECONDARY_CODE[PRN_[sat]].at(0) == '0' ? 1 : -1));
if (system_[sat] == "G")
{
samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)));
- num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(Galileo_E1_C_SECONDARY_CODE_LENGTH) : 1);
+ num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(GALILEO_E1_C_SECONDARY_CODE_LENGTH) : 1);
data_bit_duration_ms_.push_back(1e3 / GPS_CA_TELEMETRY_RATE_BITS_SECOND);
}
else if (system_[sat] == "R")
{
samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GLONASS_L1_CA_CODE_RATE_HZ / GLONASS_L1_CA_CODE_LENGTH_CHIPS)));
- num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(Galileo_E1_C_SECONDARY_CODE_LENGTH) : 1);
+ num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(GALILEO_E1_C_SECONDARY_CODE_LENGTH) : 1);
data_bit_duration_ms_.push_back(1e3 / GLONASS_GNAV_TELEMETRY_RATE_BITS_SECOND);
}
else if (system_[sat] == "E")
{
if (signal_[sat].at(0) == '5')
{
- int codelen = static_cast<int>(Galileo_E5a_CODE_LENGTH_CHIPS);
- samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (Galileo_E5a_CODE_CHIP_RATE_HZ / codelen)));
+ int codelen = static_cast<int>(GALILEO_E5A_CODE_LENGTH_CHIPS);
+ samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / codelen)));
num_of_codes_per_vector_.push_back(1);
- data_bit_duration_ms_.push_back(1e3 / Galileo_E5a_SYMBOL_RATE_BPS);
+ data_bit_duration_ms_.push_back(1e3 / GALILEO_E5A_SYMBOL_RATE_BPS);
}
else
{
- samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+ samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
- num_of_codes_per_vector_.push_back(static_cast<int>(Galileo_E1_C_SECONDARY_CODE_LENGTH));
- data_bit_duration_ms_.push_back(1e3 / Galileo_E1_B_SYMBOL_RATE_BPS);
+ num_of_codes_per_vector_.push_back(static_cast<int>(GALILEO_E1_C_SECONDARY_CODE_LENGTH));
+ data_bit_duration_ms_.push_back(1e3 / GALILEO_E1_B_SYMBOL_RATE_BPS);
}
}
}
@@ -212,7 +212,7 @@ void signal_generator_c::generate_codes()
strcpy(signal, "5X");
galileo_e5_a_code_gen_complex_sampled(sampled_code_data_[sat], signal, PRN_[sat], fs_in_,
- static_cast<int>(Galileo_E5a_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
+ static_cast<int>(GALILEO_E5A_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
//noise
if (noise_flag_)
{
@@ -230,7 +230,7 @@ void signal_generator_c::generate_codes()
strcpy(signal, "1B");
galileo_e1_code_gen_complex_sampled(code, signal, cboc, PRN_[sat], fs_in_,
- static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
+ static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
// Obtain the desired CN0 assuming that Pn = 1.
if (noise_flag_)
@@ -254,7 +254,7 @@ void signal_generator_c::generate_codes()
strcpy(signal, "1C");
galileo_e1_code_gen_complex_sampled(sampled_code_pilot_[sat], signal, cboc, PRN_[sat], fs_in_,
- static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat], true);
+ static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat], true);
// Obtain the desired CN0 assuming that Pn = 1.
if (noise_flag_)
@@ -380,7 +380,7 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
if (signal_[sat].at(0) == '5')
{
// EACH WORK outputs 1 modulated primary code
- int codelen = static_cast<int>(Galileo_E5a_CODE_LENGTH_CHIPS);
+ int codelen = static_cast<int>(GALILEO_E5A_CODE_LENGTH_CHIPS);
unsigned int delay_samples = (delay_chips_[sat] % codelen) * samples_per_code_[sat] / codelen;
for (k = 0; k < delay_samples; k++)
{
@@ -395,10 +395,10 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
// New random data bit
current_data_bit_int_[sat] = (uniform_dist(e1) % 2) == 0 ? 1 : -1;
}
- data_modulation_[sat] = current_data_bit_int_[sat] * (Galileo_E5a_I_SECONDARY_CODE.at((ms_counter_[sat] + delay_sec_[sat]) % 20) == '0' ? 1 : -1);
- pilot_modulation_[sat] = (Galileo_E5a_Q_SECONDARY_CODE[PRN_[sat] - 1].at((ms_counter_[sat] + delay_sec_[sat]) % 100) == '0' ? 1 : -1);
+ data_modulation_[sat] = current_data_bit_int_[sat] * (GALILEO_E5A_I_SECONDARY_CODE.at((ms_counter_[sat] + delay_sec_[sat]) % 20) == '0' ? 1 : -1);
+ pilot_modulation_[sat] = (GALILEO_E5A_Q_SECONDARY_CODE[PRN_[sat] - 1].at((ms_counter_[sat] + delay_sec_[sat]) % 100) == '0' ? 1 : -1);
- ms_counter_[sat] = ms_counter_[sat] + static_cast<int>(round(1e3 * GALILEO_E5a_CODE_PERIOD));
+ ms_counter_[sat] = ms_counter_[sat] + static_cast<int>(round(1e3 * GALILEO_E5A_CODE_PERIOD));
for (k = delay_samples; k < samples_per_code_[sat]; k++)
{
@@ -410,7 +410,7 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
}
else
{
- unsigned int delay_samples = (delay_chips_[sat] % static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * samples_per_code_[sat] / Galileo_E1_B_CODE_LENGTH_CHIPS;
+ unsigned int delay_samples = (delay_chips_[sat] % static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * samples_per_code_[sat] / GALILEO_E1_B_CODE_LENGTH_CHIPS;
for (i = 0; i < num_of_codes_per_vector_[sat]; i++)
{
@@ -432,7 +432,7 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
out_idx++;
}
- ms_counter_[sat] = (ms_counter_[sat] + static_cast<int>(round(1e3 * Galileo_E1_CODE_PERIOD))) % data_bit_duration_ms_[sat];
+ ms_counter_[sat] = (ms_counter_[sat] + static_cast<int>(round(1e3 * GALILEO_E1_CODE_PERIOD))) % data_bit_duration_ms_[sat];
}
}
}
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
index 5e40880a5..5450a4377 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
@@ -222,7 +222,7 @@ void rtl_tcp_signal_source_c::set_if_gain(int gain)
{
double start, stop, step;
};
- if (info_.get_tuner_type() != rtl_tcp_dongle_info::TUNER_E4000)
+ if (info_.get_tuner_type() != Rtl_Tcp_Dongle_Info::TUNER_E4000)
{
return;
}
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
index d685b26a1..2edbf9db0 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
@@ -88,7 +88,7 @@ private:
int16_t port,
bool flip_iq);
- rtl_tcp_dongle_info info_;
+ Rtl_Tcp_Dongle_Info info_;
// IO members
boost::asio::io_service io_service_;
diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
index 992507cd7..5e0d6f4cd 100644
--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
@@ -39,7 +39,7 @@
#include <cstring> // for memcpy
#include <utility>
-gnss_sdr_valve::gnss_sdr_valve(size_t sizeof_stream_item,
+Gnss_Sdr_Valve::Gnss_Sdr_Valve(size_t sizeof_stream_item,
uint64_t nitems,
gr::msg_queue::sptr queue,
bool stop_flowgraph) : gr::sync_block("valve",
@@ -56,25 +56,25 @@ gnss_sdr_valve::gnss_sdr_valve(size_t sizeof_stream_item,
boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, gr::msg_queue::sptr queue, bool stop_flowgraph)
{
- boost::shared_ptr<gnss_sdr_valve> valve_(new gnss_sdr_valve(sizeof_stream_item, nitems, std::move(queue), stop_flowgraph));
+ boost::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), stop_flowgraph));
return valve_;
}
boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, gr::msg_queue::sptr queue)
{
- boost::shared_ptr<gnss_sdr_valve> valve_(new gnss_sdr_valve(sizeof_stream_item, nitems, std::move(queue), true));
+ boost::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), true));
return valve_;
}
-void gnss_sdr_valve::open_valve()
+void Gnss_Sdr_Valve::open_valve()
{
d_open_valve = true;
}
-int gnss_sdr_valve::work(int noutput_items,
+int Gnss_Sdr_Valve::work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.h b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
index 19c104b99..16a141cd4 100644
--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.h
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
@@ -52,7 +52,7 @@ boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
* \brief Implementation of a GNU Radio block that sends a STOP message to the
* control queue right after a specific number of samples have passed through it.
*/
-class gnss_sdr_valve : public gr::sync_block
+class Gnss_Sdr_Valve : public gr::sync_block
{
friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
uint64_t nitems,
@@ -69,7 +69,7 @@ class gnss_sdr_valve : public gr::sync_block
bool d_open_valve;
public:
- gnss_sdr_valve(size_t sizeof_stream_item,
+ Gnss_Sdr_Valve(size_t sizeof_stream_item,
uint64_t nitems,
gr::msg_queue::sptr queue, bool stop_flowgraph);
void open_valve();
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
index c359b6d35..09abb26db 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
@@ -37,13 +37,13 @@
using boost::asio::ip::tcp;
-rtl_tcp_dongle_info::rtl_tcp_dongle_info() : tuner_type_(0), tuner_gain_count_(0)
+Rtl_Tcp_Dongle_Info::Rtl_Tcp_Dongle_Info() : tuner_type_(0), tuner_gain_count_(0)
{
std::memset(magic_, 0, sizeof(magic_));
}
-boost::system::error_code rtl_tcp_dongle_info::read(boost::asio::ip::tcp::socket &socket)
+boost::system::error_code Rtl_Tcp_Dongle_Info::read(boost::asio::ip::tcp::socket &socket)
{
boost::system::error_code ec;
@@ -67,7 +67,7 @@ boost::system::error_code rtl_tcp_dongle_info::read(boost::asio::ip::tcp::socket
}
-const char *rtl_tcp_dongle_info::get_type_name() const
+const char *Rtl_Tcp_Dongle_Info::get_type_name() const
{
switch (get_tuner_type())
{
@@ -89,7 +89,7 @@ const char *rtl_tcp_dongle_info::get_type_name() const
}
-double rtl_tcp_dongle_info::clip_gain(int gain) const
+double Rtl_Tcp_Dongle_Info::clip_gain(int gain) const
{
// the following gain values have been copied from librtlsdr
// all gain values are expressed in tenths of a dB
@@ -146,7 +146,7 @@ double rtl_tcp_dongle_info::clip_gain(int gain) const
}
-bool rtl_tcp_dongle_info::is_valid() const
+bool Rtl_Tcp_Dongle_Info::is_valid() const
{
return std::memcmp(magic_, "RTL0", 4) == 0;
}
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
index 983b94a29..e7ac9eb94 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
@@ -39,7 +39,7 @@
* \brief This class represents the dongle information
* which is sent by rtl_tcp.
*/
-class rtl_tcp_dongle_info
+class Rtl_Tcp_Dongle_Info
{
private:
char magic_[4]{};
@@ -58,7 +58,7 @@ public:
TUNER_R828D
};
- rtl_tcp_dongle_info();
+ Rtl_Tcp_Dongle_Info();
boost::system::error_code read(boost::asio::ip::tcp::socket &socket);
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
index bece79c18..cf794ca49 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
@@ -88,8 +88,8 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
{
case 1: // INAV
{
- d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E1_CODE_PERIOD_MS);
- d_samples_per_symbol = Galileo_E1_B_SAMPLES_PER_SYMBOL;
+ d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS);
+ d_samples_per_symbol = GALILEO_E1_B_SAMPLES_PER_SYMBOL;
d_bits_per_preamble = GALILEO_INAV_PREAMBLE_LENGTH_BITS;
// set the preamble
d_samples_per_preamble = GALILEO_INAV_PREAMBLE_LENGTH_BITS * d_samples_per_symbol;
@@ -105,7 +105,7 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
}
case 2: // FNAV
{
- d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E5a_CODE_PERIOD_MS);
+ d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS);
d_samples_per_symbol = GALILEO_FNAV_CODES_PER_SYMBOL;
d_bits_per_preamble = GALILEO_FNAV_PREAMBLE_LENGTH_BITS;
// set the preamble
@@ -114,13 +114,13 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
d_required_symbols = static_cast<uint32_t>(GALILEO_FNAV_SYMBOLS_PER_PAGE) * d_samples_per_symbol + d_samples_per_preamble;
// preamble bits to sampled symbols
d_preamble_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(d_samples_per_preamble * sizeof(int32_t), volk_gnsssdr_get_alignment()));
- d_secondary_code_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(Galileo_E5a_I_SECONDARY_CODE_LENGTH * sizeof(int32_t), volk_gnsssdr_get_alignment()));
+ d_secondary_code_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(GALILEO_E5A_I_SECONDARY_CODE_LENGTH * sizeof(int32_t), volk_gnsssdr_get_alignment()));
d_frame_length_symbols = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS;
CodeLength = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS;
DataLength = (CodeLength / nn) - mm;
- for (int32_t i = 0; i < Galileo_E5a_I_SECONDARY_CODE_LENGTH; i++)
+ for (int32_t i = 0; i < GALILEO_E5A_I_SECONDARY_CODE_LENGTH; i++)
{
- if (Galileo_E5a_I_SECONDARY_CODE.at(i) == '1')
+ if (GALILEO_E5A_I_SECONDARY_CODE.at(i) == '1')
{
d_secondary_code_samples[i] = 1;
}
@@ -183,7 +183,7 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
d_preamble_samples[n] = d_secondary_code_samples[m];
n++;
m++;
- m = m % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+ m = m % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
}
}
else
@@ -193,7 +193,7 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
d_preamble_samples[n] = -d_secondary_code_samples[m];
n++;
m++;
- m = m % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+ m = m % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
}
}
break;
@@ -563,7 +563,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
{
d_page_part_symbols[i] += static_cast<float>(d_secondary_code_samples[k]) * d_symbol_history.at(i * d_samples_per_symbol + d_samples_per_preamble + m); // because last symbol of the preamble is just received now!
k++;
- k = k % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+ k = k % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
}
}
}
@@ -577,7 +577,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
{
d_page_part_symbols[i] -= static_cast<float>(d_secondary_code_samples[k]) * d_symbol_history.at(i * d_samples_per_symbol + d_samples_per_preamble + m); // because last symbol of the preamble is just received now!
k++;
- k = k % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+ k = k % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
}
}
}
@@ -634,7 +634,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
{
// TOW_5 refers to the even preamble, but when we decode it we are in the odd part, so 1 second later plus the decoding delay
d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_inav_nav.TOW_5 * 1000.0);
- d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E1_CODE_PERIOD_MS);
+ d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
d_inav_nav.flag_TOW_5 = false;
}
@@ -642,13 +642,13 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
{
// TOW_6 refers to the even preamble, but when we decode it we are in the odd part, so 1 second later plus the decoding delay
d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_inav_nav.TOW_6 * 1000.0);
- d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E1_CODE_PERIOD_MS);
+ d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
d_inav_nav.flag_TOW_6 = false;
}
else
{
// this page has no timing information
- d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E1_CODE_PERIOD_MS); // + GALILEO_INAV_PAGE_PART_SYMBOLS*GALILEO_E1_CODE_PERIOD;
+ d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS); // + GALILEO_INAV_PAGE_PART_SYMBOLS*GALILEO_E1_CODE_PERIOD;
}
}
break;
@@ -660,7 +660,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
if (d_fnav_nav.flag_TOW_1 == true)
{
d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_1 * 1000.0);
- d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+ d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
//d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
d_fnav_nav.flag_TOW_1 = false;
}
@@ -668,26 +668,26 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
{
d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_2 * 1000.0);
//d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
- d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+ d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
d_fnav_nav.flag_TOW_2 = false;
}
else if (d_fnav_nav.flag_TOW_3 == true)
{
d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_3 * 1000.0);
//d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
- d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+ d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
d_fnav_nav.flag_TOW_3 = false;
}
else if (d_fnav_nav.flag_TOW_4 == true)
{
d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_4 * 1000.0);
//d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
- d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+ d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
d_fnav_nav.flag_TOW_4 = false;
}
else
{
- d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E5a_CODE_PERIOD_MS);
+ d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS);
}
break;
}
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
index 76e64eaaf..a0b54b74d 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
@@ -68,9 +68,9 @@ gps_l5_telemetry_decoder_cc::gps_l5_telemetry_decoder_cc(
d_TOW_at_Preamble_ms = 0U;
// initialize the CNAV frame decoder (libswiftcnav)
cnav_msg_decoder_init(&d_cnav_decoder);
- for (int32_t aux = 0; aux < GPS_L5i_NH_CODE_LENGTH; aux++)
+ for (int32_t aux = 0; aux < GPS_L5I_NH_CODE_LENGTH; aux++)
{
- if (GPS_L5i_NH_CODE[aux] == 0)
+ if (GPS_L5I_NH_CODE[aux] == 0)
{
bits_NH[aux] = -1.0;
}
@@ -154,9 +154,9 @@ int gps_l5_telemetry_decoder_cc::general_work(int noutput_items __attribute__((u
int32_t symbol_value = 0;
// Search correlation with Neuman-Hofman Code (see IS-GPS-705D)
- if (sym_hist.size() == GPS_L5i_NH_CODE_LENGTH)
+ if (sym_hist.size() == GPS_L5I_NH_CODE_LENGTH)
{
- for (int32_t i = 0; i < GPS_L5i_NH_CODE_LENGTH; i++)
+ for (int32_t i = 0; i < GPS_L5I_NH_CODE_LENGTH; i++)
{
if ((bits_NH[i] * sym_hist.at(i)) > 0.0)
{
@@ -167,7 +167,7 @@ int gps_l5_telemetry_decoder_cc::general_work(int noutput_items __attribute__((u
corr_NH -= 1;
}
}
- if (abs(corr_NH) == GPS_L5i_NH_CODE_LENGTH)
+ if (abs(corr_NH) == GPS_L5I_NH_CODE_LENGTH)
{
sync_NH = true;
if (corr_NH > 0)
@@ -241,12 +241,12 @@ int gps_l5_telemetry_decoder_cc::general_work(int noutput_items __attribute__((u
// delay by the formulae:
// \code
// symbolTime_ms = msg->tow * 6000 + *pdelay * 10 + (12 * 10); 12 symbols of the encoder's transitory
- d_TOW_at_current_symbol_ms = msg.tow * 6000 + (delay + 12) * GPS_L5i_SYMBOL_PERIOD_MS;
+ d_TOW_at_current_symbol_ms = msg.tow * 6000 + (delay + 12) * GPS_L5I_SYMBOL_PERIOD_MS;
d_flag_valid_word = true;
}
else
{
- d_TOW_at_current_symbol_ms += GPS_L5i_PERIOD_MS;
+ d_TOW_at_current_symbol_ms += GPS_L5I_PERIOD_MS;
if (current_synchro_data.Flag_valid_symbol_output == false)
{
d_flag_valid_word = false;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
index 2414343ee..d28e8b58f 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
@@ -90,7 +90,7 @@ private:
bool d_flag_valid_word;
Gps_CNAV_Navigation_Message d_CNAV_Message;
- double bits_NH[GPS_L5i_NH_CODE_LENGTH]{};
+ double bits_NH[GPS_L5I_NH_CODE_LENGTH]{};
std::deque<double> sym_hist;
bool sync_NH;
bool new_sym;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
index 552a0f398..8a3628cbd 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
@@ -64,7 +64,7 @@ sbas_l1_telemetry_decoder_cc::sbas_l1_telemetry_decoder_cc(
d_dump = dump;
d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
LOG(INFO) << "SBAS L1 TELEMETRY PROCESSING: satellite " << d_satellite;
- d_block_size = d_samples_per_symbol * d_symbols_per_bit * d_block_size_in_bits;
+ d_block_size = D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * D_BLOCK_SIZE_IN_BITS;
d_channel = 0;
set_output_multiple(1);
}
@@ -101,7 +101,7 @@ void sbas_l1_telemetry_decoder_cc::set_channel(int32_t channel)
// ### helper class for sample alignment ###
-sbas_l1_telemetry_decoder_cc::sample_aligner::sample_aligner()
+sbas_l1_telemetry_decoder_cc::Sample_Aligner::Sample_Aligner()
{
d_n_smpls_in_history = 3;
d_iir_par = 0.05;
@@ -109,10 +109,10 @@ sbas_l1_telemetry_decoder_cc::sample_aligner::sample_aligner()
}
-sbas_l1_telemetry_decoder_cc::sample_aligner::~sample_aligner() = default;
+sbas_l1_telemetry_decoder_cc::Sample_Aligner::~Sample_Aligner() = default;
-void sbas_l1_telemetry_decoder_cc::sample_aligner::reset()
+void sbas_l1_telemetry_decoder_cc::Sample_Aligner::reset()
{
d_past_sample = 0;
d_corr_paired = 0;
@@ -124,7 +124,7 @@ void sbas_l1_telemetry_decoder_cc::sample_aligner::reset()
/*
* samples length must be a multiple of two
*/
-bool sbas_l1_telemetry_decoder_cc::sample_aligner::get_symbols(const std::vector<double> &samples, std::vector<double> &symbols)
+bool sbas_l1_telemetry_decoder_cc::Sample_Aligner::get_symbols(const std::vector<double> &samples, std::vector<double> &symbols)
{
double smpls[3] = {};
double corr_diff;
@@ -134,12 +134,12 @@ bool sbas_l1_telemetry_decoder_cc::sample_aligner::get_symbols(const std::vector
VLOG(FLOW) << "get_symbols(): "
<< "d_past_sample=" << d_past_sample << "\tsamples size=" << samples.size();
- for (uint32_t i_sym = 0; i_sym < samples.size() / sbas_l1_telemetry_decoder_cc::d_samples_per_symbol; i_sym++)
+ for (uint32_t i_sym = 0; i_sym < samples.size() / sbas_l1_telemetry_decoder_cc::D_SAMPLES_PER_SYMBOL; i_sym++)
{
// get the next samples
for (int32_t i = 0; i < d_n_smpls_in_history; i++)
{
- smpls[i] = static_cast<int32_t>(i_sym) * sbas_l1_telemetry_decoder_cc::d_samples_per_symbol + i - 1 == -1 ? d_past_sample : samples[i_sym * sbas_l1_telemetry_decoder_cc::d_samples_per_symbol + i - 1];
+ smpls[i] = static_cast<int32_t>(i_sym) * sbas_l1_telemetry_decoder_cc::D_SAMPLES_PER_SYMBOL + i - 1 == -1 ? d_past_sample : samples[i_sym * sbas_l1_telemetry_decoder_cc::D_SAMPLES_PER_SYMBOL + i - 1];
}
// update the pseudo correlations (IIR method) of the two possible alignments
@@ -182,7 +182,7 @@ bool sbas_l1_telemetry_decoder_cc::sample_aligner::get_symbols(const std::vector
// ### helper class for symbol alignment and viterbi decoding ###
-sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::symbol_aligner_and_decoder()
+sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::Symbol_Aligner_And_Decoder()
{
// convolutional code properties
d_KK = 7;
@@ -197,14 +197,14 @@ sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::symbol_aligner_and_dec
}
-sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::~symbol_aligner_and_decoder()
+sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::~Symbol_Aligner_And_Decoder()
{
delete d_vd1;
delete d_vd2;
}
-void sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::reset()
+void sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::reset()
{
d_past_symbol = 0;
d_vd1->reset();
@@ -212,10 +212,10 @@ void sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::reset()
}
-bool sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::get_bits(const std::vector<double> &symbols, std::vector<int32_t> &bits)
+bool sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::get_bits(const std::vector<double> &symbols, std::vector<int32_t> &bits)
{
const int32_t traceback_depth = 5 * d_KK;
- int32_t nbits_requested = symbols.size() / d_symbols_per_bit;
+ int32_t nbits_requested = symbols.size() / D_SYMBOLS_PER_BIT;
int32_t nbits_decoded;
// fill two vectors with the two possible symbol alignments
std::vector<double> symbols_vd1(symbols); // aligned symbol vector -> copy input symbol vector
@@ -251,13 +251,13 @@ bool sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::get_bits(const st
// ### helper class for detecting the preamble and collect the corresponding message candidates ###
-void sbas_l1_telemetry_decoder_cc::frame_detector::reset()
+void sbas_l1_telemetry_decoder_cc::Frame_Detector::reset()
{
d_buffer.clear();
}
-void sbas_l1_telemetry_decoder_cc::frame_detector::get_frame_candidates(const std::vector<int32_t> &bits, std::vector<std::pair<int32_t, std::vector<int32_t>>> &msg_candidates)
+void sbas_l1_telemetry_decoder_cc::Frame_Detector::get_frame_candidates(const std::vector<int32_t> &bits, std::vector<std::pair<int32_t, std::vector<int32_t>>> &msg_candidates)
{
std::stringstream ss;
uint32_t sbas_msg_length = 250;
@@ -321,12 +321,12 @@ void sbas_l1_telemetry_decoder_cc::frame_detector::get_frame_candidates(const st
// ### helper class for checking the CRC of the message candidates ###
-void sbas_l1_telemetry_decoder_cc::crc_verifier::reset()
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::reset()
{
}
-void sbas_l1_telemetry_decoder_cc::crc_verifier::get_valid_frames(const std::vector<msg_candiate_int_t> &msg_candidates, std::vector<msg_candiate_char_t> &valid_msgs)
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::get_valid_frames(const std::vector<msg_candiate_int_t> &msg_candidates, std::vector<msg_candiate_char_t> &valid_msgs)
{
std::stringstream ss;
VLOG(FLOW) << "get_valid_frames(): "
@@ -364,7 +364,7 @@ void sbas_l1_telemetry_decoder_cc::crc_verifier::get_valid_frames(const std::vec
}
-void sbas_l1_telemetry_decoder_cc::crc_verifier::zerropad_back_and_convert_to_bytes(const std::vector<int> &msg_candidate, std::vector<uint8_t> &bytes)
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::zerropad_back_and_convert_to_bytes(const std::vector<int> &msg_candidate, std::vector<uint8_t> &bytes)
{
std::stringstream ss;
const size_t bits_per_byte = 8;
@@ -391,7 +391,7 @@ void sbas_l1_telemetry_decoder_cc::crc_verifier::zerropad_back_and_convert_to_by
}
-void sbas_l1_telemetry_decoder_cc::crc_verifier::zerropad_front_and_convert_to_bytes(const std::vector<int32_t> &msg_candidate, std::vector<uint8_t> &bytes)
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::zerropad_front_and_convert_to_bytes(const std::vector<int32_t> &msg_candidate, std::vector<uint8_t> &bytes)
{
std::stringstream ss;
const size_t bits_per_byte = 8;
@@ -466,7 +466,7 @@ int sbas_l1_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
for (const auto &valid_msg : valid_msgs)
{
int32_t message_sample_offset =
- (sample_alignment ? 0 : -1) + d_samples_per_symbol * (symbol_alignment ? -1 : 0) + d_samples_per_symbol * d_symbols_per_bit * valid_msg.first;
+ (sample_alignment ? 0 : -1) + D_SAMPLES_PER_SYMBOL * (symbol_alignment ? -1 : 0) + D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * valid_msg.first;
double message_sample_stamp = sample_stamp + static_cast<double>(message_sample_offset) / 1000.0;
VLOG(EVENT) << "message_sample_stamp=" << message_sample_stamp
<< " (sample_stamp=" << sample_stamp
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
index c1956d5e4..f1188737b 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
@@ -76,9 +76,9 @@ private:
void viterbi_decoder(double *page_part_symbols, int32_t *page_part_bits);
void align_samples();
- static const int32_t d_samples_per_symbol = 2;
- static const int32_t d_symbols_per_bit = 2;
- static const int32_t d_block_size_in_bits = 30;
+ static const int32_t D_SAMPLES_PER_SYMBOL = 2;
+ static const int32_t D_SYMBOLS_PER_BIT = 2;
+ static const int32_t D_BLOCK_SIZE_IN_BITS = 30;
bool d_dump;
Gnss_Satellite d_satellite;
@@ -94,11 +94,11 @@ private:
typedef std::pair<int32_t, std::vector<uint8_t>> msg_candiate_char_t;
// helper class for sample alignment
- class sample_aligner
+ class Sample_Aligner
{
public:
- sample_aligner();
- ~sample_aligner();
+ Sample_Aligner();
+ ~Sample_Aligner();
void reset();
/*
* samples length must be a multiple of two
@@ -116,11 +116,11 @@ private:
} d_sample_aligner;
// helper class for symbol alignment and Viterbi decoding
- class symbol_aligner_and_decoder
+ class Symbol_Aligner_And_Decoder
{
public:
- symbol_aligner_and_decoder();
- ~symbol_aligner_and_decoder();
+ Symbol_Aligner_And_Decoder();
+ ~Symbol_Aligner_And_Decoder();
void reset();
bool get_bits(const std::vector<double> &symbols, std::vector<int32_t> &bits);
@@ -133,7 +133,7 @@ private:
// helper class for detecting the preamble and collect the corresponding message candidates
- class frame_detector
+ class Frame_Detector
{
public:
void reset();
@@ -145,7 +145,7 @@ private:
// helper class for checking the CRC of the message candidates
- class crc_verifier
+ class Crc_Verifier
{
public:
void reset();
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
index 207c7fb94..acfe434ff 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
@@ -34,7 +34,7 @@
#include <string.h>
-static const u8 bitn[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
+static const u8 BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
/** \defgroup bits Bit Utils
* Bit field packing, unpacking and utility functions.
@@ -249,7 +249,7 @@ u8 count_bits_u64(u64 v, u8 bv)
int i = 0;
for (i = 0; i < 16; i++)
{
- r += bitn[(v >> (i * 4)) & 0xf];
+ r += BITN[(v >> (i * 4)) & 0xf];
}
return bv == 1 ? r : 64 - r;
}
@@ -268,7 +268,7 @@ u8 count_bits_u32(u32 v, u8 bv)
int i = 0;
for (i = 0; i < 8; i++)
{
- r += bitn[(v >> (i * 4)) & 0xf];
+ r += BITN[(v >> (i * 4)) & 0xf];
}
return bv == 1 ? r : 32 - r;
}
@@ -287,7 +287,7 @@ u8 count_bits_u16(u16 v, u8 bv)
int i = 0;
for (i = 0; i < 4; i++)
{
- r += bitn[(v >> (i * 4)) & 0xf];
+ r += BITN[(v >> (i * 4)) & 0xf];
}
return bv == 1 ? r : 16 - r;
}
@@ -306,7 +306,7 @@ u8 count_bits_u8(u8 v, u8 bv)
int i = 0;
for (i = 0; i < 2; i++)
{
- r += bitn[(v >> (i * 4)) & 0xf];
+ r += BITN[(v >> (i * 4)) & 0xf];
}
return bv == 1 ? r : 8 - r;
}
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
index b5f3623a2..27b669932 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
@@ -39,7 +39,7 @@
* Cyclic redundancy checks.
* \{ */
-static const u32 crc24qtab[256] = {
+static const u32 CRC24QTAB[256] = {
0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
@@ -93,7 +93,7 @@ u32 crc24q(const u8 *buf, u32 len, u32 crc)
u32 i = 0;
for (i = 0; i < len; i++)
{
- crc = ((crc << 8) & 0xFFFFFF) ^ crc24qtab[((crc >> 16) ^ buf[i]) & 0xff];
+ crc = ((crc << 8) & 0xFFFFFF) ^ CRC24QTAB[((crc >> 16) ^ buf[i]) & 0xff];
}
return crc;
}
@@ -128,7 +128,7 @@ u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert)
acc ^= 0xFFu;
}
b = (acc >> shift) & 0xFFu;
- crc = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
+ crc = ((crc << 8) & 0xFFFFFFu) ^ CRC24QTAB[((crc >> 16) ^ b) & 0xFFu];
}
acc = (acc << 8) | *buf;
if (invert)
@@ -136,7 +136,7 @@ u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert)
acc ^= 0xFFu;
}
b = (acc >> shift) & 0xFFu;
- crc = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
+ crc = ((crc << 8) & 0xFFFFFFu) ^ CRC24QTAB[((crc >> 16) ^ b) & 0xFFu];
return crc;
}
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
index 4912bd093..6c2bc02d0 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@@ -117,7 +117,7 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
}
trk_param.track_pilot = track_pilot;
trk_param.extend_correlation_symbols = extend_correlation_symbols;
- int vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+ int vector_length = std::round(fs_in / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
trk_param.vector_length = vector_length;
trk_param.system = 'E';
char sig_[3] = "1B";
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
index 358e952c9..be3a99f0c 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -82,7 +82,7 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
port_ch0 = configuration->property(role + ".port_ch0", 2060);
std::string default_dump_filename = "./track_ch";
dump_filename = configuration->property(role + ".dump_filename", default_dump_filename);
- vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+ vector_length = std::round(fs_in / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
//################# MAKE TRACKING GNURadio object ###################
if (item_type == "gr_complex")
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
index 78a497755..8e5fe8314 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
@@ -93,7 +93,7 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz;
float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
trk_param.early_late_space_chips = early_late_space_chips;
- int vector_length = std::round(fs_in / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS));
+ int vector_length = std::round(fs_in / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS));
trk_param.vector_length = vector_length;
int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -104,9 +104,9 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
extend_correlation_symbols = 1;
std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
}
- else if (!track_pilot and extend_correlation_symbols > Galileo_E5a_I_SECONDARY_CODE_LENGTH)
+ else if (!track_pilot and extend_correlation_symbols > GALILEO_E5A_I_SECONDARY_CODE_LENGTH)
{
- extend_correlation_symbols = Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+ extend_correlation_symbols = GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be lower than 21 when tracking the data component. Coherent integration has been set to 20 symbols (20 ms)" << TEXT_RESET << std::endl;
}
if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
index f0fbcd37a..1fdba0405 100644
--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
@@ -93,7 +93,7 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz;
float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
trk_param.early_late_space_chips = early_late_space_chips;
- int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5i_CODE_RATE_HZ) / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS)));
+ int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5I_CODE_RATE_HZ) / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS)));
trk_param.vector_length = vector_length;
int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -104,9 +104,9 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
extend_correlation_symbols = 1;
std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
}
- else if (!track_pilot and extend_correlation_symbols > GPS_L5i_NH_CODE_LENGTH)
+ else if (!track_pilot and extend_correlation_symbols > GPS_L5I_NH_CODE_LENGTH)
{
- extend_correlation_symbols = GPS_L5i_NH_CODE_LENGTH;
+ extend_correlation_symbols = GPS_L5I_NH_CODE_LENGTH;
std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be lower than 11 when tracking the data component. Coherent integration has been set to 10 symbols (10 ms)" << TEXT_RESET << std::endl;
}
if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index 36fdaed0e..033e49493 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -173,24 +173,24 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
else if (signal_type == "L5")
{
d_signal_carrier_freq = GPS_L5_FREQ_HZ;
- d_code_period = GPS_L5i_PERIOD;
- d_code_chip_rate = GPS_L5i_CODE_RATE_HZ;
+ d_code_period = GPS_L5I_PERIOD;
+ d_code_chip_rate = GPS_L5I_CODE_RATE_HZ;
d_symbols_per_bit = GPS_L5_SAMPLES_PER_SYMBOL;
d_correlation_length_ms = 1;
d_code_samples_per_chip = 1;
- d_code_length_chips = static_cast<uint32_t>(GPS_L5i_CODE_LENGTH_CHIPS);
+ d_code_length_chips = static_cast<uint32_t>(GPS_L5I_CODE_LENGTH_CHIPS);
d_secondary = true;
if (trk_parameters.track_pilot)
{
- d_secondary_code_length = static_cast<uint32_t>(GPS_L5q_NH_CODE_LENGTH);
- d_secondary_code_string = const_cast<std::string *>(&GPS_L5q_NH_CODE_STR);
+ d_secondary_code_length = static_cast<uint32_t>(GPS_L5Q_NH_CODE_LENGTH);
+ d_secondary_code_string = const_cast<std::string *>(&GPS_L5Q_NH_CODE_STR);
signal_pretty_name = signal_pretty_name + "Q";
interchange_iq = true;
}
else
{
- d_secondary_code_length = static_cast<uint32_t>(GPS_L5i_NH_CODE_LENGTH);
- d_secondary_code_string = const_cast<std::string *>(&GPS_L5i_NH_CODE_STR);
+ d_secondary_code_length = static_cast<uint32_t>(GPS_L5I_NH_CODE_LENGTH);
+ d_secondary_code_string = const_cast<std::string *>(&GPS_L5I_NH_CODE_STR);
signal_pretty_name = signal_pretty_name + "I";
interchange_iq = false;
}
@@ -214,10 +214,10 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
systemName = "Galileo";
if (signal_type == "1B")
{
- d_signal_carrier_freq = Galileo_E1_FREQ_HZ;
- d_code_period = Galileo_E1_CODE_PERIOD;
- d_code_chip_rate = Galileo_E1_CODE_CHIP_RATE_HZ;
- d_code_length_chips = static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS);
+ d_signal_carrier_freq = GALILEO_E1_FREQ_HZ;
+ d_code_period = GALILEO_E1_CODE_PERIOD;
+ d_code_chip_rate = GALILEO_E1_CODE_CHIP_RATE_HZ;
+ d_code_length_chips = static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS);
d_symbols_per_bit = 1;
d_correlation_length_ms = 4;
d_code_samples_per_chip = 2; // CBOC disabled: 2 samples per chip. CBOC enabled: 12 samples per chip
@@ -225,8 +225,8 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
if (trk_parameters.track_pilot)
{
d_secondary = true;
- d_secondary_code_length = static_cast<uint32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
- d_secondary_code_string = const_cast<std::string *>(&Galileo_E1_C_SECONDARY_CODE);
+ d_secondary_code_length = static_cast<uint32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
+ d_secondary_code_string = const_cast<std::string *>(&GALILEO_E1_C_SECONDARY_CODE);
signal_pretty_name = signal_pretty_name + "C";
}
else
@@ -238,18 +238,18 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
}
else if (signal_type == "5X")
{
- d_signal_carrier_freq = Galileo_E5a_FREQ_HZ;
- d_code_period = GALILEO_E5a_CODE_PERIOD;
- d_code_chip_rate = Galileo_E5a_CODE_CHIP_RATE_HZ;
+ d_signal_carrier_freq = GALILEO_E5A_FREQ_HZ;
+ d_code_period = GALILEO_E5A_CODE_PERIOD;
+ d_code_chip_rate = GALILEO_E5A_CODE_CHIP_RATE_HZ;
d_symbols_per_bit = 20;
d_correlation_length_ms = 1;
d_code_samples_per_chip = 1;
- d_code_length_chips = static_cast<uint32_t>(Galileo_E5a_CODE_LENGTH_CHIPS);
+ d_code_length_chips = static_cast<uint32_t>(GALILEO_E5A_CODE_LENGTH_CHIPS);
if (trk_parameters.track_pilot)
{
d_secondary = true;
- d_secondary_code_length = static_cast<uint32_t>(Galileo_E5a_Q_SECONDARY_CODE_LENGTH);
+ d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_Q_SECONDARY_CODE_LENGTH);
signal_pretty_name = signal_pretty_name + "Q";
interchange_iq = true;
}
@@ -554,7 +554,7 @@ void dll_pll_veml_tracking::start_tracking()
galileo_e5_a_code_gen_complex_primary(aux_code, d_acquisition_gnss_synchro->PRN, const_cast<char *>(signal_type.c_str()));
if (trk_parameters.track_pilot)
{
- d_secondary_code_string = const_cast<std::string *>(&Galileo_E5a_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
+ d_secondary_code_string = const_cast<std::string *>(&GALILEO_E5A_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
for (uint32_t i = 0; i < d_code_length_chips; i++)
{
d_tracking_code[i] = aux_code[i].imag();
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
index 484f0b63c..477880b03 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
@@ -121,8 +121,8 @@ private:
float *d_data_code;
float *d_local_code_shift_chips;
float *d_prompt_data_shift;
- cpu_multicorrelator_real_codes multicorrelator_cpu;
- cpu_multicorrelator_real_codes correlator_data_cpu; //for data channel
+ Cpu_Multicorrelator_Real_Codes multicorrelator_cpu;
+ Cpu_Multicorrelator_Real_Codes correlator_data_cpu; //for data channel
/* TODO: currently the multicorrelator does not support adding extra correlator
with different local code, thus we need extra multicorrelator instance.
Implement this functionality inside multicorrelator class
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index 36fae9906..e6177bbe7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -116,7 +116,7 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
// Initialization of local code replica
// Get space for a vector with the sinboc(1,1) replica sampled 2x/chip
- d_ca_code = static_cast<gr_complex *>(volk_gnsssdr_malloc((2 * Galileo_E1_B_CODE_LENGTH_CHIPS) * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
+ d_ca_code = static_cast<gr_complex *>(volk_gnsssdr_malloc((2 * GALILEO_E1_B_CODE_LENGTH_CHIPS) * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
// correlator outputs (scalar)
d_n_correlator_taps = 5; // Very-Early, Early, Prompt, Late, Very-Late
@@ -146,7 +146,7 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
//--- Perform initializations ------------------------------
// define initial code frequency basis of NCO
- d_code_freq_chips = Galileo_E1_CODE_CHIP_RATE_HZ;
+ d_code_freq_chips = GALILEO_E1_CODE_CHIP_RATE_HZ;
// define residual code phase (in chips)
d_rem_code_phase_samples = 0.0;
// define residual carrier phase
@@ -194,10 +194,10 @@ void Galileo_E1_Tcp_Connector_Tracking_cc::start_tracking()
d_acquisition_gnss_synchro->Signal,
false,
d_acquisition_gnss_synchro->PRN,
- 2 * Galileo_E1_CODE_CHIP_RATE_HZ,
+ 2 * GALILEO_E1_CODE_CHIP_RATE_HZ,
0);
- multicorrelator_cpu.set_local_code_and_taps(static_cast<int32_t>(2 * Galileo_E1_B_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
+ multicorrelator_cpu.set_local_code_and_taps(static_cast<int32_t>(2 * GALILEO_E1_B_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
for (int32_t n = 0; n < d_n_correlator_taps; n++)
{
d_correlator_outs[n] = gr_complex(0, 0);
@@ -302,7 +302,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
float carr_error_filt_hz = 0.0;
float code_error_filt_chips = 0.0;
- tcp_packet_data tcp_data;
+ Tcp_Packet_Data tcp_data;
// GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
Gnss_Synchro current_synchro_data = Gnss_Synchro();
// Block input data and block output stream pointers
@@ -372,11 +372,11 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
// New carrier Doppler frequency estimation
d_carrier_doppler_hz = d_acq_carrier_doppler_hz + carr_error_filt_hz;
// New code Doppler frequency estimation
- d_code_freq_chips = Galileo_E1_CODE_CHIP_RATE_HZ + ((d_carrier_doppler_hz * Galileo_E1_CODE_CHIP_RATE_HZ) / Galileo_E1_FREQ_HZ);
+ d_code_freq_chips = GALILEO_E1_CODE_CHIP_RATE_HZ + ((d_carrier_doppler_hz * GALILEO_E1_CODE_CHIP_RATE_HZ) / GALILEO_E1_FREQ_HZ);
//carrier phase accumulator for (K) doppler estimation
- d_acc_carrier_phase_rad -= GPS_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
+ d_acc_carrier_phase_rad -= GPS_TWO_PI * d_carrier_doppler_hz * GALILEO_E1_CODE_PERIOD;
//remnant carrier phase to prevent overflow in the code NCO
- d_rem_carr_phase_rad = d_rem_carr_phase_rad + GPS_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
+ d_rem_carr_phase_rad = d_rem_carr_phase_rad + GPS_TWO_PI * d_carrier_doppler_hz * GALILEO_E1_CODE_PERIOD;
d_rem_carr_phase_rad = fmod(d_rem_carr_phase_rad, GPS_TWO_PI);
// ################## DLL ##########################################################
@@ -384,7 +384,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
code_error_filt_chips = tcp_data.proc_pack_code_error;
//Code phase accumulator
float code_error_filt_secs;
- code_error_filt_secs = (Galileo_E1_CODE_PERIOD * code_error_filt_chips) / Galileo_E1_CODE_CHIP_RATE_HZ; //[seconds]
+ code_error_filt_secs = (GALILEO_E1_CODE_PERIOD * code_error_filt_chips) / GALILEO_E1_CODE_CHIP_RATE_HZ; //[seconds]
d_acc_code_phase_secs = d_acc_code_phase_secs + code_error_filt_secs;
// ################## CARRIER AND CODE NCO BUFFER ALIGNMENT #######################
@@ -395,7 +395,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
double K_blk_samples;
// Compute the next buffer length based in the new period of the PRN sequence and the code phase error estimation
T_chip_seconds = 1 / static_cast<double>(d_code_freq_chips);
- T_prn_seconds = T_chip_seconds * Galileo_E1_B_CODE_LENGTH_CHIPS;
+ T_prn_seconds = T_chip_seconds * GALILEO_E1_B_CODE_LENGTH_CHIPS;
T_prn_samples = T_prn_seconds * static_cast<double>(d_fs_in);
K_blk_samples = T_prn_samples + d_rem_code_phase_samples + code_error_filt_secs * static_cast<double>(d_fs_in);
d_current_prn_length_samples = round(K_blk_samples); //round to a discrete samples
@@ -413,7 +413,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
d_cn0_estimation_counter = 0;
// Code lock indicator
- d_CN0_SNV_dB_Hz = cn0_svn_estimator(d_Prompt_buffer, FLAGS_cn0_samples, Galileo_E1_CODE_PERIOD);
+ d_CN0_SNV_dB_Hz = cn0_svn_estimator(d_Prompt_buffer, FLAGS_cn0_samples, GALILEO_E1_CODE_PERIOD);
// Carrier lock indicator
d_carrier_lock_test = carrier_lock_detector(d_Prompt_buffer, FLAGS_cn0_samples);
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
index ff14ab9cb..423eef516 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
@@ -142,7 +142,7 @@ private:
// correlator
float *d_local_code_shift_chips;
gr_complex *d_correlator_outs;
- cpu_multicorrelator multicorrelator_cpu;
+ Cpu_Multicorrelator multicorrelator_cpu;
// tracking vars
double d_code_freq_chips;
@@ -154,7 +154,7 @@ private:
size_t d_port;
int32_t d_listen_connection;
float d_control_id;
- tcp_communication d_tcp_com;
+ Tcp_Communication d_tcp_com;
//PRN period in samples
int32_t d_current_prn_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
index 2a5102942..93c43c35a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -125,7 +125,7 @@ private:
gr_complex* d_ca_code;
float* d_local_code_shift_chips;
gr_complex* d_correlator_outs;
- cpu_multicorrelator multicorrelator_cpu;
+ Cpu_Multicorrelator multicorrelator_cpu;
// remaining code phase and carrier phase between tracking loops
double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
index 54c30e270..a58fee4aa 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -129,7 +129,7 @@ private:
//gr_complex* d_correlator_outs;
lv_16sc_t* d_correlator_outs_16sc;
//cpu_multicorrelator multicorrelator_cpu;
- cpu_multicorrelator_16sc multicorrelator_cpu_16sc;
+ Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
// remaining code phase and carrier phase between tracking loops
double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
index 15bc1c90f..158eaa761 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
@@ -126,7 +126,7 @@ private:
gr_complex* d_ca_code;
float* d_local_code_shift_chips;
gr_complex* d_correlator_outs;
- cpu_multicorrelator multicorrelator_cpu;
+ Cpu_Multicorrelator multicorrelator_cpu;
// tracking vars
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
index 1be8d3c7f..44b711243 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
@@ -123,7 +123,7 @@ private:
gr_complex* d_ca_code;
float* d_local_code_shift_chips;
gr_complex* d_correlator_outs;
- cpu_multicorrelator multicorrelator_cpu;
+ Cpu_Multicorrelator multicorrelator_cpu;
// remaining code phase and carrier phase between tracking loops
double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
index 3b2618eb9..d451da17b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
@@ -127,7 +127,7 @@ private:
//gr_complex* d_correlator_outs;
lv_16sc_t* d_correlator_outs_16sc;
//cpu_multicorrelator multicorrelator_cpu;
- cpu_multicorrelator_16sc multicorrelator_cpu_16sc;
+ Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
// remaining code phase and carrier phase between tracking loops
double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
index 29f6bb077..d72137d29 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
@@ -124,7 +124,7 @@ private:
gr_complex* d_ca_code;
float* d_local_code_shift_chips;
gr_complex* d_correlator_outs;
- cpu_multicorrelator multicorrelator_cpu;
+ Cpu_Multicorrelator multicorrelator_cpu;
// tracking vars
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index ecbe2c15f..dc9283932 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -121,7 +121,7 @@ private:
gr_complex* d_ca_code;
float* d_local_code_shift_chips;
gr_complex* d_correlator_outs;
- cpu_multicorrelator multicorrelator_cpu;
+ Cpu_Multicorrelator multicorrelator_cpu;
// remaining code phase and carrier phase between tracking loops
double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
index 6b67fa09b..9aec25252 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -126,7 +126,7 @@ private:
//gr_complex* d_correlator_outs;
lv_16sc_t* d_correlator_outs_16sc;
//cpu_multicorrelator multicorrelator_cpu;
- cpu_multicorrelator_16sc multicorrelator_cpu_16sc;
+ Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
// remaining code phase and carrier phase between tracking loops
double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
index 96305fc0b..e2faa339c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
@@ -173,7 +173,7 @@ private:
float* d_ca_code;
float* d_local_code_shift_chips;
gr_complex* d_correlator_outs;
- cpu_multicorrelator_real_codes multicorrelator_cpu;
+ Cpu_Multicorrelator_Real_Codes multicorrelator_cpu;
// tracking vars
double d_code_freq_chips;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 51c8d20fc..8521314b4 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -334,7 +334,7 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
float code_error = 0.0;
float code_nco = 0.0;
- tcp_packet_data tcp_data;
+ Tcp_Packet_Data tcp_data;
// GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
Gnss_Synchro current_synchro_data = Gnss_Synchro();
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
index a4a1c82e7..3fa928a4d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
@@ -128,7 +128,7 @@ private:
// correlator
float *d_local_code_shift_chips;
gr_complex *d_correlator_outs;
- cpu_multicorrelator multicorrelator_cpu;
+ Cpu_Multicorrelator multicorrelator_cpu;
// tracking vars
double d_code_freq_hz;
@@ -139,7 +139,7 @@ private:
size_t d_port;
int32_t d_listen_connection;
float d_control_id;
- tcp_communication d_tcp_com;
+ Tcp_Communication d_tcp_com;
//PRN period in samples
int32_t d_current_prn_length_samples;
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.cc b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
index 0e30856ce..c201a5df7 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
@@ -37,7 +37,7 @@
#include <cmath>
-cpu_multicorrelator::cpu_multicorrelator()
+Cpu_Multicorrelator::Cpu_Multicorrelator()
{
d_sig_in = nullptr;
d_local_code_in = nullptr;
@@ -49,16 +49,16 @@ cpu_multicorrelator::cpu_multicorrelator()
}
-cpu_multicorrelator::~cpu_multicorrelator()
+Cpu_Multicorrelator::~Cpu_Multicorrelator()
{
if (d_local_codes_resampled != nullptr)
{
- cpu_multicorrelator::free();
+ Cpu_Multicorrelator::free();
}
}
-bool cpu_multicorrelator::init(
+bool Cpu_Multicorrelator::init(
int max_signal_length_samples,
int n_correlators)
{
@@ -75,7 +75,7 @@ bool cpu_multicorrelator::init(
}
-bool cpu_multicorrelator::set_local_code_and_taps(
+bool Cpu_Multicorrelator::set_local_code_and_taps(
int code_length_chips,
const std::complex<float>* local_code_in,
float* shifts_chips)
@@ -87,7 +87,7 @@ bool cpu_multicorrelator::set_local_code_and_taps(
}
-bool cpu_multicorrelator::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
+bool Cpu_Multicorrelator::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
{
// Save CPU pointers
d_sig_in = sig_in;
@@ -96,7 +96,7 @@ bool cpu_multicorrelator::set_input_output_vectors(std::complex<float>* corr_out
}
-void cpu_multicorrelator::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
+void Cpu_Multicorrelator::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
{
volk_gnsssdr_32fc_xn_resampler_32fc_xn(d_local_codes_resampled,
d_local_code_in,
@@ -109,7 +109,7 @@ void cpu_multicorrelator::update_local_code(int correlator_length_samples, float
}
-bool cpu_multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
float rem_carrier_phase_in_rad,
float phase_step_rad,
float rem_code_phase_chips,
@@ -126,7 +126,7 @@ bool cpu_multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
}
-bool cpu_multicorrelator::free()
+bool Cpu_Multicorrelator::free()
{
// Free memory
if (d_local_codes_resampled != nullptr)
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.h b/src/algorithms/tracking/libs/cpu_multicorrelator.h
index 8dab4c4a4..d0f73d616 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator.h
@@ -41,11 +41,11 @@
/*!
* \brief Class that implements carrier wipe-off and correlators.
*/
-class cpu_multicorrelator
+class Cpu_Multicorrelator
{
public:
- cpu_multicorrelator();
- ~cpu_multicorrelator();
+ Cpu_Multicorrelator();
+ ~Cpu_Multicorrelator();
bool init(int max_signal_length_samples, int n_correlators);
bool set_local_code_and_taps(int code_length_chips, const std::complex<float> *local_code_in, float *shifts_chips);
bool set_input_output_vectors(std::complex<float> *corr_out, const std::complex<float> *sig_in);
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
index e57d1c2eb..107a38f7d 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
@@ -36,7 +36,7 @@
#include <cmath>
-bool cpu_multicorrelator_16sc::init(
+bool Cpu_Multicorrelator_16sc::init(
int max_signal_length_samples,
int n_correlators)
{
@@ -54,7 +54,7 @@ bool cpu_multicorrelator_16sc::init(
}
-bool cpu_multicorrelator_16sc::set_local_code_and_taps(
+bool Cpu_Multicorrelator_16sc::set_local_code_and_taps(
int code_length_chips,
const lv_16sc_t* local_code_in,
float* shifts_chips)
@@ -66,7 +66,7 @@ bool cpu_multicorrelator_16sc::set_local_code_and_taps(
}
-bool cpu_multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, const lv_16sc_t* sig_in)
+bool Cpu_Multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, const lv_16sc_t* sig_in)
{
// Save CPU pointers
d_sig_in = sig_in;
@@ -75,7 +75,7 @@ bool cpu_multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, con
}
-void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
+void Cpu_Multicorrelator_16sc::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
{
volk_gnsssdr_16ic_xn_resampler_16ic_xn(d_local_codes_resampled,
d_local_code_in,
@@ -88,7 +88,7 @@ void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples,
}
-bool cpu_multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
float rem_carrier_phase_in_rad,
float phase_step_rad,
float rem_code_phase_chips,
@@ -105,7 +105,7 @@ bool cpu_multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
}
-cpu_multicorrelator_16sc::cpu_multicorrelator_16sc()
+Cpu_Multicorrelator_16sc::Cpu_Multicorrelator_16sc()
{
d_sig_in = nullptr;
d_local_code_in = nullptr;
@@ -117,16 +117,16 @@ cpu_multicorrelator_16sc::cpu_multicorrelator_16sc()
}
-cpu_multicorrelator_16sc::~cpu_multicorrelator_16sc()
+Cpu_Multicorrelator_16sc::~Cpu_Multicorrelator_16sc()
{
if (d_local_codes_resampled != nullptr)
{
- cpu_multicorrelator_16sc::free();
+ Cpu_Multicorrelator_16sc::free();
}
}
-bool cpu_multicorrelator_16sc::free()
+bool Cpu_Multicorrelator_16sc::free()
{
// Free memory
if (d_local_codes_resampled != nullptr)
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
index 16881ca07..7ef9549e8 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
@@ -41,11 +41,11 @@
/*!
* \brief Class that implements carrier wipe-off and correlators.
*/
-class cpu_multicorrelator_16sc
+class Cpu_Multicorrelator_16sc
{
public:
- cpu_multicorrelator_16sc();
- ~cpu_multicorrelator_16sc();
+ Cpu_Multicorrelator_16sc();
+ ~Cpu_Multicorrelator_16sc();
bool init(int max_signal_length_samples, int n_correlators);
bool set_local_code_and_taps(int code_length_chips, const lv_16sc_t *local_code_in, float *shifts_chips);
bool set_input_output_vectors(lv_16sc_t *corr_out, const lv_16sc_t *sig_in);
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
index f23537fad..46475c286 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
@@ -37,7 +37,7 @@
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <cmath>
-cpu_multicorrelator_real_codes::cpu_multicorrelator_real_codes()
+Cpu_Multicorrelator_Real_Codes::Cpu_Multicorrelator_Real_Codes()
{
d_sig_in = nullptr;
d_local_code_in = nullptr;
@@ -50,16 +50,16 @@ cpu_multicorrelator_real_codes::cpu_multicorrelator_real_codes()
}
-cpu_multicorrelator_real_codes::~cpu_multicorrelator_real_codes()
+Cpu_Multicorrelator_Real_Codes::~Cpu_Multicorrelator_Real_Codes()
{
if (d_local_codes_resampled != nullptr)
{
- cpu_multicorrelator_real_codes::free();
+ Cpu_Multicorrelator_Real_Codes::free();
}
}
-bool cpu_multicorrelator_real_codes::init(
+bool Cpu_Multicorrelator_Real_Codes::init(
int max_signal_length_samples,
int n_correlators)
{
@@ -76,7 +76,7 @@ bool cpu_multicorrelator_real_codes::init(
}
-bool cpu_multicorrelator_real_codes::set_local_code_and_taps(
+bool Cpu_Multicorrelator_Real_Codes::set_local_code_and_taps(
int code_length_chips,
const float* local_code_in,
float* shifts_chips)
@@ -89,7 +89,7 @@ bool cpu_multicorrelator_real_codes::set_local_code_and_taps(
}
-bool cpu_multicorrelator_real_codes::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
+bool Cpu_Multicorrelator_Real_Codes::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
{
// Save CPU pointers
d_sig_in = sig_in;
@@ -98,7 +98,7 @@ bool cpu_multicorrelator_real_codes::set_input_output_vectors(std::complex<float
}
-void cpu_multicorrelator_real_codes::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips, float code_phase_rate_step_chips)
+void Cpu_Multicorrelator_Real_Codes::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips, float code_phase_rate_step_chips)
{
if (d_use_high_dynamics_resampler)
{
@@ -126,7 +126,7 @@ void cpu_multicorrelator_real_codes::update_local_code(int correlator_length_sam
}
// Overload Carrier_wipeoff_multicorrelator_resampler to ensure back compatibility
-bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator_Real_Codes::Carrier_wipeoff_multicorrelator_resampler(
float rem_carrier_phase_in_rad,
float phase_step_rad,
float phase_rate_step_rad,
@@ -151,7 +151,7 @@ bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
return true;
}
// Overload Carrier_wipeoff_multicorrelator_resampler to ensure back compatibility
-bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator_Real_Codes::Carrier_wipeoff_multicorrelator_resampler(
float rem_carrier_phase_in_rad,
float phase_step_rad,
float rem_code_phase_chips,
@@ -169,7 +169,7 @@ bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
}
-bool cpu_multicorrelator_real_codes::free()
+bool Cpu_Multicorrelator_Real_Codes::free()
{
// Free memory
if (d_local_codes_resampled != nullptr)
@@ -185,7 +185,7 @@ bool cpu_multicorrelator_real_codes::free()
}
-void cpu_multicorrelator_real_codes::set_high_dynamics_resampler(
+void Cpu_Multicorrelator_Real_Codes::set_high_dynamics_resampler(
bool use_high_dynamics_resampler)
{
d_use_high_dynamics_resampler = use_high_dynamics_resampler;
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h
index a4dfdd5f0..ecaad4a00 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h
@@ -42,12 +42,12 @@
/*!
* \brief Class that implements carrier wipe-off and correlators.
*/
-class cpu_multicorrelator_real_codes
+class Cpu_Multicorrelator_Real_Codes
{
public:
- cpu_multicorrelator_real_codes();
+ Cpu_Multicorrelator_Real_Codes();
void set_high_dynamics_resampler(bool use_high_dynamics_resampler);
- ~cpu_multicorrelator_real_codes();
+ ~Cpu_Multicorrelator_Real_Codes();
bool init(int max_signal_length_samples, int n_correlators);
bool set_local_code_and_taps(int code_length_chips, const float *local_code_in, float *shifts_chips);
bool set_input_output_vectors(std::complex<float> *corr_out, const std::complex<float> *sig_in);
diff --git a/src/algorithms/tracking/libs/tcp_communication.cc b/src/algorithms/tracking/libs/tcp_communication.cc
index 8ca6fde27..40cf6bb55 100644
--- a/src/algorithms/tracking/libs/tcp_communication.cc
+++ b/src/algorithms/tracking/libs/tcp_communication.cc
@@ -35,13 +35,13 @@
#include <string>
-tcp_communication::tcp_communication() : tcp_socket_(io_service_) {} // NOLINT
+Tcp_Communication::Tcp_Communication() : tcp_socket_(io_service_) {} // NOLINT
-tcp_communication::~tcp_communication() = default;
+Tcp_Communication::~Tcp_Communication() = default;
-int tcp_communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)
+int Tcp_Communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)
{
try
{
@@ -73,7 +73,7 @@ int tcp_communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)
}
-void tcp_communication::send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, tcp_packet_data* tcp_data_)
+void Tcp_Communication::send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, Tcp_Packet_Data* tcp_data_)
{
int controlc = 0;
boost::array<float, NUM_RX_VARIABLES> readbuf;
@@ -108,7 +108,7 @@ void tcp_communication::send_receive_tcp_packet_galileo_e1(boost::array<float, N
}
-void tcp_communication::send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, tcp_packet_data* tcp_data_)
+void Tcp_Communication::send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, Tcp_Packet_Data* tcp_data_)
{
int controlc = 0;
boost::array<float, NUM_RX_VARIABLES> readbuf;
@@ -143,7 +143,7 @@ void tcp_communication::send_receive_tcp_packet_gps_l1_ca(boost::array<float, NU
}
-void tcp_communication::close_tcp_connection(size_t d_port_)
+void Tcp_Communication::close_tcp_connection(size_t d_port_)
{
// Close the TCP connection
tcp_socket_.close();
diff --git a/src/algorithms/tracking/libs/tcp_communication.h b/src/algorithms/tracking/libs/tcp_communication.h
index 1a36d8212..d293fa97a 100644
--- a/src/algorithms/tracking/libs/tcp_communication.h
+++ b/src/algorithms/tracking/libs/tcp_communication.h
@@ -43,15 +43,15 @@
/*!
* \brief TCP communication class
*/
-class tcp_communication
+class Tcp_Communication
{
public:
- tcp_communication();
- ~tcp_communication();
+ Tcp_Communication();
+ ~Tcp_Communication();
int listen_tcp_connection(size_t d_port_, size_t d_port_ch0_);
- void send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, tcp_packet_data *tcp_data_);
- void send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, tcp_packet_data *tcp_data_);
+ void send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, Tcp_Packet_Data *tcp_data_);
+ void send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, Tcp_Packet_Data *tcp_data_);
void close_tcp_connection(size_t d_port_);
private:
diff --git a/src/algorithms/tracking/libs/tcp_packet_data.cc b/src/algorithms/tracking/libs/tcp_packet_data.cc
index eb53ff59b..a48c3631a 100644
--- a/src/algorithms/tracking/libs/tcp_packet_data.cc
+++ b/src/algorithms/tracking/libs/tcp_packet_data.cc
@@ -30,11 +30,11 @@
*/
#include "tcp_packet_data.h"
-tcp_packet_data::tcp_packet_data()
+Tcp_Packet_Data::Tcp_Packet_Data()
{
proc_pack_code_error = 0;
proc_pack_carr_error = 0;
proc_pack_carrier_doppler_hz = 0;
}
-tcp_packet_data::~tcp_packet_data() = default;
+Tcp_Packet_Data::~Tcp_Packet_Data() = default;
diff --git a/src/algorithms/tracking/libs/tcp_packet_data.h b/src/algorithms/tracking/libs/tcp_packet_data.h
index c803fa936..44eb4346e 100644
--- a/src/algorithms/tracking/libs/tcp_packet_data.h
+++ b/src/algorithms/tracking/libs/tcp_packet_data.h
@@ -35,11 +35,11 @@
/*!
* \brief Class that implements a TCP data packet
*/
-class tcp_packet_data
+class Tcp_Packet_Data
{
public:
- tcp_packet_data();
- ~tcp_packet_data();
+ Tcp_Packet_Data();
+ ~Tcp_Packet_Data();
float proc_pack_code_error;
float proc_pack_carr_error;
float proc_pack_carrier_doppler_hz;
diff --git a/src/core/interfaces/acquisition_interface.h b/src/core/interfaces/acquisition_interface.h
index 794748175..7067d403a 100644
--- a/src/core/interfaces/acquisition_interface.h
+++ b/src/core/interfaces/acquisition_interface.h
@@ -42,7 +42,7 @@
#include "gnss_synchro.h"
template <typename Data>
-class concurrent_queue;
+class Concurrent_Queue;
/*! \brief This abstract class represents an interface to an acquisition GNSS block.
*
diff --git a/src/core/interfaces/tracking_interface.h b/src/core/interfaces/tracking_interface.h
index da2b3c41b..406c5748d 100644
--- a/src/core/interfaces/tracking_interface.h
+++ b/src/core/interfaces/tracking_interface.h
@@ -41,7 +41,7 @@
#include "gnss_synchro.h"
template <typename Data>
-class concurrent_queue;
+class Concurrent_Queue;
/*!
* \brief This abstract class represents an interface to a tracking block.
diff --git a/src/core/libs/gnss_sdr_supl_client.cc b/src/core/libs/gnss_sdr_supl_client.cc
index 7f211aa86..366d628ae 100644
--- a/src/core/libs/gnss_sdr_supl_client.cc
+++ b/src/core/libs/gnss_sdr_supl_client.cc
@@ -37,7 +37,7 @@
#include <cmath>
#include <utility>
-gnss_sdr_supl_client::gnss_sdr_supl_client()
+Gnss_Sdr_Supl_Client::Gnss_Sdr_Supl_Client()
{
mcc = 0;
mns = 0;
@@ -50,10 +50,10 @@ gnss_sdr_supl_client::gnss_sdr_supl_client()
}
-gnss_sdr_supl_client::~gnss_sdr_supl_client() = default;
+Gnss_Sdr_Supl_Client::~Gnss_Sdr_Supl_Client() = default;
-void gnss_sdr_supl_client::print_assistance()
+void Gnss_Sdr_Supl_Client::print_assistance()
{
if (assist.set & SUPL_RRLP_ASSIST_REFTIME)
{
@@ -152,7 +152,7 @@ void gnss_sdr_supl_client::print_assistance()
}
-int gnss_sdr_supl_client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_ci)
+int Gnss_Sdr_Supl_Client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_ci)
{
// SET SUPL CLIENT INFORMATION
// GSM CELL PARAMETERS
@@ -194,7 +194,7 @@ int gnss_sdr_supl_client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_
}
-void gnss_sdr_supl_client::read_supl_data()
+void Gnss_Sdr_Supl_Client::read_supl_data()
{
// READ REFERENCE LOCATION
if (assist.set & SUPL_RRLP_ASSIST_REFLOC)
@@ -370,7 +370,7 @@ void gnss_sdr_supl_client::read_supl_data()
}
-bool gnss_sdr_supl_client::load_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_ephemeris_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -390,7 +390,7 @@ bool gnss_sdr_supl_client::load_ephemeris_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_Ephemeris> eph_map)
+bool Gnss_Sdr_Supl_Client::save_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_Ephemeris> eph_map)
{
if (eph_map.empty() == false)
{
@@ -417,7 +417,7 @@ bool gnss_sdr_supl_client::save_ephemeris_map_xml(const std::string& file_name,
}
-bool gnss_sdr_supl_client::load_gal_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_ephemeris_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -464,7 +464,7 @@ bool save_gal_ephemeris_map_xml(const std::string& file_name, std::map<int, Gali
}
-bool gnss_sdr_supl_client::load_cnav_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_cnav_ephemeris_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -511,7 +511,7 @@ bool save_cnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps
}
-bool gnss_sdr_supl_client::load_gnav_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gnav_ephemeris_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -558,7 +558,7 @@ bool save_gnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Glo
}
-bool gnss_sdr_supl_client::load_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_utc_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -577,7 +577,7 @@ bool gnss_sdr_supl_client::load_utc_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_utc_xml(const std::string& file_name, Gps_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_utc_xml(const std::string& file_name, Gps_Utc_Model& utc)
{
if (utc.valid)
{
@@ -604,7 +604,7 @@ bool gnss_sdr_supl_client::save_utc_xml(const std::string& file_name, Gps_Utc_Mo
}
-bool gnss_sdr_supl_client::load_cnav_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_cnav_utc_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -623,7 +623,7 @@ bool gnss_sdr_supl_client::load_cnav_utc_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_cnav_utc_xml(const std::string& file_name, Gps_CNAV_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_cnav_utc_xml(const std::string& file_name, Gps_CNAV_Utc_Model& utc)
{
if (utc.valid)
{
@@ -650,7 +650,7 @@ bool gnss_sdr_supl_client::save_cnav_utc_xml(const std::string& file_name, Gps_C
}
-bool gnss_sdr_supl_client::load_gal_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_utc_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -669,7 +669,7 @@ bool gnss_sdr_supl_client::load_gal_utc_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_gal_utc_xml(const std::string& file_name, Galileo_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_gal_utc_xml(const std::string& file_name, Galileo_Utc_Model& utc)
{
if (utc.flag_utc_model)
{
@@ -696,7 +696,7 @@ bool gnss_sdr_supl_client::save_gal_utc_xml(const std::string& file_name, Galile
}
-bool gnss_sdr_supl_client::load_iono_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_iono_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -715,7 +715,7 @@ bool gnss_sdr_supl_client::load_iono_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_iono_xml(const std::string& file_name, Gps_Iono& iono)
+bool Gnss_Sdr_Supl_Client::save_iono_xml(const std::string& file_name, Gps_Iono& iono)
{
if (iono.valid)
{
@@ -742,7 +742,7 @@ bool gnss_sdr_supl_client::save_iono_xml(const std::string& file_name, Gps_Iono&
}
-bool gnss_sdr_supl_client::load_gal_iono_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_iono_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -761,7 +761,7 @@ bool gnss_sdr_supl_client::load_gal_iono_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_gal_iono_xml(const std::string& file_name, Galileo_Iono& iono)
+bool Gnss_Sdr_Supl_Client::save_gal_iono_xml(const std::string& file_name, Galileo_Iono& iono)
{
if (iono.ai0_5 != 0.0)
{
@@ -788,7 +788,7 @@ bool gnss_sdr_supl_client::save_gal_iono_xml(const std::string& file_name, Galil
}
-bool gnss_sdr_supl_client::load_gps_almanac_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gps_almanac_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -808,7 +808,7 @@ bool gnss_sdr_supl_client::load_gps_almanac_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_gps_almanac_xml(const std::string& file_name, std::map<int, Gps_Almanac> gps_almanac_map)
+bool Gnss_Sdr_Supl_Client::save_gps_almanac_xml(const std::string& file_name, std::map<int, Gps_Almanac> gps_almanac_map)
{
if (gps_almanac_map.empty() == false)
{
@@ -835,7 +835,7 @@ bool gnss_sdr_supl_client::save_gps_almanac_xml(const std::string& file_name, st
}
-bool gnss_sdr_supl_client::load_gal_almanac_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_almanac_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -855,7 +855,7 @@ bool gnss_sdr_supl_client::load_gal_almanac_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::read_gal_almanac_from_gsa(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::read_gal_almanac_from_gsa(const std::string& file_name)
{
pugi::xml_document doc;
pugi::xml_parse_result result = doc.load_file(file_name.c_str());
@@ -905,7 +905,7 @@ bool gnss_sdr_supl_client::read_gal_almanac_from_gsa(const std::string& file_nam
}
-bool gnss_sdr_supl_client::save_gal_almanac_xml(const std::string& file_name, std::map<int, Galileo_Almanac> gal_almanac_map)
+bool Gnss_Sdr_Supl_Client::save_gal_almanac_xml(const std::string& file_name, std::map<int, Galileo_Almanac> gal_almanac_map)
{
if (gal_almanac_map.empty() == false)
{
@@ -932,7 +932,7 @@ bool gnss_sdr_supl_client::save_gal_almanac_xml(const std::string& file_name, st
}
-bool gnss_sdr_supl_client::load_glo_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_glo_utc_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -951,7 +951,7 @@ bool gnss_sdr_supl_client::load_glo_utc_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_glo_utc_xml(const std::string& file_name, Glonass_Gnav_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_glo_utc_xml(const std::string& file_name, Glonass_Gnav_Utc_Model& utc)
{
if (utc.valid)
{
@@ -978,7 +978,7 @@ bool gnss_sdr_supl_client::save_glo_utc_xml(const std::string& file_name, Glonas
}
-bool gnss_sdr_supl_client::load_ref_time_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_ref_time_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -997,7 +997,7 @@ bool gnss_sdr_supl_client::load_ref_time_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_ref_time_xml(const std::string& file_name, Agnss_Ref_Time& ref_time)
+bool Gnss_Sdr_Supl_Client::save_ref_time_xml(const std::string& file_name, Agnss_Ref_Time& ref_time)
{
if (ref_time.valid == true)
{
@@ -1024,7 +1024,7 @@ bool gnss_sdr_supl_client::save_ref_time_xml(const std::string& file_name, Agnss
}
-bool gnss_sdr_supl_client::load_ref_location_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_ref_location_xml(const std::string& file_name)
{
std::ifstream ifs;
try
@@ -1043,7 +1043,7 @@ bool gnss_sdr_supl_client::load_ref_location_xml(const std::string& file_name)
}
-bool gnss_sdr_supl_client::save_ref_location_xml(const std::string& file_name, Agnss_Ref_Location& ref_location)
+bool Gnss_Sdr_Supl_Client::save_ref_location_xml(const std::string& file_name, Agnss_Ref_Location& ref_location)
{
if (ref_location.valid == true)
{
diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h
index 3e0a72a3f..af78c9f16 100644
--- a/src/core/libs/gnss_sdr_supl_client.h
+++ b/src/core/libs/gnss_sdr_supl_client.h
@@ -64,7 +64,7 @@ extern "C"
/*!
* \brief class that implements a C++ interface to external Secure User Location Protocol (SUPL) client library..
*/
-class gnss_sdr_supl_client
+class Gnss_Sdr_Supl_Client
{
private:
// GSM CELL INFO
@@ -274,8 +274,8 @@ public:
*/
void print_assistance();
- gnss_sdr_supl_client();
- ~gnss_sdr_supl_client();
+ Gnss_Sdr_Supl_Client();
+ ~Gnss_Sdr_Supl_Client();
};
#endif
diff --git a/src/core/libs/supl/asn-rrlp/Accuracy.c b/src/core/libs/supl/asn-rrlp/Accuracy.c
index b3609c7ef..a51a2e12c 100644
--- a/src/core/libs/supl/asn-rrlp/Accuracy.c
+++ b/src/core/libs/supl/asn-rrlp/Accuracy.c
@@ -111,7 +111,7 @@ Accuracy_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_Accuracy_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ACCURACY_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_Accuracy = {
asn_DEF_Accuracy_tags_1, /* Same as above */
sizeof(asn_DEF_Accuracy_tags_1)
/sizeof(asn_DEF_Accuracy_tags_1[0]), /* 1 */
- &asn_PER_type_Accuracy_constr_1,
+ &ASN_PER_TYPE_ACCURACY_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/AcquisElement.c b/src/core/libs/supl/asn-rrlp/AcquisElement.c
index 506e7ad3a..a3fd8b936 100644
--- a/src/core/libs/supl/asn-rrlp/AcquisElement.c
+++ b/src/core/libs/supl/asn-rrlp/AcquisElement.c
@@ -131,27 +131,27 @@ memb_codePhaseSearchWindow_constraint_1(asn_TYPE_descriptor_t *td, const void *s
}
}
-static asn_per_constraints_t asn_PER_memb_doppler0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER0_CONSTR_3 = {
{ APC_CONSTRAINED, 12, 12, -2048, 2047 } /* (-2048..2047) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_codePhase_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_CONSTR_5 = {
{ APC_CONSTRAINED, 10, 10, 0, 1022 } /* (0..1022) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_intCodePhase_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6 = {
{ APC_CONSTRAINED, 5, 5, 0, 19 } /* (0..19) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_gpsBitNumber_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_BIT_NUMBER_CONSTR_7 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_codePhaseSearchWindow_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_8 = {
{ APC_CONSTRAINED, 4, 4, 0, 15 } /* (0..15) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_doppler0_constraint_1,
- &asn_PER_memb_doppler0_constr_3,
+ &ASN_PER_MEMB_DOPPLER0_CONSTR_3,
0,
"doppler0"
},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_codePhase_constraint_1,
- &asn_PER_memb_codePhase_constr_5,
+ &ASN_PER_MEMB_CODE_PHASE_CONSTR_5,
0,
"codePhase"
},
@@ -198,7 +198,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_intCodePhase_constraint_1,
- &asn_PER_memb_intCodePhase_constr_6,
+ &ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6,
0,
"intCodePhase"
},
@@ -207,7 +207,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_gpsBitNumber_constraint_1,
- &asn_PER_memb_gpsBitNumber_constr_7,
+ &ASN_PER_MEMB_GPS_BIT_NUMBER_CONSTR_7,
0,
"gpsBitNumber"
},
@@ -216,7 +216,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_codePhaseSearchWindow_constraint_1,
- &asn_PER_memb_codePhaseSearchWindow_constr_8,
+ &ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_8,
0,
"codePhaseSearchWindow"
},
diff --git a/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c b/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c
index 5de86fe61..d7a16c0a0 100644
--- a/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c
+++ b/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c
@@ -56,12 +56,12 @@ memb_elevation_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_azimuth_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_AZIMUTH_CONSTR_2 = {
{ APC_CONSTRAINED, 5, 5, 0, 31 } /* (0..31) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_elevation_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_ELEVATION_CONSTR_3 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_AddionalAngleFields_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_azimuth_constraint_1,
- &asn_PER_memb_azimuth_constr_2,
+ &ASN_PER_MEMB_AZIMUTH_CONSTR_2,
0,
"azimuth"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_AddionalAngleFields_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_elevation_constraint_1,
- &asn_PER_memb_elevation_constr_3,
+ &ASN_PER_MEMB_ELEVATION_CONSTR_3,
0,
"elevation"
},
diff --git a/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c b/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c
index 4b0b58a30..69f732dbb 100644
--- a/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c
+++ b/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c
@@ -56,12 +56,12 @@ memb_dopplerUncertainty_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
}
}
-static asn_per_constraints_t asn_PER_memb_doppler1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER1_CONSTR_2 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_dopplerUncertainty_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_AddionalDopplerFields_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_doppler1_constraint_1,
- &asn_PER_memb_doppler1_constr_2,
+ &ASN_PER_MEMB_DOPPLER1_CONSTR_2,
0,
"doppler1"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_AddionalDopplerFields_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_dopplerUncertainty_constraint_1,
- &asn_PER_memb_dopplerUncertainty_constr_3,
+ &ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3,
0,
"dopplerUncertainty"
},
diff --git a/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c b/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c
index e62840073..3dbce8753 100644
--- a/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c
+++ b/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c
@@ -56,12 +56,12 @@ memb_dopplerUncertainty_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
}
}
-static asn_per_constraints_t asn_PER_memb_doppler1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER1_CONSTR_2 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_dopplerUncertainty_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3 = {
{ APC_CONSTRAINED, 3, 3, 0, 4 } /* (0..4) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_AdditionalDopplerFields_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_doppler1_constraint_1,
- &asn_PER_memb_doppler1_constr_2,
+ &ASN_PER_MEMB_DOPPLER1_CONSTR_2,
0,
"doppler1"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_AdditionalDopplerFields_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_dopplerUncertainty_constraint_1,
- &asn_PER_memb_dopplerUncertainty_constr_3,
+ &ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3,
0,
"dopplerUncertainty"
},
diff --git a/src/core/libs/supl/asn-rrlp/AlertFlag.c b/src/core/libs/supl/asn-rrlp/AlertFlag.c
index 52eaeeadb..a7c3f41eb 100644
--- a/src/core/libs/supl/asn-rrlp/AlertFlag.c
+++ b/src/core/libs/supl/asn-rrlp/AlertFlag.c
@@ -111,7 +111,7 @@ AlertFlag_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_AlertFlag_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ALERT_FLAG_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_AlertFlag = {
asn_DEF_AlertFlag_tags_1, /* Same as above */
sizeof(asn_DEF_AlertFlag_tags_1)
/sizeof(asn_DEF_AlertFlag_tags_1[0]), /* 1 */
- &asn_PER_type_AlertFlag_constr_1,
+ &ASN_PER_TYPE_ALERT_FLAG_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c b/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c
index c63036c97..2093a44e6 100644
--- a/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c
+++ b/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c
@@ -256,52 +256,52 @@ memb_kepAlmanacAF1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_kepAlmanacE_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_E_CONSTR_2 = {
{ APC_CONSTRAINED, 11, 11, 0, 2047 } /* (0..2047) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacDeltaI_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_DELTA_I_CONSTR_3 = {
{ APC_CONSTRAINED, 11, 11, -1024, 1023 } /* (-1024..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacOmegaDot_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_OMEGA_DOT_CONSTR_4 = {
{ APC_CONSTRAINED, 11, 11, -1024, 1023 } /* (-1024..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepSVHealth_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_SV_HEALTH_CONSTR_5 = {
{ APC_CONSTRAINED, 4, 4, 0, 15 } /* (0..15) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacAPowerHalf_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_A_POWER_HALF_CONSTR_6 = {
{ APC_CONSTRAINED, 17, -1, -65536, 65535 } /* (-65536..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacOmega0_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_OMEGA0_CONSTR_7 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacW_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_W_CONSTR_8 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacM0_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_M0_CONSTR_9 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacAF0_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_A_F0_CONSTR_10 = {
{ APC_CONSTRAINED, 14, 14, -8192, 8191 } /* (-8192..8191) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_kepAlmanacAF1_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_A_F1_CONSTR_11 = {
{ APC_CONSTRAINED, 11, 11, -1024, 1023 } /* (-1024..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -312,7 +312,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacE_constraint_1,
- &asn_PER_memb_kepAlmanacE_constr_2,
+ &ASN_PER_MEMB_KEP_ALMANAC_E_CONSTR_2,
0,
"kepAlmanacE"
},
@@ -321,7 +321,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacDeltaI_constraint_1,
- &asn_PER_memb_kepAlmanacDeltaI_constr_3,
+ &ASN_PER_MEMB_KEP_ALMANAC_DELTA_I_CONSTR_3,
0,
"kepAlmanacDeltaI"
},
@@ -330,7 +330,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacOmegaDot_constraint_1,
- &asn_PER_memb_kepAlmanacOmegaDot_constr_4,
+ &ASN_PER_MEMB_KEP_ALMANAC_OMEGA_DOT_CONSTR_4,
0,
"kepAlmanacOmegaDot"
},
@@ -339,7 +339,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepSVHealth_constraint_1,
- &asn_PER_memb_kepSVHealth_constr_5,
+ &ASN_PER_MEMB_KEP_SV_HEALTH_CONSTR_5,
0,
"kepSVHealth"
},
@@ -348,7 +348,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacAPowerHalf_constraint_1,
- &asn_PER_memb_kepAlmanacAPowerHalf_constr_6,
+ &ASN_PER_MEMB_KEP_ALMANAC_A_POWER_HALF_CONSTR_6,
0,
"kepAlmanacAPowerHalf"
},
@@ -357,7 +357,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacOmega0_constraint_1,
- &asn_PER_memb_kepAlmanacOmega0_constr_7,
+ &ASN_PER_MEMB_KEP_ALMANAC_OMEGA0_CONSTR_7,
0,
"kepAlmanacOmega0"
},
@@ -366,7 +366,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacW_constraint_1,
- &asn_PER_memb_kepAlmanacW_constr_8,
+ &ASN_PER_MEMB_KEP_ALMANAC_W_CONSTR_8,
0,
"kepAlmanacW"
},
@@ -375,7 +375,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacM0_constraint_1,
- &asn_PER_memb_kepAlmanacM0_constr_9,
+ &ASN_PER_MEMB_KEP_ALMANAC_M0_CONSTR_9,
0,
"kepAlmanacM0"
},
@@ -384,7 +384,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacAF0_constraint_1,
- &asn_PER_memb_kepAlmanacAF0_constr_10,
+ &ASN_PER_MEMB_KEP_ALMANAC_A_F0_CONSTR_10,
0,
"kepAlmanacAF0"
},
@@ -393,7 +393,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_kepAlmanacAF1_constraint_1,
- &asn_PER_memb_kepAlmanacAF1_constr_11,
+ &ASN_PER_MEMB_KEP_ALMANAC_A_F1_CONSTR_11,
0,
"kepAlmanacAF1"
},
diff --git a/src/core/libs/supl/asn-rrlp/Almanac.c b/src/core/libs/supl/asn-rrlp/Almanac.c
index a886c36b9..7f829283d 100644
--- a/src/core/libs/supl/asn-rrlp/Almanac.c
+++ b/src/core/libs/supl/asn-rrlp/Almanac.c
@@ -31,7 +31,7 @@ memb_alamanacWNa_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_alamanacWNa_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALAMANAC_W_NA_CONSTR_2 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_alamanacWNa_constraint_1,
- &asn_PER_memb_alamanacWNa_constr_2,
+ &ASN_PER_MEMB_ALAMANAC_W_NA_CONSTR_2,
0,
"alamanacWNa"
},
diff --git a/src/core/libs/supl/asn-rrlp/AlmanacElement.c b/src/core/libs/supl/asn-rrlp/AlmanacElement.c
index 702107187..848ba0af8 100644
--- a/src/core/libs/supl/asn-rrlp/AlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/AlmanacElement.c
@@ -281,57 +281,57 @@ memb_almanacAF1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_almanacE_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_E_CONSTR_3 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_alamanacToa_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALAMANAC_TOA_CONSTR_4 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacKsii_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_KSII_CONSTR_5 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacOmegaDot_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_OMEGA_DOT_CONSTR_6 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacSVhealth_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_S_VHEALTH_CONSTR_7 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacAPowerHalf_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_A_POWER_HALF_CONSTR_8 = {
{ APC_CONSTRAINED, 24, -1, 0, 16777215 } /* (0..16777215) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacOmega0_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_OMEGA0_CONSTR_9 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacW_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_W_CONSTR_10 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacM0_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_M0_CONSTR_11 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacAF0_constr_12 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_A_F0_CONSTR_12 = {
{ APC_CONSTRAINED, 11, 11, -1024, 1023 } /* (-1024..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_almanacAF1_constr_13 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_A_F1_CONSTR_13 = {
{ APC_CONSTRAINED, 11, 11, -1024, 1023 } /* (-1024..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -351,7 +351,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacE_constraint_1,
- &asn_PER_memb_almanacE_constr_3,
+ &ASN_PER_MEMB_ALMANAC_E_CONSTR_3,
0,
"almanacE"
},
@@ -360,7 +360,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_alamanacToa_constraint_1,
- &asn_PER_memb_alamanacToa_constr_4,
+ &ASN_PER_MEMB_ALAMANAC_TOA_CONSTR_4,
0,
"alamanacToa"
},
@@ -369,7 +369,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacKsii_constraint_1,
- &asn_PER_memb_almanacKsii_constr_5,
+ &ASN_PER_MEMB_ALMANAC_KSII_CONSTR_5,
0,
"almanacKsii"
},
@@ -378,7 +378,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacOmegaDot_constraint_1,
- &asn_PER_memb_almanacOmegaDot_constr_6,
+ &ASN_PER_MEMB_ALMANAC_OMEGA_DOT_CONSTR_6,
0,
"almanacOmegaDot"
},
@@ -387,7 +387,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacSVhealth_constraint_1,
- &asn_PER_memb_almanacSVhealth_constr_7,
+ &ASN_PER_MEMB_ALMANAC_S_VHEALTH_CONSTR_7,
0,
"almanacSVhealth"
},
@@ -396,7 +396,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacAPowerHalf_constraint_1,
- &asn_PER_memb_almanacAPowerHalf_constr_8,
+ &ASN_PER_MEMB_ALMANAC_A_POWER_HALF_CONSTR_8,
0,
"almanacAPowerHalf"
},
@@ -405,7 +405,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacOmega0_constraint_1,
- &asn_PER_memb_almanacOmega0_constr_9,
+ &ASN_PER_MEMB_ALMANAC_OMEGA0_CONSTR_9,
0,
"almanacOmega0"
},
@@ -414,7 +414,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacW_constraint_1,
- &asn_PER_memb_almanacW_constr_10,
+ &ASN_PER_MEMB_ALMANAC_W_CONSTR_10,
0,
"almanacW"
},
@@ -423,7 +423,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacM0_constraint_1,
- &asn_PER_memb_almanacM0_constr_11,
+ &ASN_PER_MEMB_ALMANAC_M0_CONSTR_11,
0,
"almanacM0"
},
@@ -432,7 +432,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacAF0_constraint_1,
- &asn_PER_memb_almanacAF0_constr_12,
+ &ASN_PER_MEMB_ALMANAC_A_F0_CONSTR_12,
0,
"almanacAF0"
},
@@ -441,7 +441,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_almanacAF1_constraint_1,
- &asn_PER_memb_almanacAF1_constr_13,
+ &ASN_PER_MEMB_ALMANAC_A_F1_CONSTR_13,
0,
"almanacAF1"
},
diff --git a/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c b/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c
index 5b1d648b8..353a6d2c9 100644
--- a/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c
+++ b/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c
@@ -111,7 +111,7 @@ AntiSpoofFlag_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_AntiSpoofFlag_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ANTI_SPOOF_FLAG_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_AntiSpoofFlag = {
asn_DEF_AntiSpoofFlag_tags_1, /* Same as above */
sizeof(asn_DEF_AntiSpoofFlag_tags_1)
/sizeof(asn_DEF_AntiSpoofFlag_tags_1[0]), /* 1 */
- &asn_PER_type_AntiSpoofFlag_constr_1,
+ &ASN_PER_TYPE_ANTI_SPOOF_FLAG_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/BCCHCarrier.c b/src/core/libs/supl/asn-rrlp/BCCHCarrier.c
index 72388ca5b..b6e340cfb 100644
--- a/src/core/libs/supl/asn-rrlp/BCCHCarrier.c
+++ b/src/core/libs/supl/asn-rrlp/BCCHCarrier.c
@@ -111,7 +111,7 @@ BCCHCarrier_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_BCCHCarrier_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_BCCH_CARRIER_CONSTR_1 = {
{ APC_CONSTRAINED, 10, 10, 0, 1023 } /* (0..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_BCCHCarrier = {
asn_DEF_BCCHCarrier_tags_1, /* Same as above */
sizeof(asn_DEF_BCCHCarrier_tags_1)
/sizeof(asn_DEF_BCCHCarrier_tags_1[0]), /* 1 */
- &asn_PER_type_BCCHCarrier_constr_1,
+ &ASN_PER_TYPE_BCCH_CARRIER_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/BSIC.c b/src/core/libs/supl/asn-rrlp/BSIC.c
index 378aac7ab..de1ed2b8f 100644
--- a/src/core/libs/supl/asn-rrlp/BSIC.c
+++ b/src/core/libs/supl/asn-rrlp/BSIC.c
@@ -111,7 +111,7 @@ BSIC_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_BSIC_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_BSIC_CONSTR_1 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_BSIC = {
asn_DEF_BSIC_tags_1, /* Same as above */
sizeof(asn_DEF_BSIC_tags_1)
/sizeof(asn_DEF_BSIC_tags_1[0]), /* 1 */
- &asn_PER_type_BSIC_constr_1,
+ &ASN_PER_TYPE_BSIC_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/BadSignalElement.c b/src/core/libs/supl/asn-rrlp/BadSignalElement.c
index b0ff80566..e162e0b3d 100644
--- a/src/core/libs/supl/asn-rrlp/BadSignalElement.c
+++ b/src/core/libs/supl/asn-rrlp/BadSignalElement.c
@@ -31,7 +31,7 @@ memb_badSignalID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_badSignalID_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_BAD_SIGNAL_ID_CONSTR_3 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -51,7 +51,7 @@ static asn_TYPE_member_t asn_MBR_BadSignalElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_badSignalID_constraint_1,
- &asn_PER_memb_badSignalID_constr_3,
+ &ASN_PER_MEMB_BAD_SIGNAL_ID_CONSTR_3,
0,
"badSignalID"
},
diff --git a/src/core/libs/supl/asn-rrlp/BitNumber.c b/src/core/libs/supl/asn-rrlp/BitNumber.c
index 36c17f637..0a430f9fa 100644
--- a/src/core/libs/supl/asn-rrlp/BitNumber.c
+++ b/src/core/libs/supl/asn-rrlp/BitNumber.c
@@ -111,7 +111,7 @@ BitNumber_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_BitNumber_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_BIT_NUMBER_CONSTR_1 = {
{ APC_CONSTRAINED, 8, 8, 0, 156 } /* (0..156) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_BitNumber = {
asn_DEF_BitNumber_tags_1, /* Same as above */
sizeof(asn_DEF_BitNumber_tags_1)
/sizeof(asn_DEF_BitNumber_tags_1[0]), /* 1 */
- &asn_PER_type_BitNumber_constr_1,
+ &ASN_PER_TYPE_BIT_NUMBER_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/CellID.c b/src/core/libs/supl/asn-rrlp/CellID.c
index a66eca167..e412b5ff6 100644
--- a/src/core/libs/supl/asn-rrlp/CellID.c
+++ b/src/core/libs/supl/asn-rrlp/CellID.c
@@ -111,7 +111,7 @@ CellID_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_CellID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_ID_CONSTR_1 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CellID = {
asn_DEF_CellID_tags_1, /* Same as above */
sizeof(asn_DEF_CellID_tags_1)
/sizeof(asn_DEF_CellID_tags_1[0]), /* 1 */
- &asn_PER_type_CellID_constr_1,
+ &ASN_PER_TYPE_CELL_ID_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c b/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c
index 96fd70a6e..8da024839 100644
--- a/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c
@@ -106,22 +106,22 @@ memb_rangeRateCor_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_iod_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IOD_CONSTR_3 = {
{ APC_CONSTRAINED, 10, 10, 0, 1023 } /* (0..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_udre_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UDRE_CONSTR_4 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_pseudoRangeCor_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5 = {
{ APC_CONSTRAINED, 12, 12, -2047, 2047 } /* (-2047..2047) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_rangeRateCor_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6 = {
{ APC_CONSTRAINED, 8, 8, -127, 127 } /* (-127..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_iod_constraint_1,
- &asn_PER_memb_iod_constr_3,
+ &ASN_PER_MEMB_IOD_CONSTR_3,
0,
"iod"
},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_udre_constraint_1,
- &asn_PER_memb_udre_constr_4,
+ &ASN_PER_MEMB_UDRE_CONSTR_4,
0,
"udre"
},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_pseudoRangeCor_constraint_1,
- &asn_PER_memb_pseudoRangeCor_constr_5,
+ &ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5,
0,
"pseudoRangeCor"
},
@@ -168,7 +168,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_rangeRateCor_constraint_1,
- &asn_PER_memb_rangeRateCor_constr_6,
+ &ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6,
0,
"rangeRateCor"
},
diff --git a/src/core/libs/supl/asn-rrlp/DGPSCorrections.c b/src/core/libs/supl/asn-rrlp/DGPSCorrections.c
index 781d41f61..7fa907db6 100644
--- a/src/core/libs/supl/asn-rrlp/DGPSCorrections.c
+++ b/src/core/libs/supl/asn-rrlp/DGPSCorrections.c
@@ -56,12 +56,12 @@ memb_status_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_gpsTOW_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOW_CONSTR_2 = {
{ APC_CONSTRAINED, 20, -1, 0, 604799 } /* (0..604799) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_status_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_STATUS_CONSTR_3 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_DGPSCorrections_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_gpsTOW_constraint_1,
- &asn_PER_memb_gpsTOW_constr_2,
+ &ASN_PER_MEMB_GPS_TOW_CONSTR_2,
0,
"gpsTOW"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_DGPSCorrections_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_status_constraint_1,
- &asn_PER_memb_status_constr_3,
+ &ASN_PER_MEMB_STATUS_CONSTR_3,
0,
"status"
},
diff --git a/src/core/libs/supl/asn-rrlp/EOTDQuality.c b/src/core/libs/supl/asn-rrlp/EOTDQuality.c
index 17fcacfe8..8e4454834 100644
--- a/src/core/libs/supl/asn-rrlp/EOTDQuality.c
+++ b/src/core/libs/supl/asn-rrlp/EOTDQuality.c
@@ -56,12 +56,12 @@ memb_stdOfEOTD_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_nbrOfMeasurements_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_NBR_OF_MEASUREMENTS_CONSTR_2 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_stdOfEOTD_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_STD_OF_EOTD_CONSTR_3 = {
{ APC_CONSTRAINED, 5, 5, 0, 31 } /* (0..31) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_EOTDQuality_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_nbrOfMeasurements_constraint_1,
- &asn_PER_memb_nbrOfMeasurements_constr_2,
+ &ASN_PER_MEMB_NBR_OF_MEASUREMENTS_CONSTR_2,
0,
"nbrOfMeasurements"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_EOTDQuality_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stdOfEOTD_constraint_1,
- &asn_PER_memb_stdOfEOTD_constr_3,
+ &ASN_PER_MEMB_STD_OF_EOTD_CONSTR_3,
0,
"stdOfEOTD"
},
diff --git a/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c b/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c
index d3d05c10f..18e996518 100644
--- a/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c
+++ b/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c
@@ -94,7 +94,7 @@ EnvironmentCharacter_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_EnvironmentCharacter_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ENVIRONMENT_CHARACTER_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_EnvironmentCharacter = {
asn_DEF_EnvironmentCharacter_tags_1, /* Same as above */
sizeof(asn_DEF_EnvironmentCharacter_tags_1)
/sizeof(asn_DEF_EnvironmentCharacter_tags_1[0]), /* 1 */
- &asn_PER_type_EnvironmentCharacter_constr_1,
+ &ASN_PER_TYPE_ENVIRONMENT_CHARACTER_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_EnvironmentCharacter_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c b/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c
index 5177a8615..00025f2af 100644
--- a/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c
+++ b/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c
@@ -106,22 +106,22 @@ memb_reserved4_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_reserved1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED1_CONSTR_2 = {
{ APC_CONSTRAINED, 23, -1, 0, 8388607 } /* (0..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_reserved2_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED2_CONSTR_3 = {
{ APC_CONSTRAINED, 24, -1, 0, 16777215 } /* (0..16777215) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_reserved3_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED3_CONSTR_4 = {
{ APC_CONSTRAINED, 24, -1, 0, 16777215 } /* (0..16777215) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_reserved4_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED4_CONSTR_5 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_reserved1_constraint_1,
- &asn_PER_memb_reserved1_constr_2,
+ &ASN_PER_MEMB_RESERVED1_CONSTR_2,
0,
"reserved1"
},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_reserved2_constraint_1,
- &asn_PER_memb_reserved2_constr_3,
+ &ASN_PER_MEMB_RESERVED2_CONSTR_3,
0,
"reserved2"
},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_reserved3_constraint_1,
- &asn_PER_memb_reserved3_constr_4,
+ &ASN_PER_MEMB_RESERVED3_CONSTR_4,
0,
"reserved3"
},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_reserved4_constraint_1,
- &asn_PER_memb_reserved4_constr_5,
+ &ASN_PER_MEMB_RESERVED4_CONSTR_5,
0,
"reserved4"
},
diff --git a/src/core/libs/supl/asn-rrlp/ErrorCodes.c b/src/core/libs/supl/asn-rrlp/ErrorCodes.c
index d8b61e5d2..f8def1e38 100644
--- a/src/core/libs/supl/asn-rrlp/ErrorCodes.c
+++ b/src/core/libs/supl/asn-rrlp/ErrorCodes.c
@@ -94,7 +94,7 @@ ErrorCodes_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_ErrorCodes_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ERROR_CODES_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 5 } /* (0..5,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -148,7 +148,7 @@ asn_TYPE_descriptor_t asn_DEF_ErrorCodes = {
asn_DEF_ErrorCodes_tags_1, /* Same as above */
sizeof(asn_DEF_ErrorCodes_tags_1)
/sizeof(asn_DEF_ErrorCodes_tags_1[0]), /* 1 */
- &asn_PER_type_ErrorCodes_constr_1,
+ &ASN_PER_TYPE_ERROR_CODES_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_ErrorCodes_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c b/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c
index ff557e3d1..3f35cbf60 100644
--- a/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c
+++ b/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c
@@ -111,7 +111,7 @@ ExpOTDUncertainty_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_ExpOTDUncertainty_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_EXP_OTD_UNCERTAINTY_CONSTR_1 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_ExpOTDUncertainty = {
asn_DEF_ExpOTDUncertainty_tags_1, /* Same as above */
sizeof(asn_DEF_ExpOTDUncertainty_tags_1)
/sizeof(asn_DEF_ExpOTDUncertainty_tags_1[0]), /* 1 */
- &asn_PER_type_ExpOTDUncertainty_constr_1,
+ &ASN_PER_TYPE_EXP_OTD_UNCERTAINTY_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/ExpectedOTD.c b/src/core/libs/supl/asn-rrlp/ExpectedOTD.c
index 947c22734..7b14272b0 100644
--- a/src/core/libs/supl/asn-rrlp/ExpectedOTD.c
+++ b/src/core/libs/supl/asn-rrlp/ExpectedOTD.c
@@ -111,7 +111,7 @@ ExpectedOTD_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_ExpectedOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_EXPECTED_OTD_CONSTR_1 = {
{ APC_CONSTRAINED, 11, 11, 0, 1250 } /* (0..1250) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_ExpectedOTD = {
asn_DEF_ExpectedOTD_tags_1, /* Same as above */
sizeof(asn_DEF_ExpectedOTD_tags_1)
/sizeof(asn_DEF_ExpectedOTD_tags_1[0]), /* 1 */
- &asn_PER_type_ExpectedOTD_constr_1,
+ &ASN_PER_TYPE_EXPECTED_OTD_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c b/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c
index 9df50f61d..4007fc852 100644
--- a/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c
+++ b/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c
@@ -112,7 +112,7 @@ Ext_GeographicalInformation_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_Ext_GeographicalInformation_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_EXT_GEOGRAPHICAL_INFORMATION_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 5, 5, 1, 20 } /* (SIZE(1..20)) */,
0, 0 /* No PER value map */
@@ -139,7 +139,7 @@ asn_TYPE_descriptor_t asn_DEF_Ext_GeographicalInformation = {
asn_DEF_Ext_GeographicalInformation_tags_1, /* Same as above */
sizeof(asn_DEF_Ext_GeographicalInformation_tags_1)
/sizeof(asn_DEF_Ext_GeographicalInformation_tags_1[0]), /* 1 */
- &asn_PER_type_Ext_GeographicalInformation_constr_1,
+ &ASN_PER_TYPE_EXT_GEOGRAPHICAL_INFORMATION_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/Extended-reference.c b/src/core/libs/supl/asn-rrlp/Extended-reference.c
index 12ca01ebe..198fbffe3 100644
--- a/src/core/libs/supl/asn-rrlp/Extended-reference.c
+++ b/src/core/libs/supl/asn-rrlp/Extended-reference.c
@@ -56,12 +56,12 @@ memb_transaction_ID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_smlc_code_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SMLC_CODE_CONSTR_2 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_transaction_ID_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_TRANSACTION_ID_CONSTR_3 = {
{ APC_CONSTRAINED, 18, -1, 0, 262143 } /* (0..262143) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_Extended_reference_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_smlc_code_constraint_1,
- &asn_PER_memb_smlc_code_constr_2,
+ &ASN_PER_MEMB_SMLC_CODE_CONSTR_2,
0,
"smlc-code"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_Extended_reference_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_transaction_ID_constraint_1,
- &asn_PER_memb_transaction_ID_constr_3,
+ &ASN_PER_MEMB_TRANSACTION_ID_CONSTR_3,
0,
"transaction-ID"
},
diff --git a/src/core/libs/supl/asn-rrlp/FineRTD.c b/src/core/libs/supl/asn-rrlp/FineRTD.c
index 6a31fa718..a692cc908 100644
--- a/src/core/libs/supl/asn-rrlp/FineRTD.c
+++ b/src/core/libs/supl/asn-rrlp/FineRTD.c
@@ -111,7 +111,7 @@ FineRTD_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_FineRTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FINE_RTD_CONSTR_1 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FineRTD = {
asn_DEF_FineRTD_tags_1, /* Same as above */
sizeof(asn_DEF_FineRTD_tags_1)
/sizeof(asn_DEF_FineRTD_tags_1[0]), /* 1 */
- &asn_PER_type_FineRTD_constr_1,
+ &ASN_PER_TYPE_FINE_RTD_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/FixType.c b/src/core/libs/supl/asn-rrlp/FixType.c
index d413f29c7..17c34842b 100644
--- a/src/core/libs/supl/asn-rrlp/FixType.c
+++ b/src/core/libs/supl/asn-rrlp/FixType.c
@@ -111,7 +111,7 @@ FixType_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_FixType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FIX_TYPE_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FixType = {
asn_DEF_FixType_tags_1, /* Same as above */
sizeof(asn_DEF_FixType_tags_1)
/sizeof(asn_DEF_FixType_tags_1[0]), /* 1 */
- &asn_PER_type_FixType_constr_1,
+ &ASN_PER_TYPE_FIX_TYPE_CONSTR_1,
0, 0, /* Defined elsewhere */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/FrameDrift.c b/src/core/libs/supl/asn-rrlp/FrameDrift.c
index 0a0238c9f..ae533e585 100644
--- a/src/core/libs/supl/asn-rrlp/FrameDrift.c
+++ b/src/core/libs/supl/asn-rrlp/FrameDrift.c
@@ -111,7 +111,7 @@ FrameDrift_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_FrameDrift_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FRAME_DRIFT_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, -64, 63 } /* (-64..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FrameDrift = {
asn_DEF_FrameDrift_tags_1, /* Same as above */
sizeof(asn_DEF_FrameDrift_tags_1)
/sizeof(asn_DEF_FrameDrift_tags_1[0]), /* 1 */
- &asn_PER_type_FrameDrift_constr_1,
+ &ASN_PER_TYPE_FRAME_DRIFT_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/FrameNumber.c b/src/core/libs/supl/asn-rrlp/FrameNumber.c
index b8778f7f8..b028e5903 100644
--- a/src/core/libs/supl/asn-rrlp/FrameNumber.c
+++ b/src/core/libs/supl/asn-rrlp/FrameNumber.c
@@ -111,7 +111,7 @@ FrameNumber_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_FrameNumber_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FRAME_NUMBER_CONSTR_1 = {
{ APC_CONSTRAINED, 21, -1, 0, 2097151 } /* (0..2097151) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FrameNumber = {
asn_DEF_FrameNumber_tags_1, /* Same as above */
sizeof(asn_DEF_FrameNumber_tags_1)
/sizeof(asn_DEF_FrameNumber_tags_1[0]), /* 1 */
- &asn_PER_type_FrameNumber_constr_1,
+ &ASN_PER_TYPE_FRAME_NUMBER_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c
index 229783ca8..f6cf5ba0f 100644
--- a/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c
@@ -31,7 +31,7 @@ memb_deltaGNASSTOD_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_deltaGNASSTOD_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_GNASSTOD_CONSTR_4 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -60,7 +60,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_MsrSetElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_deltaGNASSTOD_constraint_1,
- &asn_PER_memb_deltaGNASSTOD_constr_4,
+ &ASN_PER_MEMB_DELTA_GNASSTOD_CONSTR_4,
0,
"deltaGNASSTOD"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c b/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c
index 6f31ab9b9..302a2fc62 100644
--- a/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c
@@ -181,37 +181,37 @@ memb_adr_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_cNo_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_C_NO_CONSTR_3 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_carrierQualityInd_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_CARRIER_QUALITY_IND_CONSTR_5 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_codePhase_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_CONSTR_6 = {
{ APC_CONSTRAINED, 21, -1, 0, 2097151 } /* (0..2097151) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_integerCodePhase_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_INTEGER_CODE_PHASE_CONSTR_7 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_codePhaseRMSError_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_RMS_ERROR_CONSTR_8 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_doppler_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_CONSTR_9 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_adr_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_ADR_CONSTR_10 = {
{ APC_CONSTRAINED, 25, -1, 0, 33554431 } /* (0..33554431) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -231,7 +231,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_cNo_constraint_1,
- &asn_PER_memb_cNo_constr_3,
+ &ASN_PER_MEMB_C_NO_CONSTR_3,
0,
"cNo"
},
@@ -249,7 +249,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_carrierQualityInd_constraint_1,
- &asn_PER_memb_carrierQualityInd_constr_5,
+ &ASN_PER_MEMB_CARRIER_QUALITY_IND_CONSTR_5,
0,
"carrierQualityInd"
},
@@ -258,7 +258,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_codePhase_constraint_1,
- &asn_PER_memb_codePhase_constr_6,
+ &ASN_PER_MEMB_CODE_PHASE_CONSTR_6,
0,
"codePhase"
},
@@ -267,7 +267,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_integerCodePhase_constraint_1,
- &asn_PER_memb_integerCodePhase_constr_7,
+ &ASN_PER_MEMB_INTEGER_CODE_PHASE_CONSTR_7,
0,
"integerCodePhase"
},
@@ -276,7 +276,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_codePhaseRMSError_constraint_1,
- &asn_PER_memb_codePhaseRMSError_constr_8,
+ &ASN_PER_MEMB_CODE_PHASE_RMS_ERROR_CONSTR_8,
0,
"codePhaseRMSError"
},
@@ -285,7 +285,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_doppler_constraint_1,
- &asn_PER_memb_doppler_constr_9,
+ &ASN_PER_MEMB_DOPPLER_CONSTR_9,
0,
"doppler"
},
@@ -294,7 +294,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_adr_constraint_1,
- &asn_PER_memb_adr_constr_10,
+ &ASN_PER_MEMB_ADR_CONSTR_10,
0,
"adr"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c b/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c
index cffb812c8..fce8af4e8 100644
--- a/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c
@@ -31,7 +31,7 @@ memb_ganssSignalID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssSignalID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2 = {
{ APC_CONSTRAINED, 4, 4, 0, 15 } /* (0..15) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnTypeElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssSignalID_constraint_1,
- &asn_PER_memb_ganssSignalID_constr_2,
+ &ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2,
0,
"ganssSignalID"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c b/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c
index c41627282..906260ab4 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c
@@ -6,7 +6,7 @@
#include "GANSSAlmanacElement.h"
-static asn_per_constraints_t asn_PER_type_GANSSAlmanacElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_ALMANAC_ELEMENT_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 0, 0, 0, 0 } /* (0..0,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -52,7 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSAlmanacElement = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_GANSSAlmanacElement_constr_1,
+ &ASN_PER_TYPE_GANSS_ALMANAC_ELEMENT_CONSTR_1,
asn_MBR_GANSSAlmanacElement_1,
1, /* Elements count */
&asn_SPC_GANSSAlmanacElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c b/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c
index 3fb9dff20..77630b337 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c
@@ -81,17 +81,17 @@ memb_ioda_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_weekNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_WEEK_NUMBER_CONSTR_2 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_toa_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_TOA_CONSTR_4 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ioda_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_IODA_CONSTR_5 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GANSSAlmanacModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_weekNumber_constraint_1,
- &asn_PER_memb_weekNumber_constr_2,
+ &ASN_PER_MEMB_WEEK_NUMBER_CONSTR_2,
0,
"weekNumber"
},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GANSSAlmanacModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_toa_constraint_1,
- &asn_PER_memb_toa_constr_4,
+ &ASN_PER_MEMB_TOA_CONSTR_4,
0,
"toa"
},
@@ -129,7 +129,7 @@ static asn_TYPE_member_t asn_MBR_GANSSAlmanacModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ioda_constraint_1,
- &asn_PER_memb_ioda_constr_5,
+ &ASN_PER_MEMB_IODA_CONSTR_5,
0,
"ioda"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c b/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c
index dbf9340b3..8d6fda870 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c
@@ -112,7 +112,7 @@ GANSSAssistanceData_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GANSSAssistanceData_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_ASSISTANCE_DATA_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 6, 6, 1, 40 } /* (SIZE(1..40)) */,
0, 0 /* No PER value map */
@@ -139,7 +139,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSAssistanceData = {
asn_DEF_GANSSAssistanceData_tags_1, /* Same as above */
sizeof(asn_DEF_GANSSAssistanceData_tags_1)
/sizeof(asn_DEF_GANSSAssistanceData_tags_1[0]), /* 1 */
- &asn_PER_type_GANSSAssistanceData_constr_1,
+ &ASN_PER_TYPE_GANSS_ASSISTANCE_DATA_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSSClockModel.c b/src/core/libs/supl/asn-rrlp/GANSSClockModel.c
index 3dd4501e7..bfe58654d 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSClockModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSClockModel.c
@@ -6,7 +6,7 @@
#include "GANSSClockModel.h"
-static asn_per_constraints_t asn_PER_type_GANSSClockModel_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_CLOCK_MODEL_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 0, 0, 0, 0 } /* (0..0,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -52,7 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSClockModel = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_GANSSClockModel_constr_1,
+ &ASN_PER_TYPE_GANSS_CLOCK_MODEL_CONSTR_1,
asn_MBR_GANSSClockModel_1,
1, /* Elements count */
&asn_SPC_GANSSClockModel_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GANSSDataBit.c b/src/core/libs/supl/asn-rrlp/GANSSDataBit.c
index 67e8a5f0a..5f1ab2f6a 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSDataBit.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSDataBit.c
@@ -111,7 +111,7 @@ GANSSDataBit_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GANSSDataBit_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_DATA_BIT_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSDataBit = {
asn_DEF_GANSSDataBit_tags_1, /* Same as above */
sizeof(asn_DEF_GANSSDataBit_tags_1)
/sizeof(asn_DEF_GANSSDataBit_tags_1[0]), /* 1 */
- &asn_PER_type_GANSSDataBit_constr_1,
+ &ASN_PER_TYPE_GANSS_DATA_BIT_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c b/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c
index 83aae91c6..29945a448 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c
@@ -56,12 +56,12 @@ memb_ganssDataTypeID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssTOD_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TOD_CONSTR_2 = {
{ APC_CONSTRAINED, 6, 6, 0, 59 } /* (0..59) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssDataTypeID_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_DATA_TYPE_ID_CONSTR_4 = {
{ APC_CONSTRAINED, 2, 2, 0, 2 } /* (0..2) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_GANSSDataBitAssist_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssTOD_constraint_1,
- &asn_PER_memb_ganssTOD_constr_2,
+ &ASN_PER_MEMB_GANSS_TOD_CONSTR_2,
0,
"ganssTOD"
},
@@ -90,7 +90,7 @@ static asn_TYPE_member_t asn_MBR_GANSSDataBitAssist_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssDataTypeID_constraint_1,
- &asn_PER_memb_ganssDataTypeID_constr_4,
+ &ASN_PER_MEMB_GANSS_DATA_TYPE_ID_CONSTR_4,
0,
"ganssDataTypeID"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c b/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c
index 4492d1eba..ded9c4b2f 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c
@@ -31,7 +31,7 @@ memb_dganssRefTime_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_dganssRefTime_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_DGANSS_REF_TIME_CONSTR_2 = {
{ APC_CONSTRAINED, 7, 7, 0, 119 } /* (0..119) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSSDiffCorrections_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_dganssRefTime_constraint_1,
- &asn_PER_memb_dganssRefTime_constr_2,
+ &ASN_PER_MEMB_DGANSS_REF_TIME_CONSTR_2,
0,
"dganssRefTime"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c b/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c
index f9ee75d4f..abc4c3225 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c
@@ -31,7 +31,7 @@ memb_ganssID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_ID_CONSTR_2 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSSGenericAssistDataElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssID_constraint_1,
- &asn_PER_memb_ganssID_constr_2,
+ &ASN_PER_MEMB_GANSS_ID_CONSTR_2,
0,
"ganssID"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c b/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c
index 9f5ad93bc..0ca6bbf45 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c
@@ -131,27 +131,27 @@ memb_ionoStormFlag5_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG1_CONSTR_2 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag2_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG2_CONSTR_3 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag3_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG3_CONSTR_4 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag4_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG4_CONSTR_5 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag5_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG5_CONSTR_6 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -162,7 +162,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ionoStormFlag1_constraint_1,
- &asn_PER_memb_ionoStormFlag1_constr_2,
+ &ASN_PER_MEMB_IONO_STORM_FLAG1_CONSTR_2,
0,
"ionoStormFlag1"
},
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ionoStormFlag2_constraint_1,
- &asn_PER_memb_ionoStormFlag2_constr_3,
+ &ASN_PER_MEMB_IONO_STORM_FLAG2_CONSTR_3,
0,
"ionoStormFlag2"
},
@@ -180,7 +180,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ionoStormFlag3_constraint_1,
- &asn_PER_memb_ionoStormFlag3_constr_4,
+ &ASN_PER_MEMB_IONO_STORM_FLAG3_CONSTR_4,
0,
"ionoStormFlag3"
},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ionoStormFlag4_constraint_1,
- &asn_PER_memb_ionoStormFlag4_constr_5,
+ &ASN_PER_MEMB_IONO_STORM_FLAG4_CONSTR_5,
0,
"ionoStormFlag4"
},
@@ -198,7 +198,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ionoStormFlag5_constraint_1,
- &asn_PER_memb_ionoStormFlag5_constr_6,
+ &ASN_PER_MEMB_IONO_STORM_FLAG5_CONSTR_6,
0,
"ionoStormFlag5"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c b/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c
index 10e7c67f0..5390b0def 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c
@@ -81,17 +81,17 @@ memb_ai2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ai0_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_AI0_CONSTR_2 = {
{ APC_CONSTRAINED, 12, 12, 0, 4095 } /* (0..4095) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ai1_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_AI1_CONSTR_3 = {
{ APC_CONSTRAINED, 12, 12, 0, 4095 } /* (0..4095) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ai2_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_AI2_CONSTR_4 = {
{ APC_CONSTRAINED, 12, 12, 0, 4095 } /* (0..4095) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonosphereModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ai0_constraint_1,
- &asn_PER_memb_ai0_constr_2,
+ &ASN_PER_MEMB_AI0_CONSTR_2,
0,
"ai0"
},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonosphereModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ai1_constraint_1,
- &asn_PER_memb_ai1_constr_3,
+ &ASN_PER_MEMB_AI1_CONSTR_3,
0,
"ai1"
},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonosphereModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ai2_constraint_1,
- &asn_PER_memb_ai2_constr_4,
+ &ASN_PER_MEMB_AI2_CONSTR_4,
0,
"ai2"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c b/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c
index c98360895..3dbae18cf 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c
@@ -81,17 +81,17 @@ memb_stationaryIndication_constraint_1(asn_TYPE_descriptor_t *td, const void *sp
}
}
-static asn_per_constraints_t asn_PER_memb_ganssTODFrac_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TOD_FRAC_CONSTR_4 = {
{ APC_CONSTRAINED, 15, 15, 0, 16384 } /* (0..16384) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssTimeID_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_6 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_stationaryIndication_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_STATIONARY_INDICATION_CONSTR_9 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GANSSLocationInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssTODFrac_constraint_1,
- &asn_PER_memb_ganssTODFrac_constr_4,
+ &ASN_PER_MEMB_GANSS_TOD_FRAC_CONSTR_4,
0,
"ganssTODFrac"
},
@@ -138,7 +138,7 @@ static asn_TYPE_member_t asn_MBR_GANSSLocationInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssTimeID_constraint_1,
- &asn_PER_memb_ganssTimeID_constr_6,
+ &ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_6,
0,
"ganssTimeID"
},
@@ -165,7 +165,7 @@ static asn_TYPE_member_t asn_MBR_GANSSLocationInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stationaryIndication_constraint_1,
- &asn_PER_memb_stationaryIndication_constr_9,
+ &ASN_PER_MEMB_STATIONARY_INDICATION_CONSTR_9,
0,
"stationaryIndication"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSNavModel.c b/src/core/libs/supl/asn-rrlp/GANSSNavModel.c
index 46c7cc984..1d9b2cb66 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSNavModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSNavModel.c
@@ -106,22 +106,22 @@ memb_sqrtAMBS_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_nonBroadcastIndFlag_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_NON_BROADCAST_IND_FLAG_CONSTR_2 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_toeMSB_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_TOE_MSB_CONSTR_3 = {
{ APC_CONSTRAINED, 5, 5, 0, 31 } /* (0..31) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_eMSB_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_E_MSB_CONSTR_4 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_sqrtAMBS_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_SQRT_AMBS_CONSTR_5 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_nonBroadcastIndFlag_constraint_1,
- &asn_PER_memb_nonBroadcastIndFlag_constr_2,
+ &ASN_PER_MEMB_NON_BROADCAST_IND_FLAG_CONSTR_2,
0,
"nonBroadcastIndFlag"
},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_toeMSB_constraint_1,
- &asn_PER_memb_toeMSB_constr_3,
+ &ASN_PER_MEMB_TOE_MSB_CONSTR_3,
0,
"toeMSB"
},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_eMSB_constraint_1,
- &asn_PER_memb_eMSB_constr_4,
+ &ASN_PER_MEMB_E_MSB_CONSTR_4,
0,
"eMSB"
},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_sqrtAMBS_constraint_1,
- &asn_PER_memb_sqrtAMBS_constr_5,
+ &ASN_PER_MEMB_SQRT_AMBS_CONSTR_5,
0,
"sqrtAMBS"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c b/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c
index 5bd45837a..ff3bba79c 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c
@@ -6,7 +6,7 @@
#include "GANSSOrbitModel.h"
-static asn_per_constraints_t asn_PER_type_GANSSOrbitModel_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_ORBIT_MODEL_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 0, 0, 0, 0 } /* (0..0,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -52,7 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSOrbitModel = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_GANSSOrbitModel_constr_1,
+ &ASN_PER_TYPE_GANSS_ORBIT_MODEL_CONSTR_1,
asn_MBR_GANSSOrbitModel_1,
1, /* Elements count */
&asn_SPC_GANSSOrbitModel_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c b/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c
index aaff620c7..77f16b6d7 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c
@@ -117,7 +117,7 @@ GANSSPositioningMethod_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GANSSPositioningMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_POSITIONING_METHOD_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 2, 16 } /* (SIZE(2..16)) */,
0, 0 /* No PER value map */
@@ -144,7 +144,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSPositioningMethod = {
asn_DEF_GANSSPositioningMethod_tags_1, /* Same as above */
sizeof(asn_DEF_GANSSPositioningMethod_tags_1)
/sizeof(asn_DEF_GANSSPositioningMethod_tags_1[0]), /* 1 */
- &asn_PER_type_GANSSPositioningMethod_constr_1,
+ &ASN_PER_TYPE_GANSS_POSITIONING_METHOD_CONSTR_1,
0, 0, /* Defined elsewhere */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c
index 9a5a09290..28f7fb4ed 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c
@@ -31,7 +31,7 @@ memb_ganssSignalID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssSignalID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementAssist_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssSignalID_constraint_1,
- &asn_PER_memb_ganssSignalID_constr_2,
+ &ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2,
0,
"ganssSignalID"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c
index f67633244..c527baf5a 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c
@@ -106,22 +106,22 @@ memb_codePhaseSearchWindow_constraint_1(asn_TYPE_descriptor_t *td, const void *s
}
}
-static asn_per_constraints_t asn_PER_memb_doppler0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER0_CONSTR_3 = {
{ APC_CONSTRAINED, 12, 12, -2048, 2047 } /* (-2048..2047) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_codePhase_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_CONSTR_5 = {
{ APC_CONSTRAINED, 10, 10, 0, 1022 } /* (0..1022) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_intCodePhase_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_codePhaseSearchWindow_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_7 = {
{ APC_CONSTRAINED, 5, 5, 0, 31 } /* (0..31) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_doppler0_constraint_1,
- &asn_PER_memb_doppler0_constr_3,
+ &ASN_PER_MEMB_DOPPLER0_CONSTR_3,
0,
"doppler0"
},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_codePhase_constraint_1,
- &asn_PER_memb_codePhase_constr_5,
+ &ASN_PER_MEMB_CODE_PHASE_CONSTR_5,
0,
"codePhase"
},
@@ -168,7 +168,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_intCodePhase_constraint_1,
- &asn_PER_memb_intCodePhase_constr_6,
+ &ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6,
0,
"intCodePhase"
},
@@ -177,7 +177,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_codePhaseSearchWindow_constraint_1,
- &asn_PER_memb_codePhaseSearchWindow_constr_7,
+ &ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_7,
0,
"codePhaseSearchWindow"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c b/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c
index 406523ba9..c1bd034fe 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c
@@ -56,12 +56,12 @@ memb_ganssTimeID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssDay_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_DAY_CONSTR_2 = {
{ APC_CONSTRAINED, 13, 13, 0, 8191 } /* (0..8191) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssTimeID_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_5 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefTimeInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssDay_constraint_1,
- &asn_PER_memb_ganssDay_constr_2,
+ &ASN_PER_MEMB_GANSS_DAY_CONSTR_2,
0,
"ganssDay"
},
@@ -99,7 +99,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefTimeInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssTimeID_constraint_1,
- &asn_PER_memb_ganssTimeID_constr_5,
+ &ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_5,
0,
"ganssTimeID"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c b/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c
index d32e86bf5..67367ff6f 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c
@@ -56,12 +56,12 @@ memb_iod_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_svHealth_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_SV_HEALTH_CONSTR_3 = {
{ APC_CONSTRAINED, 5, 5, -7, 13 } /* (-7..13) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_iod_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_IOD_CONSTR_4 = {
{ APC_CONSTRAINED, 10, 10, 0, 1023 } /* (0..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_GANSSSatelliteElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_svHealth_constraint_1,
- &asn_PER_memb_svHealth_constr_3,
+ &ASN_PER_MEMB_SV_HEALTH_CONSTR_3,
0,
"svHealth"
},
@@ -90,7 +90,7 @@ static asn_TYPE_member_t asn_MBR_GANSSSatelliteElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_iod_constraint_1,
- &asn_PER_memb_iod_constr_4,
+ &ASN_PER_MEMB_IOD_CONSTR_4,
0,
"iod"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSSignalID.c b/src/core/libs/supl/asn-rrlp/GANSSSignalID.c
index dfcdb15da..05ddb3db6 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSSignalID.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSSignalID.c
@@ -111,7 +111,7 @@ GANSSSignalID_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GANSSSignalID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_SIGNAL_ID_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSSignalID = {
asn_DEF_GANSSSignalID_tags_1, /* Same as above */
sizeof(asn_DEF_GANSSSignalID_tags_1)
/sizeof(asn_DEF_GANSSSignalID_tags_1[0]), /* 1 */
- &asn_PER_type_GANSSSignalID_constr_1,
+ &ASN_PER_TYPE_GANSS_SIGNAL_ID_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTOD.c b/src/core/libs/supl/asn-rrlp/GANSSTOD.c
index b2007aaa9..5022d5bd3 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTOD.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTOD.c
@@ -111,7 +111,7 @@ GANSSTOD_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GANSSTOD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSSTOD_CONSTR_1 = {
{ APC_CONSTRAINED, 17, -1, 0, 86399 } /* (0..86399) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSTOD = {
asn_DEF_GANSSTOD_tags_1, /* Same as above */
sizeof(asn_DEF_GANSSTOD_tags_1)
/sizeof(asn_DEF_GANSSTOD_tags_1[0]), /* 1 */
- &asn_PER_type_GANSSTOD_constr_1,
+ &ASN_PER_TYPE_GANSSTOD_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c b/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c
index a07695911..72519d28c 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c
@@ -111,7 +111,7 @@ GANSSTODUncertainty_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GANSSTODUncertainty_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSSTOD_UNCERTAINTY_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSTODUncertainty = {
asn_DEF_GANSSTODUncertainty_tags_1, /* Same as above */
sizeof(asn_DEF_GANSSTODUncertainty_tags_1)
/sizeof(asn_DEF_GANSSTODUncertainty_tags_1[0]), /* 1 */
- &asn_PER_type_GANSSTODUncertainty_constr_1,
+ &ASN_PER_TYPE_GANSSTOD_UNCERTAINTY_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTODm.c b/src/core/libs/supl/asn-rrlp/GANSSTODm.c
index 02a84dfe7..2bc765980 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTODm.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTODm.c
@@ -111,7 +111,7 @@ GANSSTODm_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GANSSTODm_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSSTO_DM_CONSTR_1 = {
{ APC_CONSTRAINED, 22, -1, 0, 3599999 } /* (0..3599999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSTODm = {
asn_DEF_GANSSTODm_tags_1, /* Same as above */
sizeof(asn_DEF_GANSSTODm_tags_1)
/sizeof(asn_DEF_GANSSTODm_tags_1[0]), /* 1 */
- &asn_PER_type_GANSSTODm_constr_1,
+ &ASN_PER_TYPE_GANSSTO_DM_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c b/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c
index 6ba69bb30..cd993b5e5 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c
@@ -81,17 +81,17 @@ memb_weekNumber_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssTimeModelRefTime_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TIME_MODEL_REF_TIME_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_gnssTOID_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_GNSS_TOID_CONSTR_6 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_weekNumber_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_WEEK_NUMBER_CONSTR_7 = {
{ APC_CONSTRAINED, 13, 13, 0, 8191 } /* (0..8191) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GANSSTimeModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssTimeModelRefTime_constraint_1,
- &asn_PER_memb_ganssTimeModelRefTime_constr_2,
+ &ASN_PER_MEMB_GANSS_TIME_MODEL_REF_TIME_CONSTR_2,
0,
"ganssTimeModelRefTime"
},
@@ -138,7 +138,7 @@ static asn_TYPE_member_t asn_MBR_GANSSTimeModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_gnssTOID_constraint_1,
- &asn_PER_memb_gnssTOID_constr_6,
+ &ASN_PER_MEMB_GNSS_TOID_CONSTR_6,
0,
"gnssTOID"
},
@@ -147,7 +147,7 @@ static asn_TYPE_member_t asn_MBR_GANSSTimeModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_weekNumber_constraint_1,
- &asn_PER_memb_weekNumber_constr_7,
+ &ASN_PER_MEMB_WEEK_NUMBER_CONSTR_7,
0,
"weekNumber"
},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c b/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c
index 5366ea85d..8d37ddc7a 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c
@@ -206,42 +206,42 @@ memb_ganssUtcDeltaTlsf_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssUtcA1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_A1_CONSTR_2 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssUtcA0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_A0_CONSTR_3 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssUtcTot_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_TOT_CONSTR_4 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssUtcWNt_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_W_NT_CONSTR_5 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssUtcDeltaTls_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_DELTA_TLS_CONSTR_6 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssUtcWNlsf_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_W_NLSF_CONSTR_7 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssUtcDN_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_DN_CONSTR_8 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ganssUtcDeltaTlsf_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_DELTA_TLSF_CONSTR_9 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcA1_constraint_1,
- &asn_PER_memb_ganssUtcA1_constr_2,
+ &ASN_PER_MEMB_GANSS_UTC_A1_CONSTR_2,
0,
"ganssUtcA1"
},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcA0_constraint_1,
- &asn_PER_memb_ganssUtcA0_constr_3,
+ &ASN_PER_MEMB_GANSS_UTC_A0_CONSTR_3,
0,
"ganssUtcA0"
},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcTot_constraint_1,
- &asn_PER_memb_ganssUtcTot_constr_4,
+ &ASN_PER_MEMB_GANSS_UTC_TOT_CONSTR_4,
0,
"ganssUtcTot"
},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcWNt_constraint_1,
- &asn_PER_memb_ganssUtcWNt_constr_5,
+ &ASN_PER_MEMB_GANSS_UTC_W_NT_CONSTR_5,
0,
"ganssUtcWNt"
},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcDeltaTls_constraint_1,
- &asn_PER_memb_ganssUtcDeltaTls_constr_6,
+ &ASN_PER_MEMB_GANSS_UTC_DELTA_TLS_CONSTR_6,
0,
"ganssUtcDeltaTls"
},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcWNlsf_constraint_1,
- &asn_PER_memb_ganssUtcWNlsf_constr_7,
+ &ASN_PER_MEMB_GANSS_UTC_W_NLSF_CONSTR_7,
0,
"ganssUtcWNlsf"
},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcDN_constraint_1,
- &asn_PER_memb_ganssUtcDN_constr_8,
+ &ASN_PER_MEMB_GANSS_UTC_DN_CONSTR_8,
0,
"ganssUtcDN"
},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssUtcDeltaTlsf_constraint_1,
- &asn_PER_memb_ganssUtcDeltaTlsf_constr_9,
+ &ASN_PER_MEMB_GANSS_UTC_DELTA_TLSF_CONSTR_9,
0,
"ganssUtcDeltaTlsf"
},
diff --git a/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c b/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c
index 96d4d1de7..756a7f54e 100644
--- a/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c
+++ b/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c
@@ -131,27 +131,27 @@ memb_pseuRangeRMSErr_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_cNo_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_C_NO_CONSTR_3 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_doppler_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_CONSTR_4 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_wholeChips_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_WHOLE_CHIPS_CONSTR_5 = {
{ APC_CONSTRAINED, 10, 10, 0, 1022 } /* (0..1022) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_fracChips_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_FRAC_CHIPS_CONSTR_6 = {
{ APC_CONSTRAINED, 11, 11, 0, 1024 } /* (0..1024) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_pseuRangeRMSErr_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_PSEU_RANGE_RMS_ERR_CONSTR_8 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_cNo_constraint_1,
- &asn_PER_memb_cNo_constr_3,
+ &ASN_PER_MEMB_C_NO_CONSTR_3,
0,
"cNo"
},
@@ -180,7 +180,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_doppler_constraint_1,
- &asn_PER_memb_doppler_constr_4,
+ &ASN_PER_MEMB_DOPPLER_CONSTR_4,
0,
"doppler"
},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_wholeChips_constraint_1,
- &asn_PER_memb_wholeChips_constr_5,
+ &ASN_PER_MEMB_WHOLE_CHIPS_CONSTR_5,
0,
"wholeChips"
},
@@ -198,7 +198,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_fracChips_constraint_1,
- &asn_PER_memb_fracChips_constr_6,
+ &ASN_PER_MEMB_FRAC_CHIPS_CONSTR_6,
0,
"fracChips"
},
@@ -216,7 +216,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_pseuRangeRMSErr_constraint_1,
- &asn_PER_memb_pseuRangeRMSErr_constr_8,
+ &ASN_PER_MEMB_PSEU_RANGE_RMS_ERR_CONSTR_8,
0,
"pseuRangeRMSErr"
},
diff --git a/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c
index 91c0ce711..c1aec7065 100644
--- a/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c
@@ -31,7 +31,7 @@ memb_refFrame_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_refFrame_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrSetElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refFrame_constraint_1,
- &asn_PER_memb_refFrame_constr_2,
+ &ASN_PER_MEMB_REF_FRAME_CONSTR_2,
0,
"refFrame"
},
diff --git a/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c b/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c
index f2604dbcf..6f93d65f3 100644
--- a/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c
+++ b/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c
@@ -112,7 +112,7 @@ GPSAssistanceData_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GPSAssistanceData_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPS_ASSISTANCE_DATA_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 6, 6, 1, 40 } /* (SIZE(1..40)) */,
0, 0 /* No PER value map */
@@ -139,7 +139,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSAssistanceData = {
asn_DEF_GPSAssistanceData_tags_1, /* Same as above */
sizeof(asn_DEF_GPSAssistanceData_tags_1)
/sizeof(asn_DEF_GPSAssistanceData_tags_1[0]), /* 1 */
- &asn_PER_type_GPSAssistanceData_constr_1,
+ &ASN_PER_TYPE_GPS_ASSISTANCE_DATA_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c b/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c
index 1250731f0..c80de1dad 100644
--- a/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c
+++ b/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c
@@ -111,7 +111,7 @@ GPSReferenceTimeUncertainty_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GPSReferenceTimeUncertainty_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPS_REFERENCE_TIME_UNCERTAINTY_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSReferenceTimeUncertainty = {
asn_DEF_GPSReferenceTimeUncertainty_tags_1, /* Same as above */
sizeof(asn_DEF_GPSReferenceTimeUncertainty_tags_1)
/sizeof(asn_DEF_GPSReferenceTimeUncertainty_tags_1[0]), /* 1 */
- &asn_PER_type_GPSReferenceTimeUncertainty_constr_1,
+ &ASN_PER_TYPE_GPS_REFERENCE_TIME_UNCERTAINTY_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GPSTOW23b.c b/src/core/libs/supl/asn-rrlp/GPSTOW23b.c
index 8ad2591cb..fe1c9d773 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTOW23b.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTOW23b.c
@@ -111,7 +111,7 @@ GPSTOW23b_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GPSTOW23b_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPSTO_W23B_CONSTR_1 = {
{ APC_CONSTRAINED, 23, -1, 0, 7559999 } /* (0..7559999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSTOW23b = {
asn_DEF_GPSTOW23b_tags_1, /* Same as above */
sizeof(asn_DEF_GPSTOW23b_tags_1)
/sizeof(asn_DEF_GPSTOW23b_tags_1[0]), /* 1 */
- &asn_PER_type_GPSTOW23b_constr_1,
+ &ASN_PER_TYPE_GPSTO_W23B_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GPSTOW24b.c b/src/core/libs/supl/asn-rrlp/GPSTOW24b.c
index 6a110adac..805fe2577 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTOW24b.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTOW24b.c
@@ -111,7 +111,7 @@ GPSTOW24b_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GPSTOW24b_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPSTO_W24B_CONSTR_1 = {
{ APC_CONSTRAINED, 24, -1, 0, 14399999 } /* (0..14399999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSTOW24b = {
asn_DEF_GPSTOW24b_tags_1, /* Same as above */
sizeof(asn_DEF_GPSTOW24b_tags_1)
/sizeof(asn_DEF_GPSTOW24b_tags_1[0]), /* 1 */
- &asn_PER_type_GPSTOW24b_constr_1,
+ &ASN_PER_TYPE_GPSTO_W24B_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c b/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c
index aac3de697..0ce4905d9 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c
@@ -6,7 +6,7 @@
#include "GPSTOWAssist.h"
-static asn_per_constraints_t asn_PER_type_GPSTOWAssist_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPSTOW_ASSIST_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 12 } /* (SIZE(1..12)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSTOWAssist = {
asn_DEF_GPSTOWAssist_tags_1, /* Same as above */
sizeof(asn_DEF_GPSTOWAssist_tags_1)
/sizeof(asn_DEF_GPSTOWAssist_tags_1[0]), /* 1 */
- &asn_PER_type_GPSTOWAssist_constr_1,
+ &ASN_PER_TYPE_GPSTOW_ASSIST_CONSTR_1,
asn_MBR_GPSTOWAssist_1,
1, /* Single element */
&asn_SPC_GPSTOWAssist_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c b/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c
index 6e7fe01d8..67ef9b1a3 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c
@@ -81,17 +81,17 @@ memb_deltaTow_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_referenceFrameMSB_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_FRAME_MSB_CONSTR_2 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_gpsTowSubms_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOW_SUBMS_CONSTR_3 = {
{ APC_CONSTRAINED, 14, 14, 0, 9999 } /* (0..9999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_deltaTow_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_TOW_CONSTR_4 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GPSTimeAssistanceMeasurements_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_referenceFrameMSB_constraint_1,
- &asn_PER_memb_referenceFrameMSB_constr_2,
+ &ASN_PER_MEMB_REFERENCE_FRAME_MSB_CONSTR_2,
0,
"referenceFrameMSB"
},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_GPSTimeAssistanceMeasurements_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_gpsTowSubms_constraint_1,
- &asn_PER_memb_gpsTowSubms_constr_3,
+ &ASN_PER_MEMB_GPS_TOW_SUBMS_CONSTR_3,
0,
"gpsTowSubms"
},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GPSTimeAssistanceMeasurements_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_deltaTow_constraint_1,
- &asn_PER_memb_deltaTow_constr_4,
+ &ASN_PER_MEMB_DELTA_TOW_CONSTR_4,
0,
"deltaTow"
},
diff --git a/src/core/libs/supl/asn-rrlp/GPSWeek.c b/src/core/libs/supl/asn-rrlp/GPSWeek.c
index 33cb12809..0b312cb38 100644
--- a/src/core/libs/supl/asn-rrlp/GPSWeek.c
+++ b/src/core/libs/supl/asn-rrlp/GPSWeek.c
@@ -111,7 +111,7 @@ GPSWeek_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_GPSWeek_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPS_WEEK_CONSTR_1 = {
{ APC_CONSTRAINED, 10, 10, 0, 1023 } /* (0..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSWeek = {
asn_DEF_GPSWeek_tags_1, /* Same as above */
sizeof(asn_DEF_GPSWeek_tags_1)
/sizeof(asn_DEF_GPSWeek_tags_1[0]), /* 1 */
- &asn_PER_type_GPSWeek_constr_1,
+ &ASN_PER_TYPE_GPS_WEEK_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/IonosphericModel.c b/src/core/libs/supl/asn-rrlp/IonosphericModel.c
index 552004de2..bafe72b87 100644
--- a/src/core/libs/supl/asn-rrlp/IonosphericModel.c
+++ b/src/core/libs/supl/asn-rrlp/IonosphericModel.c
@@ -206,42 +206,42 @@ memb_beta3_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_alfa0_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA0_CONSTR_2 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_alfa1_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA1_CONSTR_3 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_alfa2_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA2_CONSTR_4 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_alfa3_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA3_CONSTR_5 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_beta0_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA0_CONSTR_6 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_beta1_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA1_CONSTR_7 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_beta2_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA2_CONSTR_8 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_beta3_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA3_CONSTR_9 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_alfa0_constraint_1,
- &asn_PER_memb_alfa0_constr_2,
+ &ASN_PER_MEMB_ALFA0_CONSTR_2,
0,
"alfa0"
},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_alfa1_constraint_1,
- &asn_PER_memb_alfa1_constr_3,
+ &ASN_PER_MEMB_ALFA1_CONSTR_3,
0,
"alfa1"
},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_alfa2_constraint_1,
- &asn_PER_memb_alfa2_constr_4,
+ &ASN_PER_MEMB_ALFA2_CONSTR_4,
0,
"alfa2"
},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_alfa3_constraint_1,
- &asn_PER_memb_alfa3_constr_5,
+ &ASN_PER_MEMB_ALFA3_CONSTR_5,
0,
"alfa3"
},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_beta0_constraint_1,
- &asn_PER_memb_beta0_constr_6,
+ &ASN_PER_MEMB_BETA0_CONSTR_6,
0,
"beta0"
},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_beta1_constraint_1,
- &asn_PER_memb_beta1_constr_7,
+ &ASN_PER_MEMB_BETA1_CONSTR_7,
0,
"beta1"
},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_beta2_constraint_1,
- &asn_PER_memb_beta2_constr_8,
+ &ASN_PER_MEMB_BETA2_CONSTR_8,
0,
"beta2"
},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_beta3_constraint_1,
- &asn_PER_memb_beta3_constr_9,
+ &ASN_PER_MEMB_BETA3_CONSTR_9,
0,
"beta3"
},
diff --git a/src/core/libs/supl/asn-rrlp/LAC.c b/src/core/libs/supl/asn-rrlp/LAC.c
index e15942e24..d6de9a0ae 100644
--- a/src/core/libs/supl/asn-rrlp/LAC.c
+++ b/src/core/libs/supl/asn-rrlp/LAC.c
@@ -111,7 +111,7 @@ LAC_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_LAC_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_LAC_CONSTR_1 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_LAC = {
asn_DEF_LAC_tags_1, /* Same as above */
sizeof(asn_DEF_LAC_tags_1)
/sizeof(asn_DEF_LAC_tags_1[0]), /* 1 */
- &asn_PER_type_LAC_constr_1,
+ &ASN_PER_TYPE_LAC_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/LocErrorReason.c b/src/core/libs/supl/asn-rrlp/LocErrorReason.c
index 2d98516db..217112048 100644
--- a/src/core/libs/supl/asn-rrlp/LocErrorReason.c
+++ b/src/core/libs/supl/asn-rrlp/LocErrorReason.c
@@ -94,7 +94,7 @@ LocErrorReason_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_LocErrorReason_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_LOC_ERROR_REASON_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 0, 10 } /* (0..10,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -164,7 +164,7 @@ asn_TYPE_descriptor_t asn_DEF_LocErrorReason = {
asn_DEF_LocErrorReason_tags_1, /* Same as above */
sizeof(asn_DEF_LocErrorReason_tags_1)
/sizeof(asn_DEF_LocErrorReason_tags_1[0]), /* 1 */
- &asn_PER_type_LocErrorReason_constr_1,
+ &ASN_PER_TYPE_LOC_ERROR_REASON_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_LocErrorReason_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/LocationInfo.c b/src/core/libs/supl/asn-rrlp/LocationInfo.c
index 92d0990f6..53a747679 100644
--- a/src/core/libs/supl/asn-rrlp/LocationInfo.c
+++ b/src/core/libs/supl/asn-rrlp/LocationInfo.c
@@ -56,12 +56,12 @@ memb_gpsTOW_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_refFrame_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_gpsTOW_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOW_CONSTR_3 = {
{ APC_CONSTRAINED, 24, -1, 0, 14399999 } /* (0..14399999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_LocationInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refFrame_constraint_1,
- &asn_PER_memb_refFrame_constr_2,
+ &ASN_PER_MEMB_REF_FRAME_CONSTR_2,
0,
"refFrame"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_LocationInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_gpsTOW_constraint_1,
- &asn_PER_memb_gpsTOW_constr_3,
+ &ASN_PER_MEMB_GPS_TOW_CONSTR_3,
0,
"gpsTOW"
},
diff --git a/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c b/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c
index 808aef74c..f46280af2 100644
--- a/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c
+++ b/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c
@@ -111,7 +111,7 @@ MeasureResponseTime_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_MeasureResponseTime_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MEASURE_RESPONSE_TIME_CONSTR_1 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_MeasureResponseTime = {
asn_DEF_MeasureResponseTime_tags_1, /* Same as above */
sizeof(asn_DEF_MeasureResponseTime_tags_1)
/sizeof(asn_DEF_MeasureResponseTime_tags_1[0]), /* 1 */
- &asn_PER_type_MeasureResponseTime_constr_1,
+ &ASN_PER_TYPE_MEASURE_RESPONSE_TIME_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/MethodType.c b/src/core/libs/supl/asn-rrlp/MethodType.c
index 7a2b9ecfa..dc7782e8e 100644
--- a/src/core/libs/supl/asn-rrlp/MethodType.c
+++ b/src/core/libs/supl/asn-rrlp/MethodType.c
@@ -6,7 +6,7 @@
#include "MethodType.h"
-static asn_per_constraints_t asn_PER_type_MethodType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_METHOD_TYPE_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -82,7 +82,7 @@ asn_TYPE_descriptor_t asn_DEF_MethodType = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_MethodType_constr_1,
+ &ASN_PER_TYPE_METHOD_TYPE_CONSTR_1,
asn_MBR_MethodType_1,
4, /* Elements count */
&asn_SPC_MethodType_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c b/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c
index bf42ed64a..b14a2967f 100644
--- a/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c
+++ b/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c
@@ -111,7 +111,7 @@ ModuloTimeSlot_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_ModuloTimeSlot_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MODULO_TIME_SLOT_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_ModuloTimeSlot = {
asn_DEF_ModuloTimeSlot_tags_1, /* Same as above */
sizeof(asn_DEF_ModuloTimeSlot_tags_1)
/sizeof(asn_DEF_ModuloTimeSlot_tags_1[0]), /* 1 */
- &asn_PER_type_ModuloTimeSlot_constr_1,
+ &ASN_PER_TYPE_MODULO_TIME_SLOT_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c b/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c
index b2a849cb5..dd107752c 100644
--- a/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c
+++ b/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c
@@ -94,7 +94,7 @@ MoreAssDataToBeSent_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_MoreAssDataToBeSent_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MORE_ASS_DATA_TO_BE_SENT_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_MoreAssDataToBeSent = {
asn_DEF_MoreAssDataToBeSent_tags_1, /* Same as above */
sizeof(asn_DEF_MoreAssDataToBeSent_tags_1)
/sizeof(asn_DEF_MoreAssDataToBeSent_tags_1[0]), /* 1 */
- &asn_PER_type_MoreAssDataToBeSent_constr_1,
+ &ASN_PER_TYPE_MORE_ASS_DATA_TO_BE_SENT_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_MoreAssDataToBeSent_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/MpathIndic.c b/src/core/libs/supl/asn-rrlp/MpathIndic.c
index 8a1a0a280..67e26d4b0 100644
--- a/src/core/libs/supl/asn-rrlp/MpathIndic.c
+++ b/src/core/libs/supl/asn-rrlp/MpathIndic.c
@@ -94,7 +94,7 @@ MpathIndic_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_MpathIndic_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MPATH_INDIC_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_MpathIndic = {
asn_DEF_MpathIndic_tags_1, /* Same as above */
sizeof(asn_DEF_MpathIndic_tags_1)
/sizeof(asn_DEF_MpathIndic_tags_1[0]), /* 1 */
- &asn_PER_type_MpathIndic_constr_1,
+ &ASN_PER_TYPE_MPATH_INDIC_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_MpathIndic_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c b/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c
index 8d9149817..297d81b3f 100644
--- a/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c
+++ b/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c
@@ -111,7 +111,7 @@ MultiFrameOffset_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_MultiFrameOffset_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MULTI_FRAME_OFFSET_CONSTR_1 = {
{ APC_CONSTRAINED, 6, 6, 0, 51 } /* (0..51) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_MultiFrameOffset = {
asn_DEF_MultiFrameOffset_tags_1, /* Same as above */
sizeof(asn_DEF_MultiFrameOffset_tags_1)
/sizeof(asn_DEF_MultiFrameOffset_tags_1[0]), /* 1 */
- &asn_PER_type_MultiFrameOffset_constr_1,
+ &ASN_PER_TYPE_MULTI_FRAME_OFFSET_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/MultipleSets.c b/src/core/libs/supl/asn-rrlp/MultipleSets.c
index cce55bd21..7199ac11d 100644
--- a/src/core/libs/supl/asn-rrlp/MultipleSets.c
+++ b/src/core/libs/supl/asn-rrlp/MultipleSets.c
@@ -56,12 +56,12 @@ memb_nbrOfReferenceBTSs_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
}
}
-static asn_per_constraints_t asn_PER_memb_nbrOfSets_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_NBR_OF_SETS_CONSTR_2 = {
{ APC_CONSTRAINED, 1, 1, 2, 3 } /* (2..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_nbrOfReferenceBTSs_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_NBR_OF_REFERENCE_BT_SS_CONSTR_3 = {
{ APC_CONSTRAINED, 2, 2, 1, 3 } /* (1..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_MultipleSets_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_nbrOfSets_constraint_1,
- &asn_PER_memb_nbrOfSets_constr_2,
+ &ASN_PER_MEMB_NBR_OF_SETS_CONSTR_2,
0,
"nbrOfSets"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_MultipleSets_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_nbrOfReferenceBTSs_constraint_1,
- &asn_PER_memb_nbrOfReferenceBTSs_constr_3,
+ &ASN_PER_MEMB_NBR_OF_REFERENCE_BT_SS_CONSTR_3,
0,
"nbrOfReferenceBTSs"
},
diff --git a/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c b/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c
index 1b2ae3a79..4dcb8a6ec 100644
--- a/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c
+++ b/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c
@@ -406,82 +406,82 @@ memb_keplerCuc_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_keplerToeLSB_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_TOE_LSB_CONSTR_2 = {
{ APC_CONSTRAINED, 9, 9, 0, 511 } /* (0..511) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerW_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_W_CONSTR_3 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerDeltaN_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_DELTA_N_CONSTR_4 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerM0_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_M0_CONSTR_5 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerOmegaDot_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_OMEGA_DOT_CONSTR_6 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerELSB_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_ELSB_CONSTR_7 = {
{ APC_CONSTRAINED, 25, -1, 0, 33554431 } /* (0..33554431) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerIDot_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_I_DOT_CONSTR_8 = {
{ APC_CONSTRAINED, 14, 14, -8192, 8191 } /* (-8192..8191) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerAPowerHalfLSB_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_A_POWER_HALF_LSB_CONSTR_9 = {
{ APC_CONSTRAINED, 26, -1, 0, 67108863 } /* (0..67108863) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerI0_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_I0_CONSTR_10 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerOmega0_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_OMEGA0_CONSTR_11 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerCrs_constr_12 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CRS_CONSTR_12 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerCis_constr_13 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CIS_CONSTR_13 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerCus_constr_14 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CUS_CONSTR_14 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerCrc_constr_15 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CRC_CONSTR_15 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerCic_constr_16 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CIC_CONSTR_16 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_keplerCuc_constr_17 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CUC_CONSTR_17 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -492,7 +492,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerToeLSB_constraint_1,
- &asn_PER_memb_keplerToeLSB_constr_2,
+ &ASN_PER_MEMB_KEPLER_TOE_LSB_CONSTR_2,
0,
"keplerToeLSB"
},
@@ -501,7 +501,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerW_constraint_1,
- &asn_PER_memb_keplerW_constr_3,
+ &ASN_PER_MEMB_KEPLER_W_CONSTR_3,
0,
"keplerW"
},
@@ -510,7 +510,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerDeltaN_constraint_1,
- &asn_PER_memb_keplerDeltaN_constr_4,
+ &ASN_PER_MEMB_KEPLER_DELTA_N_CONSTR_4,
0,
"keplerDeltaN"
},
@@ -519,7 +519,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerM0_constraint_1,
- &asn_PER_memb_keplerM0_constr_5,
+ &ASN_PER_MEMB_KEPLER_M0_CONSTR_5,
0,
"keplerM0"
},
@@ -528,7 +528,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerOmegaDot_constraint_1,
- &asn_PER_memb_keplerOmegaDot_constr_6,
+ &ASN_PER_MEMB_KEPLER_OMEGA_DOT_CONSTR_6,
0,
"keplerOmegaDot"
},
@@ -537,7 +537,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerELSB_constraint_1,
- &asn_PER_memb_keplerELSB_constr_7,
+ &ASN_PER_MEMB_KEPLER_ELSB_CONSTR_7,
0,
"keplerELSB"
},
@@ -546,7 +546,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerIDot_constraint_1,
- &asn_PER_memb_keplerIDot_constr_8,
+ &ASN_PER_MEMB_KEPLER_I_DOT_CONSTR_8,
0,
"keplerIDot"
},
@@ -555,7 +555,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerAPowerHalfLSB_constraint_1,
- &asn_PER_memb_keplerAPowerHalfLSB_constr_9,
+ &ASN_PER_MEMB_KEPLER_A_POWER_HALF_LSB_CONSTR_9,
0,
"keplerAPowerHalfLSB"
},
@@ -564,7 +564,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerI0_constraint_1,
- &asn_PER_memb_keplerI0_constr_10,
+ &ASN_PER_MEMB_KEPLER_I0_CONSTR_10,
0,
"keplerI0"
},
@@ -573,7 +573,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerOmega0_constraint_1,
- &asn_PER_memb_keplerOmega0_constr_11,
+ &ASN_PER_MEMB_KEPLER_OMEGA0_CONSTR_11,
0,
"keplerOmega0"
},
@@ -582,7 +582,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerCrs_constraint_1,
- &asn_PER_memb_keplerCrs_constr_12,
+ &ASN_PER_MEMB_KEPLER_CRS_CONSTR_12,
0,
"keplerCrs"
},
@@ -591,7 +591,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerCis_constraint_1,
- &asn_PER_memb_keplerCis_constr_13,
+ &ASN_PER_MEMB_KEPLER_CIS_CONSTR_13,
0,
"keplerCis"
},
@@ -600,7 +600,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerCus_constraint_1,
- &asn_PER_memb_keplerCus_constr_14,
+ &ASN_PER_MEMB_KEPLER_CUS_CONSTR_14,
0,
"keplerCus"
},
@@ -609,7 +609,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerCrc_constraint_1,
- &asn_PER_memb_keplerCrc_constr_15,
+ &ASN_PER_MEMB_KEPLER_CRC_CONSTR_15,
0,
"keplerCrc"
},
@@ -618,7 +618,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerCic_constraint_1,
- &asn_PER_memb_keplerCic_constr_16,
+ &ASN_PER_MEMB_KEPLER_CIC_CONSTR_16,
0,
"keplerCic"
},
@@ -627,7 +627,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_keplerCuc_constraint_1,
- &asn_PER_memb_keplerCuc_constr_17,
+ &ASN_PER_MEMB_KEPLER_CUC_CONSTR_17,
0,
"keplerCuc"
},
diff --git a/src/core/libs/supl/asn-rrlp/NeighborIdentity.c b/src/core/libs/supl/asn-rrlp/NeighborIdentity.c
index 624b5cec2..4c6a649bb 100644
--- a/src/core/libs/supl/asn-rrlp/NeighborIdentity.c
+++ b/src/core/libs/supl/asn-rrlp/NeighborIdentity.c
@@ -6,7 +6,7 @@
#include "NeighborIdentity.h"
-static asn_per_constraints_t asn_PER_type_NeighborIdentity_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NEIGHBOR_IDENTITY_CONSTR_1 = {
{ APC_CONSTRAINED, 3, 3, 0, 5 } /* (0..5) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -102,7 +102,7 @@ asn_TYPE_descriptor_t asn_DEF_NeighborIdentity = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_NeighborIdentity_constr_1,
+ &ASN_PER_TYPE_NEIGHBOR_IDENTITY_CONSTR_1,
asn_MBR_NeighborIdentity_1,
6, /* Elements count */
&asn_SPC_NeighborIdentity_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c b/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c
index 1f748f2cc..047b97557 100644
--- a/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c
+++ b/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c
@@ -111,7 +111,7 @@ NumOfMeasurements_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_NumOfMeasurements_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NUM_OF_MEASUREMENTS_CONSTR_1 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_NumOfMeasurements = {
asn_DEF_NumOfMeasurements_tags_1, /* Same as above */
sizeof(asn_DEF_NumOfMeasurements_tags_1)
/sizeof(asn_DEF_NumOfMeasurements_tags_1[0]), /* 1 */
- &asn_PER_type_NumOfMeasurements_constr_1,
+ &ASN_PER_TYPE_NUM_OF_MEASUREMENTS_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/OCTET_STRING.c b/src/core/libs/supl/asn-rrlp/OCTET_STRING.c
index bd2d1d845..98aebb3bf 100644
--- a/src/core/libs/supl/asn-rrlp/OCTET_STRING.c
+++ b/src/core/libs/supl/asn-rrlp/OCTET_STRING.c
@@ -19,7 +19,7 @@ static asn_OCTET_STRING_specifics_t asn_DEF_OCTET_STRING_specs = {
offsetof(OCTET_STRING_t, _asn_ctx),
ASN_OSUBV_STR
};
-static asn_per_constraints_t asn_DEF_OCTET_STRING_constraints = {
+static asn_per_constraints_t ASN_DEF_OCTET_STRING_CONSTRAINTS = {
{ APC_CONSTRAINED, 8, 8, 0, 255 },
{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 },
0, 0
@@ -1351,8 +1351,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
cval = &pc->value;
csiz = &pc->size;
} else {
- cval = &asn_DEF_OCTET_STRING_constraints.value;
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
}
switch(specs->subvariant) {
@@ -1400,8 +1400,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
int inext = per_get_few_bits(pd, 1);
if(inext < 0) RETURN(RC_WMORE);
if(inext) {
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
- cval = &asn_DEF_OCTET_STRING_constraints.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
unit_bits = canonical_unit_bits;
}
}
@@ -1526,8 +1526,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
cval = &pc->value;
csiz = &pc->size;
} else {
- cval = &asn_DEF_OCTET_STRING_constraints.value;
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
}
ct_extensible = csiz->flags & APC_EXTENSIBLE;
@@ -1577,8 +1577,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
if((int)sizeinunits < csiz->lower_bound
|| (int)sizeinunits > csiz->upper_bound) {
if(ct_extensible) {
- cval = &asn_DEF_OCTET_STRING_constraints.value;
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
unit_bits = canonical_unit_bits;
inext = 1;
} else
diff --git a/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c b/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c
index 5a55a2d96..a61d02dc6 100644
--- a/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c
+++ b/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c
@@ -56,12 +56,12 @@ memb_taCorrection_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_refFrameNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 42431 } /* (0..42431) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_taCorrection_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_TA_CORRECTION_CONSTR_6 = {
{ APC_CONSTRAINED, 10, 10, 0, 960 } /* (0..960) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementFirst_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refFrameNumber_constraint_1,
- &asn_PER_memb_refFrameNumber_constr_2,
+ &ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2,
0,
"refFrameNumber"
},
@@ -108,7 +108,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementFirst_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_taCorrection_constraint_1,
- &asn_PER_memb_taCorrection_constr_6,
+ &ASN_PER_MEMB_TA_CORRECTION_CONSTR_6,
0,
"taCorrection"
},
diff --git a/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c b/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c
index d779dab1d..ad523960e 100644
--- a/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c
+++ b/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c
@@ -56,12 +56,12 @@ memb_taCorrection_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_refFrameNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 42431 } /* (0..42431) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_taCorrection_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_TA_CORRECTION_CONSTR_6 = {
{ APC_CONSTRAINED, 10, 10, 0, 960 } /* (0..960) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementRest_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refFrameNumber_constraint_1,
- &asn_PER_memb_refFrameNumber_constr_2,
+ &ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2,
0,
"refFrameNumber"
},
@@ -108,7 +108,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementRest_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_taCorrection_constraint_1,
- &asn_PER_memb_taCorrection_constr_6,
+ &ASN_PER_MEMB_TA_CORRECTION_CONSTR_6,
0,
"taCorrection"
},
diff --git a/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c b/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c
index a331cc268..d018129ab 100644
--- a/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c
+++ b/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c
@@ -6,7 +6,7 @@
#include "OTD-MsrsOfOtherSets.h"
-static asn_per_constraints_t asn_PER_type_OTD_MsrsOfOtherSets_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_OTD_MSRS_OF_OTHER_SETS_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_OTD_MsrsOfOtherSets = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_OTD_MsrsOfOtherSets_constr_1,
+ &ASN_PER_TYPE_OTD_MSRS_OF_OTHER_SETS_CONSTR_1,
asn_MBR_OTD_MsrsOfOtherSets_1,
2, /* Elements count */
&asn_SPC_OTD_MsrsOfOtherSets_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/OTDValue.c b/src/core/libs/supl/asn-rrlp/OTDValue.c
index 28ae50d85..4f837f8c9 100644
--- a/src/core/libs/supl/asn-rrlp/OTDValue.c
+++ b/src/core/libs/supl/asn-rrlp/OTDValue.c
@@ -111,7 +111,7 @@ OTDValue_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_OTDValue_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_OTD_VALUE_CONSTR_1 = {
{ APC_CONSTRAINED, 16, 16, 0, 39999 } /* (0..39999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_OTDValue = {
asn_DEF_OTDValue_tags_1, /* Same as above */
sizeof(asn_DEF_OTDValue_tags_1)
/sizeof(asn_DEF_OTDValue_tags_1[0]), /* 1 */
- &asn_PER_type_OTDValue_constr_1,
+ &ASN_PER_TYPE_OTD_VALUE_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/PDU.c b/src/core/libs/supl/asn-rrlp/PDU.c
index ae0cceeed..bf4708ddd 100644
--- a/src/core/libs/supl/asn-rrlp/PDU.c
+++ b/src/core/libs/supl/asn-rrlp/PDU.c
@@ -31,7 +31,7 @@ memb_referenceNumber_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_referenceNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_NUMBER_CONSTR_2 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_referenceNumber_constraint_1,
- &asn_PER_memb_referenceNumber_constr_2,
+ &ASN_PER_MEMB_REFERENCE_NUMBER_CONSTR_2,
0,
"referenceNumber"
},
diff --git a/src/core/libs/supl/asn-rrlp/PositionData.c b/src/core/libs/supl/asn-rrlp/PositionData.c
index 7f53011b8..249c4bf46 100644
--- a/src/core/libs/supl/asn-rrlp/PositionData.c
+++ b/src/core/libs/supl/asn-rrlp/PositionData.c
@@ -117,7 +117,7 @@ PositionData_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_PositionData_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POSITION_DATA_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 3, 16 } /* (SIZE(3..16)) */,
0, 0 /* No PER value map */
@@ -144,7 +144,7 @@ asn_TYPE_descriptor_t asn_DEF_PositionData = {
asn_DEF_PositionData_tags_1, /* Same as above */
sizeof(asn_DEF_PositionData_tags_1)
/sizeof(asn_DEF_PositionData_tags_1[0]), /* 1 */
- &asn_PER_type_PositionData_constr_1,
+ &ASN_PER_TYPE_POSITION_DATA_CONSTR_1,
0, 0, /* Defined elsewhere */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/PositionMethod.c b/src/core/libs/supl/asn-rrlp/PositionMethod.c
index 07e07f2a3..b1c3df488 100644
--- a/src/core/libs/supl/asn-rrlp/PositionMethod.c
+++ b/src/core/libs/supl/asn-rrlp/PositionMethod.c
@@ -94,7 +94,7 @@ PositionMethod_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_PositionMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POSITION_METHOD_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 2 } /* (0..2) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -140,7 +140,7 @@ asn_TYPE_descriptor_t asn_DEF_PositionMethod = {
asn_DEF_PositionMethod_tags_1, /* Same as above */
sizeof(asn_DEF_PositionMethod_tags_1)
/sizeof(asn_DEF_PositionMethod_tags_1[0]), /* 1 */
- &asn_PER_type_PositionMethod_constr_1,
+ &ASN_PER_TYPE_POSITION_METHOD_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_PositionMethod_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/RRLP-Component.c b/src/core/libs/supl/asn-rrlp/RRLP-Component.c
index e587f7de4..fe8f448a7 100644
--- a/src/core/libs/supl/asn-rrlp/RRLP-Component.c
+++ b/src/core/libs/supl/asn-rrlp/RRLP-Component.c
@@ -6,7 +6,7 @@
#include "RRLP-Component.h"
-static asn_per_constraints_t asn_PER_type_RRLP_Component_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_RRLP_COMPONENT_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 4 } /* (0..4,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -92,7 +92,7 @@ asn_TYPE_descriptor_t asn_DEF_RRLP_Component = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_RRLP_Component_constr_1,
+ &ASN_PER_TYPE_RRLP_COMPONENT_CONSTR_1,
asn_MBR_RRLP_Component_1,
5, /* Elements count */
&asn_SPC_RRLP_Component_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/RefQuality.c b/src/core/libs/supl/asn-rrlp/RefQuality.c
index f64877ef4..0b4fd5c23 100644
--- a/src/core/libs/supl/asn-rrlp/RefQuality.c
+++ b/src/core/libs/supl/asn-rrlp/RefQuality.c
@@ -111,7 +111,7 @@ RefQuality_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_RefQuality_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REF_QUALITY_CONSTR_1 = {
{ APC_CONSTRAINED, 5, 5, 0, 31 } /* (0..31) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RefQuality = {
asn_DEF_RefQuality_tags_1, /* Same as above */
sizeof(asn_DEF_RefQuality_tags_1)
/sizeof(asn_DEF_RefQuality_tags_1[0]), /* 1 */
- &asn_PER_type_RefQuality_constr_1,
+ &ASN_PER_TYPE_REF_QUALITY_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/ReferenceFrame.c b/src/core/libs/supl/asn-rrlp/ReferenceFrame.c
index 56c1bbc50..96d482637 100644
--- a/src/core/libs/supl/asn-rrlp/ReferenceFrame.c
+++ b/src/core/libs/supl/asn-rrlp/ReferenceFrame.c
@@ -56,12 +56,12 @@ memb_referenceFNMSB_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_referenceFN_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_FN_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_referenceFNMSB_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_FNMSB_CONSTR_3 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_ReferenceFrame_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_referenceFN_constraint_1,
- &asn_PER_memb_referenceFN_constr_2,
+ &ASN_PER_MEMB_REFERENCE_FN_CONSTR_2,
0,
"referenceFN"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_ReferenceFrame_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_referenceFNMSB_constraint_1,
- &asn_PER_memb_referenceFNMSB_constr_3,
+ &ASN_PER_MEMB_REFERENCE_FNMSB_CONSTR_3,
0,
"referenceFNMSB"
},
diff --git a/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c b/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c
index d36515591..95e47ecb4 100644
--- a/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c
+++ b/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c
@@ -6,7 +6,7 @@
#include "ReferenceIdentityType.h"
-static asn_per_constraints_t asn_PER_type_ReferenceIdentityType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REFERENCE_IDENTITY_TYPE_CONSTR_1 = {
{ APC_CONSTRAINED, 3, 3, 0, 4 } /* (0..4) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -92,7 +92,7 @@ asn_TYPE_descriptor_t asn_DEF_ReferenceIdentityType = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_ReferenceIdentityType_constr_1,
+ &ASN_PER_TYPE_REFERENCE_IDENTITY_TYPE_CONSTR_1,
asn_MBR_ReferenceIdentityType_1,
5, /* Elements count */
&asn_SPC_ReferenceIdentityType_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/ReferenceRelation.c b/src/core/libs/supl/asn-rrlp/ReferenceRelation.c
index 931e2c477..c4497a860 100644
--- a/src/core/libs/supl/asn-rrlp/ReferenceRelation.c
+++ b/src/core/libs/supl/asn-rrlp/ReferenceRelation.c
@@ -94,7 +94,7 @@ ReferenceRelation_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_ReferenceRelation_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REFERENCE_RELATION_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 2 } /* (0..2) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -140,7 +140,7 @@ asn_TYPE_descriptor_t asn_DEF_ReferenceRelation = {
asn_DEF_ReferenceRelation_tags_1, /* Same as above */
sizeof(asn_DEF_ReferenceRelation_tags_1)
/sizeof(asn_DEF_ReferenceRelation_tags_1[0]), /* 1 */
- &asn_PER_type_ReferenceRelation_constr_1,
+ &ASN_PER_TYPE_REFERENCE_RELATION_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_ReferenceRelation_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/RelDistance.c b/src/core/libs/supl/asn-rrlp/RelDistance.c
index a444e3f70..8273278e4 100644
--- a/src/core/libs/supl/asn-rrlp/RelDistance.c
+++ b/src/core/libs/supl/asn-rrlp/RelDistance.c
@@ -111,7 +111,7 @@ RelDistance_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_RelDistance_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REL_DISTANCE_CONSTR_1 = {
{ APC_CONSTRAINED, 19, -1, -200000, 200000 } /* (-200000..200000) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RelDistance = {
asn_DEF_RelDistance_tags_1, /* Same as above */
sizeof(asn_DEF_RelDistance_tags_1)
/sizeof(asn_DEF_RelDistance_tags_1[0]), /* 1 */
- &asn_PER_type_RelDistance_constr_1,
+ &ASN_PER_TYPE_REL_DISTANCE_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/RelativeAlt.c b/src/core/libs/supl/asn-rrlp/RelativeAlt.c
index c65d44aa1..78cc612e4 100644
--- a/src/core/libs/supl/asn-rrlp/RelativeAlt.c
+++ b/src/core/libs/supl/asn-rrlp/RelativeAlt.c
@@ -111,7 +111,7 @@ RelativeAlt_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_RelativeAlt_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_RELATIVE_ALT_CONSTR_1 = {
{ APC_CONSTRAINED, 13, 13, -4000, 4000 } /* (-4000..4000) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RelativeAlt = {
asn_DEF_RelativeAlt_tags_1, /* Same as above */
sizeof(asn_DEF_RelativeAlt_tags_1)
/sizeof(asn_DEF_RelativeAlt_tags_1[0]), /* 1 */
- &asn_PER_type_RelativeAlt_constr_1,
+ &ASN_PER_TYPE_RELATIVE_ALT_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/RequestIndex.c b/src/core/libs/supl/asn-rrlp/RequestIndex.c
index 6d481f20f..f238a32f6 100644
--- a/src/core/libs/supl/asn-rrlp/RequestIndex.c
+++ b/src/core/libs/supl/asn-rrlp/RequestIndex.c
@@ -111,7 +111,7 @@ RequestIndex_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_RequestIndex_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REQUEST_INDEX_CONSTR_1 = {
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (1..16) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RequestIndex = {
asn_DEF_RequestIndex_tags_1, /* Same as above */
sizeof(asn_DEF_RequestIndex_tags_1)
/sizeof(asn_DEF_RequestIndex_tags_1[0]), /* 1 */
- &asn_PER_type_RequestIndex_constr_1,
+ &ASN_PER_TYPE_REQUEST_INDEX_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c b/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c
index 52aff059d..89fd8b230 100644
--- a/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c
+++ b/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c
@@ -111,7 +111,7 @@ RequiredResponseTime_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_RequiredResponseTime_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REQUIRED_RESPONSE_TIME_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 1, 128 } /* (1..128) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RequiredResponseTime = {
asn_DEF_RequiredResponseTime_tags_1, /* Same as above */
sizeof(asn_DEF_RequiredResponseTime_tags_1)
/sizeof(asn_DEF_RequiredResponseTime_tags_1[0]), /* 1 */
- &asn_PER_type_RequiredResponseTime_constr_1,
+ &ASN_PER_TYPE_REQUIRED_RESPONSE_TIME_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/RoughRTD.c b/src/core/libs/supl/asn-rrlp/RoughRTD.c
index db420b619..d9222b869 100644
--- a/src/core/libs/supl/asn-rrlp/RoughRTD.c
+++ b/src/core/libs/supl/asn-rrlp/RoughRTD.c
@@ -111,7 +111,7 @@ RoughRTD_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_RoughRTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ROUGH_RTD_CONSTR_1 = {
{ APC_CONSTRAINED, 11, 11, 0, 1250 } /* (0..1250) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RoughRTD = {
asn_DEF_RoughRTD_tags_1, /* Same as above */
sizeof(asn_DEF_RoughRTD_tags_1)
/sizeof(asn_DEF_RoughRTD_tags_1[0]), /* 1 */
- &asn_PER_type_RoughRTD_constr_1,
+ &ASN_PER_TYPE_ROUGH_RTD_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/SVID.c b/src/core/libs/supl/asn-rrlp/SVID.c
index 5a9adbd3a..ab082f9c0 100644
--- a/src/core/libs/supl/asn-rrlp/SVID.c
+++ b/src/core/libs/supl/asn-rrlp/SVID.c
@@ -111,7 +111,7 @@ SVID_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_SVID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SVID_CONSTR_1 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SVID = {
asn_DEF_SVID_tags_1, /* Same as above */
sizeof(asn_DEF_SVID_tags_1)
/sizeof(asn_DEF_SVID_tags_1[0]), /* 1 */
- &asn_PER_type_SVID_constr_1,
+ &ASN_PER_TYPE_SVID_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/SVIDMASK.c b/src/core/libs/supl/asn-rrlp/SVIDMASK.c
index 7c2c1a590..9791443d6 100644
--- a/src/core/libs/supl/asn-rrlp/SVIDMASK.c
+++ b/src/core/libs/supl/asn-rrlp/SVIDMASK.c
@@ -117,7 +117,7 @@ SVIDMASK_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_SVIDMASK_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SVIDMASK_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 6, 6, 1, 36 } /* (SIZE(1..36)) */,
0, 0 /* No PER value map */
@@ -144,7 +144,7 @@ asn_TYPE_descriptor_t asn_DEF_SVIDMASK = {
asn_DEF_SVIDMASK_tags_1, /* Same as above */
sizeof(asn_DEF_SVIDMASK_tags_1)
/sizeof(asn_DEF_SVIDMASK_tags_1[0]), /* 1 */
- &asn_PER_type_SVIDMASK_constr_1,
+ &ASN_PER_TYPE_SVIDMASK_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/SatElement.c b/src/core/libs/supl/asn-rrlp/SatElement.c
index 5a3eaf8e1..bab8b9de3 100644
--- a/src/core/libs/supl/asn-rrlp/SatElement.c
+++ b/src/core/libs/supl/asn-rrlp/SatElement.c
@@ -206,42 +206,42 @@ memb_deltaRangeRateCor3_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
}
}
-static asn_per_constraints_t asn_PER_memb_iode_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IODE_CONSTR_3 = {
{ APC_CONSTRAINED, 8, 8, 0, 239 } /* (0..239) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_udre_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UDRE_CONSTR_4 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_pseudoRangeCor_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5 = {
{ APC_CONSTRAINED, 12, 12, -2047, 2047 } /* (-2047..2047) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_rangeRateCor_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6 = {
{ APC_CONSTRAINED, 8, 8, -127, 127 } /* (-127..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_deltaPseudoRangeCor2_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR2_CONSTR_7 = {
{ APC_CONSTRAINED, 8, 8, -127, 127 } /* (-127..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_deltaRangeRateCor2_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_RANGE_RATE_COR2_CONSTR_8 = {
{ APC_CONSTRAINED, 4, 4, -7, 7 } /* (-7..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_deltaPseudoRangeCor3_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR3_CONSTR_9 = {
{ APC_CONSTRAINED, 8, 8, -127, 127 } /* (-127..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_deltaRangeRateCor3_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_RANGE_RATE_COR3_CONSTR_10 = {
{ APC_CONSTRAINED, 4, 4, -7, 7 } /* (-7..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_iode_constraint_1,
- &asn_PER_memb_iode_constr_3,
+ &ASN_PER_MEMB_IODE_CONSTR_3,
0,
"iode"
},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_udre_constraint_1,
- &asn_PER_memb_udre_constr_4,
+ &ASN_PER_MEMB_UDRE_CONSTR_4,
0,
"udre"
},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_pseudoRangeCor_constraint_1,
- &asn_PER_memb_pseudoRangeCor_constr_5,
+ &ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5,
0,
"pseudoRangeCor"
},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_rangeRateCor_constraint_1,
- &asn_PER_memb_rangeRateCor_constr_6,
+ &ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6,
0,
"rangeRateCor"
},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_deltaPseudoRangeCor2_constraint_1,
- &asn_PER_memb_deltaPseudoRangeCor2_constr_7,
+ &ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR2_CONSTR_7,
0,
"deltaPseudoRangeCor2"
},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_deltaRangeRateCor2_constraint_1,
- &asn_PER_memb_deltaRangeRateCor2_constr_8,
+ &ASN_PER_MEMB_DELTA_RANGE_RATE_COR2_CONSTR_8,
0,
"deltaRangeRateCor2"
},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_deltaPseudoRangeCor3_constraint_1,
- &asn_PER_memb_deltaPseudoRangeCor3_constr_9,
+ &ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR3_CONSTR_9,
0,
"deltaPseudoRangeCor3"
},
@@ -324,7 +324,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_deltaRangeRateCor3_constraint_1,
- &asn_PER_memb_deltaRangeRateCor3_constr_10,
+ &ASN_PER_MEMB_DELTA_RANGE_RATE_COR3_CONSTR_10,
0,
"deltaRangeRateCor3"
},
diff --git a/src/core/libs/supl/asn-rrlp/SatStatus.c b/src/core/libs/supl/asn-rrlp/SatStatus.c
index b92afe853..4f7306873 100644
--- a/src/core/libs/supl/asn-rrlp/SatStatus.c
+++ b/src/core/libs/supl/asn-rrlp/SatStatus.c
@@ -6,7 +6,7 @@
#include "SatStatus.h"
-static asn_per_constraints_t asn_PER_type_SatStatus_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SAT_STATUS_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ asn_TYPE_descriptor_t asn_DEF_SatStatus = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_SatStatus_constr_1,
+ &ASN_PER_TYPE_SAT_STATUS_CONSTR_1,
asn_MBR_SatStatus_1,
3, /* Elements count */
&asn_SPC_SatStatus_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SatelliteID.c b/src/core/libs/supl/asn-rrlp/SatelliteID.c
index 84951ec1a..9d95fda67 100644
--- a/src/core/libs/supl/asn-rrlp/SatelliteID.c
+++ b/src/core/libs/supl/asn-rrlp/SatelliteID.c
@@ -111,7 +111,7 @@ SatelliteID_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_SatelliteID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SATELLITE_ID_CONSTR_1 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SatelliteID = {
asn_DEF_SatelliteID_tags_1, /* Same as above */
sizeof(asn_DEF_SatelliteID_tags_1)
/sizeof(asn_DEF_SatelliteID_tags_1[0]), /* 1 */
- &asn_PER_type_SatelliteID_constr_1,
+ &ASN_PER_TYPE_SATELLITE_ID_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c b/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c
index 7425bba8d..867b4dbae 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c
@@ -6,7 +6,7 @@
#include "SeqOf-BadSatelliteSet.h"
-static asn_per_constraints_t asn_PER_type_SeqOf_BadSatelliteSet_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_BAD_SATELLITE_SET_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOf_BadSatelliteSet = {
asn_DEF_SeqOf_BadSatelliteSet_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOf_BadSatelliteSet_tags_1)
/sizeof(asn_DEF_SeqOf_BadSatelliteSet_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOf_BadSatelliteSet_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_BAD_SATELLITE_SET_CONSTR_1,
asn_MBR_SeqOf_BadSatelliteSet_1,
1, /* Single element */
&asn_SPC_SeqOf_BadSatelliteSet_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c b/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c
index 2347dbef1..c613f6ea8 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c
@@ -6,7 +6,7 @@
#include "SeqOf-GANSSDataBits.h"
-static asn_per_constraints_t asn_PER_type_SeqOf_GANSSDataBits_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_DATA_BITS_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 10, 10, 1, 1024 } /* (SIZE(1..1024)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOf_GANSSDataBits = {
asn_DEF_SeqOf_GANSSDataBits_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOf_GANSSDataBits_tags_1)
/sizeof(asn_DEF_SeqOf_GANSSDataBits_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOf_GANSSDataBits_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_DATA_BITS_CONSTR_1,
asn_MBR_SeqOf_GANSSDataBits_1,
1, /* Single element */
&asn_SPC_SeqOf_GANSSDataBits_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c b/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c
index 4084ecaf0..a52a77112 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c
@@ -6,7 +6,7 @@
#include "SeqOfAcquisElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfAcquisElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_ACQUIS_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfAcquisElement = {
asn_DEF_SeqOfAcquisElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfAcquisElement_tags_1)
/sizeof(asn_DEF_SeqOfAcquisElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfAcquisElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_ACQUIS_ELEMENT_CONSTR_1,
asn_MBR_SeqOfAcquisElement_1,
1, /* Single element */
&asn_SPC_SeqOfAcquisElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c b/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c
index 33843ff27..3d030ddc1 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c
@@ -6,7 +6,7 @@
#include "SeqOfAlmanacElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfAlmanacElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_ALMANAC_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 6, 6, 1, 64 } /* (SIZE(1..64)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfAlmanacElement = {
asn_DEF_SeqOfAlmanacElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfAlmanacElement_tags_1)
/sizeof(asn_DEF_SeqOfAlmanacElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfAlmanacElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_ALMANAC_ELEMENT_CONSTR_1,
asn_MBR_SeqOfAlmanacElement_1,
1, /* Single element */
&asn_SPC_SeqOfAlmanacElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c b/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c
index 1e77ca7ff..61e5d3c6f 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c
@@ -6,7 +6,7 @@
#include "SeqOfBadSignalElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfBadSignalElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_BAD_SIGNAL_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfBadSignalElement = {
asn_DEF_SeqOfBadSignalElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfBadSignalElement_tags_1)
/sizeof(asn_DEF_SeqOfBadSignalElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfBadSignalElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_BAD_SIGNAL_ELEMENT_CONSTR_1,
asn_MBR_SeqOfBadSignalElement_1,
1, /* Single element */
&asn_SPC_SeqOfBadSignalElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c b/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c
index e65dcad05..d53e83fe1 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c
@@ -6,7 +6,7 @@
#include "SeqOfDGANSSSgnElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfDGANSSSgnElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_DGANSS_SGN_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfDGANSSSgnElement = {
asn_DEF_SeqOfDGANSSSgnElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfDGANSSSgnElement_tags_1)
/sizeof(asn_DEF_SeqOfDGANSSSgnElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfDGANSSSgnElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_DGANSS_SGN_ELEMENT_CONSTR_1,
asn_MBR_SeqOfDGANSSSgnElement_1,
1, /* Single element */
&asn_SPC_SeqOfDGANSSSgnElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c
index 689475fdd..066acec5a 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSS-MsrSetElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSS_MsrSetElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_MSR_SET_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 2, 2, 1, 3 } /* (SIZE(1..3)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSS_MsrSetElement = {
asn_DEF_SeqOfGANSS_MsrSetElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSS_MsrSetElement_tags_1)
/sizeof(asn_DEF_SeqOfGANSS_MsrSetElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSS_MsrSetElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_MSR_SET_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGANSS_MsrSetElement_1,
1, /* Single element */
&asn_SPC_SeqOfGANSS_MsrSetElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c
index 8543904c5..e77545690 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSS-SgnElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSS_SgnElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_SGN_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSS_SgnElement = {
asn_DEF_SeqOfGANSS_SgnElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSS_SgnElement_tags_1)
/sizeof(asn_DEF_SeqOfGANSS_SgnElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSS_SgnElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_SGN_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGANSS_SgnElement_1,
1, /* Single element */
&asn_SPC_SeqOfGANSS_SgnElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c
index 706d36493..4144d9ae6 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSS-SgnTypeElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSS_SgnTypeElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_SGN_TYPE_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 3, 3, 1, 6 } /* (SIZE(1..6)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSS_SgnTypeElement = {
asn_DEF_SeqOfGANSS_SgnTypeElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSS_SgnTypeElement_tags_1)
/sizeof(asn_DEF_SeqOfGANSS_SgnTypeElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSS_SgnTypeElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_SGN_TYPE_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGANSS_SgnTypeElement_1,
1, /* Single element */
&asn_SPC_SeqOfGANSS_SgnTypeElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c
index 1b6a339f8..18eb57152 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSSAlmanacElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSAlmanacElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_ALMANAC_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 6, 6, 1, 36 } /* (SIZE(1..36)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSAlmanacElement = {
asn_DEF_SeqOfGANSSAlmanacElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSSAlmanacElement_tags_1)
/sizeof(asn_DEF_SeqOfGANSSAlmanacElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSSAlmanacElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_ALMANAC_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGANSSAlmanacElement_1,
1, /* Single element */
&asn_SPC_SeqOfGANSSAlmanacElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c
index 737ab2623..56bdf4074 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSSGenericAssistDataElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSGenericAssistDataElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_GENERIC_ASSIST_DATA_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 3, 3, 1, 8 } /* (SIZE(1..8)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSGenericAssistDataElement = {
asn_DEF_SeqOfGANSSGenericAssistDataElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSSGenericAssistDataElement_tags_1)
/sizeof(asn_DEF_SeqOfGANSSGenericAssistDataElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSSGenericAssistDataElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_GENERIC_ASSIST_DATA_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGANSSGenericAssistDataElement_1,
1, /* Single element */
&asn_SPC_SeqOfGANSSGenericAssistDataElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c
index 8e9a1bf16..f38140eec 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSSRefMeasurementElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSRefMeasurementElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_REF_MEASUREMENT_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSRefMeasurementElement = {
asn_DEF_SeqOfGANSSRefMeasurementElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSSRefMeasurementElement_tags_1)
/sizeof(asn_DEF_SeqOfGANSSRefMeasurementElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSSRefMeasurementElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_REF_MEASUREMENT_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGANSSRefMeasurementElement_1,
1, /* Single element */
&asn_SPC_SeqOfGANSSRefMeasurementElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c
index 5c9c95fa5..21c130866 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSSSatelliteElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSSatelliteElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_SATELLITE_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 5, 5, 1, 32 } /* (SIZE(1..32)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSSatelliteElement = {
asn_DEF_SeqOfGANSSSatelliteElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSSSatelliteElement_tags_1)
/sizeof(asn_DEF_SeqOfGANSSSatelliteElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSSSatelliteElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_SATELLITE_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGANSSSatelliteElement_1,
1, /* Single element */
&asn_SPC_SeqOfGANSSSatelliteElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c
index d3a923f23..e3341bd4d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c
@@ -6,7 +6,7 @@
#include "SeqOfGANSSTimeModel.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSTimeModel_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_TIME_MODEL_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 3, 3, 1, 7 } /* (SIZE(1..7)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSTimeModel = {
asn_DEF_SeqOfGANSSTimeModel_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGANSSTimeModel_tags_1)
/sizeof(asn_DEF_SeqOfGANSSTimeModel_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGANSSTimeModel_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GANSS_TIME_MODEL_CONSTR_1,
asn_MBR_SeqOfGANSSTimeModel_1,
1, /* Single element */
&asn_SPC_SeqOfGANSSTimeModel_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c
index c66328606..16637c8b6 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGPS-MsrElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGPS_MsrElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GPS_MSR_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGPS_MsrElement = {
asn_DEF_SeqOfGPS_MsrElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGPS_MsrElement_tags_1)
/sizeof(asn_DEF_SeqOfGPS_MsrElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGPS_MsrElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GPS_MSR_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGPS_MsrElement_1,
1, /* Single element */
&asn_SPC_SeqOfGPS_MsrElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c
index b9f6297a5..ab5c3a559 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c
@@ -6,7 +6,7 @@
#include "SeqOfGPS-MsrSetElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfGPS_MsrSetElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GPS_MSR_SET_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 2, 2, 1, 3 } /* (SIZE(1..3)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGPS_MsrSetElement = {
asn_DEF_SeqOfGPS_MsrSetElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfGPS_MsrSetElement_tags_1)
/sizeof(asn_DEF_SeqOfGPS_MsrSetElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfGPS_MsrSetElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_GPS_MSR_SET_ELEMENT_CONSTR_1,
asn_MBR_SeqOfGPS_MsrSetElement_1,
1, /* Single element */
&asn_SPC_SeqOfGPS_MsrSetElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c
index 15f1cefff..60bd0348d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c
@@ -6,7 +6,7 @@
#include "SeqOfMsrAssistBTS-R98-ExpOTD.h"
-static asn_per_constraints_t asn_PER_type_SeqOfMsrAssistBTS_R98_ExpOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_R98_EXP_OTD_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 15 } /* (SIZE(1..15)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD = {
asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD_tags_1)
/sizeof(asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfMsrAssistBTS_R98_ExpOTD_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_R98_EXP_OTD_CONSTR_1,
asn_MBR_SeqOfMsrAssistBTS_R98_ExpOTD_1,
1, /* Single element */
&asn_SPC_SeqOfMsrAssistBTS_R98_ExpOTD_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c
index fb1b5638e..27bff4abf 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c
@@ -6,7 +6,7 @@
#include "SeqOfMsrAssistBTS.h"
-static asn_per_constraints_t asn_PER_type_SeqOfMsrAssistBTS_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 15 } /* (SIZE(1..15)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfMsrAssistBTS = {
asn_DEF_SeqOfMsrAssistBTS_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfMsrAssistBTS_tags_1)
/sizeof(asn_DEF_SeqOfMsrAssistBTS_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfMsrAssistBTS_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_CONSTR_1,
asn_MBR_SeqOfMsrAssistBTS_1,
1, /* Single element */
&asn_SPC_SeqOfMsrAssistBTS_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c b/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c
index d28ec04a2..1606f1a20 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c
@@ -6,7 +6,7 @@
#include "SeqOfNavModelElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfNavModelElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_NAV_MODEL_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfNavModelElement = {
asn_DEF_SeqOfNavModelElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfNavModelElement_tags_1)
/sizeof(asn_DEF_SeqOfNavModelElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfNavModelElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_NAV_MODEL_ELEMENT_CONSTR_1,
asn_MBR_SeqOfNavModelElement_1,
1, /* Single element */
&asn_SPC_SeqOfNavModelElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c
index ace76ee1a..5e2bb795d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c
@@ -6,7 +6,7 @@
#include "SeqOfOTD-FirstSetMsrs-R98-Ext.h"
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_FirstSetMsrs_R98_Ext_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_R98_EXT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 3, 3, 1, 5 } /* (SIZE(1..5)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext = {
asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext_tags_1)
/sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfOTD_FirstSetMsrs_R98_Ext_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_R98_EXT_CONSTR_1,
asn_MBR_SeqOfOTD_FirstSetMsrs_R98_Ext_1,
1, /* Single element */
&asn_SPC_SeqOfOTD_FirstSetMsrs_R98_Ext_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c
index d3f9263f8..bfebd113d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c
@@ -6,7 +6,7 @@
#include "SeqOfOTD-FirstSetMsrs.h"
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_FirstSetMsrs_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 10 } /* (SIZE(1..10)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_FirstSetMsrs = {
asn_DEF_SeqOfOTD_FirstSetMsrs_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_tags_1)
/sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfOTD_FirstSetMsrs_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_CONSTR_1,
asn_MBR_SeqOfOTD_FirstSetMsrs_1,
1, /* Single element */
&asn_SPC_SeqOfOTD_FirstSetMsrs_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c
index 27c86b0a5..dae155d61 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c
@@ -6,7 +6,7 @@
#include "SeqOfOTD-MsrElementRest.h"
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_MsrElementRest_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_MSR_ELEMENT_REST_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 1, 1, 1, 2 } /* (SIZE(1..2)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_MsrElementRest = {
asn_DEF_SeqOfOTD_MsrElementRest_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfOTD_MsrElementRest_tags_1)
/sizeof(asn_DEF_SeqOfOTD_MsrElementRest_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfOTD_MsrElementRest_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_OTD_MSR_ELEMENT_REST_CONSTR_1,
asn_MBR_SeqOfOTD_MsrElementRest_1,
1, /* Single element */
&asn_SPC_SeqOfOTD_MsrElementRest_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c
index 51b804707..2c7b3b47d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c
@@ -6,7 +6,7 @@
#include "SeqOfOTD-MsrsOfOtherSets.h"
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_MsrsOfOtherSets_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_MSRS_OF_OTHER_SETS_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 10 } /* (SIZE(1..10)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_MsrsOfOtherSets = {
asn_DEF_SeqOfOTD_MsrsOfOtherSets_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfOTD_MsrsOfOtherSets_tags_1)
/sizeof(asn_DEF_SeqOfOTD_MsrsOfOtherSets_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfOTD_MsrsOfOtherSets_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_OTD_MSRS_OF_OTHER_SETS_CONSTR_1,
asn_MBR_SeqOfOTD_MsrsOfOtherSets_1,
1, /* Single element */
&asn_SPC_SeqOfOTD_MsrsOfOtherSets_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c b/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c
index e02edb83c..9e55174be 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c
@@ -6,7 +6,7 @@
#include "SeqOfReferenceIdentityType.h"
-static asn_per_constraints_t asn_PER_type_SeqOfReferenceIdentityType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_REFERENCE_IDENTITY_TYPE_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 2, 2, 1, 3 } /* (SIZE(1..3)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfReferenceIdentityType = {
asn_DEF_SeqOfReferenceIdentityType_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfReferenceIdentityType_tags_1)
/sizeof(asn_DEF_SeqOfReferenceIdentityType_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfReferenceIdentityType_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_REFERENCE_IDENTITY_TYPE_CONSTR_1,
asn_MBR_SeqOfReferenceIdentityType_1,
1, /* Single element */
&asn_SPC_SeqOfReferenceIdentityType_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c b/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c
index c70089990..2e8aaa42c 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c
@@ -6,7 +6,7 @@
#include "SeqOfSatElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfSatElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SAT_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 16 } /* (SIZE(1..16)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSatElement = {
asn_DEF_SeqOfSatElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfSatElement_tags_1)
/sizeof(asn_DEF_SeqOfSatElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfSatElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_SAT_ELEMENT_CONSTR_1,
asn_MBR_SeqOfSatElement_1,
1, /* Single element */
&asn_SPC_SeqOfSatElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c b/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c
index 36a8f243a..23920f7fc 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c
@@ -6,7 +6,7 @@
#include "SeqOfSgnTypeElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfSgnTypeElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SGN_TYPE_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 2, 2, 1, 3 } /* (SIZE(1..3)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSgnTypeElement = {
asn_DEF_SeqOfSgnTypeElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfSgnTypeElement_tags_1)
/sizeof(asn_DEF_SeqOfSgnTypeElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfSgnTypeElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_SGN_TYPE_ELEMENT_CONSTR_1,
asn_MBR_SeqOfSgnTypeElement_1,
1, /* Single element */
&asn_SPC_SeqOfSgnTypeElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c b/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c
index 4ecbbcbb7..43c0778d7 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c
@@ -6,7 +6,7 @@
#include "SeqOfStandardClockModelElement.h"
-static asn_per_constraints_t asn_PER_type_SeqOfStandardClockModelElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_STANDARD_CLOCK_MODEL_ELEMENT_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 1, 1, 1, 2 } /* (SIZE(1..2)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfStandardClockModelElement = {
asn_DEF_SeqOfStandardClockModelElement_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfStandardClockModelElement_tags_1)
/sizeof(asn_DEF_SeqOfStandardClockModelElement_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfStandardClockModelElement_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_STANDARD_CLOCK_MODEL_ELEMENT_CONSTR_1,
asn_MBR_SeqOfStandardClockModelElement_1,
1, /* Single element */
&asn_SPC_SeqOfStandardClockModelElement_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c
index ae77b5fee..0f53a336b 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c
@@ -6,7 +6,7 @@
#include "SeqOfSystemInfoAssistBTS-R98-ExpOTD.h"
-static asn_per_constraints_t asn_PER_type_SeqOfSystemInfoAssistBTS_R98_ExpOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 5, 5, 1, 32 } /* (SIZE(1..32)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD = {
asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD_tags_1)
/sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfSystemInfoAssistBTS_R98_ExpOTD_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1,
asn_MBR_SeqOfSystemInfoAssistBTS_R98_ExpOTD_1,
1, /* Single element */
&asn_SPC_SeqOfSystemInfoAssistBTS_R98_ExpOTD_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c
index a728a3bde..9a0af489a 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c
@@ -6,7 +6,7 @@
#include "SeqOfSystemInfoAssistBTS.h"
-static asn_per_constraints_t asn_PER_type_SeqOfSystemInfoAssistBTS_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 5, 5, 1, 32 } /* (SIZE(1..32)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSystemInfoAssistBTS = {
asn_DEF_SeqOfSystemInfoAssistBTS_tags_1, /* Same as above */
sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_tags_1)
/sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_tags_1[0]), /* 1 */
- &asn_PER_type_SeqOfSystemInfoAssistBTS_constr_1,
+ &ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_CONSTR_1,
asn_MBR_SeqOfSystemInfoAssistBTS_1,
1, /* Single element */
&asn_SPC_SeqOfSystemInfoAssistBTS_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SgnTypeElement.c b/src/core/libs/supl/asn-rrlp/SgnTypeElement.c
index fa49b6689..946abbe38 100644
--- a/src/core/libs/supl/asn-rrlp/SgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/SgnTypeElement.c
@@ -31,7 +31,7 @@ memb_ganssStatusHealth_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ganssStatusHealth_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_STATUS_HEALTH_CONSTR_3 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -51,7 +51,7 @@ static asn_TYPE_member_t asn_MBR_SgnTypeElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ganssStatusHealth_constraint_1,
- &asn_PER_memb_ganssStatusHealth_constr_3,
+ &ASN_PER_MEMB_GANSS_STATUS_HEALTH_CONSTR_3,
0,
"ganssStatusHealth"
},
diff --git a/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c b/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c
index e04f2b6c0..2e17a8a54 100644
--- a/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c
@@ -156,32 +156,32 @@ memb_stanModelID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_stanClockTocLSB_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_TOC_LSB_CONSTR_2 = {
{ APC_CONSTRAINED, 9, 9, 0, 511 } /* (0..511) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_stanClockAF2_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_A_F2_CONSTR_3 = {
{ APC_CONSTRAINED, 12, 12, -2048, 2047 } /* (-2048..2047) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_stanClockAF1_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_A_F1_CONSTR_4 = {
{ APC_CONSTRAINED, 18, -1, -131072, 131071 } /* (-131072..131071) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_stanClockAF0_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_A_F0_CONSTR_5 = {
{ APC_CONSTRAINED, 28, -1, -134217728, 134217727 } /* (-134217728..134217727) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_stanClockTgd_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_TGD_CONSTR_6 = {
{ APC_CONSTRAINED, 10, 10, -512, 511 } /* (-512..511) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_stanModelID_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_MODEL_ID_CONSTR_7 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -192,7 +192,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stanClockTocLSB_constraint_1,
- &asn_PER_memb_stanClockTocLSB_constr_2,
+ &ASN_PER_MEMB_STAN_CLOCK_TOC_LSB_CONSTR_2,
0,
"stanClockTocLSB"
},
@@ -201,7 +201,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stanClockAF2_constraint_1,
- &asn_PER_memb_stanClockAF2_constr_3,
+ &ASN_PER_MEMB_STAN_CLOCK_A_F2_CONSTR_3,
0,
"stanClockAF2"
},
@@ -210,7 +210,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stanClockAF1_constraint_1,
- &asn_PER_memb_stanClockAF1_constr_4,
+ &ASN_PER_MEMB_STAN_CLOCK_A_F1_CONSTR_4,
0,
"stanClockAF1"
},
@@ -219,7 +219,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stanClockAF0_constraint_1,
- &asn_PER_memb_stanClockAF0_constr_5,
+ &ASN_PER_MEMB_STAN_CLOCK_A_F0_CONSTR_5,
0,
"stanClockAF0"
},
@@ -228,7 +228,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stanClockTgd_constraint_1,
- &asn_PER_memb_stanClockTgd_constr_6,
+ &ASN_PER_MEMB_STAN_CLOCK_TGD_CONSTR_6,
0,
"stanClockTgd"
},
@@ -237,7 +237,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_stanModelID_constraint_1,
- &asn_PER_memb_stanModelID_constr_7,
+ &ASN_PER_MEMB_STAN_MODEL_ID_CONSTR_7,
0,
"stanModelID"
},
diff --git a/src/core/libs/supl/asn-rrlp/StdResolution.c b/src/core/libs/supl/asn-rrlp/StdResolution.c
index b5dd33517..574f0af9a 100644
--- a/src/core/libs/supl/asn-rrlp/StdResolution.c
+++ b/src/core/libs/supl/asn-rrlp/StdResolution.c
@@ -111,7 +111,7 @@ StdResolution_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_StdResolution_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_STD_RESOLUTION_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_StdResolution = {
asn_DEF_StdResolution_tags_1, /* Same as above */
sizeof(asn_DEF_StdResolution_tags_1)
/sizeof(asn_DEF_StdResolution_tags_1[0]), /* 1 */
- &asn_PER_type_StdResolution_constr_1,
+ &ASN_PER_TYPE_STD_RESOLUTION_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c
index a7e14dce0..e0d73b1ff 100644
--- a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c
+++ b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c
@@ -6,7 +6,7 @@
#include "SystemInfoAssistBTS-R98-ExpOTD.h"
-static asn_per_constraints_t asn_PER_type_SystemInfoAssistBTS_R98_ExpOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_SystemInfoAssistBTS_R98_ExpOTD = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_SystemInfoAssistBTS_R98_ExpOTD_constr_1,
+ &ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1,
asn_MBR_SystemInfoAssistBTS_R98_ExpOTD_1,
2, /* Elements count */
&asn_SPC_SystemInfoAssistBTS_R98_ExpOTD_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c
index 30a007816..3b7d17674 100644
--- a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c
+++ b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c
@@ -6,7 +6,7 @@
#include "SystemInfoAssistBTS.h"
-static asn_per_constraints_t asn_PER_type_SystemInfoAssistBTS_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_SystemInfoAssistBTS = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_SystemInfoAssistBTS_constr_1,
+ &ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_CONSTR_1,
asn_MBR_SystemInfoAssistBTS_1,
2, /* Elements count */
&asn_SPC_SystemInfoAssistBTS_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c b/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c
index 713303193..68c0b86bd 100644
--- a/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c
+++ b/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c
@@ -111,7 +111,7 @@ SystemInfoIndex_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_SystemInfoIndex_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SYSTEM_INFO_INDEX_CONSTR_1 = {
{ APC_CONSTRAINED, 5, 5, 1, 32 } /* (1..32) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SystemInfoIndex = {
asn_DEF_SystemInfoIndex_tags_1, /* Same as above */
sizeof(asn_DEF_SystemInfoIndex_tags_1)
/sizeof(asn_DEF_SystemInfoIndex_tags_1[0]), /* 1 */
- &asn_PER_type_SystemInfoIndex_constr_1,
+ &ASN_PER_TYPE_SYSTEM_INFO_INDEX_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/TA0.c b/src/core/libs/supl/asn-rrlp/TA0.c
index c6e6e0a14..1879f9e19 100644
--- a/src/core/libs/supl/asn-rrlp/TA0.c
+++ b/src/core/libs/supl/asn-rrlp/TA0.c
@@ -111,7 +111,7 @@ TA0_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TA0_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_T_A0_CONSTR_1 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TA0 = {
asn_DEF_TA0_tags_1, /* Same as above */
sizeof(asn_DEF_TA0_tags_1)
/sizeof(asn_DEF_TA0_tags_1[0]), /* 1 */
- &asn_PER_type_TA0_constr_1,
+ &ASN_PER_TYPE_T_A0_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/TA1.c b/src/core/libs/supl/asn-rrlp/TA1.c
index d118cab48..43b3fb216 100644
--- a/src/core/libs/supl/asn-rrlp/TA1.c
+++ b/src/core/libs/supl/asn-rrlp/TA1.c
@@ -111,7 +111,7 @@ TA1_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TA1_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_T_A1_CONSTR_1 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TA1 = {
asn_DEF_TA1_tags_1, /* Same as above */
sizeof(asn_DEF_TA1_tags_1)
/sizeof(asn_DEF_TA1_tags_1[0]), /* 1 */
- &asn_PER_type_TA1_constr_1,
+ &ASN_PER_TYPE_T_A1_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/TA2.c b/src/core/libs/supl/asn-rrlp/TA2.c
index 9d4ba1f9d..f86657377 100644
--- a/src/core/libs/supl/asn-rrlp/TA2.c
+++ b/src/core/libs/supl/asn-rrlp/TA2.c
@@ -111,7 +111,7 @@ TA2_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TA2_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_T_A2_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, -64, 63 } /* (-64..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TA2 = {
asn_DEF_TA2_tags_1, /* Same as above */
sizeof(asn_DEF_TA2_tags_1)
/sizeof(asn_DEF_TA2_tags_1[0]), /* 1 */
- &asn_PER_type_TA2_constr_1,
+ &ASN_PER_TYPE_T_A2_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/TLMReservedBits.c b/src/core/libs/supl/asn-rrlp/TLMReservedBits.c
index 5493ac422..cac6e5f46 100644
--- a/src/core/libs/supl/asn-rrlp/TLMReservedBits.c
+++ b/src/core/libs/supl/asn-rrlp/TLMReservedBits.c
@@ -111,7 +111,7 @@ TLMReservedBits_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TLMReservedBits_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TLM_RESERVED_BITS_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TLMReservedBits = {
asn_DEF_TLMReservedBits_tags_1, /* Same as above */
sizeof(asn_DEF_TLMReservedBits_tags_1)
/sizeof(asn_DEF_TLMReservedBits_tags_1[0]), /* 1 */
- &asn_PER_type_TLMReservedBits_constr_1,
+ &ASN_PER_TYPE_TLM_RESERVED_BITS_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/TLMWord.c b/src/core/libs/supl/asn-rrlp/TLMWord.c
index 08495fde8..1bd83baaf 100644
--- a/src/core/libs/supl/asn-rrlp/TLMWord.c
+++ b/src/core/libs/supl/asn-rrlp/TLMWord.c
@@ -111,7 +111,7 @@ TLMWord_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TLMWord_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TLM_WORD_CONSTR_1 = {
{ APC_CONSTRAINED, 14, 14, 0, 16383 } /* (0..16383) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TLMWord = {
asn_DEF_TLMWord_tags_1, /* Same as above */
sizeof(asn_DEF_TLMWord_tags_1)
/sizeof(asn_DEF_TLMWord_tags_1[0]), /* 1 */
- &asn_PER_type_TLMWord_constr_1,
+ &ASN_PER_TYPE_TLM_WORD_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/TimeSlot.c b/src/core/libs/supl/asn-rrlp/TimeSlot.c
index f879e587c..e9f8728d7 100644
--- a/src/core/libs/supl/asn-rrlp/TimeSlot.c
+++ b/src/core/libs/supl/asn-rrlp/TimeSlot.c
@@ -111,7 +111,7 @@ TimeSlot_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TimeSlot_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIME_SLOT_CONSTR_1 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeSlot = {
asn_DEF_TimeSlot_tags_1, /* Same as above */
sizeof(asn_DEF_TimeSlot_tags_1)
/sizeof(asn_DEF_TimeSlot_tags_1[0]), /* 1 */
- &asn_PER_type_TimeSlot_constr_1,
+ &ASN_PER_TYPE_TIME_SLOT_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c b/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c
index dc0d3ca0f..347b073f7 100644
--- a/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c
+++ b/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c
@@ -94,7 +94,7 @@ TimeSlotScheme_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TimeSlotScheme_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIME_SLOT_SCHEME_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeSlotScheme = {
asn_DEF_TimeSlotScheme_tags_1, /* Same as above */
sizeof(asn_DEF_TimeSlotScheme_tags_1)
/sizeof(asn_DEF_TimeSlotScheme_tags_1[0]), /* 1 */
- &asn_PER_type_TimeSlotScheme_constr_1,
+ &ASN_PER_TYPE_TIME_SLOT_SCHEME_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_TimeSlotScheme_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/UTCModel.c b/src/core/libs/supl/asn-rrlp/UTCModel.c
index 73a0520d6..a8d0557e1 100644
--- a/src/core/libs/supl/asn-rrlp/UTCModel.c
+++ b/src/core/libs/supl/asn-rrlp/UTCModel.c
@@ -206,42 +206,42 @@ memb_utcDeltaTlsf_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_utcA1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_A1_CONSTR_2 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_utcA0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_A0_CONSTR_3 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_utcTot_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_TOT_CONSTR_4 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_utcWNt_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_W_NT_CONSTR_5 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_utcDeltaTls_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_DELTA_TLS_CONSTR_6 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_utcWNlsf_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_W_NLSF_CONSTR_7 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_utcDN_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_DN_CONSTR_8 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_utcDeltaTlsf_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_DELTA_TLSF_CONSTR_9 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcA1_constraint_1,
- &asn_PER_memb_utcA1_constr_2,
+ &ASN_PER_MEMB_UTC_A1_CONSTR_2,
0,
"utcA1"
},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcA0_constraint_1,
- &asn_PER_memb_utcA0_constr_3,
+ &ASN_PER_MEMB_UTC_A0_CONSTR_3,
0,
"utcA0"
},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcTot_constraint_1,
- &asn_PER_memb_utcTot_constr_4,
+ &ASN_PER_MEMB_UTC_TOT_CONSTR_4,
0,
"utcTot"
},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcWNt_constraint_1,
- &asn_PER_memb_utcWNt_constr_5,
+ &ASN_PER_MEMB_UTC_W_NT_CONSTR_5,
0,
"utcWNt"
},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcDeltaTls_constraint_1,
- &asn_PER_memb_utcDeltaTls_constr_6,
+ &ASN_PER_MEMB_UTC_DELTA_TLS_CONSTR_6,
0,
"utcDeltaTls"
},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcWNlsf_constraint_1,
- &asn_PER_memb_utcWNlsf_constr_7,
+ &ASN_PER_MEMB_UTC_W_NLSF_CONSTR_7,
0,
"utcWNlsf"
},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcDN_constraint_1,
- &asn_PER_memb_utcDN_constr_8,
+ &ASN_PER_MEMB_UTC_DN_CONSTR_8,
0,
"utcDN"
},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_utcDeltaTlsf_constraint_1,
- &asn_PER_memb_utcDeltaTlsf_constr_9,
+ &ASN_PER_MEMB_UTC_DELTA_TLSF_CONSTR_9,
0,
"utcDeltaTlsf"
},
diff --git a/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c b/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c
index 9b2c5278c..28d2189fc 100644
--- a/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c
+++ b/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c
@@ -94,7 +94,7 @@ UlPseudoSegInd_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_UlPseudoSegInd_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_UL_PSEUDO_SEG_IND_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UlPseudoSegInd = {
asn_DEF_UlPseudoSegInd_tags_1, /* Same as above */
sizeof(asn_DEF_UlPseudoSegInd_tags_1)
/sizeof(asn_DEF_UlPseudoSegInd_tags_1[0]), /* 1 */
- &asn_PER_type_UlPseudoSegInd_constr_1,
+ &ASN_PER_TYPE_UL_PSEUDO_SEG_IND_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_UlPseudoSegInd_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c b/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c
index 07896a408..c367db368 100644
--- a/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c
+++ b/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c
@@ -888,152 +888,152 @@ memb_ephemIDot_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_type_ephemE_constr_17 = {
+static asn_per_constraints_t ASN_PER_TYPE_EPHEM_E_CONSTR_17 = {
{ APC_CONSTRAINED, 32, -1, 0, 4294967295 } /* (0..4294967295) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_type_ephemAPowerHalf_constr_19 = {
+static asn_per_constraints_t ASN_PER_TYPE_EPHEM_A_POWER_HALF_CONSTR_19 = {
{ APC_CONSTRAINED, 32, -1, 0, 4294967295 } /* (0..4294967295) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemCodeOnL2_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CODE_ON_L2_CONSTR_2 = {
{ APC_CONSTRAINED, 2, 2, 0, 3 } /* (0..3) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemURA_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_URA_CONSTR_3 = {
{ APC_CONSTRAINED, 4, 4, 0, 15 } /* (0..15) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemSVhealth_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_S_VHEALTH_CONSTR_4 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemIODC_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_IODC_CONSTR_5 = {
{ APC_CONSTRAINED, 10, 10, 0, 1023 } /* (0..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemL2Pflag_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_L2_PFLAG_CONSTR_6 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemTgd_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_TGD_CONSTR_8 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemToc_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_TOC_CONSTR_9 = {
{ APC_CONSTRAINED, 16, 16, 0, 37799 } /* (0..37799) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemAF2_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_F2_CONSTR_10 = {
{ APC_CONSTRAINED, 8, 8, -128, 127 } /* (-128..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemAF1_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_F1_CONSTR_11 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemAF0_constr_12 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_F0_CONSTR_12 = {
{ APC_CONSTRAINED, 22, -1, -2097152, 2097151 } /* (-2097152..2097151) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemCrs_constr_13 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CRS_CONSTR_13 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemDeltaN_constr_14 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_DELTA_N_CONSTR_14 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemM0_constr_15 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_M0_CONSTR_15 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemCuc_constr_16 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CUC_CONSTR_16 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemE_constr_17 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_E_CONSTR_17 = {
{ APC_CONSTRAINED, 32, -1, 0, 4294967295 } /* (0..4294967295) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemCus_constr_18 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CUS_CONSTR_18 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemAPowerHalf_constr_19 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_POWER_HALF_CONSTR_19 = {
{ APC_CONSTRAINED, 32, -1, 0, 4294967295 } /* (0..4294967295) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemToe_constr_20 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_TOE_CONSTR_20 = {
{ APC_CONSTRAINED, 16, 16, 0, 37799 } /* (0..37799) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemFitFlag_constr_21 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_FIT_FLAG_CONSTR_21 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemAODA_constr_22 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_AODA_CONSTR_22 = {
{ APC_CONSTRAINED, 5, 5, 0, 31 } /* (0..31) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemCic_constr_23 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CIC_CONSTR_23 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemOmegaA0_constr_24 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_OMEGA_A0_CONSTR_24 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemCis_constr_25 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CIS_CONSTR_25 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemI0_constr_26 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_I0_CONSTR_26 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemCrc_constr_27 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CRC_CONSTR_27 = {
{ APC_CONSTRAINED, 16, 16, -32768, 32767 } /* (-32768..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemW_constr_28 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_W_CONSTR_28 = {
{ APC_CONSTRAINED, 32, -1, (-2147483647L - 1), 2147483647 } /* (-2147483648..2147483647) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemOmegaADot_constr_29 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_OMEGA_A_DOT_CONSTR_29 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ephemIDot_constr_30 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_I_DOT_CONSTR_30 = {
{ APC_CONSTRAINED, 14, 14, -8192, 8191 } /* (-8192..8191) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -1067,7 +1067,7 @@ asn_TYPE_descriptor_t asn_DEF_ephemE_17 = {
asn_DEF_ephemE_tags_17, /* Same as above */
sizeof(asn_DEF_ephemE_tags_17)
/sizeof(asn_DEF_ephemE_tags_17[0]), /* 2 */
- &asn_PER_type_ephemE_constr_17,
+ &ASN_PER_TYPE_EPHEM_E_CONSTR_17,
0, 0, /* No members */
&asn_SPC_ephemE_specs_17 /* Additional specs */
};
@@ -1101,7 +1101,7 @@ asn_TYPE_descriptor_t asn_DEF_ephemAPowerHalf_19 = {
asn_DEF_ephemAPowerHalf_tags_19, /* Same as above */
sizeof(asn_DEF_ephemAPowerHalf_tags_19)
/sizeof(asn_DEF_ephemAPowerHalf_tags_19[0]), /* 2 */
- &asn_PER_type_ephemAPowerHalf_constr_19,
+ &ASN_PER_TYPE_EPHEM_A_POWER_HALF_CONSTR_19,
0, 0, /* No members */
&asn_SPC_ephemAPowerHalf_specs_19 /* Additional specs */
};
@@ -1112,7 +1112,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemCodeOnL2_constraint_1,
- &asn_PER_memb_ephemCodeOnL2_constr_2,
+ &ASN_PER_MEMB_EPHEM_CODE_ON_L2_CONSTR_2,
0,
"ephemCodeOnL2"
},
@@ -1121,7 +1121,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemURA_constraint_1,
- &asn_PER_memb_ephemURA_constr_3,
+ &ASN_PER_MEMB_EPHEM_URA_CONSTR_3,
0,
"ephemURA"
},
@@ -1130,7 +1130,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemSVhealth_constraint_1,
- &asn_PER_memb_ephemSVhealth_constr_4,
+ &ASN_PER_MEMB_EPHEM_S_VHEALTH_CONSTR_4,
0,
"ephemSVhealth"
},
@@ -1139,7 +1139,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemIODC_constraint_1,
- &asn_PER_memb_ephemIODC_constr_5,
+ &ASN_PER_MEMB_EPHEM_IODC_CONSTR_5,
0,
"ephemIODC"
},
@@ -1148,7 +1148,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemL2Pflag_constraint_1,
- &asn_PER_memb_ephemL2Pflag_constr_6,
+ &ASN_PER_MEMB_EPHEM_L2_PFLAG_CONSTR_6,
0,
"ephemL2Pflag"
},
@@ -1166,7 +1166,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemTgd_constraint_1,
- &asn_PER_memb_ephemTgd_constr_8,
+ &ASN_PER_MEMB_EPHEM_TGD_CONSTR_8,
0,
"ephemTgd"
},
@@ -1175,7 +1175,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemToc_constraint_1,
- &asn_PER_memb_ephemToc_constr_9,
+ &ASN_PER_MEMB_EPHEM_TOC_CONSTR_9,
0,
"ephemToc"
},
@@ -1184,7 +1184,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemAF2_constraint_1,
- &asn_PER_memb_ephemAF2_constr_10,
+ &ASN_PER_MEMB_EPHEM_A_F2_CONSTR_10,
0,
"ephemAF2"
},
@@ -1193,7 +1193,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemAF1_constraint_1,
- &asn_PER_memb_ephemAF1_constr_11,
+ &ASN_PER_MEMB_EPHEM_A_F1_CONSTR_11,
0,
"ephemAF1"
},
@@ -1202,7 +1202,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemAF0_constraint_1,
- &asn_PER_memb_ephemAF0_constr_12,
+ &ASN_PER_MEMB_EPHEM_A_F0_CONSTR_12,
0,
"ephemAF0"
},
@@ -1211,7 +1211,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemCrs_constraint_1,
- &asn_PER_memb_ephemCrs_constr_13,
+ &ASN_PER_MEMB_EPHEM_CRS_CONSTR_13,
0,
"ephemCrs"
},
@@ -1220,7 +1220,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemDeltaN_constraint_1,
- &asn_PER_memb_ephemDeltaN_constr_14,
+ &ASN_PER_MEMB_EPHEM_DELTA_N_CONSTR_14,
0,
"ephemDeltaN"
},
@@ -1229,7 +1229,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemM0_constraint_1,
- &asn_PER_memb_ephemM0_constr_15,
+ &ASN_PER_MEMB_EPHEM_M0_CONSTR_15,
0,
"ephemM0"
},
@@ -1238,7 +1238,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemCuc_constraint_1,
- &asn_PER_memb_ephemCuc_constr_16,
+ &ASN_PER_MEMB_EPHEM_CUC_CONSTR_16,
0,
"ephemCuc"
},
@@ -1247,7 +1247,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_ephemE_17,
memb_ephemE_constraint_1,
- &asn_PER_memb_ephemE_constr_17,
+ &ASN_PER_MEMB_EPHEM_E_CONSTR_17,
0,
"ephemE"
},
@@ -1256,7 +1256,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemCus_constraint_1,
- &asn_PER_memb_ephemCus_constr_18,
+ &ASN_PER_MEMB_EPHEM_CUS_CONSTR_18,
0,
"ephemCus"
},
@@ -1265,7 +1265,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_ephemAPowerHalf_19,
memb_ephemAPowerHalf_constraint_1,
- &asn_PER_memb_ephemAPowerHalf_constr_19,
+ &ASN_PER_MEMB_EPHEM_A_POWER_HALF_CONSTR_19,
0,
"ephemAPowerHalf"
},
@@ -1274,7 +1274,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemToe_constraint_1,
- &asn_PER_memb_ephemToe_constr_20,
+ &ASN_PER_MEMB_EPHEM_TOE_CONSTR_20,
0,
"ephemToe"
},
@@ -1283,7 +1283,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemFitFlag_constraint_1,
- &asn_PER_memb_ephemFitFlag_constr_21,
+ &ASN_PER_MEMB_EPHEM_FIT_FLAG_CONSTR_21,
0,
"ephemFitFlag"
},
@@ -1292,7 +1292,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemAODA_constraint_1,
- &asn_PER_memb_ephemAODA_constr_22,
+ &ASN_PER_MEMB_EPHEM_AODA_CONSTR_22,
0,
"ephemAODA"
},
@@ -1301,7 +1301,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemCic_constraint_1,
- &asn_PER_memb_ephemCic_constr_23,
+ &ASN_PER_MEMB_EPHEM_CIC_CONSTR_23,
0,
"ephemCic"
},
@@ -1310,7 +1310,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemOmegaA0_constraint_1,
- &asn_PER_memb_ephemOmegaA0_constr_24,
+ &ASN_PER_MEMB_EPHEM_OMEGA_A0_CONSTR_24,
0,
"ephemOmegaA0"
},
@@ -1319,7 +1319,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemCis_constraint_1,
- &asn_PER_memb_ephemCis_constr_25,
+ &ASN_PER_MEMB_EPHEM_CIS_CONSTR_25,
0,
"ephemCis"
},
@@ -1328,7 +1328,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemI0_constraint_1,
- &asn_PER_memb_ephemI0_constr_26,
+ &ASN_PER_MEMB_EPHEM_I0_CONSTR_26,
0,
"ephemI0"
},
@@ -1337,7 +1337,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemCrc_constraint_1,
- &asn_PER_memb_ephemCrc_constr_27,
+ &ASN_PER_MEMB_EPHEM_CRC_CONSTR_27,
0,
"ephemCrc"
},
@@ -1346,7 +1346,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemW_constraint_1,
- &asn_PER_memb_ephemW_constr_28,
+ &ASN_PER_MEMB_EPHEM_W_CONSTR_28,
0,
"ephemW"
},
@@ -1355,7 +1355,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemOmegaADot_constraint_1,
- &asn_PER_memb_ephemOmegaADot_constr_29,
+ &ASN_PER_MEMB_EPHEM_OMEGA_A_DOT_CONSTR_29,
0,
"ephemOmegaADot"
},
@@ -1364,7 +1364,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_ephemIDot_constraint_1,
- &asn_PER_memb_ephemIDot_constr_30,
+ &ASN_PER_MEMB_EPHEM_I_DOT_CONSTR_30,
0,
"ephemIDot"
},
diff --git a/src/core/libs/supl/asn-rrlp/UseMultipleSets.c b/src/core/libs/supl/asn-rrlp/UseMultipleSets.c
index 59c95ffc7..35b9b1164 100644
--- a/src/core/libs/supl/asn-rrlp/UseMultipleSets.c
+++ b/src/core/libs/supl/asn-rrlp/UseMultipleSets.c
@@ -94,7 +94,7 @@ UseMultipleSets_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_UseMultipleSets_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_USE_MULTIPLE_SETS_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UseMultipleSets = {
asn_DEF_UseMultipleSets_tags_1, /* Same as above */
sizeof(asn_DEF_UseMultipleSets_tags_1)
/sizeof(asn_DEF_UseMultipleSets_tags_1[0]), /* 1 */
- &asn_PER_type_UseMultipleSets_constr_1,
+ &ASN_PER_TYPE_USE_MULTIPLE_SETS_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_UseMultipleSets_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/AltitudeInfo.c b/src/core/libs/supl/asn-supl/AltitudeInfo.c
index 70f48f49c..531988546 100644
--- a/src/core/libs/supl/asn-supl/AltitudeInfo.c
+++ b/src/core/libs/supl/asn-supl/AltitudeInfo.c
@@ -144,17 +144,17 @@ memb_altUncertainty_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_type_altitudeDirection_constr_2 = {
+static asn_per_constraints_t ASN_PER_TYPE_ALTITUDE_DIRECTION_CONSTR_2 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_altitude_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALTITUDE_CONSTR_5 = {
{ APC_CONSTRAINED, 15, 15, 0, 32767 } /* (0..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_altUncertainty_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALT_UNCERTAINTY_CONSTR_6 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -200,7 +200,7 @@ asn_TYPE_descriptor_t asn_DEF_altitudeDirection_2 = {
asn_DEF_altitudeDirection_tags_2, /* Same as above */
sizeof(asn_DEF_altitudeDirection_tags_2)
/sizeof(asn_DEF_altitudeDirection_tags_2[0]), /* 2 */
- &asn_PER_type_altitudeDirection_constr_2,
+ &ASN_PER_TYPE_ALTITUDE_DIRECTION_CONSTR_2,
0, 0, /* Defined elsewhere */
&asn_SPC_altitudeDirection_specs_2 /* Additional specs */
};
@@ -220,7 +220,7 @@ static asn_TYPE_member_t asn_MBR_AltitudeInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_altitude_constraint_1,
- &asn_PER_memb_altitude_constr_5,
+ &ASN_PER_MEMB_ALTITUDE_CONSTR_5,
0,
"altitude"
},
@@ -229,7 +229,7 @@ static asn_TYPE_member_t asn_MBR_AltitudeInfo_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_altUncertainty_constraint_1,
- &asn_PER_memb_altUncertainty_constr_6,
+ &ASN_PER_MEMB_ALT_UNCERTAINTY_CONSTR_6,
0,
"altUncertainty"
},
diff --git a/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c b/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c
index 0445a22cb..3ccbebf84 100644
--- a/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c
+++ b/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c
@@ -111,7 +111,7 @@ CPICH_Ec_N0_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_CPICH_Ec_N0_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CPICH_EC_N0_CONSTR_1 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CPICH_Ec_N0 = {
asn_DEF_CPICH_Ec_N0_tags_1, /* Same as above */
sizeof(asn_DEF_CPICH_Ec_N0_tags_1)
/sizeof(asn_DEF_CPICH_Ec_N0_tags_1[0]), /* 1 */
- &asn_PER_type_CPICH_Ec_N0_constr_1,
+ &ASN_PER_TYPE_CPICH_EC_N0_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/CPICH-RSCP.c b/src/core/libs/supl/asn-supl/CPICH-RSCP.c
index 81726e708..92e525704 100644
--- a/src/core/libs/supl/asn-supl/CPICH-RSCP.c
+++ b/src/core/libs/supl/asn-supl/CPICH-RSCP.c
@@ -111,7 +111,7 @@ CPICH_RSCP_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_CPICH_RSCP_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CPICH_RSCP_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CPICH_RSCP = {
asn_DEF_CPICH_RSCP_tags_1, /* Same as above */
sizeof(asn_DEF_CPICH_RSCP_tags_1)
/sizeof(asn_DEF_CPICH_RSCP_tags_1[0]), /* 1 */
- &asn_PER_type_CPICH_RSCP_constr_1,
+ &ASN_PER_TYPE_CPICH_RSCP_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/CdmaCellInformation.c b/src/core/libs/supl/asn-supl/CdmaCellInformation.c
index d08ecc007..aba676872 100644
--- a/src/core/libs/supl/asn-supl/CdmaCellInformation.c
+++ b/src/core/libs/supl/asn-supl/CdmaCellInformation.c
@@ -206,42 +206,42 @@ memb_refSeconds_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_refNID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_NID_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refSID_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_SID_CONSTR_3 = {
{ APC_CONSTRAINED, 15, 15, 0, 32767 } /* (0..32767) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refBASEID_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_BASEID_CONSTR_4 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refBASELAT_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_BASELAT_CONSTR_5 = {
{ APC_CONSTRAINED, 22, -1, 0, 4194303 } /* (0..4194303) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_reBASELONG_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_RE_BASELONG_CONSTR_6 = {
{ APC_CONSTRAINED, 23, -1, 0, 8388607 } /* (0..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refREFPN_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_REFPN_CONSTR_7 = {
{ APC_CONSTRAINED, 9, 9, 0, 511 } /* (0..511) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refWeekNumber_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_WEEK_NUMBER_CONSTR_8 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refSeconds_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_SECONDS_CONSTR_9 = {
{ APC_CONSTRAINED, 22, -1, 0, 4194303 } /* (0..4194303) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refNID_constraint_1,
- &asn_PER_memb_refNID_constr_2,
+ &ASN_PER_MEMB_REF_NID_CONSTR_2,
0,
"refNID"
},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refSID_constraint_1,
- &asn_PER_memb_refSID_constr_3,
+ &ASN_PER_MEMB_REF_SID_CONSTR_3,
0,
"refSID"
},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refBASEID_constraint_1,
- &asn_PER_memb_refBASEID_constr_4,
+ &ASN_PER_MEMB_REF_BASEID_CONSTR_4,
0,
"refBASEID"
},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refBASELAT_constraint_1,
- &asn_PER_memb_refBASELAT_constr_5,
+ &ASN_PER_MEMB_REF_BASELAT_CONSTR_5,
0,
"refBASELAT"
},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_reBASELONG_constraint_1,
- &asn_PER_memb_reBASELONG_constr_6,
+ &ASN_PER_MEMB_RE_BASELONG_CONSTR_6,
0,
"reBASELONG"
},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refREFPN_constraint_1,
- &asn_PER_memb_refREFPN_constr_7,
+ &ASN_PER_MEMB_REF_REFPN_CONSTR_7,
0,
"refREFPN"
},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refWeekNumber_constraint_1,
- &asn_PER_memb_refWeekNumber_constr_8,
+ &ASN_PER_MEMB_REF_WEEK_NUMBER_CONSTR_8,
0,
"refWeekNumber"
},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refSeconds_constraint_1,
- &asn_PER_memb_refSeconds_constr_9,
+ &ASN_PER_MEMB_REF_SECONDS_CONSTR_9,
0,
"refSeconds"
},
diff --git a/src/core/libs/supl/asn-supl/CellInfo.c b/src/core/libs/supl/asn-supl/CellInfo.c
index 77eb080ba..469d624c3 100644
--- a/src/core/libs/supl/asn-supl/CellInfo.c
+++ b/src/core/libs/supl/asn-supl/CellInfo.c
@@ -6,7 +6,7 @@
#include "CellInfo.h"
-static asn_per_constraints_t asn_PER_type_CellInfo_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_INFO_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ asn_TYPE_descriptor_t asn_DEF_CellInfo = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_CellInfo_constr_1,
+ &ASN_PER_TYPE_CELL_INFO_CONSTR_1,
asn_MBR_CellInfo_1,
3, /* Elements count */
&asn_SPC_CellInfo_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/CellMeasuredResults.c b/src/core/libs/supl/asn-supl/CellMeasuredResults.c
index 0b1a9f7c1..10760d310 100644
--- a/src/core/libs/supl/asn-supl/CellMeasuredResults.c
+++ b/src/core/libs/supl/asn-supl/CellMeasuredResults.c
@@ -31,12 +31,12 @@ memb_cellIdentity_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_type_modeSpecificInfo_constr_3 = {
+static asn_per_constraints_t ASN_PER_TYPE_MODE_SPECIFIC_INFO_CONSTR_3 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_cellIdentity_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_CELL_IDENTITY_CONSTR_2 = {
{ APC_CONSTRAINED, 28, -1, 0, 268435455 } /* (0..268435455) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -273,7 +273,7 @@ asn_TYPE_descriptor_t asn_DEF_modeSpecificInfo_3 = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_modeSpecificInfo_constr_3,
+ &ASN_PER_TYPE_MODE_SPECIFIC_INFO_CONSTR_3,
asn_MBR_modeSpecificInfo_3,
2, /* Elements count */
&asn_SPC_modeSpecificInfo_specs_3 /* Additional specs */
@@ -285,7 +285,7 @@ static asn_TYPE_member_t asn_MBR_CellMeasuredResults_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_cellIdentity_constraint_1,
- &asn_PER_memb_cellIdentity_constr_2,
+ &ASN_PER_MEMB_CELL_IDENTITY_CONSTR_2,
0,
"cellIdentity"
},
diff --git a/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c b/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c
index 567dcf35f..ecbb9da57 100644
--- a/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c
+++ b/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c
@@ -6,7 +6,7 @@
#include "CellMeasuredResultsList.h"
-static asn_per_constraints_t asn_PER_type_CellMeasuredResultsList_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_MEASURED_RESULTS_LIST_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 5, 5, 1, 32 } /* (SIZE(1..32)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_CellMeasuredResultsList = {
asn_DEF_CellMeasuredResultsList_tags_1, /* Same as above */
sizeof(asn_DEF_CellMeasuredResultsList_tags_1)
/sizeof(asn_DEF_CellMeasuredResultsList_tags_1[0]), /* 1 */
- &asn_PER_type_CellMeasuredResultsList_constr_1,
+ &ASN_PER_TYPE_CELL_MEASURED_RESULTS_LIST_CONSTR_1,
asn_MBR_CellMeasuredResultsList_1,
1, /* Single element */
&asn_SPC_CellMeasuredResultsList_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/CellParametersID.c b/src/core/libs/supl/asn-supl/CellParametersID.c
index 4092e8585..8cc4a66b3 100644
--- a/src/core/libs/supl/asn-supl/CellParametersID.c
+++ b/src/core/libs/supl/asn-supl/CellParametersID.c
@@ -111,7 +111,7 @@ CellParametersID_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_CellParametersID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_PARAMETERS_ID_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CellParametersID = {
asn_DEF_CellParametersID_tags_1, /* Same as above */
sizeof(asn_DEF_CellParametersID_tags_1)
/sizeof(asn_DEF_CellParametersID_tags_1[0]), /* 1 */
- &asn_PER_type_CellParametersID_constr_1,
+ &ASN_PER_TYPE_CELL_PARAMETERS_ID_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/EncodingType.c b/src/core/libs/supl/asn-supl/EncodingType.c
index ff25bfa80..db0ad1ea7 100644
--- a/src/core/libs/supl/asn-supl/EncodingType.c
+++ b/src/core/libs/supl/asn-supl/EncodingType.c
@@ -94,7 +94,7 @@ EncodingType_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_EncodingType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ENCODING_TYPE_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_EncodingType = {
asn_DEF_EncodingType_tags_1, /* Same as above */
sizeof(asn_DEF_EncodingType_tags_1)
/sizeof(asn_DEF_EncodingType_tags_1[0]), /* 1 */
- &asn_PER_type_EncodingType_constr_1,
+ &ASN_PER_TYPE_ENCODING_TYPE_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_EncodingType_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/FQDN.c b/src/core/libs/supl/asn-supl/FQDN.c
index 84c9d1f0a..1d4f501a2 100644
--- a/src/core/libs/supl/asn-supl/FQDN.c
+++ b/src/core/libs/supl/asn-supl/FQDN.c
@@ -155,7 +155,7 @@ FQDN_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_FQDN_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FQDN_CONSTR_1 = {
{ APC_CONSTRAINED, 6, 6, 45, 122 } /* (45..122) */,
{ APC_CONSTRAINED, 8, 8, 1, 255 } /* (SIZE(1..255)) */,
asn_PER_MAP_FQDN_1_v2c, /* Value to PER code map */
@@ -183,7 +183,7 @@ asn_TYPE_descriptor_t asn_DEF_FQDN = {
asn_DEF_FQDN_tags_1, /* Same as above */
sizeof(asn_DEF_FQDN_tags_1)
/sizeof(asn_DEF_FQDN_tags_1[0]), /* 1 */
- &asn_PER_type_FQDN_constr_1,
+ &ASN_PER_TYPE_FQDN_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/FormatIndicator.c b/src/core/libs/supl/asn-supl/FormatIndicator.c
index 9a17c684c..61c2ce2b8 100644
--- a/src/core/libs/supl/asn-supl/FormatIndicator.c
+++ b/src/core/libs/supl/asn-supl/FormatIndicator.c
@@ -94,7 +94,7 @@ FormatIndicator_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_FormatIndicator_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FORMAT_INDICATOR_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 7 } /* (0..7,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -152,7 +152,7 @@ asn_TYPE_descriptor_t asn_DEF_FormatIndicator = {
asn_DEF_FormatIndicator_tags_1, /* Same as above */
sizeof(asn_DEF_FormatIndicator_tags_1)
/sizeof(asn_DEF_FormatIndicator_tags_1[0]), /* 1 */
- &asn_PER_type_FormatIndicator_constr_1,
+ &ASN_PER_TYPE_FORMAT_INDICATOR_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_FormatIndicator_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/FrequencyInfo.c b/src/core/libs/supl/asn-supl/FrequencyInfo.c
index 6aa75a010..d0ebd64fb 100644
--- a/src/core/libs/supl/asn-supl/FrequencyInfo.c
+++ b/src/core/libs/supl/asn-supl/FrequencyInfo.c
@@ -6,7 +6,7 @@
#include "FrequencyInfo.h"
-static asn_per_constraints_t asn_PER_type_fmodeSpecificInfo_constr_2 = {
+static asn_per_constraints_t ASN_PER_TYPE_FMODE_SPECIFIC_INFO_CONSTR_2 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 1, 1, 0, 1 } /* (0..1,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -63,7 +63,7 @@ asn_TYPE_descriptor_t asn_DEF_fmodeSpecificInfo_2 = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_fmodeSpecificInfo_constr_2,
+ &ASN_PER_TYPE_FMODE_SPECIFIC_INFO_CONSTR_2,
asn_MBR_fmodeSpecificInfo_2,
2, /* Elements count */
&asn_SPC_fmodeSpecificInfo_specs_2 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/GeneralizedTime.c b/src/core/libs/supl/asn-supl/GeneralizedTime.c
index 3007af94e..ec23c6836 100644
--- a/src/core/libs/supl/asn-supl/GeneralizedTime.c
+++ b/src/core/libs/supl/asn-supl/GeneralizedTime.c
@@ -152,7 +152,7 @@ static ber_tlv_tag_t asn_DEF_GeneralizedTime_tags[] = {
(ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), /* [UNIVERSAL 26] IMPLICIT ...*/
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)) /* ... OCTET STRING */
};
-static asn_per_constraints_t asn_DEF_GeneralizedTime_constraints = {
+static asn_per_constraints_t ASN_DEF_GENERALIZED_TIME_CONSTRAINTS = {
{ APC_CONSTRAINED, 7, 7, 0x20, 0x7e }, /* Value */
{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 }, /* Size */
0, 0
@@ -176,7 +176,7 @@ asn_TYPE_descriptor_t asn_DEF_GeneralizedTime = {
asn_DEF_GeneralizedTime_tags,
sizeof(asn_DEF_GeneralizedTime_tags)
/ sizeof(asn_DEF_GeneralizedTime_tags[0]),
- &asn_DEF_GeneralizedTime_constraints,
+ &ASN_DEF_GENERALIZED_TIME_CONSTRAINTS,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/GsmCellInformation.c b/src/core/libs/supl/asn-supl/GsmCellInformation.c
index 14aed828a..f43919e0f 100644
--- a/src/core/libs/supl/asn-supl/GsmCellInformation.c
+++ b/src/core/libs/supl/asn-supl/GsmCellInformation.c
@@ -131,27 +131,27 @@ memb_tA_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_refMCC_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MCC_CONSTR_2 = {
{ APC_CONSTRAINED, 10, 10, 0, 999 } /* (0..999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refMNC_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MNC_CONSTR_3 = {
{ APC_CONSTRAINED, 10, 10, 0, 999 } /* (0..999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refLAC_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_LAC_CONSTR_4 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refCI_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_CI_CONSTR_5 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_tA_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_T_A_CONSTR_7 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -162,7 +162,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refMCC_constraint_1,
- &asn_PER_memb_refMCC_constr_2,
+ &ASN_PER_MEMB_REF_MCC_CONSTR_2,
0,
"refMCC"
},
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refMNC_constraint_1,
- &asn_PER_memb_refMNC_constr_3,
+ &ASN_PER_MEMB_REF_MNC_CONSTR_3,
0,
"refMNC"
},
@@ -180,7 +180,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refLAC_constraint_1,
- &asn_PER_memb_refLAC_constr_4,
+ &ASN_PER_MEMB_REF_LAC_CONSTR_4,
0,
"refLAC"
},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refCI_constraint_1,
- &asn_PER_memb_refCI_constr_5,
+ &ASN_PER_MEMB_REF_CI_CONSTR_5,
0,
"refCI"
},
@@ -207,7 +207,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_tA_constraint_1,
- &asn_PER_memb_tA_constr_7,
+ &ASN_PER_MEMB_T_A_CONSTR_7,
0,
"tA"
},
diff --git a/src/core/libs/supl/asn-supl/Horandveruncert.c b/src/core/libs/supl/asn-supl/Horandveruncert.c
index a73928d71..73ba2b860 100644
--- a/src/core/libs/supl/asn-supl/Horandveruncert.c
+++ b/src/core/libs/supl/asn-supl/Horandveruncert.c
@@ -240,32 +240,32 @@ memb_veruncertspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_verdirect_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERDIRECT_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 1, 1} /* (SIZE(1..1)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_bearing_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_3 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_4 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_verspeed_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERSPEED_CONSTR_5 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_horuncertspeed_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORUNCERTSPEED_CONSTR_6 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_veruncertspeed_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERUNCERTSPEED_CONSTR_7 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
@@ -276,7 +276,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_verdirect_constraint_1,
- &asn_PER_memb_verdirect_constr_2,
+ &ASN_PER_MEMB_VERDIRECT_CONSTR_2,
0,
"verdirect"},
{ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, bearing),
@@ -284,7 +284,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_bearing_constraint_1,
- &asn_PER_memb_bearing_constr_3,
+ &ASN_PER_MEMB_BEARING_CONSTR_3,
0,
"bearing"},
{ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, horspeed),
@@ -292,7 +292,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_horspeed_constraint_1,
- &asn_PER_memb_horspeed_constr_4,
+ &ASN_PER_MEMB_HORSPEED_CONSTR_4,
0,
"horspeed"},
{ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, verspeed),
@@ -300,7 +300,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_verspeed_constraint_1,
- &asn_PER_memb_verspeed_constr_5,
+ &ASN_PER_MEMB_VERSPEED_CONSTR_5,
0,
"verspeed"},
{ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, horuncertspeed),
@@ -308,7 +308,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_horuncertspeed_constraint_1,
- &asn_PER_memb_horuncertspeed_constr_6,
+ &ASN_PER_MEMB_HORUNCERTSPEED_CONSTR_6,
0,
"horuncertspeed"},
{ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, veruncertspeed),
@@ -316,7 +316,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_veruncertspeed_constraint_1,
- &asn_PER_memb_veruncertspeed_constr_7,
+ &ASN_PER_MEMB_VERUNCERTSPEED_CONSTR_7,
0,
"veruncertspeed"},
};
diff --git a/src/core/libs/supl/asn-supl/Horandvervel.c b/src/core/libs/supl/asn-supl/Horandvervel.c
index b91d072e1..6f8b3bc5c 100644
--- a/src/core/libs/supl/asn-supl/Horandvervel.c
+++ b/src/core/libs/supl/asn-supl/Horandvervel.c
@@ -162,22 +162,22 @@ memb_verspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_verdirect_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERDIRECT_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 1, 1} /* (SIZE(1..1)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_bearing_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_3 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_4 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_verspeed_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERSPEED_CONSTR_5 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
@@ -188,7 +188,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_verdirect_constraint_1,
- &asn_PER_memb_verdirect_constr_2,
+ &ASN_PER_MEMB_VERDIRECT_CONSTR_2,
0,
"verdirect"},
{ATF_NOFLAGS, 0, offsetof(struct Horandvervel, bearing),
@@ -196,7 +196,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_bearing_constraint_1,
- &asn_PER_memb_bearing_constr_3,
+ &ASN_PER_MEMB_BEARING_CONSTR_3,
0,
"bearing"},
{ATF_NOFLAGS, 0, offsetof(struct Horandvervel, horspeed),
@@ -204,7 +204,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_horspeed_constraint_1,
- &asn_PER_memb_horspeed_constr_4,
+ &ASN_PER_MEMB_HORSPEED_CONSTR_4,
0,
"horspeed"},
{ATF_NOFLAGS, 0, offsetof(struct Horandvervel, verspeed),
@@ -212,7 +212,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_verspeed_constraint_1,
- &asn_PER_memb_verspeed_constr_5,
+ &ASN_PER_MEMB_VERSPEED_CONSTR_5,
0,
"verspeed"},
};
diff --git a/src/core/libs/supl/asn-supl/Horvel.c b/src/core/libs/supl/asn-supl/Horvel.c
index 7c2080fff..fb8f8502c 100644
--- a/src/core/libs/supl/asn-supl/Horvel.c
+++ b/src/core/libs/supl/asn-supl/Horvel.c
@@ -84,12 +84,12 @@ memb_horspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_bearing_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_3 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
0, 0 /* No PER value map */
@@ -100,7 +100,7 @@ static asn_TYPE_member_t asn_MBR_Horvel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_bearing_constraint_1,
- &asn_PER_memb_bearing_constr_2,
+ &ASN_PER_MEMB_BEARING_CONSTR_2,
0,
"bearing"},
{ATF_NOFLAGS, 0, offsetof(struct Horvel, horspeed),
@@ -108,7 +108,7 @@ static asn_TYPE_member_t asn_MBR_Horvel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_horspeed_constraint_1,
- &asn_PER_memb_horspeed_constr_3,
+ &ASN_PER_MEMB_HORSPEED_CONSTR_3,
0,
"horspeed"},
};
diff --git a/src/core/libs/supl/asn-supl/Horveluncert.c b/src/core/libs/supl/asn-supl/Horveluncert.c
index b3983f3f6..3e00aee15 100644
--- a/src/core/libs/supl/asn-supl/Horveluncert.c
+++ b/src/core/libs/supl/asn-supl/Horveluncert.c
@@ -123,17 +123,17 @@ memb_uncertspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_bearing_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_3 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_uncertspeed_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UNCERTSPEED_CONSTR_4 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
@@ -144,7 +144,7 @@ static asn_TYPE_member_t asn_MBR_Horveluncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_bearing_constraint_1,
- &asn_PER_memb_bearing_constr_2,
+ &ASN_PER_MEMB_BEARING_CONSTR_2,
0,
"bearing"},
{ATF_NOFLAGS, 0, offsetof(struct Horveluncert, horspeed),
@@ -152,7 +152,7 @@ static asn_TYPE_member_t asn_MBR_Horveluncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_horspeed_constraint_1,
- &asn_PER_memb_horspeed_constr_3,
+ &ASN_PER_MEMB_HORSPEED_CONSTR_3,
0,
"horspeed"},
{ATF_NOFLAGS, 0, offsetof(struct Horveluncert, uncertspeed),
@@ -160,7 +160,7 @@ static asn_TYPE_member_t asn_MBR_Horveluncert_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_uncertspeed_constraint_1,
- &asn_PER_memb_uncertspeed_constr_4,
+ &ASN_PER_MEMB_UNCERTSPEED_CONSTR_4,
0,
"uncertspeed"},
};
diff --git a/src/core/libs/supl/asn-supl/IA5String.c b/src/core/libs/supl/asn-supl/IA5String.c
index 02ecd3ee7..c404406d4 100644
--- a/src/core/libs/supl/asn-supl/IA5String.c
+++ b/src/core/libs/supl/asn-supl/IA5String.c
@@ -12,7 +12,7 @@ static ber_tlv_tag_t asn_DEF_IA5String_tags[] = {
(ASN_TAG_CLASS_UNIVERSAL | (22 << 2)), /* [UNIVERSAL 22] IMPLICIT ...*/
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)) /* ... OCTET STRING */
};
-static asn_per_constraints_t asn_DEF_IA5String_constraints = {
+static asn_per_constraints_t ASN_DEF_I_A5_STRING_CONSTRAINTS = {
{ APC_CONSTRAINED, 7, 7, 0, 0x7f }, /* Value */
{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 }, /* Size */
0, 0
@@ -36,7 +36,7 @@ asn_TYPE_descriptor_t asn_DEF_IA5String = {
asn_DEF_IA5String_tags,
sizeof(asn_DEF_IA5String_tags)
/ sizeof(asn_DEF_IA5String_tags[0]),
- &asn_DEF_IA5String_constraints,
+ &ASN_DEF_I_A5_STRING_CONSTRAINTS,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/IPAddress.c b/src/core/libs/supl/asn-supl/IPAddress.c
index f1861adac..1da24fbd8 100644
--- a/src/core/libs/supl/asn-supl/IPAddress.c
+++ b/src/core/libs/supl/asn-supl/IPAddress.c
@@ -68,17 +68,17 @@ memb_ipv6Address_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_ipv4Address_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_IPV4_ADDRESS_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 4, 4} /* (SIZE(4..4)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_ipv6Address_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IPV6_ADDRESS_CONSTR_3 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_type_IPAddress_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_IP_ADDRESS_CONSTR_1 = {
{APC_CONSTRAINED, 1, 1, 0, 1} /* (0..1) */,
{APC_UNCONSTRAINED, -1, -1, 0, 0},
0, 0 /* No PER value map */
@@ -89,7 +89,7 @@ static asn_TYPE_member_t asn_MBR_IPAddress_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_ipv4Address_constraint_1,
- &asn_PER_memb_ipv4Address_constr_2,
+ &ASN_PER_MEMB_IPV4_ADDRESS_CONSTR_2,
0,
"ipv4Address"},
{ATF_NOFLAGS, 0, offsetof(struct IPAddress, choice.ipv6Address),
@@ -97,7 +97,7 @@ static asn_TYPE_member_t asn_MBR_IPAddress_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_ipv6Address_constraint_1,
- &asn_PER_memb_ipv6Address_constr_3,
+ &ASN_PER_MEMB_IPV6_ADDRESS_CONSTR_3,
0,
"ipv6Address"},
};
@@ -132,7 +132,7 @@ asn_TYPE_descriptor_t asn_DEF_IPAddress = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_IPAddress_constr_1,
+ &ASN_PER_TYPE_IP_ADDRESS_CONSTR_1,
asn_MBR_IPAddress_1,
2, /* Elements count */
&asn_SPC_IPAddress_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/KeyIdentity.c b/src/core/libs/supl/asn-supl/KeyIdentity.c
index 49104664a..cb4081683 100644
--- a/src/core/libs/supl/asn-supl/KeyIdentity.c
+++ b/src/core/libs/supl/asn-supl/KeyIdentity.c
@@ -131,7 +131,7 @@ KeyIdentity_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_KeyIdentity_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_KEY_IDENTITY_CONSTR_1 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 128, 128} /* (SIZE(128..128)) */,
0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_KeyIdentity = {
sizeof(asn_DEF_KeyIdentity_tags_1) / sizeof(asn_DEF_KeyIdentity_tags_1[0]), /* 1 */
asn_DEF_KeyIdentity_tags_1, /* Same as above */
sizeof(asn_DEF_KeyIdentity_tags_1) / sizeof(asn_DEF_KeyIdentity_tags_1[0]), /* 1 */
- &asn_PER_type_KeyIdentity_constr_1,
+ &ASN_PER_TYPE_KEY_IDENTITY_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/KeyIdentity4.c b/src/core/libs/supl/asn-supl/KeyIdentity4.c
index ef652c319..55c90f14e 100644
--- a/src/core/libs/supl/asn-supl/KeyIdentity4.c
+++ b/src/core/libs/supl/asn-supl/KeyIdentity4.c
@@ -131,7 +131,7 @@ KeyIdentity4_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_KeyIdentity4_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_KEY_IDENTITY4_CONSTR_1 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 128, 128} /* (SIZE(128..128)) */,
0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_KeyIdentity4 = {
sizeof(asn_DEF_KeyIdentity4_tags_1) / sizeof(asn_DEF_KeyIdentity4_tags_1[0]), /* 1 */
asn_DEF_KeyIdentity4_tags_1, /* Same as above */
sizeof(asn_DEF_KeyIdentity4_tags_1) / sizeof(asn_DEF_KeyIdentity4_tags_1[0]), /* 1 */
- &asn_PER_type_KeyIdentity4_constr_1,
+ &ASN_PER_TYPE_KEY_IDENTITY4_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/MAC.c b/src/core/libs/supl/asn-supl/MAC.c
index 5592eaf53..2fe9de455 100644
--- a/src/core/libs/supl/asn-supl/MAC.c
+++ b/src/core/libs/supl/asn-supl/MAC.c
@@ -131,7 +131,7 @@ MAC_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_MAC_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MAC_CONSTR_1 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 64, 64} /* (SIZE(64..64)) */,
0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_MAC = {
sizeof(asn_DEF_MAC_tags_1) / sizeof(asn_DEF_MAC_tags_1[0]), /* 1 */
asn_DEF_MAC_tags_1, /* Same as above */
sizeof(asn_DEF_MAC_tags_1) / sizeof(asn_DEF_MAC_tags_1[0]), /* 1 */
- &asn_PER_type_MAC_constr_1,
+ &ASN_PER_TYPE_MAC_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/MeasuredResultsList.c b/src/core/libs/supl/asn-supl/MeasuredResultsList.c
index 1108ef45e..dd653c7a2 100644
--- a/src/core/libs/supl/asn-supl/MeasuredResultsList.c
+++ b/src/core/libs/supl/asn-supl/MeasuredResultsList.c
@@ -6,7 +6,7 @@
#include "MeasuredResultsList.h"
-static asn_per_constraints_t asn_PER_type_MeasuredResultsList_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MEASURED_RESULTS_LIST_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 3, 3, 1, 8 } /* (SIZE(1..8)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_MeasuredResultsList = {
asn_DEF_MeasuredResultsList_tags_1, /* Same as above */
sizeof(asn_DEF_MeasuredResultsList_tags_1)
/sizeof(asn_DEF_MeasuredResultsList_tags_1[0]), /* 1 */
- &asn_PER_type_MeasuredResultsList_constr_1,
+ &ASN_PER_TYPE_MEASURED_RESULTS_LIST_CONSTR_1,
asn_MBR_MeasuredResultsList_1,
1, /* Single element */
&asn_SPC_MeasuredResultsList_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/NMR.c b/src/core/libs/supl/asn-supl/NMR.c
index f64caffbe..f9fff612e 100644
--- a/src/core/libs/supl/asn-supl/NMR.c
+++ b/src/core/libs/supl/asn-supl/NMR.c
@@ -6,7 +6,7 @@
#include "NMR.h"
-static asn_per_constraints_t asn_PER_type_NMR_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NMR_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 15 } /* (SIZE(1..15)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_NMR = {
asn_DEF_NMR_tags_1, /* Same as above */
sizeof(asn_DEF_NMR_tags_1)
/sizeof(asn_DEF_NMR_tags_1[0]), /* 1 */
- &asn_PER_type_NMR_constr_1,
+ &ASN_PER_TYPE_NMR_CONSTR_1,
asn_MBR_NMR_1,
1, /* Single element */
&asn_SPC_NMR_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/NMRelement.c b/src/core/libs/supl/asn-supl/NMRelement.c
index 79d122d82..ae64a2e78 100644
--- a/src/core/libs/supl/asn-supl/NMRelement.c
+++ b/src/core/libs/supl/asn-supl/NMRelement.c
@@ -81,17 +81,17 @@ memb_rxLev_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_aRFCN_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_A_RFCN_CONSTR_2 = {
{ APC_CONSTRAINED, 10, 10, 0, 1023 } /* (0..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_bSIC_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_B_SIC_CONSTR_3 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_rxLev_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_RX_LEV_CONSTR_4 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_NMRelement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_aRFCN_constraint_1,
- &asn_PER_memb_aRFCN_constr_2,
+ &ASN_PER_MEMB_A_RFCN_CONSTR_2,
0,
"aRFCN"
},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_NMRelement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_bSIC_constraint_1,
- &asn_PER_memb_bSIC_constr_3,
+ &ASN_PER_MEMB_B_SIC_CONSTR_3,
0,
"bSIC"
},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_NMRelement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_rxLev_constraint_1,
- &asn_PER_memb_rxLev_constr_4,
+ &ASN_PER_MEMB_RX_LEV_CONSTR_4,
0,
"rxLev"
},
diff --git a/src/core/libs/supl/asn-supl/Notification.c b/src/core/libs/supl/asn-supl/Notification.c
index 7643e9048..c8d4c280e 100644
--- a/src/core/libs/supl/asn-supl/Notification.c
+++ b/src/core/libs/supl/asn-supl/Notification.c
@@ -58,12 +58,12 @@ memb_clientName_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_requestorId_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REQUESTOR_ID_CONSTR_4 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 6, 6, 1, 50 } /* (SIZE(1..50)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_clientName_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_CLIENT_NAME_CONSTR_6 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 6, 6, 1, 50 } /* (SIZE(1..50)) */,
0, 0 /* No PER value map */
@@ -92,7 +92,7 @@ static asn_TYPE_member_t asn_MBR_Notification_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_requestorId_constraint_1,
- &asn_PER_memb_requestorId_constr_4,
+ &ASN_PER_MEMB_REQUESTOR_ID_CONSTR_4,
0,
"requestorId"
},
@@ -110,7 +110,7 @@ static asn_TYPE_member_t asn_MBR_Notification_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_clientName_constraint_1,
- &asn_PER_memb_clientName_constr_6,
+ &ASN_PER_MEMB_CLIENT_NAME_CONSTR_6,
0,
"clientName"
},
diff --git a/src/core/libs/supl/asn-supl/NotificationType.c b/src/core/libs/supl/asn-supl/NotificationType.c
index 8c1178a98..e6b591c40 100644
--- a/src/core/libs/supl/asn-supl/NotificationType.c
+++ b/src/core/libs/supl/asn-supl/NotificationType.c
@@ -94,7 +94,7 @@ NotificationType_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_NotificationType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NOTIFICATION_TYPE_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 4 } /* (0..4,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -146,7 +146,7 @@ asn_TYPE_descriptor_t asn_DEF_NotificationType = {
asn_DEF_NotificationType_tags_1, /* Same as above */
sizeof(asn_DEF_NotificationType_tags_1)
/sizeof(asn_DEF_NotificationType_tags_1[0]), /* 1 */
- &asn_PER_type_NotificationType_constr_1,
+ &ASN_PER_TYPE_NOTIFICATION_TYPE_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_NotificationType_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/OCTET_STRING.c b/src/core/libs/supl/asn-supl/OCTET_STRING.c
index bd2d1d845..98aebb3bf 100644
--- a/src/core/libs/supl/asn-supl/OCTET_STRING.c
+++ b/src/core/libs/supl/asn-supl/OCTET_STRING.c
@@ -19,7 +19,7 @@ static asn_OCTET_STRING_specifics_t asn_DEF_OCTET_STRING_specs = {
offsetof(OCTET_STRING_t, _asn_ctx),
ASN_OSUBV_STR
};
-static asn_per_constraints_t asn_DEF_OCTET_STRING_constraints = {
+static asn_per_constraints_t ASN_DEF_OCTET_STRING_CONSTRAINTS = {
{ APC_CONSTRAINED, 8, 8, 0, 255 },
{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 },
0, 0
@@ -1351,8 +1351,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
cval = &pc->value;
csiz = &pc->size;
} else {
- cval = &asn_DEF_OCTET_STRING_constraints.value;
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
}
switch(specs->subvariant) {
@@ -1400,8 +1400,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
int inext = per_get_few_bits(pd, 1);
if(inext < 0) RETURN(RC_WMORE);
if(inext) {
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
- cval = &asn_DEF_OCTET_STRING_constraints.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
unit_bits = canonical_unit_bits;
}
}
@@ -1526,8 +1526,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
cval = &pc->value;
csiz = &pc->size;
} else {
- cval = &asn_DEF_OCTET_STRING_constraints.value;
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
}
ct_extensible = csiz->flags & APC_EXTENSIBLE;
@@ -1577,8 +1577,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
if((int)sizeinunits < csiz->lower_bound
|| (int)sizeinunits > csiz->upper_bound) {
if(ct_extensible) {
- cval = &asn_DEF_OCTET_STRING_constraints.value;
- csiz = &asn_DEF_OCTET_STRING_constraints.size;
+ cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+ csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
unit_bits = canonical_unit_bits;
inext = 1;
} else
diff --git a/src/core/libs/supl/asn-supl/Pathloss.c b/src/core/libs/supl/asn-supl/Pathloss.c
index 3bbec50fb..ddeca35b9 100644
--- a/src/core/libs/supl/asn-supl/Pathloss.c
+++ b/src/core/libs/supl/asn-supl/Pathloss.c
@@ -111,7 +111,7 @@ Pathloss_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_Pathloss_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_PATHLOSS_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 46, 173 } /* (46..173) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_Pathloss = {
asn_DEF_Pathloss_tags_1, /* Same as above */
sizeof(asn_DEF_Pathloss_tags_1)
/sizeof(asn_DEF_Pathloss_tags_1[0]), /* 1 */
- &asn_PER_type_Pathloss_constr_1,
+ &ASN_PER_TYPE_PATHLOSS_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/PosMethod.c b/src/core/libs/supl/asn-supl/PosMethod.c
index d65c13b6f..b720df296 100644
--- a/src/core/libs/supl/asn-supl/PosMethod.c
+++ b/src/core/libs/supl/asn-supl/PosMethod.c
@@ -94,7 +94,7 @@ PosMethod_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_PosMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POS_METHOD_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 0, 9 } /* (0..9,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -156,7 +156,7 @@ asn_TYPE_descriptor_t asn_DEF_PosMethod = {
asn_DEF_PosMethod_tags_1, /* Same as above */
sizeof(asn_DEF_PosMethod_tags_1)
/sizeof(asn_DEF_PosMethod_tags_1[0]), /* 1 */
- &asn_PER_type_PosMethod_constr_1,
+ &ASN_PER_TYPE_POS_METHOD_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_PosMethod_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/PosPayLoad.c b/src/core/libs/supl/asn-supl/PosPayLoad.c
index b12f05e74..ebb173c43 100644
--- a/src/core/libs/supl/asn-supl/PosPayLoad.c
+++ b/src/core/libs/supl/asn-supl/PosPayLoad.c
@@ -84,22 +84,22 @@ memb_rrlpPayload_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_tia801payload_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_TIA801PAYLOAD_CONSTR_2 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 13, 13, 1, 8192 } /* (SIZE(1..8192)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_rrcPayload_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_RRC_PAYLOAD_CONSTR_3 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 13, 13, 1, 8192 } /* (SIZE(1..8192)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_rrlpPayload_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_RRLP_PAYLOAD_CONSTR_4 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 13, 13, 1, 8192 } /* (SIZE(1..8192)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_type_PosPayLoad_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POS_PAY_LOAD_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -110,7 +110,7 @@ static asn_TYPE_member_t asn_MBR_PosPayLoad_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_tia801payload_constraint_1,
- &asn_PER_memb_tia801payload_constr_2,
+ &ASN_PER_MEMB_TIA801PAYLOAD_CONSTR_2,
0,
"tia801payload"
},
@@ -119,7 +119,7 @@ static asn_TYPE_member_t asn_MBR_PosPayLoad_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_rrcPayload_constraint_1,
- &asn_PER_memb_rrcPayload_constr_3,
+ &ASN_PER_MEMB_RRC_PAYLOAD_CONSTR_3,
0,
"rrcPayload"
},
@@ -128,7 +128,7 @@ static asn_TYPE_member_t asn_MBR_PosPayLoad_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_rrlpPayload_constraint_1,
- &asn_PER_memb_rrlpPayload_constr_4,
+ &ASN_PER_MEMB_RRLP_PAYLOAD_CONSTR_4,
0,
"rrlpPayload"
},
@@ -165,7 +165,7 @@ asn_TYPE_descriptor_t asn_DEF_PosPayLoad = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_PosPayLoad_constr_1,
+ &ASN_PER_TYPE_POS_PAY_LOAD_CONSTR_1,
asn_MBR_PosPayLoad_1,
3, /* Elements count */
&asn_SPC_PosPayLoad_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/PositionEstimate.c b/src/core/libs/supl/asn-supl/PositionEstimate.c
index 4b7367af2..ee44b7a11 100644
--- a/src/core/libs/supl/asn-supl/PositionEstimate.c
+++ b/src/core/libs/supl/asn-supl/PositionEstimate.c
@@ -244,37 +244,37 @@ memb_confidence_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_type_latitudeSign_constr_2 = {
+static asn_per_constraints_t ASN_PER_TYPE_LATITUDE_SIGN_CONSTR_2 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_uncertaintySemiMajor_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_UNCERTAINTY_SEMI_MAJOR_CONSTR_8 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_uncertaintySemiMinor_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_UNCERTAINTY_SEMI_MINOR_CONSTR_9 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_orientationMajorAxis_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_ORIENTATION_MAJOR_AXIS_CONSTR_10 = {
{ APC_CONSTRAINED, 8, 8, 0, 180 } /* (0..180) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_latitude_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_LATITUDE_CONSTR_5 = {
{ APC_CONSTRAINED, 23, -1, 0, 8388607 } /* (0..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_longitude_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_LONGITUDE_CONSTR_6 = {
{ APC_CONSTRAINED, 24, -1, -8388608, 8388607 } /* (-8388608..8388607) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_confidence_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_CONFIDENCE_CONSTR_11 = {
{ APC_CONSTRAINED, 7, 7, 0, 100 } /* (0..100) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -320,7 +320,7 @@ asn_TYPE_descriptor_t asn_DEF_latitudeSign_2 = {
asn_DEF_latitudeSign_tags_2, /* Same as above */
sizeof(asn_DEF_latitudeSign_tags_2)
/sizeof(asn_DEF_latitudeSign_tags_2[0]), /* 2 */
- &asn_PER_type_latitudeSign_constr_2,
+ &ASN_PER_TYPE_LATITUDE_SIGN_CONSTR_2,
0, 0, /* Defined elsewhere */
&asn_SPC_latitudeSign_specs_2 /* Additional specs */
};
@@ -331,7 +331,7 @@ static asn_TYPE_member_t asn_MBR_uncertainty_7[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_uncertaintySemiMajor_constraint_7,
- &asn_PER_memb_uncertaintySemiMajor_constr_8,
+ &ASN_PER_MEMB_UNCERTAINTY_SEMI_MAJOR_CONSTR_8,
0,
"uncertaintySemiMajor"
},
@@ -340,7 +340,7 @@ static asn_TYPE_member_t asn_MBR_uncertainty_7[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_uncertaintySemiMinor_constraint_7,
- &asn_PER_memb_uncertaintySemiMinor_constr_9,
+ &ASN_PER_MEMB_UNCERTAINTY_SEMI_MINOR_CONSTR_9,
0,
"uncertaintySemiMinor"
},
@@ -349,7 +349,7 @@ static asn_TYPE_member_t asn_MBR_uncertainty_7[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_orientationMajorAxis_constraint_7,
- &asn_PER_memb_orientationMajorAxis_constr_10,
+ &ASN_PER_MEMB_ORIENTATION_MAJOR_AXIS_CONSTR_10,
0,
"orientationMajorAxis"
},
@@ -413,7 +413,7 @@ static asn_TYPE_member_t asn_MBR_PositionEstimate_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_latitude_constraint_1,
- &asn_PER_memb_latitude_constr_5,
+ &ASN_PER_MEMB_LATITUDE_CONSTR_5,
0,
"latitude"
},
@@ -422,7 +422,7 @@ static asn_TYPE_member_t asn_MBR_PositionEstimate_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_longitude_constraint_1,
- &asn_PER_memb_longitude_constr_6,
+ &ASN_PER_MEMB_LONGITUDE_CONSTR_6,
0,
"longitude"
},
@@ -440,7 +440,7 @@ static asn_TYPE_member_t asn_MBR_PositionEstimate_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_confidence_constraint_1,
- &asn_PER_memb_confidence_constr_11,
+ &ASN_PER_MEMB_CONFIDENCE_CONSTR_11,
0,
"confidence"
},
diff --git a/src/core/libs/supl/asn-supl/PrefMethod.c b/src/core/libs/supl/asn-supl/PrefMethod.c
index 3949a64ec..e07280a8f 100644
--- a/src/core/libs/supl/asn-supl/PrefMethod.c
+++ b/src/core/libs/supl/asn-supl/PrefMethod.c
@@ -94,7 +94,7 @@ PrefMethod_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_PrefMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_PREF_METHOD_CONSTR_1 = {
{ APC_CONSTRAINED, 2, 2, 0, 2 } /* (0..2) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -140,7 +140,7 @@ asn_TYPE_descriptor_t asn_DEF_PrefMethod = {
asn_DEF_PrefMethod_tags_1, /* Same as above */
sizeof(asn_DEF_PrefMethod_tags_1)
/sizeof(asn_DEF_PrefMethod_tags_1[0]), /* 1 */
- &asn_PER_type_PrefMethod_constr_1,
+ &ASN_PER_TYPE_PREF_METHOD_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_PrefMethod_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c b/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c
index ea2ce5877..1c7d91177 100644
--- a/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c
+++ b/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c
@@ -111,7 +111,7 @@ PrimaryCCPCH_RSCP_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_PrimaryCCPCH_RSCP_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_PRIMARY_CCPCH_RSCP_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_PrimaryCCPCH_RSCP = {
asn_DEF_PrimaryCCPCH_RSCP_tags_1, /* Same as above */
sizeof(asn_DEF_PrimaryCCPCH_RSCP_tags_1)
/sizeof(asn_DEF_PrimaryCCPCH_RSCP_tags_1[0]), /* 1 */
- &asn_PER_type_PrimaryCCPCH_RSCP_constr_1,
+ &ASN_PER_TYPE_PRIMARY_CCPCH_RSCP_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c b/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c
index 62efe3f10..f7afc5b7c 100644
--- a/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c
+++ b/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c
@@ -31,7 +31,7 @@ memb_primaryScramblingCode_constraint_1(asn_TYPE_descriptor_t *td, const void *s
}
}
-static asn_per_constraints_t asn_PER_memb_primaryScramblingCode_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_2 = {
{ APC_CONSTRAINED, 9, 9, 0, 511 } /* (0..511) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_PrimaryCPICH_Info_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_primaryScramblingCode_constraint_1,
- &asn_PER_memb_primaryScramblingCode_constr_2,
+ &ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_2,
0,
"primaryScramblingCode"
},
diff --git a/src/core/libs/supl/asn-supl/QoP.c b/src/core/libs/supl/asn-supl/QoP.c
index 5591c9f49..9bc7e6372 100644
--- a/src/core/libs/supl/asn-supl/QoP.c
+++ b/src/core/libs/supl/asn-supl/QoP.c
@@ -106,22 +106,22 @@ memb_delay_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_horacc_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORACC_CONSTR_2 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_veracc_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERACC_CONSTR_3 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_maxLocAge_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_MAX_LOC_AGE_CONSTR_4 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_delay_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELAY_CONSTR_5 = {
{ APC_CONSTRAINED, 3, 3, 0, 7 } /* (0..7) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_horacc_constraint_1,
- &asn_PER_memb_horacc_constr_2,
+ &ASN_PER_MEMB_HORACC_CONSTR_2,
0,
"horacc"
},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_veracc_constraint_1,
- &asn_PER_memb_veracc_constr_3,
+ &ASN_PER_MEMB_VERACC_CONSTR_3,
0,
"veracc"
},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_maxLocAge_constraint_1,
- &asn_PER_memb_maxLocAge_constr_4,
+ &ASN_PER_MEMB_MAX_LOC_AGE_CONSTR_4,
0,
"maxLocAge"
},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_delay_constraint_1,
- &asn_PER_memb_delay_constr_5,
+ &ASN_PER_MEMB_DELAY_CONSTR_5,
0,
"delay"
},
diff --git a/src/core/libs/supl/asn-supl/SETAuthKey.c b/src/core/libs/supl/asn-supl/SETAuthKey.c
index 3069866a2..7918881de 100644
--- a/src/core/libs/supl/asn-supl/SETAuthKey.c
+++ b/src/core/libs/supl/asn-supl/SETAuthKey.c
@@ -84,17 +84,17 @@ memb_longKey_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_shortKey_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SHORT_KEY_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 128, 128} /* (SIZE(128..128)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_longKey_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_LONG_KEY_CONSTR_3 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 256, 256} /* (SIZE(256..256)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_type_SETAuthKey_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SET_AUTH_KEY_CONSTR_1 = {
{APC_CONSTRAINED | APC_EXTENSIBLE, 1, 1, 0, 1} /* (0..1,...) */,
{APC_UNCONSTRAINED, -1, -1, 0, 0},
0, 0 /* No PER value map */
@@ -105,7 +105,7 @@ static asn_TYPE_member_t asn_MBR_SETAuthKey_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_shortKey_constraint_1,
- &asn_PER_memb_shortKey_constr_2,
+ &ASN_PER_MEMB_SHORT_KEY_CONSTR_2,
0,
"shortKey"},
{ATF_NOFLAGS, 0, offsetof(struct SETAuthKey, choice.longKey),
@@ -113,7 +113,7 @@ static asn_TYPE_member_t asn_MBR_SETAuthKey_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_longKey_constraint_1,
- &asn_PER_memb_longKey_constr_3,
+ &ASN_PER_MEMB_LONG_KEY_CONSTR_3,
0,
"longKey"},
};
@@ -148,7 +148,7 @@ asn_TYPE_descriptor_t asn_DEF_SETAuthKey = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_SETAuthKey_constr_1,
+ &ASN_PER_TYPE_SET_AUTH_KEY_CONSTR_1,
asn_MBR_SETAuthKey_1,
2, /* Elements count */
&asn_SPC_SETAuthKey_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SETId.c b/src/core/libs/supl/asn-supl/SETId.c
index 93a635e23..ec2936fb5 100644
--- a/src/core/libs/supl/asn-supl/SETId.c
+++ b/src/core/libs/supl/asn-supl/SETId.c
@@ -184,32 +184,32 @@ memb_nai_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_msisdn_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_MSISDN_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_mdn_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_MDN_CONSTR_3 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_min_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_MIN_CONSTR_4 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 34, 34} /* (SIZE(34..34)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_imsi_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_IMSI_CONSTR_5 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_nai_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_NAI_CONSTR_6 = {
{APC_CONSTRAINED, 7, 7, 0, 127} /* (0..127) */,
{APC_CONSTRAINED, 10, 10, 1, 1000} /* (SIZE(1..1000)) */,
0, 0 /* No PER character map necessary */
};
-static asn_per_constraints_t asn_PER_type_SETId_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SET_ID_CONSTR_1 = {
{APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 5} /* (0..5,...) */,
{APC_UNCONSTRAINED, -1, -1, 0, 0},
0, 0 /* No PER value map */
@@ -220,7 +220,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_msisdn_constraint_1,
- &asn_PER_memb_msisdn_constr_2,
+ &ASN_PER_MEMB_MSISDN_CONSTR_2,
0,
"msisdn"},
{ATF_NOFLAGS, 0, offsetof(struct SETId, choice.mdn),
@@ -228,7 +228,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_mdn_constraint_1,
- &asn_PER_memb_mdn_constr_3,
+ &ASN_PER_MEMB_MDN_CONSTR_3,
0,
"mdn"},
{ATF_NOFLAGS, 0, offsetof(struct SETId, choice.min),
@@ -236,7 +236,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_BIT_STRING,
memb_min_constraint_1,
- &asn_PER_memb_min_constr_4,
+ &ASN_PER_MEMB_MIN_CONSTR_4,
0,
"min"},
{ATF_NOFLAGS, 0, offsetof(struct SETId, choice.imsi),
@@ -244,7 +244,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_imsi_constraint_1,
- &asn_PER_memb_imsi_constr_5,
+ &ASN_PER_MEMB_IMSI_CONSTR_5,
0,
"imsi"},
{ATF_NOFLAGS, 0, offsetof(struct SETId, choice.nai),
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_IA5String,
memb_nai_constraint_1,
- &asn_PER_memb_nai_constr_6,
+ &ASN_PER_MEMB_NAI_CONSTR_6,
0,
"nai"},
{ATF_NOFLAGS, 0, offsetof(struct SETId, choice.iPAddress),
@@ -299,7 +299,7 @@ asn_TYPE_descriptor_t asn_DEF_SETId = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_SETId_constr_1,
+ &ASN_PER_TYPE_SET_ID_CONSTR_1,
asn_MBR_SETId_1,
6, /* Elements count */
&asn_SPC_SETId_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SLPAddress.c b/src/core/libs/supl/asn-supl/SLPAddress.c
index d123057c7..ece16a747 100644
--- a/src/core/libs/supl/asn-supl/SLPAddress.c
+++ b/src/core/libs/supl/asn-supl/SLPAddress.c
@@ -6,7 +6,7 @@
#include "SLPAddress.h"
-static asn_per_constraints_t asn_PER_type_SLPAddress_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SLP_ADDRESS_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 1, 1, 0, 1 } /* (0..1,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_SLPAddress = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_SLPAddress_constr_1,
+ &ASN_PER_TYPE_SLP_ADDRESS_CONSTR_1,
asn_MBR_SLPAddress_1,
2, /* Elements count */
&asn_SPC_SLPAddress_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SLPMode.c b/src/core/libs/supl/asn-supl/SLPMode.c
index f01e1f89a..79bf7a835 100644
--- a/src/core/libs/supl/asn-supl/SLPMode.c
+++ b/src/core/libs/supl/asn-supl/SLPMode.c
@@ -94,7 +94,7 @@ SLPMode_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_SLPMode_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SLP_MODE_CONSTR_1 = {
{ APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SLPMode = {
asn_DEF_SLPMode_tags_1, /* Same as above */
sizeof(asn_DEF_SLPMode_tags_1)
/sizeof(asn_DEF_SLPMode_tags_1[0]), /* 1 */
- &asn_PER_type_SLPMode_constr_1,
+ &ASN_PER_TYPE_SLP_MODE_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_SLPMode_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/SatelliteInfo.c b/src/core/libs/supl/asn-supl/SatelliteInfo.c
index b32a55b86..428a1c2a0 100644
--- a/src/core/libs/supl/asn-supl/SatelliteInfo.c
+++ b/src/core/libs/supl/asn-supl/SatelliteInfo.c
@@ -6,7 +6,7 @@
#include "SatelliteInfo.h"
-static asn_per_constraints_t asn_PER_type_SatelliteInfo_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SATELLITE_INFO_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 5, 5, 1, 31 } /* (SIZE(1..31)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SatelliteInfo = {
asn_DEF_SatelliteInfo_tags_1, /* Same as above */
sizeof(asn_DEF_SatelliteInfo_tags_1)
/sizeof(asn_DEF_SatelliteInfo_tags_1[0]), /* 1 */
- &asn_PER_type_SatelliteInfo_constr_1,
+ &ASN_PER_TYPE_SATELLITE_INFO_CONSTR_1,
asn_MBR_SatelliteInfo_1,
1, /* Single element */
&asn_SPC_SatelliteInfo_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SatelliteInfoElement.c b/src/core/libs/supl/asn-supl/SatelliteInfoElement.c
index 0590d6e3b..3580d65e4 100644
--- a/src/core/libs/supl/asn-supl/SatelliteInfoElement.c
+++ b/src/core/libs/supl/asn-supl/SatelliteInfoElement.c
@@ -56,12 +56,12 @@ memb_iODE_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_satId_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SAT_ID_CONSTR_2 = {
{ APC_CONSTRAINED, 6, 6, 0, 63 } /* (0..63) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_iODE_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_I_ODE_CONSTR_3 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_SatelliteInfoElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_satId_constraint_1,
- &asn_PER_memb_satId_constr_2,
+ &ASN_PER_MEMB_SAT_ID_CONSTR_2,
0,
"satId"
},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_SatelliteInfoElement_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_iODE_constraint_1,
- &asn_PER_memb_iODE_constr_3,
+ &ASN_PER_MEMB_I_ODE_CONSTR_3,
0,
"iODE"
},
diff --git a/src/core/libs/supl/asn-supl/SetSessionID.c b/src/core/libs/supl/asn-supl/SetSessionID.c
index 5adf6d09e..11a122d2b 100644
--- a/src/core/libs/supl/asn-supl/SetSessionID.c
+++ b/src/core/libs/supl/asn-supl/SetSessionID.c
@@ -31,7 +31,7 @@ memb_sessionId_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_sessionId_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SESSION_ID_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_SetSessionID_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_sessionId_constraint_1,
- &asn_PER_memb_sessionId_constr_2,
+ &ASN_PER_MEMB_SESSION_ID_CONSTR_2,
0,
"sessionId"
},
diff --git a/src/core/libs/supl/asn-supl/SlpSessionID.c b/src/core/libs/supl/asn-supl/SlpSessionID.c
index 0e52d2d34..aed350daa 100644
--- a/src/core/libs/supl/asn-supl/SlpSessionID.c
+++ b/src/core/libs/supl/asn-supl/SlpSessionID.c
@@ -37,7 +37,7 @@ memb_sessionID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_sessionID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SESSION_ID_CONSTR_2 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 4, 4} /* (SIZE(4..4)) */,
0, 0 /* No PER value map */
@@ -48,7 +48,7 @@ static asn_TYPE_member_t asn_MBR_SlpSessionID_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
memb_sessionID_constraint_1,
- &asn_PER_memb_sessionID_constr_2,
+ &ASN_PER_MEMB_SESSION_ID_CONSTR_2,
0,
"sessionID"},
{ATF_NOFLAGS, 0, offsetof(struct SlpSessionID, slpId),
diff --git a/src/core/libs/supl/asn-supl/Status.c b/src/core/libs/supl/asn-supl/Status.c
index 5637fd918..acb84c342 100644
--- a/src/core/libs/supl/asn-supl/Status.c
+++ b/src/core/libs/supl/asn-supl/Status.c
@@ -94,7 +94,7 @@ Status_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_Status_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_STATUS_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_Status = {
asn_DEF_Status_tags_1, /* Same as above */
sizeof(asn_DEF_Status_tags_1)
/sizeof(asn_DEF_Status_tags_1[0]), /* 1 */
- &asn_PER_type_Status_constr_1,
+ &ASN_PER_TYPE_STATUS_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_Status_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/StatusCode.c b/src/core/libs/supl/asn-supl/StatusCode.c
index 3edb52a21..e4828f47f 100644
--- a/src/core/libs/supl/asn-supl/StatusCode.c
+++ b/src/core/libs/supl/asn-supl/StatusCode.c
@@ -94,7 +94,7 @@ StatusCode_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_StatusCode_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_STATUS_CODE_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 5, 5, 0, 19 } /* (0..19,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -176,7 +176,7 @@ asn_TYPE_descriptor_t asn_DEF_StatusCode = {
asn_DEF_StatusCode_tags_1, /* Same as above */
sizeof(asn_DEF_StatusCode_tags_1)
/sizeof(asn_DEF_StatusCode_tags_1[0]), /* 1 */
- &asn_PER_type_StatusCode_constr_1,
+ &ASN_PER_TYPE_STATUS_CODE_CONSTR_1,
0, 0, /* Defined elsewhere */
&asn_SPC_StatusCode_specs_1 /* Additional specs */
};
diff --git a/src/core/libs/supl/asn-supl/TGSN.c b/src/core/libs/supl/asn-supl/TGSN.c
index 2da645c36..36f840d4e 100644
--- a/src/core/libs/supl/asn-supl/TGSN.c
+++ b/src/core/libs/supl/asn-supl/TGSN.c
@@ -111,7 +111,7 @@ TGSN_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TGSN_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TGSN_CONSTR_1 = {
{ APC_CONSTRAINED, 4, 4, 0, 14 } /* (0..14) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TGSN = {
asn_DEF_TGSN_tags_1, /* Same as above */
sizeof(asn_DEF_TGSN_tags_1)
/sizeof(asn_DEF_TGSN_tags_1[0]), /* 1 */
- &asn_PER_type_TGSN_constr_1,
+ &ASN_PER_TYPE_TGSN_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/TimeslotISCP-List.c b/src/core/libs/supl/asn-supl/TimeslotISCP-List.c
index cd5e6bd0f..02831de49 100644
--- a/src/core/libs/supl/asn-supl/TimeslotISCP-List.c
+++ b/src/core/libs/supl/asn-supl/TimeslotISCP-List.c
@@ -6,7 +6,7 @@
#include "TimeslotISCP-List.h"
-static asn_per_constraints_t asn_PER_type_TimeslotISCP_List_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIMESLOT_ISCP_LIST_CONSTR_1 = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 4, 4, 1, 14 } /* (SIZE(1..14)) */,
0, 0 /* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeslotISCP_List = {
asn_DEF_TimeslotISCP_List_tags_1, /* Same as above */
sizeof(asn_DEF_TimeslotISCP_List_tags_1)
/sizeof(asn_DEF_TimeslotISCP_List_tags_1[0]), /* 1 */
- &asn_PER_type_TimeslotISCP_List_constr_1,
+ &ASN_PER_TYPE_TIMESLOT_ISCP_LIST_CONSTR_1,
asn_MBR_TimeslotISCP_List_1,
1, /* Single element */
&asn_SPC_TimeslotISCP_List_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/TimeslotISCP.c b/src/core/libs/supl/asn-supl/TimeslotISCP.c
index d0a155752..411f73f71 100644
--- a/src/core/libs/supl/asn-supl/TimeslotISCP.c
+++ b/src/core/libs/supl/asn-supl/TimeslotISCP.c
@@ -111,7 +111,7 @@ TimeslotISCP_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_TimeslotISCP_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIMESLOT_ISCP_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeslotISCP = {
asn_DEF_TimeslotISCP_tags_1, /* Same as above */
sizeof(asn_DEF_TimeslotISCP_tags_1)
/sizeof(asn_DEF_TimeslotISCP_tags_1[0]), /* 1 */
- &asn_PER_type_TimeslotISCP_constr_1,
+ &ASN_PER_TYPE_TIMESLOT_ISCP_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/UARFCN.c b/src/core/libs/supl/asn-supl/UARFCN.c
index 5a703b7ce..96bd38dbd 100644
--- a/src/core/libs/supl/asn-supl/UARFCN.c
+++ b/src/core/libs/supl/asn-supl/UARFCN.c
@@ -111,7 +111,7 @@ UARFCN_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_UARFCN_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_UARFCN_CONSTR_1 = {
{ APC_CONSTRAINED, 14, 14, 0, 16383 } /* (0..16383) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UARFCN = {
asn_DEF_UARFCN_tags_1, /* Same as above */
sizeof(asn_DEF_UARFCN_tags_1)
/sizeof(asn_DEF_UARFCN_tags_1[0]), /* 1 */
- &asn_PER_type_UARFCN_constr_1,
+ &ASN_PER_TYPE_UARFCN_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/ULP-PDU.c b/src/core/libs/supl/asn-supl/ULP-PDU.c
index 75ac7fab2..a96fee787 100644
--- a/src/core/libs/supl/asn-supl/ULP-PDU.c
+++ b/src/core/libs/supl/asn-supl/ULP-PDU.c
@@ -31,7 +31,7 @@ memb_length_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_length_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_LENGTH_CONSTR_2 = {
{ APC_CONSTRAINED, 16, 16, 0, 65535 } /* (0..65535) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_ULP_PDU_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_length_constraint_1,
- &asn_PER_memb_length_constr_2,
+ &ASN_PER_MEMB_LENGTH_CONSTR_2,
0,
"length"
},
diff --git a/src/core/libs/supl/asn-supl/UTCTime.c b/src/core/libs/supl/asn-supl/UTCTime.c
index 0abe1db74..a3d73e337 100644
--- a/src/core/libs/supl/asn-supl/UTCTime.c
+++ b/src/core/libs/supl/asn-supl/UTCTime.c
@@ -23,7 +23,7 @@ static ber_tlv_tag_t asn_DEF_UTCTime_tags[] = {
(ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), /* [UNIVERSAL 26] IMPLICIT ...*/
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)) /* ... OCTET STRING */
};
-static asn_per_constraints_t asn_DEF_UTCTime_constraints = {
+static asn_per_constraints_t ASN_DEF_UTC_TIME_CONSTRAINTS = {
{ APC_CONSTRAINED, 7, 7, 0x20, 0x7e }, /* Value */
{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 }, /* Size */
0, 0
@@ -47,7 +47,7 @@ asn_TYPE_descriptor_t asn_DEF_UTCTime = {
asn_DEF_UTCTime_tags,
sizeof(asn_DEF_UTCTime_tags)
/ sizeof(asn_DEF_UTCTime_tags[0]),
- &asn_DEF_UTCTime_constraints,
+ &ASN_DEF_UTC_TIME_CONSTRAINTS,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c b/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c
index 77b24d619..9c735eee3 100644
--- a/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c
+++ b/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c
@@ -111,7 +111,7 @@ UTRA_CarrierRSSI_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_UTRA_CarrierRSSI_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_UTRA_CARRIER_RSSI_CONSTR_1 = {
{ APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UTRA_CarrierRSSI = {
asn_DEF_UTRA_CarrierRSSI_tags_1, /* Same as above */
sizeof(asn_DEF_UTRA_CarrierRSSI_tags_1)
/sizeof(asn_DEF_UTRA_CarrierRSSI_tags_1[0]), /* 1 */
- &asn_PER_type_UTRA_CarrierRSSI_constr_1,
+ &ASN_PER_TYPE_UTRA_CARRIER_RSSI_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/UlpMessage.c b/src/core/libs/supl/asn-supl/UlpMessage.c
index d27e05d04..8953cf17a 100644
--- a/src/core/libs/supl/asn-supl/UlpMessage.c
+++ b/src/core/libs/supl/asn-supl/UlpMessage.c
@@ -6,7 +6,7 @@
#include "UlpMessage.h"
-static asn_per_constraints_t asn_PER_type_UlpMessage_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ULP_MESSAGE_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 7 } /* (0..7,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -122,7 +122,7 @@ asn_TYPE_descriptor_t asn_DEF_UlpMessage = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_UlpMessage_constr_1,
+ &ASN_PER_TYPE_ULP_MESSAGE_CONSTR_1,
asn_MBR_UlpMessage_1,
8, /* Elements count */
&asn_SPC_UlpMessage_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/Velocity.c b/src/core/libs/supl/asn-supl/Velocity.c
index 67e4e4c66..59d08fb55 100644
--- a/src/core/libs/supl/asn-supl/Velocity.c
+++ b/src/core/libs/supl/asn-supl/Velocity.c
@@ -6,7 +6,7 @@
#include "Velocity.h"
-static asn_per_constraints_t asn_PER_type_Velocity_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_VELOCITY_CONSTR_1 = {
{ APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 3 } /* (0..3,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -82,7 +82,7 @@ asn_TYPE_descriptor_t asn_DEF_Velocity = {
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- &asn_PER_type_Velocity_constr_1,
+ &ASN_PER_TYPE_VELOCITY_CONSTR_1,
asn_MBR_Velocity_1,
4, /* Elements count */
&asn_SPC_Velocity_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/Ver.c b/src/core/libs/supl/asn-supl/Ver.c
index 5c99a89fc..13a139987 100644
--- a/src/core/libs/supl/asn-supl/Ver.c
+++ b/src/core/libs/supl/asn-supl/Ver.c
@@ -131,7 +131,7 @@ Ver_encode_uper(asn_TYPE_descriptor_t *td,
return td->uper_encoder(td, constraints, structure, per_out);
}
-static asn_per_constraints_t asn_PER_type_Ver_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_VER_CONSTR_1 = {
{APC_UNCONSTRAINED, -1, -1, 0, 0},
{APC_CONSTRAINED, 0, 0, 64, 64} /* (SIZE(64..64)) */,
0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_Ver = {
sizeof(asn_DEF_Ver_tags_1) / sizeof(asn_DEF_Ver_tags_1[0]), /* 1 */
asn_DEF_Ver_tags_1, /* Same as above */
sizeof(asn_DEF_Ver_tags_1) / sizeof(asn_DEF_Ver_tags_1[0]), /* 1 */
- &asn_PER_type_Ver_constr_1,
+ &ASN_PER_TYPE_VER_CONSTR_1,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/Version.c b/src/core/libs/supl/asn-supl/Version.c
index 3f5d9b753..ebde033d9 100644
--- a/src/core/libs/supl/asn-supl/Version.c
+++ b/src/core/libs/supl/asn-supl/Version.c
@@ -81,17 +81,17 @@ memb_servind_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_maj_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_MAJ_CONSTR_2 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_min_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_MIN_CONSTR_3 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_servind_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_SERVIND_CONSTR_4 = {
{ APC_CONSTRAINED, 8, 8, 0, 255 } /* (0..255) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_Version_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_maj_constraint_1,
- &asn_PER_memb_maj_constr_2,
+ &ASN_PER_MEMB_MAJ_CONSTR_2,
0,
"maj"
},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_Version_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_min_constraint_1,
- &asn_PER_memb_min_constr_3,
+ &ASN_PER_MEMB_MIN_CONSTR_3,
0,
"min"
},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_Version_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_servind_constraint_1,
- &asn_PER_memb_servind_constr_4,
+ &ASN_PER_MEMB_SERVIND_CONSTR_4,
0,
"servind"
},
diff --git a/src/core/libs/supl/asn-supl/VisibleString.c b/src/core/libs/supl/asn-supl/VisibleString.c
index 3487b6f93..8ef827f35 100644
--- a/src/core/libs/supl/asn-supl/VisibleString.c
+++ b/src/core/libs/supl/asn-supl/VisibleString.c
@@ -12,7 +12,7 @@ static ber_tlv_tag_t asn_DEF_VisibleString_tags[] = {
(ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), /* [UNIVERSAL 26] IMPLICIT ...*/
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)) /* ... OCTET STRING */
};
-static asn_per_constraints_t asn_DEF_VisibleString_constraints = {
+static asn_per_constraints_t ASN_DEF_VISIBLE_STRING_CONSTRAINTS = {
{ APC_CONSTRAINED, 7, 7, 0x20, 0x7e }, /* Value */
{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 }, /* Size */
0, 0
@@ -36,7 +36,7 @@ asn_TYPE_descriptor_t asn_DEF_VisibleString = {
asn_DEF_VisibleString_tags,
sizeof(asn_DEF_VisibleString_tags)
/ sizeof(asn_DEF_VisibleString_tags[0]),
- &asn_DEF_VisibleString_constraints,
+ &ASN_DEF_VISIBLE_STRING_CONSTRAINTS,
0, 0, /* No members */
0 /* No specifics */
};
diff --git a/src/core/libs/supl/asn-supl/WcdmaCellInformation.c b/src/core/libs/supl/asn-supl/WcdmaCellInformation.c
index d4561099c..bc5b17d0f 100644
--- a/src/core/libs/supl/asn-supl/WcdmaCellInformation.c
+++ b/src/core/libs/supl/asn-supl/WcdmaCellInformation.c
@@ -106,22 +106,22 @@ memb_primaryScramblingCode_constraint_1(asn_TYPE_descriptor_t *td, const void *s
}
}
-static asn_per_constraints_t asn_PER_memb_refMCC_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MCC_CONSTR_2 = {
{ APC_CONSTRAINED, 10, 10, 0, 999 } /* (0..999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refMNC_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MNC_CONSTR_3 = {
{ APC_CONSTRAINED, 10, 10, 0, 999 } /* (0..999) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_refUC_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_UC_CONSTR_4 = {
{ APC_CONSTRAINED, 28, -1, 0, 268435455 } /* (0..268435455) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_primaryScramblingCode_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_6 = {
{ APC_CONSTRAINED, 9, 9, 0, 511 } /* (0..511) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refMCC_constraint_1,
- &asn_PER_memb_refMCC_constr_2,
+ &ASN_PER_MEMB_REF_MCC_CONSTR_2,
0,
"refMCC"
},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refMNC_constraint_1,
- &asn_PER_memb_refMNC_constr_3,
+ &ASN_PER_MEMB_REF_MNC_CONSTR_3,
0,
"refMNC"
},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_refUC_constraint_1,
- &asn_PER_memb_refUC_constr_4,
+ &ASN_PER_MEMB_REF_UC_CONSTR_4,
0,
"refUC"
},
@@ -168,7 +168,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_primaryScramblingCode_constraint_1,
- &asn_PER_memb_primaryScramblingCode_constr_6,
+ &ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_6,
0,
"primaryScramblingCode"
},
diff --git a/src/core/libs/supl/asn-supl/XNavigationModel.c b/src/core/libs/supl/asn-supl/XNavigationModel.c
index 4440f2557..9af4d5b13 100644
--- a/src/core/libs/supl/asn-supl/XNavigationModel.c
+++ b/src/core/libs/supl/asn-supl/XNavigationModel.c
@@ -106,22 +106,22 @@ memb_toeLimit_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
}
}
-static asn_per_constraints_t asn_PER_memb_gpsWeek_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_WEEK_CONSTR_2 = {
{ APC_CONSTRAINED, 10, 10, 0, 1023 } /* (0..1023) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_gpsToe_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOE_CONSTR_3 = {
{ APC_CONSTRAINED, 8, 8, 0, 167 } /* (0..167) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_nSAT_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_N_SAT_CONSTR_4 = {
{ APC_CONSTRAINED, 5, 5, 0, 31 } /* (0..31) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_per_constraints_t asn_PER_memb_toeLimit_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_TOE_LIMIT_CONSTR_5 = {
{ APC_CONSTRAINED, 4, 4, 0, 10 } /* (0..10) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_gpsWeek_constraint_1,
- &asn_PER_memb_gpsWeek_constr_2,
+ &ASN_PER_MEMB_GPS_WEEK_CONSTR_2,
0,
"gpsWeek"
},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_gpsToe_constraint_1,
- &asn_PER_memb_gpsToe_constr_3,
+ &ASN_PER_MEMB_GPS_TOE_CONSTR_3,
0,
"gpsToe"
},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_nSAT_constraint_1,
- &asn_PER_memb_nSAT_constr_4,
+ &ASN_PER_MEMB_N_SAT_CONSTR_4,
0,
"nSAT"
},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
-1, /* IMPLICIT tag at current level */
&asn_DEF_NativeInteger,
memb_toeLimit_constraint_1,
- &asn_PER_memb_toeLimit_constr_5,
+ &ASN_PER_MEMB_TOE_LIMIT_CONSTR_5,
0,
"toeLimit"
},
diff --git a/src/core/receiver/concurrent_map.h b/src/core/receiver/concurrent_map.h
index 218030286..af3823bd1 100644
--- a/src/core/receiver/concurrent_map.h
+++ b/src/core/receiver/concurrent_map.h
@@ -43,7 +43,7 @@ template <typename Data>
* \brief This class implements a thread-safe std::map
*
*/
-class concurrent_map
+class Concurrent_Map
{
typedef typename std::map<int, Data>::iterator Data_iterator; // iterator is scope dependent
private:
diff --git a/src/core/receiver/concurrent_queue.h b/src/core/receiver/concurrent_queue.h
index 3a4e89190..02c6dd896 100644
--- a/src/core/receiver/concurrent_queue.h
+++ b/src/core/receiver/concurrent_queue.h
@@ -43,7 +43,7 @@ template <typename Data>
* boost_thread to perform MUTEX based on the code available at
* http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html
*/
-class concurrent_queue
+class Concurrent_Queue
{
private:
std::queue<Data> the_queue;
diff --git a/src/core/receiver/control_message_factory.h b/src/core/receiver/control_message_factory.h
index 4ca93e725..f8a4666f6 100644
--- a/src/core/receiver/control_message_factory.h
+++ b/src/core/receiver/control_message_factory.h
@@ -36,7 +36,7 @@
#include <vector>
//! Message described by who sent it and what it says
-typedef struct ControlMessage_
+typedef struct control_message
{
unsigned int who;
unsigned int what;
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 75efbae2d..e7cd49740 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -70,8 +70,8 @@
#include <utility>
-extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
-extern concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
+extern Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
using google::LogMessage;
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index 590ebb622..0fe3674fc 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -122,8 +122,8 @@ private:
void telecommand_listener();
boost::thread cmd_interface_thread_;
//SUPL assistance classes
- gnss_sdr_supl_client supl_client_acquisition_;
- gnss_sdr_supl_client supl_client_ephemeris_;
+ Gnss_Sdr_Supl_Client supl_client_acquisition_;
+ Gnss_Sdr_Supl_Client supl_client_ephemeris_;
int supl_mcc; // Current network MCC (Mobile country code), 3 digits.
int supl_mns; // Current network MNC (Mobile Network code), 2 or 3 digits.
int supl_lac; // Current network LAC (Location area code),16 bits, 1-65520 are valid values.
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index d88508c7b..277cad96c 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -392,10 +392,10 @@ void GNSSFlowgraph::connect()
acq_fs = GPS_L1_CA_OPT_ACQ_FS_HZ;
break;
case evGAL_1B:
- acq_fs = Galileo_E1_OPT_ACQ_FS_HZ;
+ acq_fs = GALILEO_E1_OPT_ACQ_FS_HZ;
break;
case evGAL_5X:
- acq_fs = Galileo_E5a_OPT_ACQ_FS_HZ;
+ acq_fs = GALILEO_E5A_OPT_ACQ_FS_HZ;
break;
case evGLO_1G:
acq_fs = fs;
diff --git a/src/core/system_parameters/Beidou_B1I.h b/src/core/system_parameters/Beidou_B1I.h
index 76ac02f2c..b31f470e9 100644
--- a/src/core/system_parameters/Beidou_B1I.h
+++ b/src/core/system_parameters/Beidou_B1I.h
@@ -38,8 +38,8 @@
#include <vector>
// Physical constants
-const double BEIDOU_C_m_s = 299792458.0; //!< The speed of light, [m/s]
-const double BEIDOU_C_m_ms = 299792.4580; //!< The speed of light, [m/ms]
+const double BEIDOU_C_M_S = 299792458.0; //!< The speed of light, [m/s]
+const double BEIDOU_C_M_MS = 299792.4580; //!< The speed of light, [m/ms]
const double BEIDOU_PI = 3.1415926535898; //!< Pi
const double BEIDOU_TWO_PI = 6.283185307179586; //!< 2Pi
const double BEIDOU_OMEGA_EARTH_DOT = 7.2921150e-5; //!< Earth rotation rate, [rad/s] as defined in CGCS2000
@@ -70,7 +70,7 @@ const std::string BEIDOU_B1I_D2_SECONDARY_CODE_STR = "00";
const double BEIDOU_MAX_TOA_DELAY_MS = 20; //******************
//#define NAVIGATION_SOLUTION_RATE_MS 1000 // this cannot go here
-const double BEIDOU_STARTOFFSET_ms = 68.802; //**************[ms] Initial sign. travel time (this cannot go here)
+const double BEIDOU_STARTOFFSET_MS = 68.802; //**************[ms] Initial sign. travel time (this cannot go here)
// OBSERVABLE HISTORY DEEP FOR INTERPOLATION
diff --git a/src/core/system_parameters/GLONASS_L1_L2_CA.h b/src/core/system_parameters/GLONASS_L1_L2_CA.h
index 816b2c9aa..bcb414e48 100644
--- a/src/core/system_parameters/GLONASS_L1_L2_CA.h
+++ b/src/core/system_parameters/GLONASS_L1_L2_CA.h
@@ -42,13 +42,13 @@
// Physical constants
-const double GLONASS_C_m_s = SPEED_OF_LIGHT; //!< The speed of light, [m/s]
-const double GLONASS_C_m_ms = 299792.4580; //!< The speed of light, [m/ms]
+const double GLONASS_C_M_S = SPEED_OF_LIGHT; //!< The speed of light, [m/s]
+const double GLONASS_C_M_MS = 299792.4580; //!< The speed of light, [m/ms]
const double GLONASS_PI = 3.1415926535898; //!< Pi as defined in IS-GPS-200E
const double GLONASS_TWO_PI = 6.283185307179586; //!< 2Pi as defined in IS-GPS-200E
const double GLONASS_OMEGA_EARTH_DOT = 7.292115e-5; //!< Earth rotation rate, [rad/s]
const double GLONASS_GM = 398600.4418e9; //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2]
-const double GLONASS_fM_a = 0.35e9; //!< Gravitational constant of atmosphere [m^3/s^2]
+const double GLONASS_F_M_A = 0.35e9; //!< Gravitational constant of atmosphere [m^3/s^2]
const double GLONASS_SEMI_MAJOR_AXIS = 6378136; //!< Semi-major axis of Earth [m]
const double GLONASS_FLATTENING = 1 / 29825784; //!< Flattening parameter
const double GLONASS_GRAVITY = 97803284; //!< Equatorial acceleration of gravity [mGal]
@@ -225,7 +225,7 @@ const std::map<uint32_t, int32_t> GLONASS_PRN = {
}, //Plane 3
{24, 2}}; //Plane 3
-const double GLONASS_STARTOFFSET_ms = 68.802; //[ms] Initial sign. travel time (this cannot go here)
+const double GLONASS_STARTOFFSET_MS = 68.802; //[ms] Initial sign. travel time (this cannot go here)
// OBSERVABLE HISTORY DEEP FOR INTERPOLATION
const int32_t GLONASS_L1_CA_HISTORY_DEEP = 100;
@@ -301,7 +301,7 @@ const std::vector<std::pair<int32_t, int32_t>> N({{71, 5}});
const std::vector<std::pair<int32_t, int32_t>> M({{76, 2}});
// STRING 5
-const std::vector<std::pair<int32_t, int32_t>> N_A({{6, 11}});
+const std::vector<std::pair<int32_t, int32_t>> DAY_NUMBER_A({{6, 11}});
const std::vector<std::pair<int32_t, int32_t>> TAU_C({{17, 32}});
const std::vector<std::pair<int32_t, int32_t>> N_4({{50, 5}});
const std::vector<std::pair<int32_t, int32_t>> TAU_GPS({{55, 22}});
@@ -310,7 +310,7 @@ const std::vector<std::pair<int32_t, int32_t>> ALM_L_N({{77, 1}});
// STRING 6, 8, 10, 12, 14
const std::vector<std::pair<int32_t, int32_t>> C_N({{6, 1}});
const std::vector<std::pair<int32_t, int32_t>> M_N_A({{7, 2}});
-const std::vector<std::pair<int32_t, int32_t>> n_A({{9, 5}});
+const std::vector<std::pair<int32_t, int32_t>> N_A({{9, 5}});
const std::vector<std::pair<int32_t, int32_t>> TAU_N_A({{14, 10}});
const std::vector<std::pair<int32_t, int32_t>> LAMBDA_N_A({{24, 21}});
const std::vector<std::pair<int32_t, int32_t>> DELTA_I_N_A({{45, 18}});
diff --git a/src/core/system_parameters/GPS_L1_CA.h b/src/core/system_parameters/GPS_L1_CA.h
index 349897994..ee81a18e8 100644
--- a/src/core/system_parameters/GPS_L1_CA.h
+++ b/src/core/system_parameters/GPS_L1_CA.h
@@ -40,8 +40,8 @@
// Physical constants
-const double GPS_C_m_s = SPEED_OF_LIGHT; //!< The speed of light, [m/s]
-const double GPS_C_m_ms = 299792.4580; //!< The speed of light, [m/ms]
+const double GPS_C_M_S = SPEED_OF_LIGHT; //!< The speed of light, [m/s]
+const double GPS_C_M_MS = 299792.4580; //!< The speed of light, [m/ms]
const double GPS_PI = 3.1415926535898; //!< Pi as defined in IS-GPS-200E
const double GPS_TWO_PI = 6.283185307179586; //!< 2Pi as defined in IS-GPS-200E
const double OMEGA_EARTH_DOT = DEFAULT_OMEGA_EARTH_DOT; //!< Earth rotation rate, [rad/s]
@@ -72,7 +72,7 @@ const double MAX_TOA_DELAY_MS = 20;
//#define NAVIGATION_SOLUTION_RATE_MS 1000 // this cannot go here
//const double GPS_STARTOFFSET_ms = 68.802; //[ms] Initial sign. travel time (this cannot go here)
-const double GPS_STARTOFFSET_ms = 60.0;
+const double GPS_STARTOFFSET_MS = 60.0;
// OBSERVABLE HISTORY DEEP FOR INTERPOLATION
const int32_t GPS_L1_CA_HISTORY_DEEP = 100;
diff --git a/src/core/system_parameters/GPS_L2C.h b/src/core/system_parameters/GPS_L2C.h
index 40986fd5b..95542e2e2 100644
--- a/src/core/system_parameters/GPS_L2C.h
+++ b/src/core/system_parameters/GPS_L2C.h
@@ -42,8 +42,8 @@
// Physical constants
-const double GPS_L2_C_m_s = 299792458.0; //!< The speed of light, [m/s]
-const double GPS_L2_C_m_ms = 299792.4580; //!< The speed of light, [m/ms]
+const double GPS_L2_C_M_S = 299792458.0; //!< The speed of light, [m/s]
+const double GPS_L2_C_M_MS = 299792.4580; //!< The speed of light, [m/ms]
const double GPS_L2_PI = 3.1415926535898; //!< Pi as defined in IS-GPS-200E
const double GPS_L2_TWO_PI = 6.283185307179586; //!< 2Pi as defined in IS-GPS-200E
const double GPS_L2_OMEGA_EARTH_DOT = 7.2921151467e-5; //!< Earth rotation rate, [rad/s]
diff --git a/src/core/system_parameters/GPS_L5.h b/src/core/system_parameters/GPS_L5.h
index ff669d8b0..d2fa25db3 100644
--- a/src/core/system_parameters/GPS_L5.h
+++ b/src/core/system_parameters/GPS_L5.h
@@ -40,8 +40,8 @@
// Physical constants
-const double GPS_L5_C_m_s = 299792458.0; //!< The speed of light, [m/s]
-const double GPS_L5_C_m_ms = 299792.4580; //!< The speed of light, [m/ms]
+const double GPS_L5_C_M_S = 299792458.0; //!< The speed of light, [m/s]
+const double GPS_L5_C_M_MS = 299792.4580; //!< The speed of light, [m/ms]
const double GPS_L5_PI = 3.1415926535898; //!< Pi as defined in IS-GPS-200E
const double GPS_L5_TWO_PI = 6.283185307179586; //!< 2Pi as defined in IS-GPS-200E
const double GPS_L5_OMEGA_EARTH_DOT = 7.2921151467e-5; //!< Earth rotation rate, [rad/s]
@@ -51,23 +51,23 @@ const double GPS_L5_F = -4.442807633e-10; //!< Constant, [s/(m)^(1
// carrier and code frequencies
const double GPS_L5_FREQ_HZ = FREQ5; //!< L5 [Hz]
-const double GPS_L5i_CODE_RATE_HZ = 10.23e6; //!< GPS L5i code rate [chips/s]
-const int32_t GPS_L5i_CODE_LENGTH_CHIPS = 10230; //!< GPS L5i code length [chips]
-const double GPS_L5i_PERIOD = 0.001; //!< GPS L5 code period [seconds]
-const int32_t GPS_L5i_PERIOD_MS = 1; //!< GPS L5 code period [ms]
-const double GPS_L5i_SYMBOL_PERIOD = 0.01; //!< GPS L5 symbol period [seconds]
-const int32_t GPS_L5i_SYMBOL_PERIOD_MS = 10; //!< GPS L5 symbol period [ms]
+const double GPS_L5I_CODE_RATE_HZ = 10.23e6; //!< GPS L5i code rate [chips/s]
+const int32_t GPS_L5I_CODE_LENGTH_CHIPS = 10230; //!< GPS L5i code length [chips]
+const double GPS_L5I_PERIOD = 0.001; //!< GPS L5 code period [seconds]
+const int32_t GPS_L5I_PERIOD_MS = 1; //!< GPS L5 code period [ms]
+const double GPS_L5I_SYMBOL_PERIOD = 0.01; //!< GPS L5 symbol period [seconds]
+const int32_t GPS_L5I_SYMBOL_PERIOD_MS = 10; //!< GPS L5 symbol period [ms]
-const double GPS_L5q_CODE_RATE_HZ = 10.23e6; //!< GPS L5i code rate [chips/s]
-const int32_t GPS_L5q_CODE_LENGTH_CHIPS = 10230; //!< GPS L5i code length [chips]
-const double GPS_L5q_PERIOD = 0.001; //!< GPS L5 code period [seconds]
+const double GPS_L5Q_CODE_RATE_HZ = 10.23e6; //!< GPS L5i code rate [chips/s]
+const int32_t GPS_L5Q_CODE_LENGTH_CHIPS = 10230; //!< GPS L5i code length [chips]
+const double GPS_L5Q_PERIOD = 0.001; //!< GPS L5 code period [seconds]
const int32_t GPS_L5_HISTORY_DEEP = 5;
//optimum parameters
const uint32_t GPS_L5_OPT_ACQ_FS_HZ = 10000000; //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
-const int32_t GPS_L5i_INIT_REG[210] =
+const int32_t GPS_L5I_INIT_REG[210] =
{266, 365, 804, 1138,
1509, 1559, 1756, 2084,
2170, 2303, 2527, 2687,
@@ -124,7 +124,7 @@ const int32_t GPS_L5i_INIT_REG[210] =
5950, 5521, 1515};
-const int32_t GPS_L5q_INIT_REG[210] =
+const int32_t GPS_L5Q_INIT_REG[210] =
{
1701, 323, 5292, 2020,
5429, 7136, 1041, 5947,
@@ -186,11 +186,11 @@ const int32_t GPS_L5_SYMBOLS_PER_BIT = 2;
const int32_t GPS_L5_SAMPLES_PER_SYMBOL = 10;
const int32_t GPS_L5_CNAV_DATA_PAGE_SYMBOLS = 600;
const int32_t GPS_L5_CNAV_DATA_PAGE_DURATION_S = 6;
-const int32_t GPS_L5i_NH_CODE_LENGTH = 10;
-const int32_t GPS_L5i_NH_CODE[10] = {0, 0, 0, 0, 1, 1, 0, 1, 0, 1};
-const std::string GPS_L5i_NH_CODE_STR = "0000110101";
-const int32_t GPS_L5q_NH_CODE_LENGTH = 20;
-const int32_t GPS_L5q_NH_CODE[20] = {0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0};
-const std::string GPS_L5q_NH_CODE_STR = "00000100110101001110";
+const int32_t GPS_L5I_NH_CODE_LENGTH = 10;
+const int32_t GPS_L5I_NH_CODE[10] = {0, 0, 0, 0, 1, 1, 0, 1, 0, 1};
+const std::string GPS_L5I_NH_CODE_STR = "0000110101";
+const int32_t GPS_L5Q_NH_CODE_LENGTH = 20;
+const int32_t GPS_L5Q_NH_CODE[20] = {0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0};
+const std::string GPS_L5Q_NH_CODE_STR = "00000100110101001110";
#endif /* GNSS_SDR_GPS_L5_H_ */
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 4c9048c11..d54472ca2 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -46,29 +46,29 @@ const double GALILEO_PI = 3.1415926535898; //!< Pi as defined in G
const double GALILEO_TWO_PI = 6.283185307179600; //!< 2*Pi as defined in GALILEO ICD
const double GALILEO_GM = 3.986004418e14; //!< Geocentric gravitational constant[m^3/s^2]
const double GALILEO_OMEGA_EARTH_DOT = 7.2921151467e-5; //!< Mean angular velocity of the Earth [rad/s]
-const double GALILEO_C_m_s = 299792458.0; //!< The speed of light, [m/s]
-const double GALILEO_C_m_ms = 299792.4580; //!< The speed of light, [m/ms]
+const double GALILEO_C_M_S = 299792458.0; //!< The speed of light, [m/s]
+const double GALILEO_C_M_MS = 299792.4580; //!< The speed of light, [m/ms]
const double GALILEO_F = -4.442807309e-10; //!< Constant, [s/(m)^(1/2)]
// carrier and code frequencies
-const double Galileo_E1_FREQ_HZ = FREQ1; //!< Galileo E1 carrier frequency [Hz]
-const double Galileo_E1_CODE_CHIP_RATE_HZ = 1.023e6; //!< Galileo E1 code rate [chips/s]
-const double Galileo_E1_CODE_PERIOD = 0.004; //!< Galileo E1 code period [s]
-const int32_t Galileo_E1_CODE_PERIOD_MS = 4; //!< Galileo E1 code period [ms]
-const double Galileo_E1_SUB_CARRIER_A_RATE_HZ = 1.023e6; //!< Galileo E1 sub-carrier 'a' rate [Hz]
-const double Galileo_E1_SUB_CARRIER_B_RATE_HZ = 6.138e6; //!< Galileo E1 sub-carrier 'b' rate [Hz]
-const double Galileo_E1_B_CODE_LENGTH_CHIPS = 4092.0; //!< Galileo E1-B code length [chips]
-const double Galileo_E1_B_SYMBOL_RATE_BPS = 250.0; //!< Galileo E1-B symbol rate [bits/second]
-const int32_t Galileo_E1_B_SAMPLES_PER_SYMBOL = 1; //!< (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS) / Galileo_E1_B_SYMBOL_RATE_BPS
-const int32_t Galileo_E1_C_SECONDARY_CODE_LENGTH = 25; //!< Galileo E1-C secondary code length [chips]
-const int32_t Galileo_E1_NUMBER_OF_CODES = 50;
+const double GALILEO_E1_FREQ_HZ = FREQ1; //!< Galileo E1 carrier frequency [Hz]
+const double GALILEO_E1_CODE_CHIP_RATE_HZ = 1.023e6; //!< Galileo E1 code rate [chips/s]
+const double GALILEO_E1_CODE_PERIOD = 0.004; //!< Galileo E1 code period [s]
+const int32_t GALILEO_E1_CODE_PERIOD_MS = 4; //!< Galileo E1 code period [ms]
+const double GALILEO_E1_SUB_CARRIER_A_RATE_HZ = 1.023e6; //!< Galileo E1 sub-carrier 'a' rate [Hz]
+const double GALILEO_E1_SUB_CARRIER_B_RATE_HZ = 6.138e6; //!< Galileo E1 sub-carrier 'b' rate [Hz]
+const double GALILEO_E1_B_CODE_LENGTH_CHIPS = 4092.0; //!< Galileo E1-B code length [chips]
+const double GALILEO_E1_B_SYMBOL_RATE_BPS = 250.0; //!< Galileo E1-B symbol rate [bits/second]
+const int32_t GALILEO_E1_B_SAMPLES_PER_SYMBOL = 1; //!< (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS) / Galileo_E1_B_SYMBOL_RATE_BPS
+const int32_t GALILEO_E1_C_SECONDARY_CODE_LENGTH = 25; //!< Galileo E1-C secondary code length [chips]
+const int32_t GALILEO_E1_NUMBER_OF_CODES = 50;
//optimum parameters
-const uint32_t Galileo_E1_OPT_ACQ_FS_HZ = 2000000; //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
+const uint32_t GALILEO_E1_OPT_ACQ_FS_HZ = 2000000; //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
-const double GALILEO_STARTOFFSET_ms = 68.802; //[ms] Initial sign. travel time (this cannot go here)
+const double GALILEO_STARTOFFSET_MS = 68.802; //[ms] Initial sign. travel time (this cannot go here)
// OBSERVABLE HISTORY DEEP FOR INTERPOLATION
@@ -79,7 +79,7 @@ const int32_t GALILEO_E1_HISTORY_DEEP = 100;
const std::string GALILEO_INAV_PREAMBLE = {"0101100000"};
const int32_t GALILEO_INAV_PREAMBLE_LENGTH_BITS = 10;
-const double GALILEO_INAV_PAGE_PART_WITH_PREABLE_SECONDS = 2.0 + GALILEO_INAV_PREAMBLE_LENGTH_BITS * Galileo_E1_CODE_PERIOD;
+const double GALILEO_INAV_PAGE_PART_WITH_PREABLE_SECONDS = 2.0 + GALILEO_INAV_PREAMBLE_LENGTH_BITS * GALILEO_E1_CODE_PERIOD;
const int32_t GALILEO_INAV_PREAMBLE_PERIOD_SYMBOLS = 250;
const int32_t GALILEO_INAV_PAGE_PART_SYMBOLS = 250; //!< Each Galileo INAV pages are composed of two parts (even and odd) each of 250 symbols, including preamble. See Galileo ICD 4.3.2
const int32_t GALILEO_INAV_PAGE_SYMBOLS = 500; //!< The complete Galileo INAV page length
@@ -93,218 +93,218 @@ const int32_t GALILEO_PAGE_TYPE_BITS = 6;
const int32_t GALILEO_DATA_JK_BITS = 128;
const int32_t GALILEO_DATA_FRAME_BITS = 196;
const int32_t GALILEO_DATA_FRAME_BYTES = 25;
-const double GALILEO_E1_CODE_PERIOD = 0.004;
-const int32_t GALILEO_E1_CODE_PERIOD_MS = 4;
+//const double GALILEO_E1_CODE_PERIOD = 0.004;
+//const int32_t GALILEO_E1_CODE_PERIOD_MS = 4;
-const std::vector<std::pair<int32_t, int32_t>> type({{1, 6}});
-const std::vector<std::pair<int32_t, int32_t>> PAGE_TYPE_bit({{1, 6}});
+const std::vector<std::pair<int32_t, int32_t>> TYPE({{1, 6}});
+const std::vector<std::pair<int32_t, int32_t>> PAGE_TYPE_BIT({{1, 6}});
/*Page 1 - Word type 1: Ephemeris (1/4)*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_1_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> T0E_1_bit({{17, 14}});
-const int32_t t0e_1_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> M0_1_bit({{31, 32}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_1_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> T0_E_1_BIT({{17, 14}});
+const int32_t T0E_1_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> M0_1_BIT({{31, 32}});
const double M0_1_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> e_1_bit({{63, 32}});
-const double e_1_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> A_1_bit({{95, 32}});
-const double A_1_LSB_gal = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> E_1_BIT({{63, 32}});
+const double E_1_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> A_1_BIT({{95, 32}});
+const double A_1_LSB_GAL = TWO_N19;
//last two bits are reserved
/*Page 2 - Word type 2: Ephemeris (2/4)*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_2_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> OMEGA_0_2_bit({{17, 32}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_2_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_0_2_BIT({{17, 32}});
const double OMEGA_0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> i_0_2_bit({{49, 32}});
-const double i_0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> omega_2_bit({{81, 32}});
-const double omega_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> iDot_2_bit({{113, 14}});
-const double iDot_2_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> I_0_2_BIT({{49, 32}});
+const double I_0_2_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_2_BIT({{81, 32}});
+const double OMEGA_2_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> I_DOT_2_BIT({{113, 14}});
+const double I_DOT_2_LSB = PI_TWO_N43;
//last two bits are reserved
/*Word type 3: Ephemeris (3/4) and SISA*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_3_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> OMEGA_dot_3_bit({{17, 24}});
-const double OMEGA_dot_3_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> delta_n_3_bit({{41, 16}});
-const double delta_n_3_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> C_uc_3_bit({{57, 16}});
-const double C_uc_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> C_us_3_bit({{73, 16}});
-const double C_us_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> C_rc_3_bit({{89, 16}});
-const double C_rc_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> C_rs_3_bit({{105, 16}});
-const double C_rs_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> SISA_3_bit({{121, 8}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_3_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_3_BIT({{17, 24}});
+const double OMEGA_DOT_3_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_N_3_BIT({{41, 16}});
+const double DELTA_N_3_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> C_UC_3_BIT({{57, 16}});
+const double C_UC_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> C_US_3_BIT({{73, 16}});
+const double C_US_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> C_RC_3_BIT({{89, 16}});
+const double C_RC_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> C_RS_3_BIT({{105, 16}});
+const double C_RS_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> SISA_3_BIT({{121, 8}});
/*Word type 4: Ephemeris (4/4) and Clock correction parameters*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_4_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> SV_ID_PRN_4_bit({{17, 6}});
-const std::vector<std::pair<int32_t, int32_t>> C_ic_4_bit({{23, 16}});
-const double C_ic_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> C_is_4_bit({{39, 16}});
-const double C_is_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> t0c_4_bit({{55, 14}}); //
-const int32_t t0c_4_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> af0_4_bit({{69, 31}}); //
-const double af0_4_LSB = TWO_N34;
-const std::vector<std::pair<int32_t, int32_t>> af1_4_bit({{100, 21}}); //
-const double af1_4_LSB = TWO_N46;
-const std::vector<std::pair<int32_t, int32_t>> af2_4_bit({{121, 6}});
-const double af2_4_LSB = TWO_N59;
-const std::vector<std::pair<int32_t, int32_t>> spare_4_bit({{127, 2}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_4_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> SV_ID_PRN_4_BIT({{17, 6}});
+const std::vector<std::pair<int32_t, int32_t>> C_IC_4_BIT({{23, 16}});
+const double C_IC_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> C_IS_4_BIT({{39, 16}});
+const double C_IS_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> T0C_4_BIT({{55, 14}}); //
+const int32_t T0C_4_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> AF0_4_BIT({{69, 31}}); //
+const double AF0_4_LSB = TWO_N34;
+const std::vector<std::pair<int32_t, int32_t>> AF1_4_BIT({{100, 21}}); //
+const double AF1_4_LSB = TWO_N46;
+const std::vector<std::pair<int32_t, int32_t>> AF2_4_BIT({{121, 6}});
+const double AF2_4_LSB = TWO_N59;
+const std::vector<std::pair<int32_t, int32_t>> SPARE_4_BIT({{127, 2}});
//last two bits are reserved
/*Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST*/
/*Ionospheric correction*/
/*Az*/
-const std::vector<std::pair<int32_t, int32_t>> ai0_5_bit({{7, 11}}); //
-const double ai0_5_LSB = TWO_N2;
-const std::vector<std::pair<int32_t, int32_t>> ai1_5_bit({{18, 11}}); //
-const double ai1_5_LSB = TWO_N8;
-const std::vector<std::pair<int32_t, int32_t>> ai2_5_bit({{29, 14}}); //
-const double ai2_5_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> AI0_5_BIT({{7, 11}}); //
+const double AI0_5_LSB = TWO_N2;
+const std::vector<std::pair<int32_t, int32_t>> AI1_5_BIT({{18, 11}}); //
+const double AI1_5_LSB = TWO_N8;
+const std::vector<std::pair<int32_t, int32_t>> AI2_5_BIT({{29, 14}}); //
+const double AI2_5_LSB = TWO_N15;
/*Ionospheric disturbance flag*/
-const std::vector<std::pair<int32_t, int32_t>> Region1_5_bit({{43, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> Region2_5_bit({{44, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> Region3_5_bit({{45, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> Region4_5_bit({{46, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> Region5_5_bit({{47, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> BGD_E1E5a_5_bit({{48, 10}}); //
-const double BGD_E1E5a_5_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> BGD_E1E5b_5_bit({{58, 10}}); //
-const double BGD_E1E5b_5_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_5_bit({{68, 2}}); //
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_5_bit({{70, 2}}); //
-const std::vector<std::pair<int32_t, int32_t>> E5b_DVS_5_bit({{72, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> E1B_DVS_5_bit({{73, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5A_5_BIT({{48, 10}}); //
+const double BGD_E1_E5A_5_LSB = TWO_N32;
+const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5B_5_BIT({{58, 10}}); //
+const double BGD_E1_E5B_5_LSB = TWO_N32;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}}); //
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_5_BIT({{70, 2}}); //
+const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> E1_B_DVS_5_BIT({{73, 1}}); //
/*GST*/
-const std::vector<std::pair<int32_t, int32_t>> WN_5_bit({{74, 12}});
-const std::vector<std::pair<int32_t, int32_t>> TOW_5_bit({{86, 20}});
-const std::vector<std::pair<int32_t, int32_t>> spare_5_bit({{106, 23}});
+const std::vector<std::pair<int32_t, int32_t>> WN_5_BIT({{74, 12}});
+const std::vector<std::pair<int32_t, int32_t>> TOW_5_BIT({{86, 20}});
+const std::vector<std::pair<int32_t, int32_t>> SPARE_5_BIT({{106, 23}});
/* Page 6 */
-const std::vector<std::pair<int32_t, int32_t>> A0_6_bit({{7, 32}});
+const std::vector<std::pair<int32_t, int32_t>> A0_6_BIT({{7, 32}});
const double A0_6_LSB = TWO_N30;
-const std::vector<std::pair<int32_t, int32_t>> A1_6_bit({{39, 24}});
+const std::vector<std::pair<int32_t, int32_t>> A1_6_BIT({{39, 24}});
const double A1_6_LSB = TWO_N50;
-const std::vector<std::pair<int32_t, int32_t>> Delta_tLS_6_bit({{63, 8}});
-const std::vector<std::pair<int32_t, int32_t>> t0t_6_bit({{71, 8}});
-const int32_t t0t_6_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> WNot_6_bit({{79, 8}});
-const std::vector<std::pair<int32_t, int32_t>> WN_LSF_6_bit({{87, 8}});
-const std::vector<std::pair<int32_t, int32_t>> DN_6_bit({{95, 3}});
-const std::vector<std::pair<int32_t, int32_t>> Delta_tLSF_6_bit({{98, 8}});
-const std::vector<std::pair<int32_t, int32_t>> TOW_6_bit({{106, 20}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_T_LS_6_BIT({{63, 8}});
+const std::vector<std::pair<int32_t, int32_t>> T0T_6_BIT({{71, 8}});
+const int32_t T0T_6_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> W_NOT_6_BIT({{79, 8}});
+const std::vector<std::pair<int32_t, int32_t>> WN_LSF_6_BIT({{87, 8}});
+const std::vector<std::pair<int32_t, int32_t>> DN_6_BIT({{95, 3}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_T_LSF_6_BIT({{98, 8}});
+const std::vector<std::pair<int32_t, int32_t>> TOW_6_BIT({{106, 20}});
/* Page 7 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_7_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> WN_a_7_bit({{11, 2}});
-const std::vector<std::pair<int32_t, int32_t>> t0a_7_bit({{13, 10}});
-const int32_t t0a_7_LSB = 600;
-const std::vector<std::pair<int32_t, int32_t>> SVID1_7_bit({{23, 6}});
-const std::vector<std::pair<int32_t, int32_t>> DELTA_A_7_bit({{29, 13}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_7_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> WN_A_7_BIT({{11, 2}});
+const std::vector<std::pair<int32_t, int32_t>> T0A_7_BIT({{13, 10}});
+const int32_t T0A_7_LSB = 600;
+const std::vector<std::pair<int32_t, int32_t>> SVI_D1_7_BIT({{23, 6}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_A_7_BIT({{29, 13}});
const double DELTA_A_7_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> e_7_bit({{42, 11}});
-const double e_7_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> omega_7_bit({{53, 16}});
-const double omega_7_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> delta_i_7_bit({{69, 11}});
-const double delta_i_7_LSB = TWO_N14;
-const std::vector<std::pair<int32_t, int32_t>> Omega0_7_bit({{80, 16}});
-const double Omega0_7_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> Omega_dot_7_bit({{96, 11}});
-const double Omega_dot_7_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> M0_7_bit({{107, 16}});
+const std::vector<std::pair<int32_t, int32_t>> E_7_BIT({{42, 11}});
+const double E_7_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_7_BIT({{53, 16}});
+const double OMEGA_7_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_I_7_BIT({{69, 11}});
+const double DELTA_I_7_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA0_7_BIT({{80, 16}});
+const double OMEGA0_7_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_7_BIT({{96, 11}});
+const double OMEGA_DOT_7_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> M0_7_BIT({{107, 16}});
const double M0_7_LSB = TWO_N15;
/* Page 8 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_8_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> af0_8_bit({{11, 16}});
-const double af0_8_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> af1_8_bit({{27, 13}});
-const double af1_8_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_8_bit({{40, 2}});
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_8_bit({{42, 2}});
-const std::vector<std::pair<int32_t, int32_t>> SVID2_8_bit({{44, 6}});
-const std::vector<std::pair<int32_t, int32_t>> DELTA_A_8_bit({{50, 13}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_8_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> AF0_8_BIT({{11, 16}});
+const double AF0_8_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> AF1_8_BIT({{27, 13}});
+const double AF1_8_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_8_BIT({{40, 2}});
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_8_BIT({{42, 2}});
+const std::vector<std::pair<int32_t, int32_t>> SVI_D2_8_BIT({{44, 6}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_A_8_BIT({{50, 13}});
const double DELTA_A_8_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> e_8_bit({{63, 11}});
-const double e_8_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> omega_8_bit({{74, 16}});
-const double omega_8_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> delta_i_8_bit({{90, 11}});
-const double delta_i_8_LSB = TWO_N14;
-const std::vector<std::pair<int32_t, int32_t>> Omega0_8_bit({{101, 16}});
-const double Omega0_8_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> Omega_dot_8_bit({{117, 11}});
-const double Omega_dot_8_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> E_8_BIT({{63, 11}});
+const double E_8_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_8_BIT({{74, 16}});
+const double OMEGA_8_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_I_8_BIT({{90, 11}});
+const double DELTA_I_8_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA0_8_BIT({{101, 16}});
+const double OMEGA0_8_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_8_BIT({{117, 11}});
+const double OMEGA_DOT_8_LSB = TWO_N33;
/* Page 9 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_9_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> WN_a_9_bit({{11, 2}});
-const std::vector<std::pair<int32_t, int32_t>> t0a_9_bit({{13, 10}});
-const int32_t t0a_9_LSB = 600;
-const std::vector<std::pair<int32_t, int32_t>> M0_9_bit({{23, 16}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_9_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> WN_A_9_BIT({{11, 2}});
+const std::vector<std::pair<int32_t, int32_t>> T0A_9_BIT({{13, 10}});
+const int32_t T0A_9_LSB = 600;
+const std::vector<std::pair<int32_t, int32_t>> M0_9_BIT({{23, 16}});
const double M0_9_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> af0_9_bit({{39, 16}});
-const double af0_9_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> af1_9_bit({{55, 13}});
-const double af1_9_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_9_bit({{68, 2}});
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_9_bit({{70, 2}});
-const std::vector<std::pair<int32_t, int32_t>> SVID3_9_bit({{72, 6}});
-const std::vector<std::pair<int32_t, int32_t>> DELTA_A_9_bit({{78, 13}});
+const std::vector<std::pair<int32_t, int32_t>> AF0_9_BIT({{39, 16}});
+const double AF0_9_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> AF1_9_BIT({{55, 13}});
+const double AF1_9_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_9_BIT({{68, 2}});
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_9_BIT({{70, 2}});
+const std::vector<std::pair<int32_t, int32_t>> SVI_D3_9_BIT({{72, 6}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_A_9_BIT({{78, 13}});
const double DELTA_A_9_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> e_9_bit({{91, 11}});
-const double e_9_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> omega_9_bit({{102, 16}});
-const double omega_9_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> delta_i_9_bit({{118, 11}});
-const double delta_i_9_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> E_9_BIT({{91, 11}});
+const double E_9_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_9_BIT({{102, 16}});
+const double OMEGA_9_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_I_9_BIT({{118, 11}});
+const double DELTA_I_9_LSB = TWO_N14;
/* Page 10 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_10_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> Omega0_10_bit({{11, 16}});
-const double Omega0_10_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> Omega_dot_10_bit({{27, 11}});
-const double Omega_dot_10_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> M0_10_bit({{38, 16}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_10_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> OMEGA0_10_BIT({{11, 16}});
+const double OMEGA0_10_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_10_BIT({{27, 11}});
+const double OMEGA_DOT_10_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> M0_10_BIT({{38, 16}});
const double M0_10_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> af0_10_bit({{54, 16}});
-const double af0_10_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> af1_10_bit({{70, 13}});
-const double af1_10_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_10_bit({{83, 2}});
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_10_bit({{85, 2}});
-const std::vector<std::pair<int32_t, int32_t>> A_0G_10_bit({{87, 16}});
+const std::vector<std::pair<int32_t, int32_t>> AF0_10_BIT({{54, 16}});
+const double AF0_10_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> AF1_10_BIT({{70, 13}});
+const double AF1_10_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_10_BIT({{83, 2}});
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_10_BIT({{85, 2}});
+const std::vector<std::pair<int32_t, int32_t>> A_0_G_10_BIT({{87, 16}});
const double A_0G_10_LSB = TWO_N35;
-const std::vector<std::pair<int32_t, int32_t>> A_1G_10_bit({{103, 12}});
+const std::vector<std::pair<int32_t, int32_t>> A_1_G_10_BIT({{103, 12}});
const double A_1G_10_LSB = TWO_N51;
-const std::vector<std::pair<int32_t, int32_t>> t_0G_10_bit({{115, 8}});
-const int32_t t_0G_10_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> WN_0G_10_bit({{123, 6}});
+const std::vector<std::pair<int32_t, int32_t>> T_0_G_10_BIT({{115, 8}});
+const int32_t T_0_G_10_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> WN_0_G_10_BIT({{123, 6}});
/* Page 0 */
-const std::vector<std::pair<int32_t, int32_t>> Time_0_bit({{7, 2}});
-const std::vector<std::pair<int32_t, int32_t>> WN_0_bit({{97, 12}});
-const std::vector<std::pair<int32_t, int32_t>> TOW_0_bit({{109, 20}});
+const std::vector<std::pair<int32_t, int32_t>> TIME_0_BIT({{7, 2}});
+const std::vector<std::pair<int32_t, int32_t>> WN_0_BIT({{97, 12}});
+const std::vector<std::pair<int32_t, int32_t>> TOW_0_BIT({{109, 20}});
// Galileo E1 primary codes
-const std::string Galileo_E1_B_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
+const std::string GALILEO_E1_B_PRIMARY_CODE[GALILEO_E1_NUMBER_OF_CODES] = {
"F5D710130573541B9DBD4FD9E9B20A0D59D144C54BC7935539D2E75810FB51E494093A0A19DD79C70C5A98E5657AA578097777E86BCC4651CC72F2F974DC766E07AEA3D0B557EF42FF57E6A58E805358CE9257669133B18F80FDBDFB38C5524C7FB1DE079842482990DF58F72321D9201F8979EAB159B2679C9E95AA6D53456C0DF75C2B4316D1E2309216882854253A1FA60CA2C94ECE013E2A8C943341E7D9E5A8464B3AD407E0AE465C3E3DD1BE60A8C3D50F831536401E776BE02A6042FC4A27AF653F0CFC4D4D013F115310788D68CAEAD3ECCCC5330587EB3C22A1459FC8E6FCCE9CDE849A5205E70C6D66D125814D698DD0EEBFEAE52CC65C5C84EEDF207379000E169D318426516AC5D1C31F2E18A65E07AE6E33FDD724B13098B3A444688389EFBBB5EEAB588742BB083B679D42FB26FF77919EAB21DE0389D9997498F967AE05AF0F4C7E177416E18C4D5E6987ED3590690AD127D872F14A8F4903A12329732A9768F82F295BEE391879293E3A97D51435A7F03ED7FBE275F102A83202DC3DE94AF4C712E9D006D182693E9632933E6EB773880CF147B922E74539E4582F79E39723B4C80E42EDCE4C08A8D02221BAE6D17734817D5B531C0D3C1AE723911F3FFF6AAC02E97FEA69E376AF4761E6451CA61FDB2F9187642EFCD63A09AAB680770C1593EEDD4FF4293BFFD6DD2C3367E85B14A654C834B6699421A", // 01
"96B856A629F581D1344FEF597835FE60434625D077ECF0D95FBE1155EA0431979E5AFF544AF591A332FDAEF98AB1EDD847A73F3AF15AAEE7E9A05C9D82C59EC325EF4CF264B8ADF2A8E8BA459354CB4B415CC50BF239ADBC31B3A9C87B0843CF3B9E6D646BA43F866276B053826F3A2334CC5E2EFB9F8F195B382E75EEA63F58A06B3F82A3B5C77C1800FD9498F803E524435B321210BB84690BED0BBBE16D363B3A90656A73720E27008852FB7DACC8284411B177728D9527C560859084A395A6F11A96AD9DB6B43E00642B000ED12BFD967868EAB1108552CD4FC89FBC408ACE7678C381EC91DD000319124EB5D5EF52C4CAC9AADEE2FA045C16CE492D7F43743CA77924C78696FCBF2F9F7F36D8E623752200C6FCBBD71ABBB6877F3C5D6E6740AB0389458A6B66440858B2D383244E853646FE2714211DEA9E6196252815BB704A20BFE556AC474F8998944E0CABBBE21A6400B87BFDCF937D12B2821D59298AF4AD378F0F42BD8C41693B8D993CF37C8B478F3BB5D33AD2A9FA24AD7B8FA895FDBC04964192F7BA3FF74E0E3A435B5DFE042E3115CACF29624C0645E9C917534A2EBC1F5665E4E1B1BC56208DBCD8A27CCB6474D5D0E20CA4072C960E5ACE41BDA3770DF3B681F2B318F6F8E1CB17C2857350FB6009AED665E13B2780D79217F73FAC7A8A48048DB0FB8A8A5007CDDC9A7B2DA8257C99F1CB605A18204",
"E57DE19A3E4A8C122FCB1DD6584B3D2DAE364D800F9C5A9E957B38F624CBD3ACC58FA3ED070B5E44857CCB813FBC0BB83B5D157C6C562422E5963CC4DD753C45B0264F8E136A0F1774D77A543E44D51EF8C6B9408B6E3B5CEE1347A94F13ECDC94DC764976E5A50B4CB0AE7557553B47EDFE03EC2CD32EA8D125A341E1EDFC77E75330D6E7B23DC838EBCE7E5567F5B8C80C3D15E7404B4E10F0BEB0C69626A814AF91334199864FC77E0FF548DC2A6FA6A71C3C0561F2B085CC05E8512E27B9DBA60B93D114B87935776C8E9A67905C429D48BF3AB1B0A56FAFBFD5D9C8D8C8A9E5918BFF273CF5E8664FF2B90314BDBFDAD5AB8C22A0E45C104ECE75EA43FE9BDCE306A5A28AE464628163D249D8056005F1A900951808CC8620F81768153436F741667A8E271DD986C7A1E5046FCC74C7CEBBF9A1296D6CF0B2FF85BE412D87214BB368DFF462AD649D7324A117252311C664D33E4DAFBD830FBCEB6EFBDD7391D4BADA7A775FD1949D981F619655DB3C22BAC34E5AE41222905C0C7E80D6EA28471EC0468756531C09A471EDBE200472E78F1701FEE96E5769A9893C0F11E7906B064442E06E21ED8B0D70AF288690C532A2D03B373E1E0085F62F7AAA658B569C5184E3DDC40ECAA88B887118601691892F9F55E2DE79E49DFF11D434C2BA3AA6447522A7C99DC215CAD2ED0114ED62CBDAE9D315E48AE14D2014B7F8E",
@@ -357,7 +357,7 @@ const std::string Galileo_E1_B_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
"97051FC67ACA30E8AEE73D3A8CF38BB13524D4E0EBD9BE68398C7C16227CABB1D0B0A0ABE7B6384ABA02905BA0C3C7363599D059C7B4C99DB165CD14FA12FA7912449CA7DD5E346D8010C85A757382270DAD15BA3CE36A76EF55F81A1E80BF366B37FE3A88EC722028C25E234E624040450A99CD808F942568AA7133981D72E7F2928894670AD5399482DF1B90E7E64062F830B736C79C30F36281495C76699CD48404673FA334F042F9E0E67DD7F3853BF71ABEAF6A9A5546855E840CE42B224D8F6490C6CE5FC02EBAF4FFC390107058F54CD635D4A7F2878099C1EF495750E6921BE2F39AD808C4210F287319F811A254CEF8CF153FC50AB2F3D694A530949E5F578D075DB96DDCF2BB90ED3DE09D9CA8E08662FD8982741DE1CE0A6B64C3D3D5004B5C04B2B0DFD976A20FACC94D1762D41EE03B40D2CF367612812EF4CC41D1BFE9CEB51AE3A22AF1BE7B85A057D3048D0E73FA0FDAF1119EFD76F0A41BE63128B22D64A5553E9549D411483BBCA1483EF30CF6A6D317AD2C7973EFA6D4C1121F703D2F48FCDA3177AD450D75D2A28D2C244AEA13F0E60AEED8ACBAB444D400DF5E280DB799B2D9A984DF1E2567D39D1DE58EF78CA6B4D8BC172B07DCB02D156CA96EEFAC69E556CFCE0AAB617C7FBB8C34871C1D35E74B7BD307D3F2E424C7A9AD676A1A69E0FE735EA50887A1DFAE6CA2FE4460FC7EF323ADE493020" // 50
};
-const std::string Galileo_E1_C_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
+const std::string GALILEO_E1_C_PRIMARY_CODE[GALILEO_E1_NUMBER_OF_CODES] = {
"B39340CA1C817D81EF4FAE4E95BF3504A7709089FB48560E9E3EF802180E85EB2194E05902C6C4C52021FEB7EC64FD416BCEBC8E39D64A4B5EE345291911AB8204A888C25B1CD3D9342A56C538636D3EAB957037D09E879AE5F3A39834FBB84A3D8D5090D7814246B62E9CA68533D2EC403B4FB9488467FF9758B0D15A8CEF89187A1D5897880040B6C3C5244E85A2AD14BCF2F5ABC44A7B1D4A87E8BDA05766218773ED4F70F8D1D07CBB1E8CA6298E64EE6DC5886D37495BA2EDB3E0B0B68AD9F300310B88898DDEEFD484538C31A9BCAA76ECAD0C16607D32189058B0862EE9D70CEA9D304755CE8037BA4C46C2573181748A212E4B2BDD04F9BC240518273DC17CBAFF21A03E9120FA7DCA18D56DD1D9A7E510C90CF219104385F531F2EFAFD185ECB6B911F9B7809D98D86F15516FFDDBE9BD1CF8662EB777C3F94EA3F962D7B79449FAAD39935429E92CAE5637E9BCF4E94D413D27934952409AB536BE4055AFBC4330CD1E4B5509EFE5F8EFC9ECBE9EF377DE7E37C479BB9D3EE7745E4609B0A6D2C5D92EB3C9E2278C1F2221FF907596AA5E096ACF8990EBA907E43AD320F8019CB6355A2BA8670EE5A4F463E8E56F8F1D3E7F4922510FB668E32C4CF23AD8496399638B095B47833E0CBB34977EB3E4242EAF870D86660D6A73F83E45D6E8A41EDCA3815079649544597C5C43B6C93FEBAD5700D22EDAF431FD340",
"A64F94BB47BD4033C76D4924305907EC1F618B43C7535F3CFC093E5AF5DDD5C4339F3BB6D835B5C2C2053CD3D5693368D4E1A7CAC59425D1FD96809C67285CFD3FC05B01053CB0773221D7205778022F487BF99D1650566BE287FD7AE882AA8E8F52E5D4E3C0C2F971C9FF70AA378691EBD8ADE45CF213822D09FD05243F9726F6C69893845E57C37A7643E16B770E26F431FF69D437271905D270EB85D8D229D7D87662121F0BEEB1E895ED9589A9CF5833408A04197AC9025D8570AD9B75DB7E192EA0A089504996E9DC652975D83633619CFF80667D8B519536B3475248BA8213C8A4C66DE69B4B3774BF9142425C57F34A27B1E288119E3FFCC6AF6A21087F9394F09DDFBD42F32D059B8CD4104A519BA640765D5CDE490E62F10E695FBFD33CBC9D2208A532C8EC25DA28B8CC1B6850AB43D9B5C00B6E74B7A148791AB07B328D347058C7E6233E18C5ED172C9F9E9ACF29D913E2A1614BFC0893D4967ED033B2B9AE6B51F908F1CED57C14FEEA85CD4D9711216BE7F79FA6721B7DCCA033C80127AC6E5FCF58EB4005EC24CB4886D787355362D5E7031B9B2AC2A86D730AD734181E723A811FF510A4DF868001973FE83288D78E6F9B9441DAF5BE2974A2848FD917C3BCD346A431922246EC852E4AAD467E60C15D61DD3BF4A207BB57DB45DCADEFE3210BE74B9DACC918A394469F2E2C95AD1E211947948FE24F5E4",
"FD1F6976002C39C87187C44E3D224ED4DF0B67750105944C651A5E57798F168A136AC0FB5979C4E847A82B20A2E6C45DB42EF2B930A80D3257BCCC53EDA966F5DCD9AD47CFB226EED9B62A874E9F6404D4087798A1005F4131171D3A47907A3CD602B83DABE094D2CB031867DF4595F3ED59FD8C4D76EDEEE59E422CE5C7D0A5F720BE94FA24DF05F758348EADD5EFE9197C6BB2292E2B14DB8C6DB24AA94C5FF0F5106D2B566058D32C58B63A150784F7B02478D9973DD4CFD2E84059AE0F4F1320754B7EE83F04A51C67EFFC2EB1C301C0C58DBAEBE95474E3484A76500103C14C40BB0B7D3A04D8BDABB605C1EF9FD4A6564934DEC50BD5878243AEE80F9796EED70CE1B1E8B55725DF76472D12D4A7A487989F42E6705818B1F7E149E97153A7B05A82FA3FBE51763E61171A4E12931472E94CCBA74CC09483DF93623FC60945070FDDF3A00B561650427E4BD64D675B1EB398B35EF057A66FD0B48EDBABBDCD57C32ABAE46F5CDD0CB1FCF17765258236F3DE40BD5D0A3C5C978D81DEB07367AB20B2CAA9834B9576161C4F20FB9C184A01DC9021A4E92B71333354E05BBEA9015E5AC4C66312E8B79F0B92279AC7EF1936BCC30802B83DB3D113BEF64452CAD7ACF6674FDA44023A661019841A101BE80FDA4E3210AE774E433A9ABD97F2755259AECE21F7A8C3B1A3D471F874D2EEC85B9B21BC0C2E2EC9016F847C6",
@@ -409,6 +409,6 @@ const std::string Galileo_E1_C_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
"CD7AAC98501F29507EA4E0183E8A40D2E5117E47BB5D18D01A3732DE4C821DFE86521CBEA7DB29BE1148BD544ECC681689BCD1B41EAF755310B7659342F8EE11CB41550CC30E566E192796B66C1A83C0B28BACCFA6C393043A0A2CB89712BC1CCB174DE58E66896AF39C1CEED1E05B0435F8CF6FD920D100F51584FE24879987399481DBF27DDB6286B6353919E552E669290CE02AB4CD5113D7F484229F379C7332767EC69E4336439B05DE1C1E3563DD303A4F580BFF20A40E49CB0822F715ED0221EBCDB5DBAD751124B1715E82F37488265135B6C8BBCF4F801ECC4D3525FF189493AD4EFF0C042B070C4CA8FB1FDF43D79F06A6E4E3D35D7B07D4B728D5DC54EEDACBBBA1EDDCDC07ADF7DFCFEF835E44DF1FF66DAF2A7BAEBE218AC3B15E183044D6A8A89B3C101B40BED97ED5DF93BBC1B84931D56B8C822A6D058AC74CFA4C85D8B456698E82D5B7574C17B041E5F4BEED09F75012355CBC322B822C63F10C18A8F279E9A0E18E1FEF183D23E13894E31F6D046956FE8A647558228F6D4D6910151EC03937876B6ED7A078D33DAEB3F2239353BB8181E62B286BBC41588DE10F478A5CE5B508F205A41820356767B0A0ED4B8DB9EFE348362E9A90D6C30218B295B338B51C09239D02FC8A1E7DAAAB60AC37F5E67CFC88EEF69567B5C81A03B449F4ED38B9D295A36AA3503173F6F6F66D93CE72D753076040FACDE",
"ADDCEDB50E907D20E826E6E8A0D30C20C74B2DF204EA784BAE9F618CAE33A3C937729DF9CB10BA2A4C33E0182A37200C0CC509729D828B8A2A20F283AC4F9306596684EA3FB5492A4C9F2DB459E7531C9F9C0950E7D9E93B3EE5912AE7E39AC8F4EC14B18F24E325003F477E347C5AC1B67CDB11AF3BBBBCD0AC3703024B5767AA67A208254F798684BFD1D3EACD757EEC77254950A146620400DB95E694574F739A991EBA771EBBDFF1056BB39A77DBE0636A032E17141332F951C57C6C90F348F165E3ABDD60D429D5D6BEC7E3E3463806F819EB2D212B3528A5EDE51F235AD100A35E890955F8A1DC51FDCB53EABCA2540997DD054C1F5B29462995B876B44D085904E55E1B838BEF600A992EB49CE078DF75AF3D0F137685AC0D07F0BE1EB87B63A41E74DDE869C8A683BDE60AF5D77FF18F7137495BCEFD0ED28F62F9C3E25D332B5F861D999FCDC0B4851A984A4DBB53401FD40351ADA4335C702BCC8D900C737507B990BDDBE91D201E3A0946DC968D43FD10D04B0B76667FF5B4291C2124B0124C6B710A6D1BCFAEB016B9DEEB0F7A4FE044CA4EA0CCD84B7682617C3A545071EC295B0663B3F577D562DE1D9DD80DE6A1EFD6D5991EB5246F1597B86D0E9A90CF6DB0EB2B8E7BAE9431E567F01AA98502C773742246467ABF911A91A51F6C1B9E0C3233DC1A37D17DB91A5F0F661B0EB5886964456C7818601BD0C"};
-const std::string Galileo_E1_C_SECONDARY_CODE = "0011100000001010110110010";
+const std::string GALILEO_E1_C_SECONDARY_CODE = "0011100000001010110110010";
#endif /* GNSS_SDR_GALILEO_E1_H_ */
diff --git a/src/core/system_parameters/Galileo_E5a.h b/src/core/system_parameters/Galileo_E5a.h
index cf7e56ce1..19122372c 100644
--- a/src/core/system_parameters/Galileo_E5a.h
+++ b/src/core/system_parameters/Galileo_E5a.h
@@ -40,17 +40,17 @@
// Carrier and code frequencies
-const double Galileo_E5a_FREQ_HZ = FREQ5; //!< Galileo E5a carrier frequency [Hz]
-const double Galileo_E5a_CODE_CHIP_RATE_HZ = 1.023e7; //!< Galileo E5a code rate [chips/s]
-const double Galileo_E5a_I_TIERED_CODE_PERIOD = 0.020; //!< Galileo E5a-I tiered code period [s]
-const double Galileo_E5a_Q_TIERED_CODE_PERIOD = 0.100; //!< Galileo E5a-Q tiered code period [s]
-const int32_t Galileo_E5a_CODE_LENGTH_CHIPS = 10230; //!< Galileo E5a primary code length [chips]
-const int32_t Galileo_E5a_I_SECONDARY_CODE_LENGTH = 20; //!< Galileo E5a-I secondary code length [chips]
-const int32_t Galileo_E5a_Q_SECONDARY_CODE_LENGTH = 100; //!< Galileo E5a-Q secondary code length [chips]
-const double GALILEO_E5a_CODE_PERIOD = 0.001; //!< Galileo E1 primary code period [s]
-const int32_t GALILEO_E5a_CODE_PERIOD_MS = 1; //!< Galileo E1 primary code period [ms]
-const int32_t Galileo_E5a_SYMBOL_RATE_BPS = 50; //!< Galileo E5a symbol rate [bits/second]
-const int32_t Galileo_E5a_NUMBER_OF_CODES = 50;
+const double GALILEO_E5A_FREQ_HZ = FREQ5; //!< Galileo E5a carrier frequency [Hz]
+const double GALILEO_E5A_CODE_CHIP_RATE_HZ = 1.023e7; //!< Galileo E5a code rate [chips/s]
+const double GALILEO_E5A_I_TIERED_CODE_PERIOD = 0.020; //!< Galileo E5a-I tiered code period [s]
+const double GALILEO_E5A_Q_TIERED_CODE_PERIOD = 0.100; //!< Galileo E5a-Q tiered code period [s]
+const int32_t GALILEO_E5A_CODE_LENGTH_CHIPS = 10230; //!< Galileo E5a primary code length [chips]
+const int32_t GALILEO_E5A_I_SECONDARY_CODE_LENGTH = 20; //!< Galileo E5a-I secondary code length [chips]
+const int32_t GALILEO_E5A_Q_SECONDARY_CODE_LENGTH = 100; //!< Galileo E5a-Q secondary code length [chips]
+const double GALILEO_E5A_CODE_PERIOD = 0.001; //!< Galileo E1 primary code period [s]
+const int32_t GALILEO_E5A_CODE_PERIOD_MS = 1; //!< Galileo E1 primary code period [ms]
+const int32_t GALILEO_E5A_SYMBOL_RATE_BPS = 50; //!< Galileo E5a symbol rate [bits/second]
+const int32_t GALILEO_E5A_NUMBER_OF_CODES = 50;
// OBSERVABLE HISTORY DEEP FOR INTERPOLATION AND CRC ERROR LIMIT
@@ -58,7 +58,7 @@ const int32_t GALILEO_E5A_HISTORY_DEEP = 20;
const int32_t GALILEO_E5A_CRC_ERROR_LIMIT = 6;
//optimum parameters
-const uint32_t Galileo_E5a_OPT_ACQ_FS_HZ = 10000000; //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
+const uint32_t GALILEO_E5A_OPT_ACQ_FS_HZ = 10000000; //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
// F/NAV message structure
@@ -77,156 +77,156 @@ const int32_t GALILEO_FNAV_PAGE_TYPE_BITS = 6;
const int32_t GALILEO_FNAV_DATA_FRAME_BITS = 214;
const int32_t GALILEO_FNAV_DATA_FRAME_BYTES = 27;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_PAGE_TYPE_bit({{1, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_PAGE_TYPE_BIT({{1, 6}});
/* WORD 1 iono corrections. FNAV (Galileo E5a message)*/
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SV_ID_PRN_1_bit({{7, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_1_bit({{13, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0c_1_bit({{23, 14}});
-const int32_t FNAV_t0c_1_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_1_bit({{37, 31}});
-const double FNAV_af0_1_LSB = TWO_N34;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_1_bit({{68, 21}});
-const double FNAV_af1_1_LSB = TWO_N46;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af2_1_bit({{89, 6}});
-const double FNAV_af2_1_LSB = TWO_N59;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SISA_1_bit({{95, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_ai0_1_bit({{103, 11}});
-const double FNAV_ai0_1_LSB = TWO_N2;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_ai1_1_bit({{114, 11}});
-const double FNAV_ai1_1_LSB = TWO_N8;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_ai2_1_bit({{125, 14}});
-const double FNAV_ai2_1_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region1_1_bit({{139, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region2_1_bit({{140, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region3_1_bit({{141, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region4_1_bit({{142, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region5_1_bit({{143, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_BGD_1_bit({{144, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SV_ID_PRN_1_BIT({{7, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_1_BIT({{13, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0C_1_BIT({{23, 14}});
+const int32_t FNAV_T0C_1_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_1_BIT({{37, 31}});
+const double FNAV_AF0_1_LSB = TWO_N34;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_1_BIT({{68, 21}});
+const double FNAV_AF1_1_LSB = TWO_N46;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF2_1_BIT({{89, 6}});
+const double FNAV_AF2_1_LSB = TWO_N59;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SISA_1_BIT({{95, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AI0_1_BIT({{103, 11}});
+const double FNAV_AI0_1_LSB = TWO_N2;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AI1_1_BIT({{114, 11}});
+const double FNAV_AI1_1_LSB = TWO_N8;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AI2_1_BIT({{125, 14}});
+const double FNAV_AI2_1_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION1_1_BIT({{139, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION2_1_BIT({{140, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION3_1_BIT({{141, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION4_1_BIT({{142, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION5_1_BIT({{143, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_BGD_1_BIT({{144, 10}});
const double FNAV_BGD_1_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_1_bit({{154, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_1_bit({{156, 12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_1_bit({{168, 20}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5advs_1_bit({{188, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_1_BIT({{154, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_1_BIT({{156, 12}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_1_BIT({{168, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ADVS_1_BIT({{188, 1}});
// WORD 2 Ephemeris (1/3)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_2_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_bit({{17, 32}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_2_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_BIT({{17, 32}});
const double FNAV_M0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_omegadot_2_bit({{49, 24}});
-const double FNAV_omegadot_2_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_2_bit({{73, 32}});
-const double FNAV_e_2_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_a12_2_bit({{105, 32}});
-const double FNAV_a12_2_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_omega0_2_bit({{137, 32}});
-const double FNAV_omega0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_idot_2_bit({{169, 14}});
-const double FNAV_idot_2_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_2_bit({{183, 12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_2_bit({{195, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_2_BIT({{49, 24}});
+const double FNAV_OMEGADOT_2_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_2_BIT({{73, 32}});
+const double FNAV_E_2_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A12_2_BIT({{105, 32}});
+const double FNAV_A12_2_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGA0_2_BIT({{137, 32}});
+const double FNAV_OMEGA0_2_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IDOT_2_BIT({{169, 14}});
+const double FNAV_IDOT_2_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_2_BIT({{183, 12}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_2_BIT({{195, 20}});
// WORD 3 Ephemeris (2/3)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_3_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_i0_3_bit({{17, 32}});
-const double FNAV_i0_3_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_3_bit({{49, 32}});
-const double FNAV_w_3_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltan_3_bit({{81, 16}});
-const double FNAV_deltan_3_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cuc_3_bit({{97, 16}});
-const double FNAV_Cuc_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cus_3_bit({{113, 16}});
-const double FNAV_Cus_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Crc_3_bit({{129, 16}});
-const double FNAV_Crc_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Crs_3_bit({{145, 16}});
-const double FNAV_Crs_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0e_3_bit({{161, 14}});
-const int32_t FNAV_t0e_3_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_3_bit({{175, 12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_3_bit({{187, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_3_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_I0_3_BIT({{17, 32}});
+const double FNAV_I0_3_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_3_BIT({{49, 32}});
+const double FNAV_W_3_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAN_3_BIT({{81, 16}});
+const double FNAV_DELTAN_3_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CUC_3_BIT({{97, 16}});
+const double FNAV_CUC_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CUS_3_BIT({{113, 16}});
+const double FNAV_CUS_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CRC_3_BIT({{129, 16}});
+const double FNAV_CRC_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CRS_3_BIT({{145, 16}});
+const double FNAV_CRS_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0E_3_BIT({{161, 14}});
+const int32_t FNAV_T0E_3_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_3_BIT({{175, 12}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_3_BIT({{187, 20}});
// WORD 4 Ephemeris (3/3)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_4_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cic_4_bit({{17, 16}});
-const double FNAV_Cic_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cis_4_bit({{33, 16}});
-const double FNAV_Cis_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A0_4_bit({{49, 32}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_4_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CIC_4_BIT({{17, 16}});
+const double FNAV_CIC_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CIS_4_BIT({{33, 16}});
+const double FNAV_CIS_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A0_4_BIT({{49, 32}});
const double FNAV_A0_4_LSB = TWO_N30;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A1_4_bit({{81, 24}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A1_4_BIT({{81, 24}});
const double FNAV_A1_4_LSB = TWO_N50;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltatls_4_bit({{105, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0t_4_bit({{113, 8}});
-const int32_t FNAV_t0t_4_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WNot_4_bit({{121, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WNlsf_4_bit({{129, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_DN_4_bit({{137, 3}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltatlsf_4_bit({{140, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0g_4_bit({{148, 8}});
-const int32_t FNAV_t0g_4_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A0g_4_bit({{156, 16}});
-const double FNAV_A0g_4_LSB = TWO_N35;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A1g_4_bit({{172, 12}});
-const double FNAV_A1g_4_LSB = TWO_N51;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN0g_4_bit({{184, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_4_bit({{190, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTATLS_4_BIT({{105, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0T_4_BIT({{113, 8}});
+const int32_t FNAV_T0T_4_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_NOT_4_BIT({{121, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_NLSF_4_BIT({{129, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DN_4_BIT({{137, 3}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTATLSF_4_BIT({{140, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0G_4_BIT({{148, 8}});
+const int32_t FNAV_T0G_4_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A0G_4_BIT({{156, 16}});
+const double FNAV_A0G_4_LSB = TWO_N35;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A1G_4_BIT({{172, 12}});
+const double FNAV_A1G_4_LSB = TWO_N51;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_N0G_4_BIT({{184, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_4_BIT({{190, 20}});
// WORD 5 Almanac SVID1 SVID2(1/2)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODa_5_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WNa_5_bit({{11, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0a_5_bit({{13, 10}});
-const int32_t FNAV_t0a_5_LSB = 600;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SVID1_5_bit({{23, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Deltaa12_1_5_bit({{29, 13}});
-const double FNAV_Deltaa12_5_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_1_5_bit({{42, 11}});
-const double FNAV_e_5_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_1_5_bit({{53, 16}});
-const double FNAV_w_5_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltai_1_5_bit({{69, 11}});
-const double FNAV_deltai_5_LSB = TWO_N14;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omega0_1_5_bit({{80, 16}});
-const double FNAV_Omega0_5_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omegadot_1_5_bit({{96, 11}});
-const double FNAV_Omegadot_5_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_1_5_bit({{107, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DA_5_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_NA_5_BIT({{11, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0A_5_BIT({{13, 10}});
+const int32_t FNAV_T0A_5_LSB = 600;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SVI_D1_5_BIT({{23, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAA12_1_5_BIT({{29, 13}});
+const double FNAV_DELTAA12_5_LSB = TWO_N9;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_1_5_BIT({{42, 11}});
+const double FNAV_E_5_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_1_5_BIT({{53, 16}});
+const double FNAV_W_5_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAI_1_5_BIT({{69, 11}});
+const double FNAV_DELTAI_5_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGA0_1_5_BIT({{80, 16}});
+const double FNAV_OMEGA0_5_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_1_5_BIT({{96, 11}});
+const double FNAV_OMEGADOT_5_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_1_5_BIT({{107, 16}});
const double FNAV_M0_5_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_1_5_bit({{123, 16}});
-const double FNAV_af0_5_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_1_5_bit({{139, 13}});
-const double FNAV_af1_5_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_1_5_bit({{152, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SVID2_5_bit({{154, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Deltaa12_2_5_bit({{160, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_2_5_bit({{173, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_2_5_bit({{184, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltai_2_5_bit({{200, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_1_5_BIT({{123, 16}});
+const double FNAV_AF0_5_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_1_5_BIT({{139, 13}});
+const double FNAV_AF1_5_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_1_5_BIT({{152, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SVI_D2_5_BIT({{154, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAA12_2_5_BIT({{160, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_2_5_BIT({{173, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_2_5_BIT({{184, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAI_2_5_BIT({{200, 11}});
//const std::vector<std::pair<int,int>> FNAV_Omega012_2_5_bit({{210,4}});
// WORD 6 Almanac SVID2(1/2) SVID3
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODa_6_bit({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DA_6_BIT({{7, 4}});
//const std::vector<std::pair<int,int>> FNAV_Omega022_2_6_bit({{10,12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omegadot_2_6_bit({{23, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_6_bit({{34, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_2_6_bit({{50, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_2_6_bit({{66, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_2_6_bit({{79, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SVID3_6_bit({{81, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Deltaa12_3_6_bit({{87, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_3_6_bit({{100, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_3_6_bit({{111, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltai_3_6_bit({{127, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omega0_3_6_bit({{138, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omegadot_3_6_bit({{154, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_3_6_bit({{165, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_3_6_bit({{181, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_3_6_bit({{197, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_3_6_bit({{210, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_2_6_BIT({{23, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_6_BIT({{34, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_2_6_BIT({{50, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_2_6_BIT({{66, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_2_6_BIT({{79, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SVI_D3_6_BIT({{81, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAA12_3_6_BIT({{87, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_3_6_BIT({{100, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_3_6_BIT({{111, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAI_3_6_BIT({{127, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGA0_3_6_BIT({{138, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_3_6_BIT({{154, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_3_6_BIT({{165, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_3_6_BIT({{181, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_3_6_BIT({{197, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_3_6_BIT({{210, 2}});
// Galileo E5a-I primary codes
-const std::string Galileo_E5a_I_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
+const std::string GALILEO_E5A_I_PRIMARY_CODE[GALILEO_E5A_NUMBER_OF_CODES] = {
"3CEA9DA7B07B13A6CC0AE53DAD1EE2A0FCC70009338C08AC0EE457F76A1690815C3C940AB722487CC8F3D1F4C428828E7FD2A21230E42A3BBDF1E792165F644D0E0335F95EBDC93D6005CC0C680DB7B0E1B8C4946B7974319F9816141DB9E01011E4F20DA8F1B8E15A6F618CF599C3F5C1A1B276D51318ED4119BCE0ACD0332F3DD8F88EC5215AB311C51FF4987DA93B09A43BA84CF08032F6CB28F43043C54586811D870AD6FA27AA63785345C8BCDD3DA26A0134738BC7E08461D5409FF0B791D8574CE797FC5EF7821055028CB4AF92AE1088F8806CD55F0E5FDFCD8D74ED801B2B44AD5D79D1924D41DDC6AB2070B5360CB64CCF487FE517420348CC39BF50BDF78BE7DA91542FEAB689457B3EE69E43C75FADC303F31032FD96B7DC70A88C3B7BAC7322B285D9CFB3A93AC8B890165F23848FAD8477DBDD3D0AA4CB3CD73A48000B6D134DA2DA70B56E590A101AEE78864DA0C64A7BCC6B37CD6F31E9AFF10CA4D47630752D253944632DF6EC60AECDCD223F29399CDA3B74D1DFA5471277EE6C814464A8C55D3C0B83B36B6AC9FA90CE876ACDF65E3EA3FD61D309EB71ED29A3D510B2F4C0B6D6C5B57EC9060CFBE48389DCB17CBB2284E7F578565B91503B06F49CF3E8534870AEB6AD9707265A9A1E6E2E5E6DF6DAA367239A96EF5B02C19A4543D537EB4D9D73966C09E9B52B4706F57B3E0987885EB84DEA26F7823D895F62015188ED38C04CC6714F797FDB0BC713E3D0208462F9A68E3872A167BF1BF9791AEE8BB73CF527C50975B55C4E5C2F2E95B677F833ECC878D1764839608CC1108A75EE9E58FFCFE4CB52884E7AF15EE0632E0729DA1CF5B7A227028CFE1E08F8B881E1A743D52DD27BED33DE0EE75DC031B4864CF192DFEAF64F726D73321363A233F81C57232432D2B0A5A4C44F4320847A9C143F378F204185D2B571482FE45D6BCA152E6EA7223BFC6DCE06CEF90CE9114623EAB9B1EC789B2051B4AB711DABF5B16FCD970F437B8860313B4F1F14D384EE3976B7E55D2FDCB7E1BD9BE18B722E37C853ADC7E1CC2870A02881F95B78487780E1D1C296415109CF07AB63D0782A9F451CBEB3E8B919917AEDBCA8A8E563AD3784639793E0F25CC9CC62240FA04B2F141E71BF5C84EAC56431159556B8BCE077A51469A87737D3D6F06D97DD479FCC35129F4499C19EF98BDCEA9D4941B3756CDE1997C3AFCAE62B6D9E23341E11CD05A7FFF52F5814011A84D737E1264109006BEF5F19E3C6A9C7521B44741A8282755A8F0DC2FA0E1F6CA4FB34D8CD5FAA27E18808868725B9634376137C1BBC46934F83958112D03082DDD6148F353BD1DD24B9F8FD7AD89C40DA0A92A8DBE3608038CD56FFC4ACA35241D76FAC4CAE1211AAD9D73D51C81C59BCE05F71C345730D3A2C670F8F533A950EF24B00EFE6A3F1354694ABCC6FD9EC4E74DDE1F287AD4F847A297ECCCC39AF029EFCDDDB19932D906B9CEDFCBE0D422CEE305DD05E407340F28EEEA866664D60AF293A45D5D6D5C0000B05F79463DB513ED488DE7BD4EC9EACFEF973B23CE4E9539EFCB797456CF5FD1EC54FDCEE80B39063C48B91A5C2D2BEBC81B9B46D0AD6503BE5AACED2BA5EBE81F630B4E07510356E8229F7FC5EA532B8729CDB819E066A15379AC6942CD4BC5E97C6791E098105C323A3A3DA3880D5EE5562ABBA2BDC9906F4486B51ACF8AA4405E9D7A63DB9E3058782DD9AF3995FFB3D34AEF98234A0B3DC62C339325B60706C068F0198BD8FA658396D06931B069155217690C7F88FD230CDB38E3E48530BD47722FC",
"9D8CF144C4B667345D44F765622A956CAC4E097AB1CAB05CFBCC6BB68C709503AD9DB09C09C983D46A04A05B6F7EB26DB4D46F868C10E112828B1AEDB3C0074BE0DE3C9B7821BABB4F8B8E24F69869CCD981B09A783BF6A95F39ECFAF25DED6B16F89EA09D3A8413CCEBB545651B363DD385D12BB72420440C40E804FA27DE029A1E08629BAAB598C035DC58FDD309844F3BEBDE40FCC231F38605DED06572ADD85DC51D3D8B89B4480143D0B75283522354330E5CCF4DE1A6E68047D5B8D45D835A891F2D40C9DB8A76CEB1D18FE2BC38D080A8D97064CC87D692DF21184ABFDDA7642D0BD6F3209D06B4AE7600F7DDDB71DA751120599117ECCE645FD109CCA2EC7DB98F4177F14DB854FEB314B5D7CDC3385AD203464EADEAFF4AD08DFEF3D21240BFB8EFCAAC1356C72A0F5C61BE03CD2A21A7D756FA9003D562FC4A49A6BE788EC8D80054ACA881DFFF72C2966EECD09F185EDD11218C6696DB14E05FFF3644D11E508F4F1E9C5AB3074FB1C3FB21092A1C8D5AE05688FA4A9226C3C30D0BC3981933DC8648240F8CB67085F53AC5295428DC8447A1E5A46C2BA86796982C4C6CC647FD8079BC4024BB69E2B226E6F3D0F8A90B4D36DA2AED4C6BB60D318AA7479FDC2031143C67CB4381C27072E12935001524C7BECEDAA9954BCC2AA218E9EC2C95498FD8DF655C015896D9ED42CE7F91CBBA2CC4A7920038EBB5F5CE638F969F8B179E72AE252BE7E826E5CB53C2E85AAF1E1F1AD8D534F78A681928818AC3154651FFC583DEB0A6A1F40B98771ACC528AAF80D210ADAF83597869968D499ADE9A19BAF341E8CBA20F0E1473BDD898C24C7A5466F9924EC7EE992A2086AF295BEE1F6D0F8843D91180BF2C981C11FD978B23B6BAF7786BD526B458B76A87C31D7C52DFA43F3D362C8EEFFFB3FE5FB3F6E5F34B1FEC7EF1031146F3F609B32677F148F7DEBCF3526BB45582436A3092408193D6312626E46ECFA96FEAD12A234CACE10FAF9DE75EE2D238088146328E10E9ECDBB0B018ECDF2725415CF5A06AAB857403BBF6CBFC350903A982864827988BC805A3484A31FECF7A40D4FE251BC7E487613B9D3A48D3C7DAEFDC49C4B7E625F868DB53A798515A61050978552699EF2A5BF2F13BDD444EADC9B60B479FDD4633EB4C1062AA78BEF06692DED203819D3160310FD7F2343732156A9CBCB0B50BA9A8F93E339B702670E54BFA6DB2E2E773202C690FB71EB03671AB0B1B02B2F189BD99061ADD23F75F4914067AE638C9A29DD3661C28AE272CE692CBDE6AE880FBCF272E548342372CBAF6370C7E3AE9648341CE7310BE1C534B5702B0611AF65868F840B6B7613FDAEA21DEFB4F2024487023B02B8B58C9E9F27AA787EE775249EFC40913CBBD69C38538F239B203815F00F7B9CB30DC79E6A0C3E069D109E4A1BAEEE36D354C3D0121F1342F1F4AC504A68D69DEC158D54B04BE8164B48F31BC0827A0379C5237070B6F963741AD9ED4F3865698FB8233D7F49ED4E0EEF3AD927CBAF4FAE183252BC56AE4CDE3E329B1D9C87C6C11429B15B8EE589213CFAC208A12AA01B4F1F7CC35CD0AEAE217471B3DAC1C279F353DC61994FC45FEDBBE0005D8EC729385645864EF98A3A417E62F1EACA7E60D4E773BB2E4024D62830F103A7988733DD7BBCF3AB0CD0049006FE2F7EB3821724BEC37EAE44681A9699A025D212724CD98CA3415FE2BD09FADC02F1501FA38A6083427B662DDCBD0460E12A09072698EC8966C47B8A640AC79C1B7722E78A6C28680F4BB77BBA477BE0A6FAB959B9753217C5708",
"45D1C8FF162EE106CC87C3EBF6A837930F8CC797EC7A446E8A213ABD239582350636B19B5BE428A9C13F980B7AF5CD7F32630AFE8693CDF0EC0BC2C84F2472F5B86576E8C43136C14717A24705953D392BAC96C1055B782C7941D82FEA357E5FDEFF772FB9F3DF248455CADEAC4CBA2EBA9C91184006D1680E000D59E4BC8FBE2C2F7CC2E78BFA5B60EB292F244E6CF497D5A287432F2520B31B9D9FEC1210923299EDFF043CE077195509E92372F5959AAB4666AE486DEFA400D81463C388CD05C677BFD4953D2627105B0A776960FEE916C75D53981D30DC689581B7E8E0723D65949662ECFAA6FCC9F0CE8892E367721718F906207663F9AD450AE98D75DF004080FC15DC2CD7A1DCE013A0E547ADDC29A397ECB9E7FA02035327AC40240E2091098708D424563AB7C5867F3F2D78EE3EF5B658FDDBD49435060CA2EA3D559CDE957B7E48B98DB41CF875F7B3D9EBDF6547B4EDD98DF4B747B0793152FA8CC07C6D9EE5A2002464566D86466C2EDE54A2BF4BBE823049E57364C127A14BFE1B88ECF70EFB81EB831BBF50F6AE124E5F6A775F3F2620E91D489CCF24811C0890EF905E9E2ACD399E13DC81333A54BDD295B872EB74E412E2FB654A9874854FBC3A68C73434C5FC5CED27534B2B13C316205FF4E432FAFC13A7B5B7A7FFA9FEEDB5AE69036F8F2955DA124CE5856E8C53F24E609F7D3386DC5212B2E78B5AA23B59D45FE98AA08E9CFAA9D52ED260A36AF07522C047ED43808A39D7019E444EDF84D885A9AC84092A0F6BFED562F3E0D79FB5CF62F98E67EF219FA3F5AEB7D4E344642D3D4B1A7EEA18464F6CE8D4CB3181D9EBF6F4122751B54D0D7F3FC470A91B547148AAB1CA0DF59872120190640555A7561B0F2C11280768F74B1A56674FD5480B0F510491431810D99CECBC6DB85888BACBE2B020FB8B3D78039773229714156494EAEC3A2D0A59E718F72205747D69C05DDF1C678E2E154A1F84EF0CA2E24DC4A6A996F0850A396D2432596EAE84AEC0935B8C25D5C65B52A32722F01D281C4F753EE03EB10020E9FA02462CA303DA39560669637532D381EB78AE5EC0F6DBF6273EC979442E6243F65FC51F26C6C9554C6C0E3EFF33BC4EAB6A27CAB9383BE7DDDE4218C4998033B47919503E1C9A789711EBEAAD6C0298B3DC563F54D28675260F6D896F1B8D4FD0001C429210398E9544B3DAA12C31F7EE82EF4D2234E26F873610B76756DDACD24B6132BCFFE735FE75513ED527DD04D7DC6D24059F85706679DCD1474A9DB9571426BE17E6DEBA58B33B708567697F471CA8B78E8FA73B0E18CB6F88BF9E4F442F0FC21FAB89305484828F18B65F9D373A6A2B380D73F5924F80DA234C1DD87416D025E4E663C96F287B0C83DC92C2164D81830781B715209FD11A65E64962D805389BAAA91DFBB990D3511E506A8EC101131C5B7284252F861D047DB2C2027DBAAD487ABFE429CA21CBEA7671350618E441F4D62F2D579CAE29D97023A8873869B553293D9F54D4A929E252AF132325A6E3BCBF7B36D0DAFA1E56A39A5D801FD0D5A41111017BF62AAF8346C7D424FE007C32B437ADE60AAA9540AA5078FE6C3C3CCEA53EE863086646C976FE6C79434A0AA4F53B2E9E2C3B4CF9C9C4015391E27CDFF5C1FCCCC00BBF5B99715A1265F591E294D530DB14DFD485AD34BBCEA32E5B5D0EED15F88BF5D96D058E6D70BB1A232597E35A625E5E8C2EF5E7031A71F70309019A0591BA0A50E87C839498255A3602C0FAE53166BE5E49E29D24AEC47002B698F80FC49E718B66A8959259ACC540",
@@ -280,7 +280,7 @@ const std::string Galileo_E5a_I_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
};
// Galileo E5a-Q primary codes
-const std::string Galileo_E5a_Q_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
+const std::string GALILEO_E5A_Q_PRIMARY_CODE[GALILEO_E5A_NUMBER_OF_CODES] = {
"515537AD5E5F4216C16046FB0AC50DCDBE5CEE7E3CBB51B6ABB4E87A407B90E0EFD49DE1DE5ED29184E7FF0DC31F75FBB94F46FF6586B36C7771E5A68D060A965ACCF8D640C6B6E4530FDF19DD2491BCAB69ACBCFD3EC7281CCC31253A471B652E21C4CB0B43613EC542266460F0A6199B436BEFD95572DEBEE920A915FD854D17FFD0DF8C74E23B21B28493A0927709709B07C65878C43B69DC501E9D0AA21061ECF173876CAE708C764435832D9D6FCFE62DDF2543016D6325A56D9BF1007886E62E8A832BC32063CB0717D723C5E8C5F0C0EB3960577D364C93060B64EE04A539B7601CC3113E0AEC53CF21AFAD0154DC5CCECF038474E0F4004A65B1EE2801F81968B88C3D35E87CBB126C02D770CC3D32A552883D351DEF47847391484F80646728221F993921BFC14126EE3D9527DE607152724C6D2DD305D3FEA0AAAEDF6509A2FE3248494A54FDA8E3CE7E6BBCE234E4686BA5A19724BA2CB78CFE71A6AF45532EFB286C5BB47BC3C1EEF4E4A8C757786AE974F30A86CD60EBCBFDF5502AA8F643819CBA4301E731ADBA1345B61C0B444FE7B817EA86F8DD749C451AE7D24A68D914F26C918238953E8AE61CC8553213DD6856C7863F9F6BAB1B4C84B225911E7B92BFFC12AC211B2B2CD905877FE976E07057963D47C437FE47D89648053F81AC39E8FD2F3A726866F6693E503CB6F0C3F0AA9B3EE2EA3BCDB16D726E1C6D8B073AA15F64EB68D53B1F8CDAC19C7AC33361226E81F1C793BF188755A3FE1BAC38B91ABBD4F077F7A28983EAFADC346CB941D49492625893453B364D07FE06FE42B160C16FE0462AB6366FFDEE54DC9CE4DCCA21E4E4AE5E92C872D1E4EC6FF6D3063C98A5AA5EE72481A0BDF15152E2A5425AB722101474D0E1EC8401273EA1BE1DAF7403190A94305BD1C7DFBE1F35F65D5CB97E82B7A297047507FFA0012FB73360FB8719C174E78A989A96E60A9184B3F3A8188DE100AB361921D38E8142859C8F0F7D441DB1B2E9687BBD1086643987C83DEE0BE8CED4C83BCC82B62B45311CE4F13ABC55BF5EB1ECDF15F5A07F8B2C42F07FACE0E299E87727E2D534FEBF7B9C3894CC3E2E4127A294B9FA2A671273B174DBB81D247CD2846116500A072DC3962C65FFECD0C0B46DC2AF52882058259C26FDE50BEB319AEECFA1FABA34C069680B9EBAA9D96EEBD7EA30E748213E1283396A2AFC63527624641D4E1F1022A973B1898BD4CEF4D712B49371A51D60E08F42ED1EA90AC49EEFBCC53E7F9E899DD1AA4056F11462DF1A4C81620A73C831CEB897430A22252B901EC3D6F3DF58EF26422F796EA31AA4E0E9CE5B4A9C312A22305E298FEB3B3628283D405EDF726937327D90C542434BA3B60684584A9DB244839D2ACBCD7EF147A541E35687B5B8F5F07764973112D20D1ED75DC31F6A938542B42EFAAEE0F11B0583AA4925C3132356200E8D6BDB3127B975F4115A7A8A1C471836E3C5450B501A24D4A1308BB319AA827222B550F253F64B6F7D2322C6A2D3012FEC265A66A60102A3340CBDAB900DFDB36693D41DAD8DDB8875F8C3BE76AD5355DD81D67AAEBFFFE9458E522BE0312E60F63DD92F25C0D7CF82F223AEC0BD7456752CBD5151FEB5368F8857EAFAA90E8C7499B75D46EC4CA20BA8A24C90C016B5BD2CD7864828C6140E98EDB9509AD1194F56D49675D077DE92CD481B469E3A37F7DF0D5392DA4CE4CB282530F1C73482CC0926B877B00B0CE49FAD21E4C26194C7E950E0078F3854EF88755E08E9380165C584A3DBF1ECEF6A31B224FC321326B93797BFE8",
"D67539AFB80711A0BA3CD67D963BAD346BA813D35A2EEA104D36AAAB863C656A07AD61BA60598C07744D32ED01EFCE928346C09EAAC2D392E5655F0FEBC486815AE30A38014DD8520F73CCBB71D9D42636328A50998A2A3BED3E4B34D0DCD65B94807064E2EF0C420898DB96E3B99EA9A0AD91C63857DEAEDDA5E644E62212B23D72FEDBBAA78C6581C677B10689C4AF387626DAC55F4EBE1893D52D28D20EA365702448A64A0C553ED337C3BB911DDAE2A91727299D8064BEC880183064574B5E3631E70A0590210143F4079C572BD5E2F7634C2D53B1FB1DABE79C484799E7075EFF98F033F5B2EC66C373825335D883911CEC9CFBBE2E38129B7E03D9646A7E513D5069043BC62AF4C524F12D8F98D8C9DAC5D8642DFFF48CF6737AFBBCBE965925F55F03BBD5123C9DB47AAC780301DE91FBED3C01D03E6464C2C2915BFA187A4BD93E20C24574FB91F0358CBE0921DCC8D6B7E9976763A1D2158511861EFF5D1C0B71F608E7ADE91D9DCFF5640B55BC9BD1BB322C879C7EB5C06EB2601D06241D09CFB1BC1695DFA55FA044E0E2E4BC86EFBF6A55740C4640512DDD6CA069940BC0FE1738FD376C68BA8AF7CCBA7D89F7966B29355538836372EF418D149EBF3AC104919D91BCA2F13E79A7CF7684A4DC0AC556A2843E041A71F97C94B859FE009659F593EFFEBAA6F6C1C57A5BF22752613AFB26379C42AC25804AEDAE22D63B230FCB858F496B8EA6F37104D0890525DBDE06AD988BA0287B0938572F14A98EC9E60E973FD693DB1F2AFF671AB03FB12B729D0867938DF6B60EC69790C992C6C33A531FE56D0ECC1465F65E3E57FC9E45F0F65A1061CE6D3190B6C1B8708A8A5A47222369AE889D26499CDE8F0548B8D7071F2D4DF6C0F2418BE449552327981CB0B54F792F29A71E30DE257CE1B3A7553A22275E4C8B9FAC3B8D4E9912BB22B0A899E7337513C7ACBEDA15FAD3D6919FDDD941CA659D78B74FD39E2E2F622691B89CA82FFE602DB2578A20D4665184456F32DF4DD6CBC412EC7C6914CA427CEE02F6D9810AAE1406DD68ED3869BD8E3947A2B3A803E875FF82005D853E3F43A6BF936030744C34C8B71B7722BE0AD3F475E531C9249A42671D5F3A5C77C4C28DE29AE953EBFB572578B17B636F8365FC755C22871E7D53A1F1561C92909305C9FD36AAF79E8844B63370B800B25CC1355211D9919B830A988926829F808DD2C66400279E6AC14F8EECBBE8B6E9ABFA3BDBB38A49535F64F719EF48C5FE6B2738DC6F71AACD70274FD40A29BFCAA594AC3E7D0C3C522E406BA6392444C9F362339E8FF34BE330911DC7EB11A47FF3A62A46CDE961A40CD5B24020909E5B034F45FE96CB156FFE8E2FDBC12A7C12D60D24BFBE596544E4F03AF26F086A5A667496B7DF302E4DCFC568C7ABD665EA7EAD8A7F5A000DAD9F43E68C4D8A14742E050769B3CB270E3856D7E8F4E827046D3E55A52F0E02C883881914DE87AE3C24D93E61A94919B40398D3EABB1B5142431AB919208A9785962D05061EDC951C83C73FBF6AE8DD6FF839E631C9FCF6635FA053DBCF932E359F83FBB3EE310281569741E3A8975FAAD1E573E0EC3207F6DBCDB8CC90DCA1CE517C8DFC1D31AE4841F87A5157792738DAEE7C29240DAE26C6C3E9D8A899D2271B0C374BD2EE846C6625E31B2F8379A96F601323039D281608A01A1844E5D1D20CF1D92C52107CDA71BB3B7EC4DEA958CFD7A79F71868116CD1DD2B2E66BB94D1373B733F324BE489DA51BE72B01A8572880AE1E61650B839D03B0192D290D5B36A9CF93B304",
"58B2E58A13D4D5F84F37A389E6B01DFA66DBC6A25338B2884EF08056BF0A9124DA29254AA79CDF1B0944DDED4BC7FE683EF7A3C7A1C359E61E959471E30F9D534F43EEF274AC6535C616ADC7455BFBFF43ABF268F7C995CE020CEC73BDBD04007562F2710498AD1A324F25A6233B2DF2D9A429F1C39943E45F934986D1979D293F90CFBEBE01665C98C0D72D09A382348136980B31F5D4696B85C3F42D5C445996804159CD4C4CE7547C4A3FB718AB62D9E9826D05C44C6BD21D708CABB01F46514F29FBE7352866EDBFABD0ADBB6093E1A519D0E11E27737239A07866752B6D864686AF1E308481C53C635046C0756E8008D3CD26DB970C5D6EF8CB9DE6BC4339EE9F88EA45D11B74A1525E2F1B9F91567A78E403F7ECD47A99E95C098870B928E1B0DAA984CCECA13C6857F350E808BBF66AB4EDFB0F369F6F009268D19DEEB377F7D0C4ED6414EF6D23A0A5F37A25AAD3CD62C2115CB70409049CF0CE6D4DBCC5C96767614C6FAF73E9A76C7550BB970AB3D3ACE0C07FAA9F36F1935DFCD5228427BBEB5FC7A2F951D9210A5BC32ACCA7E78AFD5FD460CE2A79348714E5542BF2D453680B070E85F3244E8A6B4EB6ED49F803E60B8A383C8BE6283B1C4DF79E0C4A23D5DAFCB26DFC5DF1D1520FB6CDA23A05A1513F751EBD0143C2B9F5494BAA74F9F95F189C5767C6F5623559D9F20CC9B9C9ADFE285FA4E1BBDA481A52ABAB36A5393370091A49A59B968CFAE89BEAF33BCA5C2A9BCC1758CEEFC2D0A175C8A5CAD5C7E3FA706C2FEA55F4971A7B8A0C5D1F22A26D7DA9A70603AC34566E4929AE78C8F1926239950EC0A6E1B37D919E24431E53FB08B2F7DCDCA2EF4177BD7D2F81BFC784FBEA0471831CDCBB9E11D60C53D0E062E8BB8D98B8EE5A40960EBE10FA642751B96E1407B38A024DC64D5C2005E71198EF394673A4A0097187D2475CF27B3EAA7955AD9F412A89B36AFB27FDF7FE699B2CC8C03F7FA40549178DF8A3C1A39441EAE869BBC89D583ECB18E310885F33B95B719045CA6955720CA75D5CF0B29E5F1B9E9EAC5EC92980B2D37EF6509CCA6E67544A8116494AC7EB9032E1E8CDB053B5AC0F60DE59BBFB78E3491D50C7ADED95042A8885FE284E90C04FFC0370B92B68379B2E7D52392A42FEB26B2419CC64412BFFC036C01109B9EAEC5FAF485F0D61C37A703EAD02127611F9D25E4EC515CABE21247156F0779CAB57C35581646BB71E87941AB5D06FB3C06C423E9E83E0C07E611C89CB000344AF49498EF5C30305DDC8958F45A45E1218837269DEEDBB0AE51D2AD8B41BE425EB7AB798856911B6F0DC721756A8154B9D1CCD61092D16A3E9E1CD5E1D7C2C45D236C9B21A0ED64AD4C0660FE42FC0B543A34FB545B0D88D42F696D53BF54A1A259486846E81B44C16EF146310AEFB3933BA9F9D4497E74AFE1449D69105B9F295DB24B4563C3FC0166CB70F104B3360BC0998EFEBABC6276F570F7679865036DB59B51AD2F91C0CCD3BCF5C07492765D480494AB5B87E83FD04B75A35F88656D3329AA5FD550DBF493B0CD2C19DEBE4358661C72A71FB17C812F75BEB61302AAAA1F757288C1D8626461F4162A2EC6296B3CCABE21B4F0695F2D2CB02B86035251FC9C5F2FB5BBF28237417DC56471629B3B4C25AFEDC4C9CD108ADAD9DB1330AB680E4998C5B3D99BCE8F08156B630A63EF36A51C813CE22A6B178683EDA389ACF58653582BC2AE8170ADEC4BE03C04CBA603C0E4572A74BD9599A8442E894EB504F7703F2353A8A3525EC5535E750303AC07E08D952755F97AF236014",
@@ -334,10 +334,10 @@ const std::string Galileo_E5a_Q_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
};
// Galileo E5a-I secondary code
-const std::string Galileo_E5a_I_SECONDARY_CODE = "10000100001011101001";
+const std::string GALILEO_E5A_I_SECONDARY_CODE = "10000100001011101001";
// Galileo E5a-Q secondary codes
-const std::string Galileo_E5a_Q_SECONDARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
+const std::string GALILEO_E5A_Q_SECONDARY_CODE[GALILEO_E5A_NUMBER_OF_CODES] = {
"1000001111110110111101101001110110001111011011100001010101000001000111111011100011001001101100011100",
"0110011001010101100010111101001111001110000011000111011110010010111010000011001101010000010100100101",
"0101100110100000001001011010100111000001101011110000011001010001101101110111100110101000001110000001",
diff --git a/src/core/system_parameters/beidou_dnav_ephemeris.cc b/src/core/system_parameters/beidou_dnav_ephemeris.cc
index 3ae8335f2..5081daa6a 100644
--- a/src/core/system_parameters/beidou_dnav_ephemeris.cc
+++ b/src/core/system_parameters/beidou_dnav_ephemeris.cc
@@ -275,7 +275,7 @@ double Beidou_Dnav_Ephemeris::satellitePosition(double transmitTime)
double dtr_s = d_A_f0 + d_A_f1 * tk + d_A_f2 * tk * tk;
/* relativity correction */
- dtr_s -= 2.0 * sqrt(BEIDOU_GM * a) * d_eccentricity * sin(E) / (BEIDOU_C_m_s * BEIDOU_C_m_s);
+ dtr_s -= 2.0 * sqrt(BEIDOU_GM * a) * d_eccentricity * sin(E) / (BEIDOU_C_M_S * BEIDOU_C_M_S);
return dtr_s;
}
diff --git a/src/core/system_parameters/galileo_fnav_message.cc b/src/core/system_parameters/galileo_fnav_message.cc
index b7fa86e3c..918b7e9c7 100644
--- a/src/core/system_parameters/galileo_fnav_message.cc
+++ b/src/core/system_parameters/galileo_fnav_message.cc
@@ -232,150 +232,150 @@ bool Galileo_Fnav_Message::_CRC_test(std::bitset<GALILEO_FNAV_DATA_FRAME_BITS> b
void Galileo_Fnav_Message::decode_page(const std::string& data)
{
std::bitset<GALILEO_FNAV_DATA_FRAME_BITS> data_bits(data);
- page_type = read_navigation_unsigned(data_bits, FNAV_PAGE_TYPE_bit);
+ page_type = read_navigation_unsigned(data_bits, FNAV_PAGE_TYPE_BIT);
switch (page_type)
{
case 1: // SVID, Clock correction, SISA, Ionospheric correction, BGD, GST, Signal health and Data validity status
- FNAV_SV_ID_PRN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SV_ID_PRN_1_bit));
- FNAV_IODnav_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_1_bit));
- FNAV_t0c_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0c_1_bit));
- FNAV_t0c_1 *= FNAV_t0c_1_LSB;
- FNAV_af0_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_1_bit));
- FNAV_af0_1 *= FNAV_af0_1_LSB;
- FNAV_af1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_1_bit));
- FNAV_af1_1 *= FNAV_af1_1_LSB;
- FNAV_af2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af2_1_bit));
- FNAV_af2_1 *= FNAV_af2_1_LSB;
- FNAV_SISA_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SISA_1_bit));
- FNAV_ai0_1 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_ai0_1_bit));
- FNAV_ai0_1 *= FNAV_ai0_1_LSB;
- FNAV_ai1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_ai1_1_bit));
- FNAV_ai1_1 *= FNAV_ai1_1_LSB;
- FNAV_ai2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_ai2_1_bit));
- FNAV_ai2_1 *= FNAV_ai2_1_LSB;
- FNAV_region1_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region1_1_bit));
- FNAV_region2_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region2_1_bit));
- FNAV_region3_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region3_1_bit));
- FNAV_region4_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region4_1_bit));
- FNAV_region5_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region5_1_bit));
- FNAV_BGD_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_BGD_1_bit));
+ FNAV_SV_ID_PRN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SV_ID_PRN_1_BIT));
+ FNAV_IODnav_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_1_BIT));
+ FNAV_t0c_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0C_1_BIT));
+ FNAV_t0c_1 *= FNAV_T0C_1_LSB;
+ FNAV_af0_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_1_BIT));
+ FNAV_af0_1 *= FNAV_AF0_1_LSB;
+ FNAV_af1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_1_BIT));
+ FNAV_af1_1 *= FNAV_AF1_1_LSB;
+ FNAV_af2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF2_1_BIT));
+ FNAV_af2_1 *= FNAV_AF2_1_LSB;
+ FNAV_SISA_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SISA_1_BIT));
+ FNAV_ai0_1 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_AI0_1_BIT));
+ FNAV_ai0_1 *= FNAV_AI0_1_LSB;
+ FNAV_ai1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AI1_1_BIT));
+ FNAV_ai1_1 *= FNAV_AI1_1_LSB;
+ FNAV_ai2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AI2_1_BIT));
+ FNAV_ai2_1 *= FNAV_AI2_1_LSB;
+ FNAV_region1_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION1_1_BIT));
+ FNAV_region2_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION2_1_BIT));
+ FNAV_region3_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION3_1_BIT));
+ FNAV_region4_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION4_1_BIT));
+ FNAV_region5_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION5_1_BIT));
+ FNAV_BGD_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_BGD_1_BIT));
FNAV_BGD_1 *= FNAV_BGD_1_LSB;
- FNAV_E5ahs_1 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_1_bit));
- FNAV_WN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_1_bit));
- FNAV_TOW_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_1_bit));
- FNAV_E5advs_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_E5advs_1_bit));
+ FNAV_E5ahs_1 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_1_BIT));
+ FNAV_WN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_1_BIT));
+ FNAV_TOW_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_1_BIT));
+ FNAV_E5advs_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_E5ADVS_1_BIT));
flag_TOW_1 = true;
flag_TOW_set = true;
flag_iono_and_GST = true; // set to false externally
break;
case 2: // Ephemeris (1/3) and GST
- FNAV_IODnav_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_2_bit));
- FNAV_M0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_bit));
+ FNAV_IODnav_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_2_BIT));
+ FNAV_M0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_BIT));
FNAV_M0_2 *= FNAV_M0_2_LSB;
- FNAV_omegadot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_omegadot_2_bit));
- FNAV_omegadot_2 *= FNAV_omegadot_2_LSB;
- FNAV_e_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_2_bit));
- FNAV_e_2 *= FNAV_e_2_LSB;
- FNAV_a12_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_a12_2_bit));
- FNAV_a12_2 *= FNAV_a12_2_LSB;
- FNAV_omega0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_omega0_2_bit));
- FNAV_omega0_2 *= FNAV_omega0_2_LSB;
- FNAV_idot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_idot_2_bit));
- FNAV_idot_2 *= FNAV_idot_2_LSB;
- FNAV_WN_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_2_bit));
- FNAV_TOW_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_2_bit));
+ FNAV_omegadot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_2_BIT));
+ FNAV_omegadot_2 *= FNAV_OMEGADOT_2_LSB;
+ FNAV_e_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_2_BIT));
+ FNAV_e_2 *= FNAV_E_2_LSB;
+ FNAV_a12_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_A12_2_BIT));
+ FNAV_a12_2 *= FNAV_A12_2_LSB;
+ FNAV_omega0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGA0_2_BIT));
+ FNAV_omega0_2 *= FNAV_OMEGA0_2_LSB;
+ FNAV_idot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_IDOT_2_BIT));
+ FNAV_idot_2 *= FNAV_IDOT_2_LSB;
+ FNAV_WN_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_2_BIT));
+ FNAV_TOW_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_2_BIT));
flag_TOW_2 = true;
flag_TOW_set = true;
flag_ephemeris_1 = true;
break;
case 3: // Ephemeris (2/3) and GST
- FNAV_IODnav_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_3_bit));
- FNAV_i0_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_i0_3_bit));
- FNAV_i0_3 *= FNAV_i0_3_LSB;
- FNAV_w_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_3_bit));
- FNAV_w_3 *= FNAV_w_3_LSB;
- FNAV_deltan_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltan_3_bit));
- FNAV_deltan_3 *= FNAV_deltan_3_LSB;
- FNAV_Cuc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cuc_3_bit));
- FNAV_Cuc_3 *= FNAV_Cuc_3_LSB;
- FNAV_Cus_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cus_3_bit));
- FNAV_Cus_3 *= FNAV_Cus_3_LSB;
- FNAV_Crc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Crc_3_bit));
- FNAV_Crc_3 *= FNAV_Crc_3_LSB;
- FNAV_Crs_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Crs_3_bit));
- FNAV_Crs_3 *= FNAV_Crs_3_LSB;
- FNAV_t0e_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0e_3_bit));
- FNAV_t0e_3 *= FNAV_t0e_3_LSB;
- FNAV_WN_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_3_bit));
- FNAV_TOW_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_3_bit));
+ FNAV_IODnav_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_3_BIT));
+ FNAV_i0_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_I0_3_BIT));
+ FNAV_i0_3 *= FNAV_I0_3_LSB;
+ FNAV_w_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_3_BIT));
+ FNAV_w_3 *= FNAV_W_3_LSB;
+ FNAV_deltan_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAN_3_BIT));
+ FNAV_deltan_3 *= FNAV_DELTAN_3_LSB;
+ FNAV_Cuc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CUC_3_BIT));
+ FNAV_Cuc_3 *= FNAV_CUC_3_LSB;
+ FNAV_Cus_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CUS_3_BIT));
+ FNAV_Cus_3 *= FNAV_CUS_3_LSB;
+ FNAV_Crc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CRC_3_BIT));
+ FNAV_Crc_3 *= FNAV_CRC_3_LSB;
+ FNAV_Crs_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CRS_3_BIT));
+ FNAV_Crs_3 *= FNAV_CRS_3_LSB;
+ FNAV_t0e_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0E_3_BIT));
+ FNAV_t0e_3 *= FNAV_T0E_3_LSB;
+ FNAV_WN_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_3_BIT));
+ FNAV_TOW_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_3_BIT));
flag_TOW_3 = true;
flag_TOW_set = true;
flag_ephemeris_2 = true;
break;
case 4: // Ephemeris (3/3), GST-UTC conversion, GST-GPS conversion and TOW
- FNAV_IODnav_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_4_bit));
- FNAV_Cic_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cic_4_bit));
- FNAV_Cic_4 *= FNAV_Cic_4_LSB;
- FNAV_Cis_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cis_4_bit));
- FNAV_Cis_4 *= FNAV_Cis_4_LSB;
- FNAV_A0_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0_4_bit));
+ FNAV_IODnav_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_4_BIT));
+ FNAV_Cic_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CIC_4_BIT));
+ FNAV_Cic_4 *= FNAV_CIC_4_LSB;
+ FNAV_Cis_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CIS_4_BIT));
+ FNAV_Cis_4 *= FNAV_CIS_4_LSB;
+ FNAV_A0_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0_4_BIT));
FNAV_A0_4 *= FNAV_A0_4_LSB;
- FNAV_A1_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1_4_bit));
+ FNAV_A1_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1_4_BIT));
FNAV_A1_4 *= FNAV_A1_4_LSB;
- FNAV_deltatls_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_deltatls_4_bit));
- FNAV_t0t_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0t_4_bit));
- FNAV_t0t_4 *= FNAV_t0t_4_LSB;
- FNAV_WNot_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WNot_4_bit));
- FNAV_WNlsf_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WNlsf_4_bit));
- FNAV_DN_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_DN_4_bit));
- FNAV_deltatlsf_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_deltatlsf_4_bit));
- FNAV_t0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0g_4_bit));
- FNAV_t0g_4 *= FNAV_t0g_4_LSB;
- FNAV_A0g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0g_4_bit));
- FNAV_A0g_4 *= FNAV_A0g_4_LSB;
- FNAV_A1g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1g_4_bit));
- FNAV_A1g_4 *= FNAV_A1g_4_LSB;
- FNAV_WN0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN0g_4_bit));
- FNAV_TOW_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_4_bit));
+ FNAV_deltatls_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_DELTATLS_4_BIT));
+ FNAV_t0t_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0T_4_BIT));
+ FNAV_t0t_4 *= FNAV_T0T_4_LSB;
+ FNAV_WNot_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_NOT_4_BIT));
+ FNAV_WNlsf_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_NLSF_4_BIT));
+ FNAV_DN_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_DN_4_BIT));
+ FNAV_deltatlsf_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_DELTATLSF_4_BIT));
+ FNAV_t0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0G_4_BIT));
+ FNAV_t0g_4 *= FNAV_T0G_4_LSB;
+ FNAV_A0g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0G_4_BIT));
+ FNAV_A0g_4 *= FNAV_A0G_4_LSB;
+ FNAV_A1g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1G_4_BIT));
+ FNAV_A1g_4 *= FNAV_A1G_4_LSB;
+ FNAV_WN0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_N0G_4_BIT));
+ FNAV_TOW_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_4_BIT));
flag_TOW_4 = true;
flag_TOW_set = true;
flag_ephemeris_3 = true;
flag_utc_model = true; // set to false externally
break;
case 5: // Almanac (SVID1 and SVID2(1/2)), Week Number and almanac reference time
- FNAV_IODa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODa_5_bit));
- FNAV_WNa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WNa_5_bit));
- FNAV_t0a_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0a_5_bit));
- FNAV_t0a_5 *= FNAV_t0a_5_LSB;
- FNAV_SVID1_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVID1_5_bit));
- FNAV_Deltaa12_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Deltaa12_1_5_bit));
- FNAV_Deltaa12_1_5 *= FNAV_Deltaa12_5_LSB;
- FNAV_e_1_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_1_5_bit));
- FNAV_e_1_5 *= FNAV_e_5_LSB;
- FNAV_w_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_1_5_bit));
- FNAV_w_1_5 *= FNAV_w_5_LSB;
- FNAV_deltai_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltai_1_5_bit));
- FNAV_deltai_1_5 *= FNAV_deltai_5_LSB;
- FNAV_Omega0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omega0_1_5_bit));
- FNAV_Omega0_1_5 *= FNAV_Omega0_5_LSB;
- FNAV_Omegadot_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omegadot_1_5_bit));
- FNAV_Omegadot_1_5 *= FNAV_Omegadot_5_LSB;
- FNAV_M0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_1_5_bit));
+ FNAV_IODa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DA_5_BIT));
+ FNAV_WNa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_NA_5_BIT));
+ FNAV_t0a_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0A_5_BIT));
+ FNAV_t0a_5 *= FNAV_T0A_5_LSB;
+ FNAV_SVID1_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVI_D1_5_BIT));
+ FNAV_Deltaa12_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAA12_1_5_BIT));
+ FNAV_Deltaa12_1_5 *= FNAV_DELTAA12_5_LSB;
+ FNAV_e_1_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_1_5_BIT));
+ FNAV_e_1_5 *= FNAV_E_5_LSB;
+ FNAV_w_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_1_5_BIT));
+ FNAV_w_1_5 *= FNAV_W_5_LSB;
+ FNAV_deltai_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAI_1_5_BIT));
+ FNAV_deltai_1_5 *= FNAV_DELTAI_5_LSB;
+ FNAV_Omega0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGA0_1_5_BIT));
+ FNAV_Omega0_1_5 *= FNAV_OMEGA0_5_LSB;
+ FNAV_Omegadot_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_1_5_BIT));
+ FNAV_Omegadot_1_5 *= FNAV_OMEGADOT_5_LSB;
+ FNAV_M0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_1_5_BIT));
FNAV_M0_1_5 *= FNAV_M0_5_LSB;
- FNAV_af0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_1_5_bit));
- FNAV_af0_1_5 *= FNAV_af0_5_LSB;
- FNAV_af1_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_1_5_bit));
- FNAV_af1_1_5 *= FNAV_af1_5_LSB;
- FNAV_E5ahs_1_5 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_1_5_bit));
- FNAV_SVID2_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVID2_5_bit));
- FNAV_Deltaa12_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Deltaa12_2_5_bit));
- FNAV_Deltaa12_2_5 *= FNAV_Deltaa12_5_LSB;
- FNAV_e_2_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_2_5_bit));
- FNAV_e_2_5 *= FNAV_e_5_LSB;
- FNAV_w_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_2_5_bit));
- FNAV_w_2_5 *= FNAV_w_5_LSB;
- FNAV_deltai_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltai_2_5_bit));
- FNAV_deltai_2_5 *= FNAV_deltai_5_LSB;
+ FNAV_af0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_1_5_BIT));
+ FNAV_af0_1_5 *= FNAV_AF0_5_LSB;
+ FNAV_af1_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_1_5_BIT));
+ FNAV_af1_1_5 *= FNAV_AF1_5_LSB;
+ FNAV_E5ahs_1_5 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_1_5_BIT));
+ FNAV_SVID2_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVI_D2_5_BIT));
+ FNAV_Deltaa12_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAA12_2_5_BIT));
+ FNAV_Deltaa12_2_5 *= FNAV_DELTAA12_5_LSB;
+ FNAV_e_2_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_2_5_BIT));
+ FNAV_e_2_5 *= FNAV_E_5_LSB;
+ FNAV_w_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_2_5_BIT));
+ FNAV_w_2_5 *= FNAV_W_5_LSB;
+ FNAV_deltai_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAI_2_5_BIT));
+ FNAV_deltai_2_5 *= FNAV_DELTAI_5_LSB;
//TODO check this
// Omega0_2 must be decoded when the two pieces are joined
omega0_1 = data.substr(210, 4);
@@ -385,7 +385,7 @@ void Galileo_Fnav_Message::decode_page(const std::string& data)
flag_almanac_1 = true;
break;
case 6: // Almanac (SVID2(2/2) and SVID3)
- FNAV_IODa_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODa_6_bit));
+ FNAV_IODa_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DA_6_BIT));
// Don't worry about omega pieces. If page 5 has not been received, all_ephemeris
// flag will be set to false and the data won't be recorded.*/
std::string omega0_2 = data.substr(10, 12);
@@ -393,36 +393,36 @@ void Galileo_Fnav_Message::decode_page(const std::string& data)
std::bitset<GALILEO_FNAV_DATA_FRAME_BITS> omega_bits(Omega0);
const std::vector<std::pair<int32_t, int32_t>> om_bit({{0, 12}});
FNAV_Omega0_2_6 = static_cast<double>(read_navigation_signed(omega_bits, om_bit));
- FNAV_Omega0_2_6 *= FNAV_Omega0_5_LSB;
- FNAV_Omegadot_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omegadot_2_6_bit));
- FNAV_Omegadot_2_6 *= FNAV_Omegadot_5_LSB;
- FNAV_M0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_6_bit));
+ FNAV_Omega0_2_6 *= FNAV_OMEGA0_5_LSB;
+ FNAV_Omegadot_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_2_6_BIT));
+ FNAV_Omegadot_2_6 *= FNAV_OMEGADOT_5_LSB;
+ FNAV_M0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_6_BIT));
FNAV_M0_2_6 *= FNAV_M0_5_LSB;
- FNAV_af0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_2_6_bit));
- FNAV_af0_2_6 *= FNAV_af0_5_LSB;
- FNAV_af1_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_2_6_bit));
- FNAV_af1_2_6 *= FNAV_af1_5_LSB;
- FNAV_E5ahs_2_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_2_6_bit));
- FNAV_SVID3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVID3_6_bit));
- FNAV_Deltaa12_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Deltaa12_3_6_bit));
- FNAV_Deltaa12_3_6 *= FNAV_Deltaa12_5_LSB;
- FNAV_e_3_6 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_3_6_bit));
- FNAV_e_3_6 *= FNAV_e_5_LSB;
- FNAV_w_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_3_6_bit));
- FNAV_w_3_6 *= FNAV_w_5_LSB;
- FNAV_deltai_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltai_3_6_bit));
- FNAV_deltai_3_6 *= FNAV_deltai_5_LSB;
- FNAV_Omega0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omega0_3_6_bit));
- FNAV_Omega0_3_6 *= FNAV_Omega0_5_LSB;
- FNAV_Omegadot_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omegadot_3_6_bit));
- FNAV_Omegadot_3_6 *= FNAV_Omegadot_5_LSB;
- FNAV_M0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_3_6_bit));
+ FNAV_af0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_2_6_BIT));
+ FNAV_af0_2_6 *= FNAV_AF0_5_LSB;
+ FNAV_af1_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_2_6_BIT));
+ FNAV_af1_2_6 *= FNAV_AF1_5_LSB;
+ FNAV_E5ahs_2_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_2_6_BIT));
+ FNAV_SVID3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVI_D3_6_BIT));
+ FNAV_Deltaa12_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAA12_3_6_BIT));
+ FNAV_Deltaa12_3_6 *= FNAV_DELTAA12_5_LSB;
+ FNAV_e_3_6 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_3_6_BIT));
+ FNAV_e_3_6 *= FNAV_E_5_LSB;
+ FNAV_w_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_3_6_BIT));
+ FNAV_w_3_6 *= FNAV_W_5_LSB;
+ FNAV_deltai_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAI_3_6_BIT));
+ FNAV_deltai_3_6 *= FNAV_DELTAI_5_LSB;
+ FNAV_Omega0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGA0_3_6_BIT));
+ FNAV_Omega0_3_6 *= FNAV_OMEGA0_5_LSB;
+ FNAV_Omegadot_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_3_6_BIT));
+ FNAV_Omegadot_3_6 *= FNAV_OMEGADOT_5_LSB;
+ FNAV_M0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_3_6_BIT));
FNAV_M0_3_6 *= FNAV_M0_5_LSB;
- FNAV_af0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_3_6_bit));
- FNAV_af0_3_6 *= FNAV_af0_5_LSB;
- FNAV_af1_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_3_6_bit));
- FNAV_af1_3_6 *= FNAV_af1_5_LSB;
- FNAV_E5ahs_3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_3_6_bit));
+ FNAV_af0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_3_6_BIT));
+ FNAV_af0_3_6 *= FNAV_AF0_5_LSB;
+ FNAV_af1_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_3_6_BIT));
+ FNAV_af1_3_6 *= FNAV_AF1_5_LSB;
+ FNAV_E5ahs_3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_3_6_BIT));
flag_almanac_2 = true;
break;
diff --git a/src/core/system_parameters/galileo_navigation_message.cc b/src/core/system_parameters/galileo_navigation_message.cc
index 7ac22320c..ea3e7889b 100644
--- a/src/core/system_parameters/galileo_navigation_message.cc
+++ b/src/core/system_parameters/galileo_navigation_message.cc
@@ -398,7 +398,7 @@ void Galileo_Navigation_Message::split_page(std::string page_string, int32_t fla
// CRC correct: Decode word
std::string page_number_bits = Data_k.substr(0, 6);
std::bitset<GALILEO_PAGE_TYPE_BITS> page_type_bits(page_number_bits); // from string to bitset
- Page_type = static_cast<int32_t>(read_page_type_unsigned(page_type_bits, type));
+ Page_type = static_cast<int32_t>(read_page_type_unsigned(page_type_bits, TYPE));
Page_type_time_stamp = Page_type;
std::string Data_jk_ephemeris = Data_k + Data_j;
page_jk_decoder(Data_jk_ephemeris.c_str());
@@ -645,101 +645,101 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
std::string data_jk_string = data_jk;
std::bitset<GALILEO_DATA_JK_BITS> data_jk_bits(data_jk_string);
- page_number = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, PAGE_TYPE_bit));
+ page_number = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, PAGE_TYPE_BIT));
LOG(INFO) << "Page number = " << page_number;
switch (page_number)
{
case 1: // Word type 1: Ephemeris (1/4)
- IOD_nav_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_1_bit));
+ IOD_nav_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_1_BIT));
DLOG(INFO) << "IOD_nav_1= " << IOD_nav_1;
- t0e_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0E_1_bit));
- t0e_1 = t0e_1 * t0e_1_LSB;
+ t0e_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0_E_1_BIT));
+ t0e_1 = t0e_1 * T0E_1_LSB;
DLOG(INFO) << "t0e_1= " << t0e_1;
- M0_1 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_1_bit));
+ M0_1 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_1_BIT));
M0_1 = M0_1 * M0_1_LSB;
DLOG(INFO) << "M0_1= " << M0_1;
- e_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_1_bit));
- e_1 = e_1 * e_1_LSB;
+ e_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_1_BIT));
+ e_1 = e_1 * E_1_LSB;
DLOG(INFO) << "e_1= " << e_1;
- A_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, A_1_bit));
- A_1 = A_1 * A_1_LSB_gal;
+ A_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, A_1_BIT));
+ A_1 = A_1 * A_1_LSB_GAL;
DLOG(INFO) << "A_1= " << A_1;
flag_ephemeris_1 = true;
DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
break;
case 2: // Word type 2: Ephemeris (2/4)
- IOD_nav_2 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_2_bit));
+ IOD_nav_2 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_2_BIT));
DLOG(INFO) << "IOD_nav_2= " << IOD_nav_2;
- OMEGA_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_0_2_bit));
+ OMEGA_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_0_2_BIT));
OMEGA_0_2 = OMEGA_0_2 * OMEGA_0_2_LSB;
DLOG(INFO) << "OMEGA_0_2= " << OMEGA_0_2;
- i_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, i_0_2_bit));
- i_0_2 = i_0_2 * i_0_2_LSB;
+ i_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, I_0_2_BIT));
+ i_0_2 = i_0_2 * I_0_2_LSB;
DLOG(INFO) << "i_0_2= " << i_0_2;
- omega_2 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_2_bit));
- omega_2 = omega_2 * omega_2_LSB;
+ omega_2 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_2_BIT));
+ omega_2 = omega_2 * OMEGA_2_LSB;
DLOG(INFO) << "omega_2= " << omega_2;
- iDot_2 = static_cast<double>(read_navigation_signed(data_jk_bits, iDot_2_bit));
- iDot_2 = iDot_2 * iDot_2_LSB;
+ iDot_2 = static_cast<double>(read_navigation_signed(data_jk_bits, I_DOT_2_BIT));
+ iDot_2 = iDot_2 * I_DOT_2_LSB;
DLOG(INFO) << "iDot_2= " << iDot_2;
flag_ephemeris_2 = true;
DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
break;
case 3: // Word type 3: Ephemeris (3/4) and SISA
- IOD_nav_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_3_bit));
+ IOD_nav_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_3_BIT));
DLOG(INFO) << "IOD_nav_3= " << IOD_nav_3;
- OMEGA_dot_3 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_dot_3_bit));
- OMEGA_dot_3 = OMEGA_dot_3 * OMEGA_dot_3_LSB;
+ OMEGA_dot_3 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_3_BIT));
+ OMEGA_dot_3 = OMEGA_dot_3 * OMEGA_DOT_3_LSB;
DLOG(INFO) << "OMEGA_dot_3= " << OMEGA_dot_3;
- delta_n_3 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_n_3_bit));
- delta_n_3 = delta_n_3 * delta_n_3_LSB;
+ delta_n_3 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_N_3_BIT));
+ delta_n_3 = delta_n_3 * DELTA_N_3_LSB;
DLOG(INFO) << "delta_n_3= " << delta_n_3;
- C_uc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_uc_3_bit));
- C_uc_3 = C_uc_3 * C_uc_3_LSB;
+ C_uc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_UC_3_BIT));
+ C_uc_3 = C_uc_3 * C_UC_3_LSB;
DLOG(INFO) << "C_uc_3= " << C_uc_3;
- C_us_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_us_3_bit));
- C_us_3 = C_us_3 * C_us_3_LSB;
+ C_us_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_US_3_BIT));
+ C_us_3 = C_us_3 * C_US_3_LSB;
DLOG(INFO) << "C_us_3= " << C_us_3;
- C_rc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_rc_3_bit));
- C_rc_3 = C_rc_3 * C_rc_3_LSB;
+ C_rc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_RC_3_BIT));
+ C_rc_3 = C_rc_3 * C_RC_3_LSB;
DLOG(INFO) << "C_rc_3= " << C_rc_3;
- C_rs_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_rs_3_bit));
- C_rs_3 = C_rs_3 * C_rs_3_LSB;
+ C_rs_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_RS_3_BIT));
+ C_rs_3 = C_rs_3 * C_RS_3_LSB;
DLOG(INFO) << "C_rs_3= " << C_rs_3;
- SISA_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SISA_3_bit));
+ SISA_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SISA_3_BIT));
DLOG(INFO) << "SISA_3= " << SISA_3;
flag_ephemeris_3 = true;
DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
break;
case 4: // Word type 4: Ephemeris (4/4) and Clock correction parameters
- IOD_nav_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_4_bit));
+ IOD_nav_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_4_BIT));
DLOG(INFO) << "IOD_nav_4= " << IOD_nav_4;
- SV_ID_PRN_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SV_ID_PRN_4_bit));
+ SV_ID_PRN_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SV_ID_PRN_4_BIT));
DLOG(INFO) << "SV_ID_PRN_4= " << SV_ID_PRN_4;
- C_ic_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_ic_4_bit));
- C_ic_4 = C_ic_4 * C_ic_4_LSB;
+ C_ic_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_IC_4_BIT));
+ C_ic_4 = C_ic_4 * C_IC_4_LSB;
DLOG(INFO) << "C_ic_4= " << C_ic_4;
- C_is_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_is_4_bit));
- C_is_4 = C_is_4 * C_is_4_LSB;
+ C_is_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_IS_4_BIT));
+ C_is_4 = C_is_4 * C_IS_4_LSB;
DLOG(INFO) << "C_is_4= " << C_is_4;
// Clock correction parameters
- t0c_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0c_4_bit));
- t0c_4 = t0c_4 * t0c_4_LSB;
+ t0c_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0C_4_BIT));
+ t0c_4 = t0c_4 * T0C_4_LSB;
DLOG(INFO) << "t0c_4= " << t0c_4;
- af0_4 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_4_bit));
- af0_4 = af0_4 * af0_4_LSB;
+ af0_4 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_4_BIT));
+ af0_4 = af0_4 * AF0_4_LSB;
DLOG(INFO) << "af0_4 = " << af0_4;
- af1_4 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_4_bit));
- af1_4 = af1_4 * af1_4_LSB;
+ af1_4 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_4_BIT));
+ af1_4 = af1_4 * AF1_4_LSB;
DLOG(INFO) << "af1_4 = " << af1_4;
- af2_4 = static_cast<double>(read_navigation_signed(data_jk_bits, af2_4_bit));
- af2_4 = af2_4 * af2_4_LSB;
+ af2_4 = static_cast<double>(read_navigation_signed(data_jk_bits, AF2_4_BIT));
+ af2_4 = af2_4 * AF2_4_LSB;
DLOG(INFO) << "af2_4 = " << af2_4;
- spare_4 = static_cast<double>(read_navigation_unsigned(data_jk_bits, spare_4_bit));
+ spare_4 = static_cast<double>(read_navigation_unsigned(data_jk_bits, SPARE_4_BIT));
DLOG(INFO) << "spare_4 = " << spare_4;
flag_ephemeris_4 = true;
DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
@@ -747,47 +747,47 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
case 5: // Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST
// Ionospheric correction
- ai0_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, ai0_5_bit));
- ai0_5 = ai0_5 * ai0_5_LSB;
+ ai0_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, AI0_5_BIT));
+ ai0_5 = ai0_5 * AI0_5_LSB;
DLOG(INFO) << "ai0_5= " << ai0_5;
- ai1_5 = static_cast<double>(read_navigation_signed(data_jk_bits, ai1_5_bit));
- ai1_5 = ai1_5 * ai1_5_LSB;
+ ai1_5 = static_cast<double>(read_navigation_signed(data_jk_bits, AI1_5_BIT));
+ ai1_5 = ai1_5 * AI1_5_LSB;
DLOG(INFO) << "ai1_5= " << ai1_5;
- ai2_5 = static_cast<double>(read_navigation_signed(data_jk_bits, ai2_5_bit));
- ai2_5 = ai2_5 * ai2_5_LSB;
+ ai2_5 = static_cast<double>(read_navigation_signed(data_jk_bits, AI2_5_BIT));
+ ai2_5 = ai2_5 * AI2_5_LSB;
DLOG(INFO) << "ai2_5= " << ai2_5;
// Ionospheric disturbance flag
- Region1_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region1_5_bit));
+ Region1_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION1_5_BIT));
DLOG(INFO) << "Region1_flag_5= " << Region1_flag_5;
- Region2_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region2_5_bit));
+ Region2_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION2_5_BIT));
DLOG(INFO) << "Region2_flag_5= " << Region2_flag_5;
- Region3_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region3_5_bit));
+ Region3_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION3_5_BIT));
DLOG(INFO) << "Region3_flag_5= " << Region3_flag_5;
- Region4_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region4_5_bit));
+ Region4_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION4_5_BIT));
DLOG(INFO) << "Region4_flag_5= " << Region4_flag_5;
- Region5_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region5_5_bit));
+ Region5_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION5_5_BIT));
DLOG(INFO) << "Region5_flag_5= " << Region5_flag_5;
- BGD_E1E5a_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1E5a_5_bit));
- BGD_E1E5a_5 = BGD_E1E5a_5 * BGD_E1E5a_5_LSB;
+ BGD_E1E5a_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1_E5A_5_BIT));
+ BGD_E1E5a_5 = BGD_E1E5a_5 * BGD_E1_E5A_5_LSB;
DLOG(INFO) << "BGD_E1E5a_5= " << BGD_E1E5a_5;
- BGD_E1E5b_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1E5b_5_bit));
- BGD_E1E5b_5 = BGD_E1E5b_5 * BGD_E1E5b_5_LSB;
+ BGD_E1E5b_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1_E5B_5_BIT));
+ BGD_E1E5b_5 = BGD_E1E5b_5 * BGD_E1_E5B_5_LSB;
DLOG(INFO) << "BGD_E1E5b_5= " << BGD_E1E5b_5;
- E5b_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_5_bit));
+ E5b_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_5_BIT));
DLOG(INFO) << "E5b_HS_5= " << E5b_HS_5;
- E1B_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_5_bit));
+ E1B_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_5_BIT));
DLOG(INFO) << "E1B_HS_5= " << E1B_HS_5;
- E5b_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E5b_DVS_5_bit));
+ E5b_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E5B_DVS_5_BIT));
DLOG(INFO) << "E5b_DVS_5= " << E5b_DVS_5;
- E1B_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E1B_DVS_5_bit));
+ E1B_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E1_B_DVS_5_BIT));
DLOG(INFO) << "E1B_DVS_5= " << E1B_DVS_5;
// GST
- WN_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_5_bit));
+ WN_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_5_BIT));
DLOG(INFO) << "WN_5= " << WN_5;
- TOW_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_5_bit));
+ TOW_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_5_BIT));
DLOG(INFO) << "TOW_5= " << TOW_5;
flag_TOW_5 = true; // set to false externally
- spare_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, spare_5_bit));
+ spare_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, SPARE_5_BIT));
DLOG(INFO) << "spare_5= " << spare_5;
flag_iono_and_GST = true; // set to false externally
flag_TOW_set = true; // set to false externally
@@ -795,26 +795,26 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
break;
case 6: // Word type 6: GST-UTC conversion parameters
- A0_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A0_6_bit));
+ A0_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A0_6_BIT));
A0_6 = A0_6 * A0_6_LSB;
DLOG(INFO) << "A0_6= " << A0_6;
- A1_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A1_6_bit));
+ A1_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A1_6_BIT));
A1_6 = A1_6 * A1_6_LSB;
DLOG(INFO) << "A1_6= " << A1_6;
- Delta_tLS_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, Delta_tLS_6_bit));
+ Delta_tLS_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, DELTA_T_LS_6_BIT));
DLOG(INFO) << "Delta_tLS_6= " << Delta_tLS_6;
- t0t_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0t_6_bit));
- t0t_6 = t0t_6 * t0t_6_LSB;
+ t0t_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0T_6_BIT));
+ t0t_6 = t0t_6 * T0T_6_LSB;
DLOG(INFO) << "t0t_6= " << t0t_6;
- WNot_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WNot_6_bit));
+ WNot_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, W_NOT_6_BIT));
DLOG(INFO) << "WNot_6= " << WNot_6;
- WN_LSF_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_LSF_6_bit));
+ WN_LSF_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_LSF_6_BIT));
DLOG(INFO) << "WN_LSF_6= " << WN_LSF_6;
- DN_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, DN_6_bit));
+ DN_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, DN_6_BIT));
DLOG(INFO) << "DN_6= " << DN_6;
- Delta_tLSF_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, Delta_tLSF_6_bit));
+ Delta_tLSF_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, DELTA_T_LSF_6_BIT));
DLOG(INFO) << "Delta_tLSF_6= " << Delta_tLSF_6;
- TOW_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_6_bit));
+ TOW_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_6_BIT));
DLOG(INFO) << "TOW_6= " << TOW_6;
flag_TOW_6 = true; // set to false externally
flag_utc_model = true; // set to false externally
@@ -823,34 +823,34 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
break;
case 7: // Word type 7: Almanac for SVID1 (1/2), almanac reference time and almanac reference week number
- IOD_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_7_bit));
+ IOD_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_7_BIT));
DLOG(INFO) << "IOD_a_7= " << IOD_a_7;
- WN_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_a_7_bit));
+ WN_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_A_7_BIT));
DLOG(INFO) << "WN_a_7= " << WN_a_7;
- t0a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0a_7_bit));
- t0a_7 = t0a_7 * t0a_7_LSB;
+ t0a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0A_7_BIT));
+ t0a_7 = t0a_7 * T0A_7_LSB;
DLOG(INFO) << "t0a_7= " << t0a_7;
- SVID1_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVID1_7_bit));
+ SVID1_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVI_D1_7_BIT));
DLOG(INFO) << "SVID1_7= " << SVID1_7;
- DELTA_A_7 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_7_bit));
+ DELTA_A_7 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_7_BIT));
DELTA_A_7 = DELTA_A_7 * DELTA_A_7_LSB;
DLOG(INFO) << "DELTA_A_7= " << DELTA_A_7;
- e_7 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_7_bit));
- e_7 = e_7 * e_7_LSB;
+ e_7 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_7_BIT));
+ e_7 = e_7 * E_7_LSB;
DLOG(INFO) << "e_7= " << e_7;
- omega_7 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_7_bit));
- omega_7 = omega_7 * omega_7_LSB;
+ omega_7 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_7_BIT));
+ omega_7 = omega_7 * OMEGA_7_LSB;
DLOG(INFO) << "omega_7= " << omega_7;
- delta_i_7 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_i_7_bit));
- delta_i_7 = delta_i_7 * delta_i_7_LSB;
+ delta_i_7 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_I_7_BIT));
+ delta_i_7 = delta_i_7 * DELTA_I_7_LSB;
DLOG(INFO) << "delta_i_7= " << delta_i_7;
- Omega0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega0_7_bit));
- Omega0_7 = Omega0_7 * Omega0_7_LSB;
+ Omega0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA0_7_BIT));
+ Omega0_7 = Omega0_7 * OMEGA0_7_LSB;
DLOG(INFO) << "Omega0_7= " << Omega0_7;
- Omega_dot_7 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega_dot_7_bit));
- Omega_dot_7 = Omega_dot_7 * Omega_dot_7_LSB;
+ Omega_dot_7 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_7_BIT));
+ Omega_dot_7 = Omega_dot_7 * OMEGA_DOT_7_LSB;
DLOG(INFO) << "Omega_dot_7= " << Omega_dot_7;
- M0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_7_bit));
+ M0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_7_BIT));
M0_7 = M0_7 * M0_7_LSB;
DLOG(INFO) << "M0_7= " << M0_7;
flag_almanac_1 = true;
@@ -858,116 +858,116 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
break;
case 8: // Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)*/
- IOD_a_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_8_bit));
+ IOD_a_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_8_BIT));
DLOG(INFO) << "IOD_a_8= " << IOD_a_8;
- af0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_8_bit));
- af0_8 = af0_8 * af0_8_LSB;
+ af0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_8_BIT));
+ af0_8 = af0_8 * AF0_8_LSB;
DLOG(INFO) << "af0_8= " << af0_8;
- af1_8 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_8_bit));
- af1_8 = af1_8 * af1_8_LSB;
+ af1_8 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_8_BIT));
+ af1_8 = af1_8 * AF1_8_LSB;
DLOG(INFO) << "af1_8= " << af1_8;
- E5b_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_8_bit));
+ E5b_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_8_BIT));
DLOG(INFO) << "E5b_HS_8= " << E5b_HS_8;
- E1B_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_8_bit));
+ E1B_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_8_BIT));
DLOG(INFO) << "E1B_HS_8= " << E1B_HS_8;
- SVID2_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVID2_8_bit));
+ SVID2_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVI_D2_8_BIT));
DLOG(INFO) << "SVID2_8= " << SVID2_8;
- DELTA_A_8 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_8_bit));
+ DELTA_A_8 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_8_BIT));
DELTA_A_8 = DELTA_A_8 * DELTA_A_8_LSB;
DLOG(INFO) << "DELTA_A_8= " << DELTA_A_8;
- e_8 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_8_bit));
- e_8 = e_8 * e_8_LSB;
+ e_8 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_8_BIT));
+ e_8 = e_8 * E_8_LSB;
DLOG(INFO) << "e_8= " << e_8;
- omega_8 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_8_bit));
- omega_8 = omega_8 * omega_8_LSB;
+ omega_8 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_8_BIT));
+ omega_8 = omega_8 * OMEGA_8_LSB;
DLOG(INFO) << "omega_8= " << omega_8;
- delta_i_8 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_i_8_bit));
- delta_i_8 = delta_i_8 * delta_i_8_LSB;
+ delta_i_8 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_I_8_BIT));
+ delta_i_8 = delta_i_8 * DELTA_I_8_LSB;
DLOG(INFO) << "delta_i_8= " << delta_i_8;
- Omega0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega0_8_bit));
- Omega0_8 = Omega0_8 * Omega0_8_LSB;
+ Omega0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA0_8_BIT));
+ Omega0_8 = Omega0_8 * OMEGA0_8_LSB;
DLOG(INFO) << "Omega0_8= " << Omega0_8;
- Omega_dot_8 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega_dot_8_bit));
- Omega_dot_8 = Omega_dot_8 * Omega_dot_8_LSB;
+ Omega_dot_8 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_8_BIT));
+ Omega_dot_8 = Omega_dot_8 * OMEGA_DOT_8_LSB;
DLOG(INFO) << "Omega_dot_8= " << Omega_dot_8;
flag_almanac_2 = true;
DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
break;
case 9: // Word type 9: Almanac for SVID2 (2/2) and SVID3 (1/2)
- IOD_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_9_bit));
+ IOD_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_9_BIT));
DLOG(INFO) << "IOD_a_9= " << IOD_a_9;
- WN_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_a_9_bit));
+ WN_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_A_9_BIT));
DLOG(INFO) << "WN_a_9= " << WN_a_9;
- t0a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0a_9_bit));
- t0a_9 = t0a_9 * t0a_9_LSB;
+ t0a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0A_9_BIT));
+ t0a_9 = t0a_9 * T0A_9_LSB;
DLOG(INFO) << "t0a_9= " << t0a_9;
- M0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_9_bit));
+ M0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_9_BIT));
M0_9 = M0_9 * M0_9_LSB;
DLOG(INFO) << "M0_9= " << M0_9;
- af0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_9_bit));
- af0_9 = af0_9 * af0_9_LSB;
+ af0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_9_BIT));
+ af0_9 = af0_9 * AF0_9_LSB;
DLOG(INFO) << "af0_9= " << af0_9;
- af1_9 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_9_bit));
- af1_9 = af1_9 * af1_9_LSB;
+ af1_9 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_9_BIT));
+ af1_9 = af1_9 * AF1_9_LSB;
DLOG(INFO) << "af1_9= " << af1_9;
- E5b_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_9_bit));
+ E5b_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_9_BIT));
DLOG(INFO) << "E5b_HS_9= " << E5b_HS_9;
- E1B_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_9_bit));
+ E1B_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_9_BIT));
DLOG(INFO) << "E1B_HS_9= " << E1B_HS_9;
- SVID3_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVID3_9_bit));
+ SVID3_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVI_D3_9_BIT));
DLOG(INFO) << "SVID3_9= " << SVID3_9;
- DELTA_A_9 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_9_bit));
+ DELTA_A_9 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_9_BIT));
DELTA_A_9 = DELTA_A_9 * DELTA_A_9_LSB;
DLOG(INFO) << "DELTA_A_9= " << DELTA_A_9;
- e_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_9_bit));
- e_9 = e_9 * e_9_LSB;
+ e_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_9_BIT));
+ e_9 = e_9 * E_9_LSB;
DLOG(INFO) << "e_9= " << e_9;
- omega_9 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_9_bit));
- omega_9 = omega_9 * omega_9_LSB;
+ omega_9 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_9_BIT));
+ omega_9 = omega_9 * OMEGA_9_LSB;
DLOG(INFO) << "omega_9= " << omega_9;
- delta_i_9 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_i_9_bit));
- delta_i_9 = delta_i_9 * delta_i_9_LSB;
+ delta_i_9 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_I_9_BIT));
+ delta_i_9 = delta_i_9 * DELTA_I_9_LSB;
DLOG(INFO) << "delta_i_9= " << delta_i_9;
flag_almanac_3 = true;
DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
break;
case 10: // Word type 10: Almanac for SVID3 (2/2) and GST-GPS conversion parameters
- IOD_a_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_10_bit));
+ IOD_a_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_10_BIT));
DLOG(INFO) << "IOD_a_10= " << IOD_a_10;
- Omega0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega0_10_bit));
- Omega0_10 = Omega0_10 * Omega0_10_LSB;
+ Omega0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA0_10_BIT));
+ Omega0_10 = Omega0_10 * OMEGA0_10_LSB;
DLOG(INFO) << "Omega0_10= " << Omega0_10;
- Omega_dot_10 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega_dot_10_bit));
- Omega_dot_10 = Omega_dot_10 * Omega_dot_10_LSB;
+ Omega_dot_10 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_10_BIT));
+ Omega_dot_10 = Omega_dot_10 * OMEGA_DOT_10_LSB;
DLOG(INFO) << "Omega_dot_10= " << Omega_dot_10;
- M0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_10_bit));
+ M0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_10_BIT));
M0_10 = M0_10 * M0_10_LSB;
DLOG(INFO) << "M0_10= " << M0_10;
- af0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_10_bit));
- af0_10 = af0_10 * af0_10_LSB;
+ af0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_10_BIT));
+ af0_10 = af0_10 * AF0_10_LSB;
DLOG(INFO) << "af0_10= " << af0_10;
- af1_10 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_10_bit));
- af1_10 = af1_10 * af1_10_LSB;
+ af1_10 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_10_BIT));
+ af1_10 = af1_10 * AF1_10_LSB;
DLOG(INFO) << "af1_10= " << af1_10;
- E5b_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_10_bit));
+ E5b_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_10_BIT));
DLOG(INFO) << "E5b_HS_10= " << E5b_HS_10;
- E1B_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_10_bit));
+ E1B_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_10_BIT));
DLOG(INFO) << "E1B_HS_10= " << E1B_HS_10;
- A_0G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_0G_10_bit));
+ A_0G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_0_G_10_BIT));
A_0G_10 = A_0G_10 * A_0G_10_LSB;
flag_GGTO_1 = true;
DLOG(INFO) << "A_0G_10= " << A_0G_10;
- A_1G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_1G_10_bit));
+ A_1G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_1_G_10_BIT));
A_1G_10 = A_1G_10 * A_1G_10_LSB;
flag_GGTO_2 = true;
DLOG(INFO) << "A_1G_10= " << A_1G_10;
- t_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t_0G_10_bit));
- t_0G_10 = t_0G_10 * t_0G_10_LSB;
+ t_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T_0_G_10_BIT));
+ t_0G_10 = t_0G_10 * T_0_G_10_LSB;
flag_GGTO_3 = true;
DLOG(INFO) << "t_0G_10= " << t_0G_10;
- WN_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0G_10_bit));
+ WN_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0_G_10_BIT));
flag_GGTO_4 = true;
DLOG(INFO) << "WN_0G_10= " << WN_0G_10;
flag_almanac_4 = true;
@@ -975,11 +975,11 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
break;
case 0: // Word type 0: I/NAV Spare Word
- Time_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, Time_0_bit));
+ Time_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TIME_0_BIT));
DLOG(INFO) << "Time_0= " << Time_0;
- WN_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0_bit));
+ WN_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0_BIT));
DLOG(INFO) << "WN_0= " << WN_0;
- TOW_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_0_bit));
+ TOW_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_0_BIT));
DLOG(INFO) << "TOW_0= " << TOW_0;
DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
break;
diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc
index 5685b34a4..4433efc8a 100644
--- a/src/core/system_parameters/glonass_gnav_navigation_message.cc
+++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc
@@ -405,7 +405,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
// --- It is string 5 ----------------------------------------------
if (flag_ephemeris_str_4 == true)
{
- gnav_utc_model.d_N_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
+ gnav_utc_model.d_N_A = static_cast<double>(read_navigation_unsigned(string_bits, DAY_NUMBER_A));
gnav_utc_model.d_tau_c = static_cast<double>(read_navigation_signed(string_bits, TAU_C)) * TWO_N31;
gnav_utc_model.d_N_4 = static_cast<double>(read_navigation_unsigned(string_bits, N_4));
gnav_utc_model.d_tau_gps = static_cast<double>(read_navigation_signed(string_bits, TAU_GPS)) * TWO_N30;
@@ -451,7 +451,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
case 6:
// --- It is string 6 ----------------------------------------------
- i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+ i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
// Make sure a valid frame_ID or satellite slot number is returned
if (d_frame_ID == 0)
@@ -461,7 +461,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
- gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+ gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -501,7 +501,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
case 8:
// --- It is string 8 ----------------------------------------------
- i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+ i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
// Make sure a valid frame_ID or satellite slot number is returned
if (d_frame_ID == 0)
@@ -511,7 +511,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
- gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+ gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -546,7 +546,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
case 10:
// --- It is string 10 ---------------------------------------------
- i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+ i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
// Make sure a valid frame_ID or satellite slot number is returned
if (d_frame_ID == 0)
@@ -556,7 +556,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
- gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+ gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -591,7 +591,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
case 12:
// --- It is string 12 ---------------------------------------------
- i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+ i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
// Make sure a valid frame_ID or satellite slot number is returned
if (d_frame_ID == 0)
@@ -600,7 +600,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
}
gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
- gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+ gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -642,7 +642,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
}
else
{
- i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+ i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
// Make sure a valid frame_ID or satellite slot number is returned
if (d_frame_ID == 0)
@@ -651,7 +651,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
}
gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
- gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+ gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
diff --git a/src/core/system_parameters/gps_ephemeris.cc b/src/core/system_parameters/gps_ephemeris.cc
index c6e181815..e6b5b10ae 100644
--- a/src/core/system_parameters/gps_ephemeris.cc
+++ b/src/core/system_parameters/gps_ephemeris.cc
@@ -283,7 +283,7 @@ double Gps_Ephemeris::satellitePosition(double transmitTime)
double dtr_s = d_A_f0 + d_A_f1 * tk + d_A_f2 * tk * tk;
/* relativity correction */
- dtr_s -= 2.0 * sqrt(GM * a) * d_e_eccentricity * sin(E) / (GPS_C_m_s * GPS_C_m_s);
+ dtr_s -= 2.0 * sqrt(GM * a) * d_e_eccentricity * sin(E) / (GPS_C_M_S * GPS_C_M_S);
return dtr_s;
}
diff --git a/src/main/main.cc b/src/main/main.cc
index 62641fd25..67e0881f5 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -72,8 +72,8 @@ using google::LogMessage;
*/
// For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
int main(int argc, char** argv)
{
diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc
index 66a8ab7de..55254a0ff 100644
--- a/src/tests/single_test_main.cc
+++ b/src/tests/single_test_main.cc
@@ -50,9 +50,9 @@
#include <queue>
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
using google::LogMessage;
diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
index 5de0d332a..08939e1e3 100644
--- a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
+++ b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
@@ -33,7 +33,7 @@
#include <iostream>
#include <utility>
-bool rtklib_solver_dump_reader::read_binary_obs()
+bool Rtklib_Solver_Dump_Reader::read_binary_obs()
{
try
{
@@ -74,7 +74,7 @@ bool rtklib_solver_dump_reader::read_binary_obs()
}
-bool rtklib_solver_dump_reader::restart()
+bool Rtklib_Solver_Dump_Reader::restart()
{
if (d_dump_file.is_open())
{
@@ -86,7 +86,7 @@ bool rtklib_solver_dump_reader::restart()
}
-int64_t rtklib_solver_dump_reader::num_epochs()
+int64_t Rtklib_Solver_Dump_Reader::num_epochs()
{
std::ifstream::pos_type size;
int epoch_size_bytes = 2 * sizeof(uint32_t) + 21 * sizeof(double) + 3 * sizeof(uint8_t) + 2 * sizeof(float);
@@ -101,7 +101,7 @@ int64_t rtklib_solver_dump_reader::num_epochs()
}
-bool rtklib_solver_dump_reader::open_obs_file(std::string out_file)
+bool Rtklib_Solver_Dump_Reader::open_obs_file(std::string out_file)
{
if (d_dump_file.is_open() == false)
{
@@ -125,7 +125,7 @@ bool rtklib_solver_dump_reader::open_obs_file(std::string out_file)
}
-rtklib_solver_dump_reader::~rtklib_solver_dump_reader()
+Rtklib_Solver_Dump_Reader::~Rtklib_Solver_Dump_Reader()
{
try
{
diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.h b/src/tests/system-tests/libs/rtklib_solver_dump_reader.h
index 5006482dd..d3990e30f 100644
--- a/src/tests/system-tests/libs/rtklib_solver_dump_reader.h
+++ b/src/tests/system-tests/libs/rtklib_solver_dump_reader.h
@@ -36,10 +36,10 @@
#include <string>
#include <vector>
-class rtklib_solver_dump_reader
+class Rtklib_Solver_Dump_Reader
{
public:
- ~rtklib_solver_dump_reader();
+ ~Rtklib_Solver_Dump_Reader();
bool read_binary_obs();
bool restart();
int64_t num_epochs();
diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
index 631e8e782..8a97cfeb3 100644
--- a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
+++ b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
@@ -35,7 +35,7 @@
#include <utility>
-spirent_motion_csv_dump_reader::spirent_motion_csv_dump_reader()
+Spirent_Motion_Csv_Dump_Reader::Spirent_Motion_Csv_Dump_Reader()
{
header_lines = 2;
TOW_ms = 0.0;
@@ -79,7 +79,7 @@ spirent_motion_csv_dump_reader::spirent_motion_csv_dump_reader()
}
-spirent_motion_csv_dump_reader::~spirent_motion_csv_dump_reader()
+Spirent_Motion_Csv_Dump_Reader::~Spirent_Motion_Csv_Dump_Reader()
{
try
{
@@ -99,7 +99,7 @@ spirent_motion_csv_dump_reader::~spirent_motion_csv_dump_reader()
}
-bool spirent_motion_csv_dump_reader::read_csv_obs()
+bool Spirent_Motion_Csv_Dump_Reader::read_csv_obs()
{
try
{
@@ -133,7 +133,7 @@ bool spirent_motion_csv_dump_reader::read_csv_obs()
}
-bool spirent_motion_csv_dump_reader::parse_vector(std::vector<double> &vec)
+bool Spirent_Motion_Csv_Dump_Reader::parse_vector(std::vector<double> &vec)
{
try
{
@@ -185,7 +185,7 @@ bool spirent_motion_csv_dump_reader::parse_vector(std::vector<double> &vec)
}
-bool spirent_motion_csv_dump_reader::restart()
+bool Spirent_Motion_Csv_Dump_Reader::restart()
{
if (d_dump_file.is_open())
{
@@ -202,7 +202,7 @@ bool spirent_motion_csv_dump_reader::restart()
}
-int64_t spirent_motion_csv_dump_reader::num_epochs()
+int64_t Spirent_Motion_Csv_Dump_Reader::num_epochs()
{
int64_t nepoch = 0LL;
std::string line;
@@ -219,7 +219,7 @@ int64_t spirent_motion_csv_dump_reader::num_epochs()
}
-bool spirent_motion_csv_dump_reader::open_obs_file(std::string out_file)
+bool Spirent_Motion_Csv_Dump_Reader::open_obs_file(std::string out_file)
{
if (d_dump_file.is_open() == false)
{
@@ -248,7 +248,7 @@ bool spirent_motion_csv_dump_reader::open_obs_file(std::string out_file)
}
-void spirent_motion_csv_dump_reader::close_obs_file()
+void Spirent_Motion_Csv_Dump_Reader::close_obs_file()
{
try
{
diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h
index b08beb6e0..5d8066627 100644
--- a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h
+++ b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h
@@ -36,11 +36,11 @@
#include <string>
#include <vector>
-class spirent_motion_csv_dump_reader
+class Spirent_Motion_Csv_Dump_Reader
{
public:
- spirent_motion_csv_dump_reader();
- ~spirent_motion_csv_dump_reader();
+ Spirent_Motion_Csv_Dump_Reader();
+ ~Spirent_Motion_Csv_Dump_Reader();
bool read_csv_obs();
bool restart();
int64_t num_epochs();
diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc
index cb8f8975b..1365b4302 100644
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@@ -60,8 +60,8 @@
#include <thread>
// For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
class PositionSystemTest : public ::testing::Test
{
@@ -470,7 +470,7 @@ void PositionSystemTest::check_results()
arma::vec ref_r_enu = {0, 0, 0};
cart2utm(true_r_eb_e, utm_zone, ref_r_enu);
- rtklib_solver_dump_reader pvt_reader;
+ Rtklib_Solver_Dump_Reader pvt_reader;
pvt_reader.open_obs_file(FLAGS_pvt_solver_dump_filename);
int64_t n_epochs = pvt_reader.num_epochs();
R_eb_e = arma::zeros(3, n_epochs);
@@ -596,7 +596,7 @@ void PositionSystemTest::check_results()
else
{
//dynamic position
- spirent_motion_csv_dump_reader ref_reader;
+ Spirent_Motion_Csv_Dump_Reader ref_reader;
ref_reader.open_obs_file(FLAGS_ref_motion_filename);
int64_t n_epochs = ref_reader.num_epochs();
ref_R_eb_e = arma::zeros(3, n_epochs);
diff --git a/src/tests/system-tests/ttff.cc b/src/tests/system-tests/ttff.cc
index c9186a05f..ab9391244 100644
--- a/src/tests/system-tests/ttff.cc
+++ b/src/tests/system-tests/ttff.cc
@@ -62,8 +62,8 @@ DEFINE_string(subdevice, "A:0", "USRP subdevice");
DEFINE_string(config_file_ttff, std::string(""), "File containing the configuration parameters for the TTFF test.");
// For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
std::vector<double> TTFF_v;
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index 5c62f9f9c..7ad4910f5 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -171,8 +171,8 @@ DECLARE_string(log_dir);
#endif // UNIT_TESTING_MINIMAL
// For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
int main(int argc, char **argv)
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index a62f21079..b02c4f59b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -58,16 +58,16 @@ class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx;
using GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx>;
-GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block
{
private:
- friend GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -75,7 +75,7 @@ public:
};
-GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr(new GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(queue));
}
@@ -97,7 +97,7 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events
}
-GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -132,7 +132,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GalileoE1Pcps8msAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 54910c30f..50b4ad78f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -59,16 +59,16 @@ class GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx;
using GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx>;
-GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block
{
private:
- friend GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -76,7 +76,7 @@ public:
};
-GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr(new GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(queue));
}
@@ -98,7 +98,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pm
}
-GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -133,7 +133,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GalileoE1PcpsAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
index 6e83b6df6..e0aeda58e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -67,16 +67,16 @@ class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx;
using GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx>;
-GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(Concurrent_Queue<int>& queue);
class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx : public gr::block
{
private:
- friend GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue<int>& queue);
+ friend GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -84,7 +84,7 @@ public:
};
-GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr(new GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(queue));
}
@@ -106,7 +106,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events(pmt::p
}
-GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, _1));
@@ -139,7 +139,7 @@ protected:
void wait_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GNSSBlockFactory> factory;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
index 5e369c576..14aac00d8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -175,8 +175,8 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid()
std::string basename = "./tmp-acq-gal1/acquisition_E_1B";
auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
- auto samples_per_code = static_cast<unsigned int>(round(4000000 / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS))); // !!
- acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code);
+ auto samples_per_code = static_cast<unsigned int>(round(4000000 / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS))); // !!
+ Acquisition_Dump_Reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code);
if (!acq_dump.read_binary_acq())
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index 40dbccb66..75207a375 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -59,16 +59,16 @@ class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx;
using GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx>;
-GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue);
class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx : public gr::block
{
private:
- friend GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue);
+ friend GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -76,7 +76,7 @@ public:
};
-GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr(new GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(queue));
}
@@ -98,7 +98,7 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt:
}
-GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1));
@@ -133,7 +133,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GalileoE1PcpsCccwsrAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index 1b3a50e84..4cf0f3672 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -67,16 +67,16 @@ class GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx;
using GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx>;
-GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx : public gr::block
{
private:
- friend GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -84,7 +84,7 @@ public:
};
-GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr(new GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(queue));
}
@@ -106,7 +106,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_
}
-GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1));
@@ -142,7 +142,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GalileoE1PcpsQuickSyncAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 100bae463..6d2bf7ead 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -61,16 +61,16 @@ class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx;
using GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx>;
-GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block
{
private:
- friend GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -78,7 +78,7 @@ public:
};
-GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr(new GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(queue));
}
@@ -100,7 +100,7 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_event
}
-GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -134,7 +134,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GalileoE1PcpsTongAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 2c2eed08e..67ab17b53 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -58,16 +58,16 @@ class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx;
using GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr = boost::shared_ptr<GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx>;
-GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(Concurrent_Queue<int>& queue);
class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx : public gr::block
{
private:
- friend GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue<int>& queue);
+ friend GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -75,7 +75,7 @@ public:
};
-GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr(new GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(queue));
}
@@ -97,7 +97,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events(p
}
-GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, _1));
@@ -131,7 +131,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GalileoE5aNoncoherentIQAcquisitionCaf> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
index 88ef46af5..6f92c592a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -63,16 +63,16 @@ class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx;
using GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr = boost::shared_ptr<GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx>;
-GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue<int>& queue);
+GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx : public gr::block
{
private:
- friend GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -80,7 +80,7 @@ public:
};
-GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue<int>& queue)
+GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr(new GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(queue));
}
@@ -102,7 +102,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events(pmt::pmt_
}
-GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, _1));
@@ -138,7 +138,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index 9a6ee1c8e..4f4ae7184 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -63,16 +63,16 @@ class GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx;
using GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx>;
-GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx : public gr::block
{
private:
- friend GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -80,7 +80,7 @@ public:
};
-GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr(new GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(queue));
}
@@ -102,7 +102,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t ms
}
-GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -137,7 +137,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index 5cc30eeb1..b7f6863c8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -177,7 +177,7 @@ void GpsL1CaPcpsAcquisitionTest::plot_grid()
auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
auto samples_per_code = static_cast<unsigned int>(round(4000000 / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS))); // !!
- acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
+ Acquisition_Dump_Reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
if (!acq_dump.read_binary_acq())
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index 82b06b177..a155ddc41 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -65,16 +65,16 @@ class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx;
using GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx>;
-GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx : public gr::block
{
private:
- friend GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -82,7 +82,7 @@ public:
};
-GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue)
+GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr(new GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(queue));
}
@@ -104,7 +104,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events(pmt:
}
-GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1));
@@ -140,7 +140,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GNSSBlockFactory> factory;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index e9acd6ac9..599bd52b5 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -61,16 +61,16 @@ class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx;
using GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx>;
-GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx : public gr::block
{
private:
- friend GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+ friend GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -78,7 +78,7 @@ public:
};
-GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
{
return GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr(new GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(queue));
}
@@ -100,7 +100,7 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_
}
-GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -133,7 +133,7 @@ protected:
void process_message();
void stop_queue();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
std::shared_ptr<GpsL1CaPcpsTongAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
index f671a9b34..987ddb350 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
@@ -35,7 +35,7 @@
#include <cmath>
#include <iostream>
-bool acquisition_dump_reader::read_binary_acq()
+bool Acquisition_Dump_Reader::read_binary_acq()
{
mat_t* matfile = Mat_Open(d_dump_filename.c_str(), MAT_ACC_RDONLY);
if (matfile == nullptr)
@@ -143,7 +143,7 @@ bool acquisition_dump_reader::read_binary_acq()
}
-acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
+Acquisition_Dump_Reader::Acquisition_Dump_Reader(const std::string& basename,
int channel,
int execution)
{
@@ -192,7 +192,7 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
d_num_doppler_bins = 0;
num_dwells = 0;
- acquisition_dump_reader(basename,
+ Acquisition_Dump_Reader(basename,
sat_,
doppler_max_,
doppler_step_,
@@ -202,7 +202,7 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
}
-acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
+Acquisition_Dump_Reader::Acquisition_Dump_Reader(const std::string& basename,
unsigned int sat,
unsigned int doppler_max,
unsigned int doppler_step,
@@ -243,4 +243,4 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
}
-acquisition_dump_reader::~acquisition_dump_reader() = default;
+Acquisition_Dump_Reader::~Acquisition_Dump_Reader() = default;
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h
index be5779f38..c68a32347 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h
@@ -36,10 +36,10 @@
#include <string>
#include <vector>
-class acquisition_dump_reader
+class Acquisition_Dump_Reader
{
public:
- acquisition_dump_reader(const std::string& basename,
+ Acquisition_Dump_Reader(const std::string& basename,
unsigned int sat,
unsigned int doppler_max,
unsigned int doppler_step,
@@ -47,11 +47,11 @@ public:
int channel = 0,
int execution = 1);
- acquisition_dump_reader(const std::string& basename,
+ Acquisition_Dump_Reader(const std::string& basename,
int channel = 0,
int execution = 1);
- ~acquisition_dump_reader();
+ ~Acquisition_Dump_Reader();
bool read_binary_acq();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
index 370b38d9b..c85062d55 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
@@ -33,7 +33,7 @@
#include <iostream>
#include <utility>
-bool observables_dump_reader::read_binary_obs()
+bool Observables_Dump_Reader::read_binary_obs()
{
try
{
@@ -56,7 +56,7 @@ bool observables_dump_reader::read_binary_obs()
}
-bool observables_dump_reader::restart()
+bool Observables_Dump_Reader::restart()
{
if (d_dump_file.is_open())
{
@@ -68,7 +68,7 @@ bool observables_dump_reader::restart()
}
-int64_t observables_dump_reader::num_epochs()
+int64_t Observables_Dump_Reader::num_epochs()
{
std::ifstream::pos_type size;
int number_of_vars_in_epoch = n_channels * 7;
@@ -84,7 +84,7 @@ int64_t observables_dump_reader::num_epochs()
}
-bool observables_dump_reader::open_obs_file(std::string out_file)
+bool Observables_Dump_Reader::open_obs_file(std::string out_file)
{
if (d_dump_file.is_open() == false)
{
@@ -108,7 +108,7 @@ bool observables_dump_reader::open_obs_file(std::string out_file)
}
-void observables_dump_reader::close_obs_file()
+void Observables_Dump_Reader::close_obs_file()
{
if (d_dump_file.is_open() == false)
{
@@ -117,7 +117,7 @@ void observables_dump_reader::close_obs_file()
}
-observables_dump_reader::observables_dump_reader(int n_channels_)
+Observables_Dump_Reader::Observables_Dump_Reader(int n_channels_)
{
n_channels = n_channels_;
RX_time = new double[n_channels];
@@ -130,7 +130,7 @@ observables_dump_reader::observables_dump_reader(int n_channels_)
}
-observables_dump_reader::~observables_dump_reader()
+Observables_Dump_Reader::~Observables_Dump_Reader()
{
try
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h
index 9548829ac..be5c76ed1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h
@@ -36,11 +36,11 @@
#include <string>
#include <vector>
-class observables_dump_reader
+class Observables_Dump_Reader
{
public:
- observables_dump_reader(int n_channels);
- ~observables_dump_reader();
+ Observables_Dump_Reader(int n_channels);
+ ~Observables_Dump_Reader();
bool read_binary_obs();
bool restart();
int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
index e35304014..286994f7e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
@@ -33,7 +33,7 @@
#include <iostream>
#include <utility>
-bool tlm_dump_reader::read_binary_obs()
+bool Tlm_Dump_Reader::read_binary_obs()
{
try
{
@@ -49,7 +49,7 @@ bool tlm_dump_reader::read_binary_obs()
}
-bool tlm_dump_reader::restart()
+bool Tlm_Dump_Reader::restart()
{
if (d_dump_file.is_open())
{
@@ -61,7 +61,7 @@ bool tlm_dump_reader::restart()
}
-int64_t tlm_dump_reader::num_epochs()
+int64_t Tlm_Dump_Reader::num_epochs()
{
std::ifstream::pos_type size;
int number_of_vars_in_epoch = 2;
@@ -77,7 +77,7 @@ int64_t tlm_dump_reader::num_epochs()
}
-bool tlm_dump_reader::open_obs_file(std::string out_file)
+bool Tlm_Dump_Reader::open_obs_file(std::string out_file)
{
if (d_dump_file.is_open() == false)
{
@@ -102,7 +102,7 @@ bool tlm_dump_reader::open_obs_file(std::string out_file)
}
-tlm_dump_reader::~tlm_dump_reader()
+Tlm_Dump_Reader::~Tlm_Dump_Reader()
{
try
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h
index 43178bdc6..3eacefee4 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h
@@ -36,10 +36,10 @@
#include <string>
#include <vector>
-class tlm_dump_reader
+class Tlm_Dump_Reader
{
public:
- ~tlm_dump_reader();
+ ~Tlm_Dump_Reader();
bool read_binary_obs();
bool restart();
int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
index 2e3fe04dc..49b37e148 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
@@ -33,7 +33,7 @@
#include <iostream>
#include <utility>
-bool tracking_dump_reader::read_binary_obs()
+bool Tracking_Dump_Reader::read_binary_obs()
{
try
{
@@ -68,7 +68,7 @@ bool tracking_dump_reader::read_binary_obs()
}
-bool tracking_dump_reader::restart()
+bool Tracking_Dump_Reader::restart()
{
if (d_dump_file.is_open())
{
@@ -80,7 +80,7 @@ bool tracking_dump_reader::restart()
}
-int64_t tracking_dump_reader::num_epochs()
+int64_t Tracking_Dump_Reader::num_epochs()
{
std::ifstream::pos_type size;
int number_of_double_vars = 1;
@@ -100,7 +100,7 @@ int64_t tracking_dump_reader::num_epochs()
}
-bool tracking_dump_reader::open_obs_file(std::string out_file)
+bool Tracking_Dump_Reader::open_obs_file(std::string out_file)
{
if (d_dump_file.is_open() == false)
{
@@ -124,7 +124,7 @@ bool tracking_dump_reader::open_obs_file(std::string out_file)
}
-tracking_dump_reader::~tracking_dump_reader()
+Tracking_Dump_Reader::~Tracking_Dump_Reader()
{
try
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h
index 790838a8a..7a2ca7e33 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h
@@ -36,10 +36,10 @@
#include <string>
#include <vector>
-class tracking_dump_reader
+class Tracking_Dump_Reader
{
public:
- ~tracking_dump_reader();
+ ~Tracking_Dump_Reader();
bool read_binary_obs();
bool restart();
int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
index 41735824f..25c81acc1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
@@ -33,7 +33,7 @@
#include <iostream>
#include <utility>
-bool tracking_true_obs_reader::read_binary_obs()
+bool Tracking_True_Obs_Reader::read_binary_obs()
{
try
{
@@ -51,7 +51,7 @@ bool tracking_true_obs_reader::read_binary_obs()
}
-bool tracking_true_obs_reader::restart()
+bool Tracking_True_Obs_Reader::restart()
{
if (d_dump_file.is_open())
{
@@ -63,7 +63,7 @@ bool tracking_true_obs_reader::restart()
}
-int64_t tracking_true_obs_reader::num_epochs()
+int64_t Tracking_True_Obs_Reader::num_epochs()
{
std::ifstream::pos_type size;
int number_of_vars_in_epoch = 5;
@@ -79,7 +79,7 @@ int64_t tracking_true_obs_reader::num_epochs()
}
-bool tracking_true_obs_reader::open_obs_file(std::string out_file)
+bool Tracking_True_Obs_Reader::open_obs_file(std::string out_file)
{
if (d_dump_file.is_open() == false)
{
@@ -103,7 +103,7 @@ bool tracking_true_obs_reader::open_obs_file(std::string out_file)
}
}
-void tracking_true_obs_reader::close_obs_file()
+void Tracking_True_Obs_Reader::close_obs_file()
{
if (d_dump_file.is_open() == true)
{
@@ -111,7 +111,7 @@ void tracking_true_obs_reader::close_obs_file()
}
}
-tracking_true_obs_reader::~tracking_true_obs_reader()
+Tracking_True_Obs_Reader::~Tracking_True_Obs_Reader()
{
try
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h
index 5b8990325..50b496ceb 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h
@@ -36,10 +36,10 @@
#include <string>
#include <vector>
-class tracking_true_obs_reader
+class Tracking_True_Obs_Reader
{
public:
- ~tracking_true_obs_reader();
+ ~Tracking_True_Obs_Reader();
bool read_binary_obs();
bool restart();
int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
index e183bb9ef..dd72ae6dc 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
@@ -33,7 +33,7 @@
#include <iostream>
#include <utility>
-bool true_observables_reader::read_binary_obs()
+bool True_Observables_Reader::read_binary_obs()
{
try
{
@@ -56,7 +56,7 @@ bool true_observables_reader::read_binary_obs()
}
-bool true_observables_reader::restart()
+bool True_Observables_Reader::restart()
{
if (d_dump_file.is_open())
{
@@ -68,7 +68,7 @@ bool true_observables_reader::restart()
}
-int64_t true_observables_reader::num_epochs()
+int64_t True_Observables_Reader::num_epochs()
{
std::ifstream::pos_type size;
int number_of_vars_in_epoch = 6 * 12;
@@ -84,7 +84,7 @@ int64_t true_observables_reader::num_epochs()
}
-bool true_observables_reader::open_obs_file(std::string out_file)
+bool True_Observables_Reader::open_obs_file(std::string out_file)
{
if (d_dump_file.is_open() == false)
{
@@ -109,7 +109,7 @@ bool true_observables_reader::open_obs_file(std::string out_file)
}
-true_observables_reader::~true_observables_reader()
+True_Observables_Reader::~True_Observables_Reader()
{
try
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h
index 86e1c868d..f17561f84 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h
@@ -36,10 +36,10 @@
#include <string>
#include <vector>
-class true_observables_reader
+class True_Observables_Reader
{
public:
- ~true_observables_reader();
+ ~True_Observables_Reader();
bool read_binary_obs();
bool restart();
int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
index 60e496ede..89cbfad09 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
@@ -155,7 +155,7 @@ void NmeaPrinterTest::conf()
TEST_F(NmeaPrinterTest, PrintLine)
{
std::string filename("nmea_test.nmea");
- std::shared_ptr<rtklib_solver> pvt_solution = std::make_shared<rtklib_solver>(12, "filename", false, false, rtk);
+ std::shared_ptr<Rtklib_Solver> pvt_solution = std::make_shared<Rtklib_Solver>(12, "filename", false, false, rtk);
boost::posix_time::ptime pt(boost::gregorian::date(1994, boost::date_time::Nov, 19),
boost::posix_time::hours(22) + boost::posix_time::minutes(54) + boost::posix_time::seconds(46));
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
index ae0a89039..53028074b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
@@ -336,14 +336,14 @@ TEST(RtcmTest, MT1045)
Galileo_Ephemeris gal_eph_read = Galileo_Ephemeris();
gal_eph.i_satellite_PRN = 5;
- gal_eph.OMEGA_dot_3 = 53.0 * OMEGA_dot_3_LSB;
+ gal_eph.OMEGA_dot_3 = 53.0 * OMEGA_DOT_3_LSB;
gal_eph.E5a_DVS = true;
std::string tx_msg = rtcm->print_MT1045(gal_eph);
EXPECT_EQ(0, rtcm->read_MT1045(tx_msg, gal_eph_read));
EXPECT_EQ(expected_true, gal_eph_read.E5a_DVS);
- EXPECT_DOUBLE_EQ(53.0 * OMEGA_dot_3_LSB, gal_eph_read.OMEGA_dot_3);
+ EXPECT_DOUBLE_EQ(53.0 * OMEGA_DOT_3_LSB, gal_eph_read.OMEGA_dot_3);
EXPECT_EQ(static_cast<unsigned int>(5), gal_eph_read.i_satellite_PRN);
EXPECT_EQ(1, rtcm->read_MT1045(rtcm->bin_to_binary_data(rtcm->hex_to_bin("FFFFFFFFFFF")), gal_eph_read));
}
@@ -570,7 +570,7 @@ TEST(RtcmTest, MSM1)
EXPECT_EQ(ref_id, rtcm->bin_to_uint(MSM1_bin.substr(size_header + size_msg_length + 12, 12)));
EXPECT_EQ(0, MSM1_bin.substr(size_header + size_msg_length + 169, Nsat * Nsig).compare("101101")); // check cell mask
- double meters_to_miliseconds = GPS_C_m_s * 0.001;
+ double meters_to_miliseconds = GPS_C_M_S * 0.001;
unsigned int rough_range_1 = static_cast<unsigned int>(std::floor(std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10)) + 0.5) & 0x3FFu;
unsigned int rough_range_2 = static_cast<unsigned int>(std::floor(std::round(gnss_synchro2.Pseudorange_m / meters_to_miliseconds / TWO_N10)) + 0.5) & 0x3FFu;
unsigned int rough_range_4 = static_cast<unsigned int>(std::floor(std::round(gnss_synchro3.Pseudorange_m / meters_to_miliseconds / TWO_N10)) + 0.5) & 0x3FFu;
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
index 68eae1518..b4c5f432c 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
@@ -45,7 +45,7 @@
DEFINE_int32(cpu_multicorrelator_real_codes_iterations_test, 100, "Number of averaged iterations in CPU multicorrelator test timing test");
DEFINE_int32(cpu_multicorrelator_real_codes_max_threads_test, 12, "Number of maximum concurrent correlators in CPU multicorrelator test timing test");
-void run_correlator_cpu_real_codes(cpu_multicorrelator_real_codes* correlator,
+void run_correlator_cpu_real_codes(Cpu_Multicorrelator_Real_Codes* correlator,
float d_rem_carrier_phase_rad,
float d_carrier_phase_step_rad,
float d_code_phase_step_chips,
@@ -71,7 +71,7 @@ TEST(CpuMulticorrelatorRealCodesTest, MeasureExecutionTime)
std::chrono::duration<double> elapsed_seconds(0);
int max_threads = FLAGS_cpu_multicorrelator_real_codes_max_threads_test;
std::vector<std::thread> thread_pool;
- cpu_multicorrelator_real_codes* correlator_pool[max_threads];
+ Cpu_Multicorrelator_Real_Codes* correlator_pool[max_threads];
unsigned int correlation_sizes[3] = {2048, 4096, 8192};
double execution_times[3];
@@ -118,7 +118,7 @@ TEST(CpuMulticorrelatorRealCodesTest, MeasureExecutionTime)
for (int n = 0; n < max_threads; n++)
{
- correlator_pool[n] = new cpu_multicorrelator_real_codes();
+ correlator_pool[n] = new Cpu_Multicorrelator_Real_Codes();
correlator_pool[n]->init(d_vector_length, d_n_correlator_taps);
correlator_pool[n]->set_input_output_vectors(d_correlator_outs, in_cpu);
correlator_pool[n]->set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc
index 706c6fe45..0f133db98 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc
@@ -45,7 +45,7 @@
DEFINE_int32(cpu_multicorrelator_iterations_test, 100, "Number of averaged iterations in CPU multicorrelator test timing test");
DEFINE_int32(cpu_multicorrelator_max_threads_test, 12, "Number of maximum concurrent correlators in CPU multicorrelator test timing test");
-void run_correlator_cpu(cpu_multicorrelator* correlator,
+void run_correlator_cpu(Cpu_Multicorrelator* correlator,
float d_rem_carrier_phase_rad,
float d_carrier_phase_step_rad,
float d_code_phase_step_chips,
@@ -69,7 +69,7 @@ TEST(CpuMulticorrelatorTest, MeasureExecutionTime)
std::chrono::duration<double> elapsed_seconds(0);
int max_threads = FLAGS_cpu_multicorrelator_max_threads_test;
std::vector<std::thread> thread_pool;
- cpu_multicorrelator* correlator_pool[max_threads];
+ Cpu_Multicorrelator* correlator_pool[max_threads];
unsigned int correlation_sizes[3] = {2048, 4096, 8192};
double execution_times[3];
@@ -116,7 +116,7 @@ TEST(CpuMulticorrelatorTest, MeasureExecutionTime)
for (int n = 0; n < max_threads; n++)
{
- correlator_pool[n] = new cpu_multicorrelator();
+ correlator_pool[n] = new Cpu_Multicorrelator();
correlator_pool[n]->init(d_vector_length, d_n_correlator_taps);
correlator_pool[n]->set_input_output_vectors(d_correlator_outs, in_cpu);
correlator_pool[n]->set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc
index 9fd80f772..32f8da6aa 100644
--- a/src/utils/front-end-cal/front_end_cal.cc
+++ b/src/utils/front-end-cal/front_end_cal.cc
@@ -48,11 +48,11 @@
#include <memory>
#include <utility>
-extern concurrent_map<Gps_Ephemeris> global_gps_ephemeris_map;
-extern concurrent_map<Gps_Iono> global_gps_iono_map;
-extern concurrent_map<Gps_Utc_Model> global_gps_utc_model_map;
-extern concurrent_map<Gps_Almanac> global_gps_almanac_map;
-extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+extern Concurrent_Map<Gps_Ephemeris> global_gps_ephemeris_map;
+extern Concurrent_Map<Gps_Iono> global_gps_iono_map;
+extern Concurrent_Map<Gps_Utc_Model> global_gps_utc_model_map;
+extern Concurrent_Map<Gps_Almanac> global_gps_almanac_map;
+extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
FrontEndCal::FrontEndCal() = default;
@@ -60,7 +60,7 @@ FrontEndCal::~FrontEndCal() = default;
bool FrontEndCal::read_assistance_from_XML()
{
- gnss_sdr_supl_client supl_client_ephemeris_;
+ Gnss_Sdr_Supl_Client supl_client_ephemeris_;
std::string eph_xml_filename = "gps_ephemeris.xml";
std::cout << "SUPL: Trying to read GPS ephemeris from XML file " << eph_xml_filename << std::endl;
LOG(INFO) << "SUPL: Trying to read GPS ephemeris from XML file " << eph_xml_filename;
@@ -87,8 +87,8 @@ bool FrontEndCal::read_assistance_from_XML()
int FrontEndCal::Get_SUPL_Assist()
{
//######### GNSS Assistance #################################
- gnss_sdr_supl_client supl_client_acquisition_;
- gnss_sdr_supl_client supl_client_ephemeris_;
+ Gnss_Sdr_Supl_Client supl_client_acquisition_;
+ Gnss_Sdr_Supl_Client supl_client_ephemeris_;
int supl_mcc; // Current network MCC (Mobile country code), 3 digits.
int supl_mns; //Current network MNC (Mobile Network code), 2 or 3 digits.
int supl_lac; // Current network LAC (Location area code),16 bits, 1-65520 are valid values.
@@ -358,7 +358,7 @@ double FrontEndCal::estimate_doppler_from_eph(unsigned int PRN, double TOW, doub
//Doppler estimation
arma::vec Doppler_Hz;
- Doppler_Hz = (obs_to_sat_velocity / GPS_C_m_s) * GPS_L1_FREQ_HZ;
+ Doppler_Hz = (obs_to_sat_velocity / GPS_C_M_S) * GPS_L1_FREQ_HZ;
double mean_Doppler_Hz;
mean_Doppler_Hz = arma::mean(Doppler_Hz);
return mean_Doppler_Hz;
diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc
index b1680d51f..cc36ce147 100644
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@@ -81,14 +81,14 @@ using google::LogMessage;
DECLARE_string(log_dir);
-concurrent_map<Gps_Ephemeris> global_gps_ephemeris_map;
-concurrent_map<Gps_Iono> global_gps_iono_map;
-concurrent_map<Gps_Utc_Model> global_gps_utc_model_map;
-concurrent_map<Gps_Almanac> global_gps_almanac_map;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Map<Gps_Ephemeris> global_gps_ephemeris_map;
+Concurrent_Map<Gps_Iono> global_gps_iono_map;
+Concurrent_Map<Gps_Utc_Model> global_gps_utc_model_map;
+Concurrent_Map<Gps_Almanac> global_gps_almanac_map;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
bool stop;
-concurrent_queue<int> channel_internal_queue;
+Concurrent_Queue<int> channel_internal_queue;
GpsL1CaPcpsAcquisitionFineDoppler* acquisition;
Gnss_Synchro* gnss_synchro;
std::vector<Gnss_Synchro> gnss_sync_vector;
From 11829e5883b44266ed6fa728af244562bef1dda9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 12:22:24 +0100
Subject: [PATCH 02/16] Unify use of stdint names
---
.../libs/libswiftcnav/bits.c | 68 +++++++++----------
.../libs/libswiftcnav/bits.h | 24 +++----
.../libs/libswiftcnav/cnav_msg.c | 26 +++----
.../libs/libswiftcnav/cnav_msg.h | 10 +--
.../telemetry_decoder/libs/libswiftcnav/edc.c | 16 ++---
.../telemetry_decoder/libs/libswiftcnav/edc.h | 4 +-
.../libs/libswiftcnav/swift_common.h | 31 ---------
7 files changed, 74 insertions(+), 105 deletions(-)
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
index acfe434ff..1cbe9eb12 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
@@ -34,7 +34,7 @@
#include <string.h>
-static const u8 BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
+static const uint8_t BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
/** \defgroup bits Bit Utils
* Bit field packing, unpacking and utility functions.
@@ -49,7 +49,7 @@ static const u8 BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
* \return 1 if there are an odd number of bits set.
* 0 if there are an even number of bits set.
*/
-u8 parity(u32 x)
+uint8_t parity(uint32_t x)
{
x ^= x >> 16;
x ^= x >> 8;
@@ -68,10 +68,10 @@ u8 parity(u32 x)
* \param len Length of bit field in bits.
* \return Bit field as an unsigned value.
*/
-u32 getbitu(const u8 *buff, u32 pos, u8 len)
+uint32_t getbitu(const uint8_t *buff, uint32_t pos, uint8_t len)
{
- u32 bits = 0;
- u32 i = 0;
+ uint32_t bits = 0;
+ uint32_t i = 0;
for (i = pos; i < pos + len; i++)
{
bits = (bits << 1) +
@@ -92,14 +92,14 @@ u32 getbitu(const u8 *buff, u32 pos, u8 len)
* \param len Length of bit field in bits.
* \return Bit field as a signed value.
*/
-s32 getbits(const u8 *buff, u32 pos, u8 len)
+int32_t getbits(const uint8_t *buff, uint32_t pos, uint8_t len)
{
- s32 bits = (s32)getbitu(buff, pos, len);
+ int32_t bits = (int32_t)getbitu(buff, pos, len);
/* Sign extend, taken from:
* http://graphics.stanford.edu/~seander/bithacks.html#VariableSignExtend
*/
- s32 m = 1u << (len - 1);
+ int32_t m = 1u << (len - 1);
return (bits ^ m) - m;
}
@@ -112,15 +112,15 @@ s32 getbits(const u8 *buff, u32 pos, u8 len)
* \param len Length of bit field in bits.
* \param data Unsigned integer to be packed into bit field.
*/
-void setbitu(u8 *buff, u32 pos, u32 len, u32 data)
+void setbitu(uint8_t *buff, uint32_t pos, uint32_t len, uint32_t data)
{
- u32 mask = 1u << (len - 1);
+ uint32_t mask = 1u << (len - 1);
if (len <= 0 || 32 < len)
{
return;
}
- u32 i = 0;
+ uint32_t i = 0;
for (i = pos; i < pos + len; i++, mask >>= 1)
{
if (data & mask)
@@ -143,9 +143,9 @@ void setbitu(u8 *buff, u32 pos, u32 len, u32 data)
* \param len Length of bit field in bits.
* \param data Signed integer to be packed into bit field.
*/
-void setbits(u8 *buff, u32 pos, u32 len, s32 data)
+void setbits(uint8_t *buff, uint32_t pos, uint32_t len, int32_t data)
{
- setbitu(buff, pos, len, (u32)data);
+ setbitu(buff, pos, len, (uint32_t)data);
}
/**
@@ -158,7 +158,7 @@ void setbits(u8 *buff, u32 pos, u32 len, s32 data)
*
* \return None
*/
-void bitshl(void *buf, u32 size, u32 shift)
+void bitshl(void *buf, uint32_t size, uint32_t shift)
{
if (shift > size * CHAR_BIT)
{
@@ -170,9 +170,9 @@ void bitshl(void *buf, u32 size, u32 shift)
unsigned char *dst = buf; /* Destination byte. */
const unsigned char *src = dst + shift / CHAR_BIT; /* First source byte, possibly incomplete. */
- u32 copy_bits = size * CHAR_BIT - shift; /* Number of bits to move */
- u32 byte_shift = copy_bits % CHAR_BIT; /* Shift of data */
- u32 full_bytes = copy_bits / CHAR_BIT; /* Number of bytes to move */
+ uint32_t copy_bits = size * CHAR_BIT - shift; /* Number of bits to move */
+ uint32_t byte_shift = copy_bits % CHAR_BIT; /* Shift of data */
+ uint32_t full_bytes = copy_bits / CHAR_BIT; /* Number of bytes to move */
if (0 == byte_shift)
{
@@ -184,8 +184,8 @@ void bitshl(void *buf, u32 size, u32 shift)
else
{
/* Create an accumulator: it will hold a value of two consecutive bytes */
- u32 acc = *src++;
- u32 i = 0;
+ uint32_t acc = *src++;
+ uint32_t i = 0;
for (i = 0; i < full_bytes; ++i)
{
acc = (acc << CHAR_BIT) | *src++;
@@ -215,22 +215,22 @@ void bitshl(void *buf, u32 size, u32 shift)
* \todo This function can be optimized for copying aligned data and using
* proper native type like long.
*/
-void bitcopy(void *dst, u32 dst_index, const void *src, u32 src_index,
- u32 count)
+void bitcopy(void *dst, uint32_t dst_index, const void *src, uint32_t src_index,
+ uint32_t count)
{
- u32 limit1 = count / 32;
- u32 limit2 = count % 32;
- u32 idx = 0;
+ uint32_t limit1 = count / 32;
+ uint32_t limit2 = count % 32;
+ uint32_t idx = 0;
for (idx = 0; idx < limit1; ++idx)
{
- u32 tmp = getbitu(src, src_index, 32);
+ uint32_t tmp = getbitu(src, src_index, 32);
setbitu(dst, dst_index, 32, tmp);
src_index += 32;
dst_index += 32;
}
if (0 != limit2)
{
- u32 tmp = getbitu(src, src_index, limit2);
+ uint32_t tmp = getbitu(src, src_index, limit2);
setbitu(dst, dst_index, limit2, tmp);
}
}
@@ -243,9 +243,9 @@ void bitcopy(void *dst, u32 dst_index, const void *src, u32 src_index,
*
* \return Number of bits set to one or zero.
*/
-u8 count_bits_u64(u64 v, u8 bv)
+uint8_t count_bits_u64(uint64_t v, uint8_t bv)
{
- u8 r = 0;
+ uint8_t r = 0;
int i = 0;
for (i = 0; i < 16; i++)
{
@@ -262,9 +262,9 @@ u8 count_bits_u64(u64 v, u8 bv)
*
* \return Number of bits set to one or zero.
*/
-u8 count_bits_u32(u32 v, u8 bv)
+uint8_t count_bits_u32(uint32_t v, uint8_t bv)
{
- u8 r = 0;
+ uint8_t r = 0;
int i = 0;
for (i = 0; i < 8; i++)
{
@@ -281,9 +281,9 @@ u8 count_bits_u32(u32 v, u8 bv)
*
* \return Number of bits set to one or zero.
*/
-u8 count_bits_u16(u16 v, u8 bv)
+uint8_t count_bits_u16(uint16_t v, uint8_t bv)
{
- u8 r = 0;
+ uint8_t r = 0;
int i = 0;
for (i = 0; i < 4; i++)
{
@@ -300,9 +300,9 @@ u8 count_bits_u16(u16 v, u8 bv)
*
* \return Number of bits set to one or zero.
*/
-u8 count_bits_u8(u8 v, u8 bv)
+uint8_t count_bits_u8(uint8_t v, uint8_t bv)
{
- u8 r = 0;
+ uint8_t r = 0;
int i = 0;
for (i = 0; i < 2; i++)
{
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
index 8e73ccf4a..11f5e512e 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
@@ -34,17 +34,17 @@
#include "swift_common.h"
-u8 parity(u32 x);
-u32 getbitu(const u8 *buff, u32 pos, u8 len);
-s32 getbits(const u8 *buff, u32 pos, u8 len);
-void setbitu(u8 *buff, u32 pos, u32 len, u32 data);
-void setbits(u8 *buff, u32 pos, u32 len, s32 data);
-void bitcopy(void *dst, u32 dst_index,
- const void *src, u32 src_index, u32 count);
-void bitshl(void *buf, u32 size, u32 shift);
-u8 count_bits_u64(u64 v, u8 bv);
-u8 count_bits_u32(u32 v, u8 bv);
-u8 count_bits_u16(u16 v, u8 bv);
-u8 count_bits_u8(u8 v, u8 bv);
+uint8_t parity(uint32_t x);
+uint32_t getbitu(const uint8_t *buff, uint32_t pos, uint8_t len);
+int32_t getbits(const uint8_t *buff, uint32_t pos, uint8_t len);
+void setbitu(uint8_t *buff, uint32_t pos, uint32_t len, uint32_t data);
+void setbits(uint8_t *buff, uint32_t pos, uint32_t len, int32_t data);
+void bitcopy(void *dst, uint32_t dst_index,
+ const void *src, uint32_t src_index, uint32_t count);
+void bitshl(void *buf, uint32_t size, uint32_t shift);
+uint8_t count_bits_u64(uint64_t v, uint8_t bv);
+uint8_t count_bits_u32(uint32_t v, uint8_t bv);
+uint8_t count_bits_u16(uint16_t v, uint8_t bv);
+uint8_t count_bits_u8(uint8_t v, uint8_t bv);
#endif /* LIBSWIFTNAV_BITS_H */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c
index bbb52ac4d..1676fc0cd 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c
@@ -56,9 +56,9 @@
*/
/** GPS L2C preamble */
-const u32 GPS_CNAV_PREAMBLE1 = 0x8Bu; /* (0b10001011u) */
+const uint32_t GPS_CNAV_PREAMBLE1 = 0x8Bu; /* (0b10001011u) */
/** Inverted GPS L2C preamble */
-const u32 GPS_CNAV_PREAMBLE2 = 0x74u; /* (0b01110100u) */
+const uint32_t GPS_CNAV_PREAMBLE2 = 0x74u; /* (0b01110100u) */
/** GPS L2C preamble length in bits */
#define GPS_CNAV_PREAMBLE_LENGTH (8)
/** GPS L2C CNAV message length in bits */
@@ -81,9 +81,9 @@ const u32 GPS_CNAV_PREAMBLE2 = 0x74u; /* (0b01110100u) */
*
* \private
*/
-static u32 _cnav_compute_crc(cnav_v27_part_t *part)
+static uint32_t _cnav_compute_crc(cnav_v27_part_t *part)
{
- u32 crc = crc24q_bits(0, part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
+ uint32_t crc = crc24q_bits(0, part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
part->invert);
return crc;
@@ -100,9 +100,9 @@ static u32 _cnav_compute_crc(cnav_v27_part_t *part)
*
* \private
*/
-static u32 _cnav_extract_crc(const cnav_v27_part_t *part)
+static uint32_t _cnav_extract_crc(const cnav_v27_part_t *part)
{
- u32 crc = getbitu(part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
+ uint32_t crc = getbitu(part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
GPS_CNAV_MSG_CRC_LENGTH);
if (part->invert)
{
@@ -136,7 +136,7 @@ static void _cnav_rescan_preamble(cnav_v27_part_t *part)
size_t j = 0;
for (i = 1, j = part->n_decoded - GPS_CNAV_PREAMBLE_LENGTH; i < j; ++i)
{
- u32 c = getbitu(part->decoded, i, GPS_CNAV_PREAMBLE_LENGTH);
+ uint32_t c = getbitu(part->decoded, i, GPS_CNAV_PREAMBLE_LENGTH);
if (GPS_CNAV_PREAMBLE1 == c || GPS_CNAV_PREAMBLE2 == c)
{
part->preamble_seen = true;
@@ -171,7 +171,7 @@ static void _cnav_rescan_preamble(cnav_v27_part_t *part)
*
* \private
*/
-static void _cnav_add_symbol(cnav_v27_part_t *part, u8 ch)
+static void _cnav_add_symbol(cnav_v27_part_t *part, uint8_t ch)
{
part->symbols[part->n_symbols++] = ch;
@@ -240,8 +240,8 @@ static void _cnav_add_symbol(cnav_v27_part_t *part, u8 ch)
{
/* We have collected 300 bits starting from message preamble. Now try
* to compute CRC-24Q */
- u32 crc = _cnav_compute_crc(part);
- u32 crc2 = _cnav_extract_crc(part);
+ uint32_t crc = _cnav_compute_crc(part);
+ uint32_t crc2 = _cnav_extract_crc(part);
if (part->message_lock)
{
@@ -332,7 +332,7 @@ static void _cnav_msg_invert(cnav_v27_part_t *part)
*
* \private
*/
-static bool _cnav_msg_decode(cnav_v27_part_t *part, cnav_msg_t *msg, u32 *delay)
+static bool _cnav_msg_decode(cnav_v27_part_t *part, cnav_msg_t *msg, uint32_t *delay)
{
bool res = false;
if (GPS_CNAV_MSG_LENGTH <= part->n_decoded)
@@ -425,9 +425,9 @@ void cnav_msg_decoder_init(cnav_msg_decoder_t *dec)
* \retval false More data is required.
*/
bool cnav_msg_decoder_add_symbol(cnav_msg_decoder_t *dec,
- u8 symbol,
+ uint8_t symbol,
cnav_msg_t *msg,
- u32 *pdelay)
+ uint32_t *pdelay)
{
_cnav_add_symbol(&dec->part1, symbol);
_cnav_add_symbol(&dec->part2, symbol);
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
index f402675c5..823175d08 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
@@ -60,11 +60,11 @@
*/
typedef struct
{
- u8 prn; /**< SV PRN. 0..31 */
- u8 msg_id; /**< Message id. 0..31 */
- u32 tow; /**< GPS ToW in 6-second units. Multiply to 6 to get seconds. */
+ uint8_t prn; /**< SV PRN. 0..31 */
+ uint8_t msg_id; /**< Message id. 0..31 */
+ uint32_t tow; /**< GPS ToW in 6-second units. Multiply to 6 to get seconds. */
bool alert; /**< CNAV message alert flag */
- u8 raw_msg[GPS_L2C_V27_DECODE_BITS + GPS_L2C_V27_DELAY_BITS]; /**< RAW MSG for GNSS-SDR */
+ uint8_t raw_msg[GPS_L2C_V27_DECODE_BITS + GPS_L2C_V27_DELAY_BITS]; /**< RAW MSG for GNSS-SDR */
} cnav_msg_t;
/**
@@ -112,7 +112,7 @@ void cnav_msg_decoder_init(cnav_msg_decoder_t *dec);
bool cnav_msg_decoder_add_symbol(cnav_msg_decoder_t *dec,
unsigned char symbol,
cnav_msg_t *msg,
- u32 *delay);
+ uint32_t *delay);
/** \} */
/** \} */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
index 27b669932..6e3e06c6f 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
@@ -39,7 +39,7 @@
* Cyclic redundancy checks.
* \{ */
-static const u32 CRC24QTAB[256] = {
+static const uint32_t CRC24QTAB[256] = {
0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
@@ -88,9 +88,9 @@ static const u32 CRC24QTAB[256] = {
*
* \return CRC-24Q value
*/
-u32 crc24q(const u8 *buf, u32 len, u32 crc)
+uint32_t crc24q(const uint8_t *buf, uint32_t len, uint32_t crc)
{
- u32 i = 0;
+ uint32_t i = 0;
for (i = 0; i < len; i++)
{
crc = ((crc << 8) & 0xFFFFFF) ^ CRC24QTAB[((crc >> 16) ^ buf[i]) & 0xff];
@@ -113,13 +113,13 @@ u32 crc24q(const u8 *buf, u32 len, u32 crc)
*
* \return CRC-24Q value
*/
-u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert)
+uint32_t crc24q_bits(uint32_t crc, const uint8_t *buf, uint32_t n_bits, bool invert)
{
- u16 acc = 0;
- u8 b = 0;
- u32 shift = 8 - n_bits % 8;
+ uint16_t acc = 0;
+ uint8_t b = 0;
+ uint32_t shift = 8 - n_bits % 8;
- u32 i = 0;
+ uint32_t i = 0;
for (i = 0; i < n_bits / 8; ++i)
{
acc = (acc << 8) | *buf++;
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
index 58a968a65..03a4022a7 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
@@ -35,7 +35,7 @@
#include "swift_common.h"
-u32 crc24q(const u8 *buf, u32 len, u32 crc);
-u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert);
+uint32_t crc24q(const uint8_t *buf, uint32_t len, uint32_t crc);
+uint32_t crc24q_bits(uint32_t crc, const uint8_t *buf, uint32_t n_bits, bool invert);
#endif /* LIBSWIFTNAV_EDC_H */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
index b4a3a6fae..3b83f3034 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
@@ -48,37 +48,6 @@
#include <stdbool.h>
#include <stdint.h>
-#ifndef COMMON_INT_TYPES
-#define COMMON_INT_TYPES
-
-/** \defgroup common_inttypes Integer types
- * Specified-width integer type definitions for shorter and nicer code.
- *
- * These should be used in preference to unspecified width types such as
- * `int` which can lead to portability issues between different platforms.
- * \{ */
-
-/** Signed 8-bit integer. */
-typedef int8_t s8;
-/** Signed 16-bit integer. */
-typedef int16_t s16;
-/** Signed 32-bit integer. */
-typedef int32_t s32;
-/** Signed 64-bit integer. */
-typedef int64_t s64;
-/** Unsigned 8-bit integer. */
-typedef uint8_t u8;
-/** Unsigned 16-bit integer. */
-typedef uint16_t u16;
-/** Unsigned 32-bit integer. */
-typedef uint32_t u32;
-/** Unsigned 64-bit integer. */
-typedef uint64_t u64;
-
-#endif
-
-/** \} */
-
/** \} */
#endif /* LIBSWIFTNAV_COMMON_H */
From d82dda30e734d732c4955fb89aaafe616f392db6 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 12:23:41 +0100
Subject: [PATCH 03/16] Remove repeated parameters
---
src/core/system_parameters/Galileo_E1.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index d54472ca2..651176ea7 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -93,8 +93,6 @@ const int32_t GALILEO_PAGE_TYPE_BITS = 6;
const int32_t GALILEO_DATA_JK_BITS = 128;
const int32_t GALILEO_DATA_FRAME_BITS = 196;
const int32_t GALILEO_DATA_FRAME_BYTES = 25;
-//const double GALILEO_E1_CODE_PERIOD = 0.004;
-//const int32_t GALILEO_E1_CODE_PERIOD_MS = 4;
const std::vector<std::pair<int32_t, int32_t>> TYPE({{1, 6}});
const std::vector<std::pair<int32_t, int32_t>> PAGE_TYPE_BIT({{1, 6}});
From 68bb71e5939907090df04654c60c102dcb7a9232 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 12:47:21 +0100
Subject: [PATCH 04/16] Add readability-identifier-naming keys
---
.clang-tidy | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index cca10bf8d..bfb1b252c 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -97,16 +97,34 @@ CheckOptions:
value: llvm
- key: performance-unnecessary-value-param.IncludeStyle
value: llvm
+ - key: readability-identifier-naming.AbstractClassCase
+ value: CamelCase
+ - key: readability-identifier-naming.AbstractClassPrefix
+ value: ''
+ - key: readability-identifier-naming.AbstractClassSuffix
+ value: ''
+ - key: readability-identifier-naming.ClassCase
+ value: Camel_Snake_Case
+ - key: readability-identifier-naming.ClassPrefix
+ value: ''
+ - key: readability-identifier-naming.ClassSuffix
+ value: ''
+ - key: readability-identifier-naming.GlobalConstantCase
+ value: UPPER_CASE
+ - key: readability-identifier-naming.GlobalConstantPrefix
+ value: ''
+ - key: readability-identifier-naming.GlobalConstantSuffix
+ value: ''
+ - key: readability-identifier-naming.IgnoreFailedSplit
+ value: '0'
+ - key: readability-identifier-naming.StructCase
+ value: aNy_CasE
+ - key: readability-identifier-naming.StructPrefix
+ value: ''
+ - key: readability-identifier-naming.StructSuffix
+ value: ''
- key: readability-inconsistent-declaration-parameter-name.IgnoreMacros
value: '1'
- key: readability-inconsistent-declaration-parameter-name.Strict
value: '0'
- - key: readability-identifier-naming.ClassCase
- value: Camel_Snake_Case
- - key: readability-identifier-naming.StructCase
- value: aNy_CasE
- - key: readability-identifier-naming.GlobalConstantCase
- value: UPPER_CASE
- - key: readability-identifier-naming.AbstractClassCase
- value: CamelCase
...
From f01f90695ea850bc9908c992037071d35abd02fc Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 13:30:18 +0100
Subject: [PATCH 05/16] Apply clang-format
---
src/algorithms/libs/rtcm.h | 4 ++--
.../telemetry_decoder/libs/libswiftcnav/cnav_msg.h | 2 +-
src/core/receiver/control_thread.h | 2 +-
src/core/receiver/gnss_block_factory.h | 6 +++---
src/core/system_parameters/GLONASS_L1_L2_CA.h | 2 +-
src/core/system_parameters/Galileo_E1.h | 14 +++++++-------
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index 50e541020..9196a0968 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -368,8 +368,8 @@ public:
void run_server(); //<! Starts running the server
void stop_server(); //<! Stops the server
- void send_message(const std::string& msg); //<! Sends a message through the server to all connected clients
- bool is_server_running() const; //<! Returns true if the server is running, false otherwise
+ void send_message(const std::string& msg); //<! Sends a message through the server to all connected clients
+ bool is_server_running() const; //<! Returns true if the server is running, false otherwise
private:
//
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
index 823175d08..9e4bdd65f 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
@@ -63,7 +63,7 @@ typedef struct
uint8_t prn; /**< SV PRN. 0..31 */
uint8_t msg_id; /**< Message id. 0..31 */
uint32_t tow; /**< GPS ToW in 6-second units. Multiply to 6 to get seconds. */
- bool alert; /**< CNAV message alert flag */
+ bool alert; /**< CNAV message alert flag */
uint8_t raw_msg[GPS_L2C_V27_DECODE_BITS + GPS_L2C_V27_DELAY_BITS]; /**< RAW MSG for GNSS-SDR */
} cnav_msg_t;
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index 0fe3674fc..d8fb5584c 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -93,7 +93,7 @@ public:
*
* \param[in] boost::shared_ptr<gr::msg_queue> control_queue
*/
- void set_control_queue(const gr::msg_queue::sptr control_queue); // NOLINT(performance-unnecessary-value-param)
+ void set_control_queue(const gr::msg_queue::sptr control_queue); // NOLINT(performance-unnecessary-value-param)
unsigned int processed_control_messages()
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index d9c153794..2b2acc8b6 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -58,7 +58,7 @@ public:
GNSSBlockFactory();
virtual ~GNSSBlockFactory();
std::unique_ptr<GNSSBlockInterface> GetSignalSource(const std::shared_ptr<ConfigurationInterface>& configuration,
- const gr::msg_queue::sptr queue, int ID = -1); // NOLINT(performance-unnecessary-value-param)
+ const gr::msg_queue::sptr queue, int ID = -1); // NOLINT(performance-unnecessary-value-param)
std::unique_ptr<GNSSBlockInterface> GetSignalConditioner(const std::shared_ptr<ConfigurationInterface>& configuration, int ID = -1);
@@ -67,7 +67,7 @@ public:
std::unique_ptr<GNSSBlockInterface> GetObservables(const std::shared_ptr<ConfigurationInterface>& configuration);
std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GetChannels(const std::shared_ptr<ConfigurationInterface>& configuration,
- const gr::msg_queue::sptr queue); // NOLINT(performance-unnecessary-value-param)
+ const gr::msg_queue::sptr queue); // NOLINT(performance-unnecessary-value-param)
/*
* \brief Returns the block with the required configuration and implementation
@@ -75,7 +75,7 @@ public:
std::unique_ptr<GNSSBlockInterface> GetBlock(const std::shared_ptr<ConfigurationInterface>& configuration,
const std::string& role, const std::string& implementation,
unsigned int in_streams, unsigned int out_streams,
- const gr::msg_queue::sptr queue = nullptr); // NOLINT(performance-unnecessary-value-param)
+ const gr::msg_queue::sptr queue = nullptr); // NOLINT(performance-unnecessary-value-param)
private:
std::unique_ptr<GNSSBlockInterface> GetChannel_1C(const std::shared_ptr<ConfigurationInterface>& configuration,
diff --git a/src/core/system_parameters/GLONASS_L1_L2_CA.h b/src/core/system_parameters/GLONASS_L1_L2_CA.h
index bcb414e48..b8c796b4f 100644
--- a/src/core/system_parameters/GLONASS_L1_L2_CA.h
+++ b/src/core/system_parameters/GLONASS_L1_L2_CA.h
@@ -48,7 +48,7 @@ const double GLONASS_PI = 3.1415926535898; //!< Pi as define
const double GLONASS_TWO_PI = 6.283185307179586; //!< 2Pi as defined in IS-GPS-200E
const double GLONASS_OMEGA_EARTH_DOT = 7.292115e-5; //!< Earth rotation rate, [rad/s]
const double GLONASS_GM = 398600.4418e9; //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2]
-const double GLONASS_F_M_A = 0.35e9; //!< Gravitational constant of atmosphere [m^3/s^2]
+const double GLONASS_F_M_A = 0.35e9; //!< Gravitational constant of atmosphere [m^3/s^2]
const double GLONASS_SEMI_MAJOR_AXIS = 6378136; //!< Semi-major axis of Earth [m]
const double GLONASS_FLATTENING = 1 / 29825784; //!< Flattening parameter
const double GLONASS_GRAVITY = 97803284; //!< Equatorial acceleration of gravity [mGal]
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 651176ea7..ee5fc3896 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -169,18 +169,18 @@ const double AI1_5_LSB = TWO_N8;
const std::vector<std::pair<int32_t, int32_t>> AI2_5_BIT({{29, 14}}); //
const double AI2_5_LSB = TWO_N15;
/*Ionospheric disturbance flag*/
-const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}}); //
-const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}}); //
const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5A_5_BIT({{48, 10}}); //
const double BGD_E1_E5A_5_LSB = TWO_N32;
const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5B_5_BIT({{58, 10}}); //
const double BGD_E1_E5B_5_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}}); //
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}}); //
const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_5_BIT({{70, 2}}); //
-const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}}); //
+const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}}); //
const std::vector<std::pair<int32_t, int32_t>> E1_B_DVS_5_BIT({{73, 1}}); //
/*GST*/
const std::vector<std::pair<int32_t, int32_t>> WN_5_BIT({{74, 12}});
From d7d4cd09aee47bf71c94572af0692c5c1671e7eb Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 15:57:15 +0100
Subject: [PATCH 06/16] Fix naming in fgpa and extra unit test implementations
---
...ileo_e1_pcps_ambiguous_acquisition_fpga.cc | 12 +++---
.../galileo_e5a_pcps_acquisition_fpga.cc | 6 +--
.../adapters/gps_l5i_pcps_acquisition_fpga.cc | 2 +-
.../galileo_e1_dll_pll_veml_tracking_fpga.cc | 28 +++++++-------
.../galileo_e5a_dll_pll_tracking_fpga.cc | 14 +++----
.../adapters/gps_l5_dll_pll_tracking_fpga.cc | 8 ++--
.../dll_pll_veml_tracking_fpga.cc | 38 +++++++++----------
.../acquisition/acq_performance_test.cc | 18 ++++-----
.../gps_l2_m_pcps_acquisition_test.cc | 2 +-
.../observables/hybrid_observables_test.cc | 14 +++----
.../pvt/rtklib_solver_test.cc | 4 +-
.../gps_l1_ca_telemetry_decoder_test.cc | 4 +-
.../gps_l1_ca_dll_pll_tracking_test.cc | 6 +--
.../gps_l1_ca_dll_pll_tracking_test_fpga.cc | 4 +-
.../tracking/gps_l1_ca_kf_tracking_test.cc | 4 +-
.../tracking/tracking_pull-in_test.cc | 12 +++---
.../tracking/tracking_pull-in_test_fpga.cc | 4 +-
17 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
index 6097ce61d..bf5f05c15 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
@@ -89,7 +89,7 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
// dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
// acq_parameters.dump_filename = dump_filename_;
//--- Find number of samples per spreading code (4 ms) -----------------
- auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+ auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
//acq_parameters.samples_per_code = code_length_;
//int samples_per_ms = static_cast<int>(std::round(static_cast<double>(fs_in_) * 0.001));
//acq_parameters.samples_per_ms = samples_per_ms;
@@ -101,8 +101,8 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
// }
//printf("fs_in = %d\n", fs_in);
- //printf("Galileo_E1_B_CODE_LENGTH_CHIPS = %f\n", Galileo_E1_B_CODE_LENGTH_CHIPS);
- //printf("Galileo_E1_CODE_CHIP_RATE_HZ = %f\n", Galileo_E1_CODE_CHIP_RATE_HZ);
+ //printf("GALILEO_E1_B_CODE_LENGTH_CHIPS = %f\n", GALILEO_E1_B_CODE_LENGTH_CHIPS);
+ //printf("GALILEO_E1_CODE_CHIP_RATE_HZ = %f\n", GALILEO_E1_CODE_CHIP_RATE_HZ);
//printf("acq adapter code_length = %d\n", code_length);
acq_parameters.code_length = code_length;
// The FPGA can only use FFT lengths that are a power of two.
@@ -123,12 +123,12 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
auto* fft_if = new gr::fft::fft_complex(nsamples_total, true); // Direct FFT
auto* code = new std::complex<float>[nsamples_total]; // buffer for the local code
auto* fft_codes_padded = static_cast<gr_complex*>(volk_gnsssdr_malloc(nsamples_total * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
- d_all_fft_codes_ = new lv_16sc_t[nsamples_total * Galileo_E1_NUMBER_OF_CODES]; // memory containing all the possible fft codes for PRN 0 to 32
+ d_all_fft_codes_ = new lv_16sc_t[nsamples_total * GALILEO_E1_NUMBER_OF_CODES]; // memory containing all the possible fft codes for PRN 0 to 32
float max; // temporary maxima search
//int tmp_re, tmp_im;
- for (unsigned int PRN = 1; PRN <= Galileo_E1_NUMBER_OF_CODES; PRN++)
+ for (unsigned int PRN = 1; PRN <= GALILEO_E1_NUMBER_OF_CODES; PRN++)
{
//code_ = new gr_complex[vector_length_];
@@ -258,7 +258,7 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
}
- // for (unsigned int PRN = 1; PRN <= Galileo_E1_NUMBER_OF_CODES; PRN++)
+ // for (unsigned int PRN = 1; PRN <= GALILEO_E1_NUMBER_OF_CODES; PRN++)
// {
// // debug
// char filename2[25];
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
index 0559ddc7e..7c3e62961 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
@@ -89,7 +89,7 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
acq_pilot_ = false;
}
- auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS)));
+ auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / GALILEO_E5A_CODE_CHIP_RATE_HZ * static_cast<double>(GALILEO_E5A_CODE_LENGTH_CHIPS)));
acq_parameters.code_length = code_length;
// The FPGA can only use FFT lengths that are a power of two.
float nbits = ceilf(log2f((float)code_length));
@@ -111,13 +111,13 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
auto* fft_if = new gr::fft::fft_complex(nsamples_total, true); // Direct FFT
auto* code = new std::complex<float>[nsamples_total]; // buffer for the local code
auto* fft_codes_padded = static_cast<gr_complex*>(volk_gnsssdr_malloc(nsamples_total * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
- d_all_fft_codes_ = new lv_16sc_t[nsamples_total * Galileo_E5a_NUMBER_OF_CODES]; // memory containing all the possible fft codes for PRN 0 to 32
+ d_all_fft_codes_ = new lv_16sc_t[nsamples_total * GALILEO_E5A_NUMBER_OF_CODES]; // memory containing all the possible fft codes for PRN 0 to 32
float max; // temporary maxima search
//printf("creating the E5A acquisition CONT");
//printf("nsamples_total = %d\n", nsamples_total);
- for (unsigned int PRN = 1; PRN <= Galileo_E5a_NUMBER_OF_CODES; PRN++)
+ for (unsigned int PRN = 1; PRN <= GALILEO_E5A_NUMBER_OF_CODES; PRN++)
{
// gr_complex* code = new gr_complex[code_length_];
char signal_[3];
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
index f90c77040..42358afc1 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
@@ -89,7 +89,7 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
//dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
//acq_parameters.dump_filename = dump_filename_;
//--- Find number of samples per spreading code -------------------------
- auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (GPS_L5i_CODE_RATE_HZ / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS))));
+ auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (GPS_L5I_CODE_RATE_HZ / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS))));
acq_parameters.code_length = code_length;
// The FPGA can only use FFT lengths that are a power of two.
float nbits = ceilf(log2f((float)code_length));
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
index 31d2cbfff..7d8462ea3 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
@@ -107,7 +107,7 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
trk_param_fpga.track_pilot = track_pilot;
d_track_pilot = track_pilot;
trk_param_fpga.extend_correlation_symbols = extend_correlation_symbols;
- int vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+ int vector_length = std::round(fs_in / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
trk_param_fpga.vector_length = vector_length;
trk_param_fpga.system = 'E';
char sig_[3] = "1B";
@@ -136,26 +136,26 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
//################# PRE-COMPUTE ALL THE CODES #################
unsigned int code_samples_per_chip = 2;
- d_ca_codes = static_cast<int*>(volk_gnsssdr_malloc(static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * Galileo_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+ d_ca_codes = static_cast<int*>(volk_gnsssdr_malloc(static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * GALILEO_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
float* ca_codes_f;
float* data_codes_f;
if (trk_param_fpga.track_pilot)
{
- d_data_codes = static_cast<int*>(volk_gnsssdr_malloc((static_cast<unsigned int>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * Galileo_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+ d_data_codes = static_cast<int*>(volk_gnsssdr_malloc((static_cast<unsigned int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * GALILEO_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
}
- ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
+ ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
if (trk_param_fpga.track_pilot)
{
- data_codes_f = static_cast<float*>(volk_gnsssdr_malloc((static_cast<unsigned int>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
+ data_codes_f = static_cast<float*>(volk_gnsssdr_malloc((static_cast<unsigned int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
}
//printf("pppppppp trk_param_fpga.track_pilot = %d\n", trk_param_fpga.track_pilot);
//int kk;
- for (unsigned int PRN = 1; PRN <= Galileo_E1_NUMBER_OF_CODES; PRN++)
+ for (unsigned int PRN = 1; PRN <= GALILEO_E1_NUMBER_OF_CODES; PRN++)
{
char data_signal[3] = "1B";
if (trk_param_fpga.track_pilot)
@@ -165,11 +165,11 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
galileo_e1_code_gen_sinboc11_float(ca_codes_f, pilot_signal, PRN);
galileo_e1_code_gen_sinboc11_float(data_codes_f, data_signal, PRN);
- for (unsigned int s = 0; s < 2 * Galileo_E1_B_CODE_LENGTH_CHIPS; s++)
+ for (unsigned int s = 0; s < 2 * GALILEO_E1_B_CODE_LENGTH_CHIPS; s++)
{
- d_ca_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
- d_data_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(data_codes_f[s]);
- //printf("%f %d | ", data_codes_f[s], d_data_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
+ d_ca_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
+ d_data_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(data_codes_f[s]);
+ //printf("%f %d | ", data_codes_f[s], d_data_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
}
//printf("\n next \n");
//scanf ("%d",&kk);
@@ -179,10 +179,10 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
//printf("no tracking pilot\n");
galileo_e1_code_gen_sinboc11_float(ca_codes_f, data_signal, PRN);
- for (unsigned int s = 0; s < 2 * Galileo_E1_B_CODE_LENGTH_CHIPS; s++)
+ for (unsigned int s = 0; s < 2 * GALILEO_E1_B_CODE_LENGTH_CHIPS; s++)
{
- d_ca_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
- //printf("%f %d | ", ca_codes_f[s], d_ca_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
+ d_ca_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
+ //printf("%f %d | ", ca_codes_f[s], d_ca_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
}
//printf("\n next \n");
//scanf ("%d",&kk);
@@ -196,7 +196,7 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
}
trk_param_fpga.ca_codes = d_ca_codes;
trk_param_fpga.data_codes = d_data_codes;
- trk_param_fpga.code_length_chips = Galileo_E1_B_CODE_LENGTH_CHIPS;
+ trk_param_fpga.code_length_chips = GALILEO_E1_B_CODE_LENGTH_CHIPS;
trk_param_fpga.code_samples_per_chip = code_samples_per_chip; // 2 sample per chip
//################# MAKE TRACKING GNURadio object ###################
tracking_fpga_sc = dll_pll_veml_make_tracking_fpga(trk_param_fpga);
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
index 1a5e1cf09..b0e69c064 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
@@ -84,7 +84,7 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
trk_param_fpga.dll_bw_narrow_hz = dll_bw_narrow_hz;
float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
trk_param_fpga.early_late_space_chips = early_late_space_chips;
- int vector_length = std::round(fs_in / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS));
+ int vector_length = std::round(fs_in / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS));
trk_param_fpga.vector_length = vector_length;
int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -96,9 +96,9 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
extend_correlation_symbols = 1;
std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
}
- else if (!track_pilot and extend_correlation_symbols > Galileo_E5a_I_SECONDARY_CODE_LENGTH)
+ else if (!track_pilot and extend_correlation_symbols > GALILEO_E5A_I_SECONDARY_CODE_LENGTH)
{
- extend_correlation_symbols = Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+ extend_correlation_symbols = GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be lower than 21 when tracking the data component. Coherent integration has been set to 20 symbols (20 ms)" << TEXT_RESET << std::endl;
}
if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
@@ -136,7 +136,7 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
//################# PRE-COMPUTE ALL THE CODES #################
unsigned int code_samples_per_chip = 1;
- auto code_length_chips = static_cast<unsigned int>(Galileo_E5a_CODE_LENGTH_CHIPS);
+ auto code_length_chips = static_cast<unsigned int>(GALILEO_E5A_CODE_LENGTH_CHIPS);
auto *aux_code = static_cast<gr_complex *>(volk_gnsssdr_malloc(sizeof(gr_complex) * code_length_chips * code_samples_per_chip, volk_gnsssdr_get_alignment()));
@@ -149,15 +149,15 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
}
tracking_code = static_cast<float *>(volk_gnsssdr_malloc(code_samples_per_chip * code_length_chips * sizeof(float), volk_gnsssdr_get_alignment()));
- d_ca_codes = static_cast<int *>(volk_gnsssdr_malloc(static_cast<int>(code_length_chips) * code_samples_per_chip * Galileo_E5a_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+ d_ca_codes = static_cast<int *>(volk_gnsssdr_malloc(static_cast<int>(code_length_chips) * code_samples_per_chip * GALILEO_E5A_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
if (trk_param_fpga.track_pilot)
{
- d_data_codes = static_cast<int *>(volk_gnsssdr_malloc((static_cast<unsigned int>(code_length_chips)) * code_samples_per_chip * Galileo_E5a_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+ d_data_codes = static_cast<int *>(volk_gnsssdr_malloc((static_cast<unsigned int>(code_length_chips)) * code_samples_per_chip * GALILEO_E5A_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
}
- for (unsigned int PRN = 1; PRN <= Galileo_E5a_NUMBER_OF_CODES; PRN++)
+ for (unsigned int PRN = 1; PRN <= GALILEO_E5A_NUMBER_OF_CODES; PRN++)
{
//galileo_e5_a_code_gen_complex_primary(aux_code, PRN, const_cast<char *>(trk_param_fpga.signal.c_str()));
galileo_e5_a_code_gen_complex_primary(aux_code, PRN, const_cast<char *>(sig_));
diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
index effa0c5b7..c12009b43 100644
--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
@@ -84,7 +84,7 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
trk_param_fpga.dll_bw_narrow_hz = dll_bw_narrow_hz;
float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
trk_param_fpga.early_late_space_chips = early_late_space_chips;
- int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5i_CODE_RATE_HZ) / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS)));
+ int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5I_CODE_RATE_HZ) / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS)));
trk_param_fpga.vector_length = vector_length;
int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -95,9 +95,9 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
extend_correlation_symbols = 1;
std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
}
- else if (!track_pilot and extend_correlation_symbols > GPS_L5i_NH_CODE_LENGTH)
+ else if (!track_pilot and extend_correlation_symbols > GPS_L5I_NH_CODE_LENGTH)
{
- extend_correlation_symbols = GPS_L5i_NH_CODE_LENGTH;
+ extend_correlation_symbols = GPS_L5I_NH_CODE_LENGTH;
std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be lower than 11 when tracking the data component. Coherent integration has been set to 10 symbols (10 ms)" << TEXT_RESET << std::endl;
}
if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
@@ -136,7 +136,7 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
//################# PRE-COMPUTE ALL THE CODES #################
unsigned int code_samples_per_chip = 1;
- auto code_length_chips = static_cast<unsigned int>(GPS_L5i_CODE_LENGTH_CHIPS);
+ auto code_length_chips = static_cast<unsigned int>(GPS_L5I_CODE_LENGTH_CHIPS);
//printf("TRK code_length_chips = %d\n", code_length_chips);
float *tracking_code;
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
index 94ff75e3e..62479aaae 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@@ -124,7 +124,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
// preamble bits to sampled symbols
d_gps_l1ca_preambles_symbols = static_cast<int32_t *>(volk_gnsssdr_malloc(GPS_CA_PREAMBLE_LENGTH_SYMBOLS * sizeof(int32_t), volk_gnsssdr_get_alignment()));
int32_t n = 0;
- for (unsigned short preambles_bit : preambles_bits)
+ for (uint16_t preambles_bit : preambles_bits)
{
for (uint32_t j = 0; j < GPS_CA_TELEMETRY_SYMBOLS_PER_BIT; j++)
{
@@ -159,8 +159,8 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
else if (signal_type == "L5")
{
d_signal_carrier_freq = GPS_L5_FREQ_HZ;
- d_code_period = GPS_L5i_PERIOD;
- d_code_chip_rate = GPS_L5i_CODE_RATE_HZ;
+ d_code_period = GPS_L5I_PERIOD;
+ d_code_chip_rate = GPS_L5I_CODE_RATE_HZ;
d_symbols_per_bit = GPS_L5_SAMPLES_PER_SYMBOL;
d_correlation_length_ms = 1;
//d_code_samples_per_chip = 1;
@@ -169,15 +169,15 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
// interchange_iq = false;
if (trk_parameters.track_pilot)
{
- d_secondary_code_length = static_cast<uint32_t>(GPS_L5q_NH_CODE_LENGTH);
- d_secondary_code_string = const_cast<std::string *>(&GPS_L5q_NH_CODE_STR);
+ d_secondary_code_length = static_cast<uint32_t>(GPS_L5Q_NH_CODE_LENGTH);
+ d_secondary_code_string = const_cast<std::string *>(&GPS_L5Q_NH_CODE_STR);
signal_pretty_name = signal_pretty_name + "Q";
interchange_iq = true;
}
else
{
- d_secondary_code_length = static_cast<uint32_t>(GPS_L5i_NH_CODE_LENGTH);
- d_secondary_code_string = const_cast<std::string *>(&GPS_L5i_NH_CODE_STR);
+ d_secondary_code_length = static_cast<uint32_t>(GPS_L5I_NH_CODE_LENGTH);
+ d_secondary_code_string = const_cast<std::string *>(&GPS_L5I_NH_CODE_STR);
signal_pretty_name = signal_pretty_name + "I";
interchange_iq = false;
}
@@ -201,9 +201,9 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
systemName = "Galileo";
if (signal_type == "1B")
{
- d_signal_carrier_freq = Galileo_E1_FREQ_HZ;
- d_code_period = Galileo_E1_CODE_PERIOD;
- d_code_chip_rate = Galileo_E1_CODE_CHIP_RATE_HZ;
+ d_signal_carrier_freq = GALILEO_E1_FREQ_HZ;
+ d_code_period = GALILEO_E1_CODE_PERIOD;
+ d_code_chip_rate = GALILEO_E1_CODE_CHIP_RATE_HZ;
//d_code_length_chips = static_cast<uint32_t >(Galileo_E1_B_CODE_LENGTH_CHIPS);
d_symbols_per_bit = 1;
d_correlation_length_ms = 4;
@@ -212,8 +212,8 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
if (trk_parameters.track_pilot)
{
d_secondary = true;
- d_secondary_code_length = static_cast<uint32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
- d_secondary_code_string = const_cast<std::string *>(&Galileo_E1_C_SECONDARY_CODE);
+ d_secondary_code_length = static_cast<uint32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
+ d_secondary_code_string = const_cast<std::string *>(&GALILEO_E1_C_SECONDARY_CODE);
signal_pretty_name = signal_pretty_name + "C";
}
else
@@ -225,9 +225,9 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
}
else if (signal_type == "5X")
{
- d_signal_carrier_freq = Galileo_E5a_FREQ_HZ;
- d_code_period = GALILEO_E5a_CODE_PERIOD;
- d_code_chip_rate = Galileo_E5a_CODE_CHIP_RATE_HZ;
+ d_signal_carrier_freq = GALILEO_E5A_FREQ_HZ;
+ d_code_period = GALILEO_E5A_CODE_PERIOD;
+ d_code_chip_rate = GALILEO_E5A_CODE_CHIP_RATE_HZ;
d_symbols_per_bit = 20;
d_correlation_length_ms = 1;
//d_code_samples_per_chip = 1;
@@ -236,14 +236,14 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
//interchange_iq = false;
if (trk_parameters.track_pilot)
{
- d_secondary_code_length = static_cast<uint32_t>(Galileo_E5a_Q_SECONDARY_CODE_LENGTH);
+ d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_Q_SECONDARY_CODE_LENGTH);
signal_pretty_name = signal_pretty_name + "Q";
interchange_iq = true;
}
else
{
- d_secondary_code_length = static_cast<uint32_t>(Galileo_E5a_I_SECONDARY_CODE_LENGTH);
- d_secondary_code_string = const_cast<std::string *>(&Galileo_E5a_I_SECONDARY_CODE);
+ d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH);
+ d_secondary_code_string = const_cast<std::string *>(&GALILEO_E5A_I_SECONDARY_CODE);
signal_pretty_name = signal_pretty_name + "I";
interchange_iq = false;
}
@@ -537,7 +537,7 @@ void dll_pll_veml_tracking_fpga::start_tracking()
{
if (trk_parameters.track_pilot)
{
- d_secondary_code_string = const_cast<std::string *>(&Galileo_E5a_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
+ d_secondary_code_string = const_cast<std::string *>(&GALILEO_E5A_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
for (uint32_t i = 0; i < d_code_length_chips; i++)
{
// nothing to compute : the local codes are pre-computed in the adapter class
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
index 74508dc3c..e93092172 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
@@ -95,15 +95,15 @@ class AcqPerfTest_msg_rx;
typedef boost::shared_ptr<AcqPerfTest_msg_rx> AcqPerfTest_msg_rx_sptr;
-AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(concurrent_queue<int>& queue);
+AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue<int>& queue);
class AcqPerfTest_msg_rx : public gr::block
{
private:
- friend AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(concurrent_queue<int>& queue);
+ friend AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue<int>& queue);
void msg_handler_events(pmt::pmt_t msg);
- AcqPerfTest_msg_rx(concurrent_queue<int>& queue);
- concurrent_queue<int>& channel_internal_queue;
+ AcqPerfTest_msg_rx(Concurrent_Queue<int>& queue);
+ Concurrent_Queue<int>& channel_internal_queue;
public:
int rx_message;
@@ -111,7 +111,7 @@ public:
};
-AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(concurrent_queue<int>& queue)
+AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue<int>& queue)
{
return AcqPerfTest_msg_rx_sptr(new AcqPerfTest_msg_rx(queue));
}
@@ -133,7 +133,7 @@ void AcqPerfTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
}
-AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(concurrent_queue<int>& queue) : gr::block("AcqPerfTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("AcqPerfTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
{
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"), boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, _1));
@@ -323,7 +323,7 @@ protected:
void check_results();
void plot_results();
- concurrent_queue<int> channel_internal_queue;
+ Concurrent_Queue<int> channel_internal_queue;
gr::msg_queue::sptr queue;
gr::top_block_sptr top_block;
@@ -779,7 +779,7 @@ void AcquisitionPerformanceTest::plot_results()
TEST_F(AcquisitionPerformanceTest, ROC)
{
- tracking_true_obs_reader true_trk_data;
+ Tracking_True_Obs_Reader true_trk_data;
if (boost::filesystem::exists(path_str))
{
@@ -872,7 +872,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
for (int execution = 1; execution <= num_executions; execution++)
{
- acquisition_dump_reader acq_dump(basename,
+ Acquisition_Dump_Reader acq_dump(basename,
observed_satellite,
config->property("Acquisition.doppler_max", 0),
config->property("Acquisition.doppler_step", 0),
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
index 8176537e2..5fb9d8c12 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
@@ -181,7 +181,7 @@ void GpsL2MPcpsAcquisitionTest::plot_grid()
auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
auto samples_per_code = static_cast<unsigned int>(floor(static_cast<double>(sampling_frequency_hz) / (GPS_L2_M_CODE_RATE_HZ / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS))));
- acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
+ Acquisition_Dump_Reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
if (!acq_dump.read_binary_acq())
{
std::cout << "Error reading files" << std::endl;
diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
index 946e43b80..cee43548b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
@@ -493,10 +493,10 @@ bool HybridObservablesTest::acquire_signal()
opt_fs = GPS_L1_CA_OPT_ACQ_FS_HZ;
break;
case evGAL_1B:
- opt_fs = Galileo_E1_OPT_ACQ_FS_HZ;
+ opt_fs = GALILEO_E1_OPT_ACQ_FS_HZ;
break;
case evGAL_5X:
- opt_fs = Galileo_E5a_OPT_ACQ_FS_HZ;
+ opt_fs = GALILEO_E5A_OPT_ACQ_FS_HZ;
break;
case evGLO_1G:
opt_fs = baseband_sampling_freq;
@@ -1687,9 +1687,9 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
{
//based on true observables metadata (for custom sdr generator)
//open true observables log file written by the simulator or based on provided RINEX obs
- std::vector<std::shared_ptr<tracking_true_obs_reader>> true_reader_vec;
+ std::vector<std::shared_ptr<Tracking_True_Obs_Reader>> true_reader_vec;
//read true data from the generator logs
- true_reader_vec.push_back(std::make_shared<tracking_true_obs_reader>());
+ true_reader_vec.push_back(std::make_shared<Tracking_True_Obs_Reader>());
std::cout << "Loading true observable data for PRN " << n.PRN << std::endl;
std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
true_obs_file.append(std::to_string(n.PRN));
@@ -1837,7 +1837,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
if (!FLAGS_enable_external_signal_file)
{
//load the true values
- true_observables_reader true_observables;
+ True_Observables_Reader true_observables;
ASSERT_NO_THROW({
if (true_observables.open_obs_file(std::string("./obs_out.bin")) == false)
{
@@ -1885,7 +1885,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
}
}
//read measured values
- observables_dump_reader estimated_observables(tracking_ch_vec.size());
+ Observables_Dump_Reader estimated_observables(tracking_ch_vec.size());
ASSERT_NO_THROW({
if (estimated_observables.open_obs_file(std::string("./observables.dat")) == false)
{
@@ -2040,7 +2040,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
}
arma::vec receiver_time_offset_ref_channel_s;
- receiver_time_offset_ref_channel_s = (true_obs_vec.at(min_pr_ch_id).col(1)(0) - measured_obs_vec.at(min_pr_ch_id).col(4)(0)) / GPS_C_m_s;
+ receiver_time_offset_ref_channel_s = (true_obs_vec.at(min_pr_ch_id).col(1)(0) - measured_obs_vec.at(min_pr_ch_id).col(4)(0)) / GPS_C_M_S;
std::cout << "Ref. channel initial Receiver time offset " << receiver_time_offset_ref_channel_s(0) * 1e3 << " [ms]" << std::endl;
for (unsigned int n = 0; n < measured_obs_vec.size(); n++)
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
index 28b69ce0d..ce191b01a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
@@ -396,12 +396,12 @@ TEST(RTKLibSolverTest, test1)
bool save_to_mat = false;
rtk_t rtk = configure_rtklib_options();
- std::unique_ptr<rtklib_solver> d_ls_pvt(new rtklib_solver(nchannels, dump_filename, flag_dump_to_file, save_to_mat, rtk));
+ std::unique_ptr<Rtklib_Solver> d_ls_pvt(new Rtklib_Solver(nchannels, dump_filename, flag_dump_to_file, save_to_mat, rtk));
d_ls_pvt->set_averaging_depth(1);
// load ephemeris
std::string eph_xml_filename = path + "data/rtklib_test/eph_GPS_L1CA_test1.xml";
- gnss_sdr_supl_client supl_client_ephemeris_;
+ Gnss_Sdr_Supl_Client supl_client_ephemeris_;
std::cout << "SUPL: Try read GPS ephemeris from XML file " << eph_xml_filename << std::endl;
if (supl_client_ephemeris_.load_ephemeris_xml(eph_xml_filename) == true)
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
index 28da8661d..be7963164 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@@ -343,7 +343,7 @@ TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
configure_receiver();
//open true observables log file written by the simulator
- tracking_true_obs_reader true_obs_data;
+ Tracking_True_Obs_Reader true_obs_data;
int test_satellite_PRN = FLAGS_test_satellite_PRN;
std::cout << "Testing satellite PRN=" << test_satellite_PRN << std::endl;
std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
@@ -440,7 +440,7 @@ TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
}
//load the measured values
- tlm_dump_reader tlm_dump;
+ Tlm_Dump_Reader tlm_dump;
ASSERT_NO_THROW({
if (tlm_dump.open_obs_file(std::string("./telemetry0.dat")) == false)
{
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
index 8fcd3a726..982eda0ee 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
@@ -447,7 +447,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
int test_satellite_PRN = 0;
double acq_delay_samples = 0.0;
double acq_doppler_hz = 0.0;
- tracking_true_obs_reader true_obs_data;
+ Tracking_True_Obs_Reader true_obs_data;
// CONFIG PARAM SWEEP LOOP
@@ -645,7 +645,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
//check results
//load the measured values
- tracking_dump_reader trk_dump;
+ Tracking_Dump_Reader trk_dump;
ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
<< "Failure opening tracking dump file";
@@ -751,7 +751,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
code_phase_error_chips = check_results_codephase(true_timestamp_s, true_prn_delay_chips, trk_timestamp_s, trk_prn_delay_chips, mean_error, std_dev_error, rmse);
for (double code_phase_error_chip : code_phase_error_chips)
{
- code_phase_error_meters.push_back(GPS_L1_CA_CHIP_PERIOD * code_phase_error_chip * GPS_C_m_s);
+ code_phase_error_meters.push_back(GPS_L1_CA_CHIP_PERIOD * code_phase_error_chip * GPS_C_M_S);
}
mean_code_phase_error.push_back(mean_error);
std_dev_code_phase_error.push_back(std_dev_error);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
index 0f93e68d7..78303a1cf 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
@@ -453,7 +453,7 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
configure_receiver();
//open true observables log file written by the simulator
- tracking_true_obs_reader true_obs_data;
+ Tracking_True_Obs_Reader true_obs_data;
int test_satellite_PRN = FLAGS_test_satellite_PRN;
std::cout << "Testing satellite PRN=" << test_satellite_PRN << std::endl;
std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
@@ -566,7 +566,7 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
}
//load the measured values
- tracking_dump_reader trk_dump;
+ Tracking_Dump_Reader trk_dump;
ASSERT_NO_THROW(
{
if (trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")) == false)
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
index f987d1973..f1046a12b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
@@ -375,7 +375,7 @@ TEST_F(GpsL1CAKfTrackingTest, ValidationOfResults)
configure_receiver();
// open true observables log file written by the simulator
- tracking_true_obs_reader true_obs_data;
+ Tracking_True_Obs_Reader true_obs_data;
int test_satellite_PRN = FLAGS_test_satellite_PRN;
std::cout << "Testing satellite PRN=" << test_satellite_PRN << std::endl;
std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
@@ -459,7 +459,7 @@ TEST_F(GpsL1CAKfTrackingTest, ValidationOfResults)
}
//load the measured values
- tracking_dump_reader trk_dump;
+ Tracking_Dump_Reader trk_dump;
ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
<< "Failure opening tracking dump file";
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
index 15756f3bc..306ad74fd 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
@@ -514,10 +514,10 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
opt_fs = GPS_L1_CA_OPT_ACQ_FS_HZ;
break;
case evGAL_1B:
- opt_fs = Galileo_E1_OPT_ACQ_FS_HZ;
+ opt_fs = GALILEO_E1_OPT_ACQ_FS_HZ;
break;
case evGAL_5X:
- opt_fs = Galileo_E5a_OPT_ACQ_FS_HZ;
+ opt_fs = GALILEO_E5A_OPT_ACQ_FS_HZ;
break;
case evGLO_1G:
opt_fs = baseband_sampling_freq;
@@ -750,7 +750,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
double true_acq_delay_samples = 0.0;
uint64_t acq_samplestamp_samples = 0;
- tracking_true_obs_reader true_obs_data;
+ Tracking_True_Obs_Reader true_obs_data;
if (!FLAGS_enable_external_signal_file)
{
test_satellite_PRN = FLAGS_test_satellite_PRN;
@@ -783,9 +783,9 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
// create the msg queue for valve
queue = gr::msg_queue::make(0);
- boost::shared_ptr<gnss_sdr_valve> reseteable_valve;
+ boost::shared_ptr<Gnss_Sdr_Valve> reseteable_valve;
long long int acq_to_trk_delay_samples = ceil(static_cast<double>(FLAGS_fs_gen_sps) * FLAGS_acq_to_trk_delay_s);
- boost::shared_ptr<gnss_sdr_valve> resetable_valve_(new gnss_sdr_valve(sizeof(gr_complex), acq_to_trk_delay_samples, queue, false));
+ boost::shared_ptr<Gnss_Sdr_Valve> resetable_valve_(new Gnss_Sdr_Valve(sizeof(gr_complex), acq_to_trk_delay_samples, queue, false));
std::shared_ptr<ControlMessageFactory> control_message_factory_;
std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> control_messages_;
@@ -910,7 +910,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
if (FLAGS_plot_detail_level >= 2 and FLAGS_show_plots)
{
//load the measured values
- tracking_dump_reader trk_dump;
+ Tracking_Dump_Reader trk_dump;
ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
<< "Failure opening tracking dump file";
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
index 44cb83374..0904d2047 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
@@ -627,7 +627,7 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults)
double true_acq_delay_samples = 0.0;
uint64_t acq_samplestamp_samples = 0;
- tracking_true_obs_reader true_obs_data;
+ Tracking_True_Obs_Reader true_obs_data;
if (!FLAGS_enable_external_signal_file)
{
test_satellite_PRN = FLAGS_test_satellite_PRN;
@@ -739,7 +739,7 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults)
if (FLAGS_plot_detail_level >= 2 and FLAGS_show_plots)
{
//load the measured values
- tracking_dump_reader trk_dump;
+ Tracking_Dump_Reader trk_dump;
ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
<< "Failure opening tracking dump file";
From 63c1409b8fbbd04362975a441658c4bb3b68eb79 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 16:56:10 +0100
Subject: [PATCH 07/16] Update changelog
---
docs/changelog | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/docs/changelog b/docs/changelog
index 692a939ef..312543bc6 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,14 +1,29 @@
## [Unreleased](https://github.com/gnss-sdr/gnss-sdr/tree/next)
+### Improvements in Efficiency
+
+- Applied clang-tidy checks and fixes related to performance.
+
### Improvements in Interoperability:
- Added the BeiDou B1I receiver chain.
+- Fix bug in GLONASS dual frequency receiver.
+
+### Improvements in Maintainability:
+
+- Usage of clang-tidy integrated into CMake scripts. New option -DENABLE_CLANG_TIDY=ON executes clang-tidy along with compilation. Requires clang compiler.
+- Applied clang-tidy checks and fixes related to readability.
### Improvements in Portability:
- CMake scripts now follow a modern approach (targets and properties) but still work in 2.8.12
+## Improvements in Reliability
+
+- Applied clang-tidy checks and fixes related to High Integrity C++.
+
+
## [0.0.10](https://github.com/gnss-sdr/gnss-sdr/releases/tag/v0.0.10)
This release has several improvements in different dimensions, addition of new features and bug fixes:
From a05aa22d396ebb9eba64882c9241b7f87380308d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 20:54:41 +0100
Subject: [PATCH 08/16] Fix building of FMCOMMS2 option
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a57aebad3..1272bc341 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1731,6 +1731,7 @@ endif()
##############################################
if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
find_package(GRIIO)
+ find_package(LIBIIO)
endif()
From 9c2cebd9064d2148cd687c597fd97ef8d1f9a0b5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:18:30 +0100
Subject: [PATCH 09/16] Fix flexiband driver building
---
src/core/receiver/CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 538f2d72a..4909f9ae9 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -168,6 +168,13 @@ if(OS_IS_MACOSX)
endif()
endif()
+if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
+ target_compile_definitions(core_receiver
+ PRIVATE
+ Gnuradio::teleorbit
+ )
+endif()
+
if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE)
set_target_properties(core_receiver
From e6ae1a307cac745abc55272006626062f841f04a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:22:36 +0100
Subject: [PATCH 10/16] Fix gn3s driver building
---
src/core/receiver/CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 4909f9ae9..b30c2295e 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -175,6 +175,13 @@ if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
)
endif()
+if(ENABLE_GN3S AND GRGN3S_FOUND)
+ target_compile_definitions(core_receiver
+ PRIVATE
+ Gnuradio::gn3s
+ )
+endif()
+
if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE)
set_target_properties(core_receiver
From 2f83d1e7339fc4023008ceb8547261279a353879 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:34:42 +0100
Subject: [PATCH 11/16] Apply clang-tidy to flexiband driver
---
.../adapters/flexiband_signal_source.cc | 12 +++++-------
.../signal_source/adapters/flexiband_signal_source.h | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
index 95b3c56cd..26d371535 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@@ -1,4 +1,4 @@
-/*!
+(item_type_ == "gr_complex") /*!
* \file raw_array_signal_source.cc
* \brief CTTC Experimental GNSS 8 channels array signal source
* \author Javier Arribas, jarribas(at)cttc.es
@@ -36,10 +36,10 @@
#include <teleorbit/frontend.h>
-using google::LogMessage;
+ using google::LogMessage;
FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configuration,
- std::string role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue)
+ const std::string& role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue)
{
std::string default_item_type = "byte";
item_type_ = configuration->property(role + ".item_type", default_item_type);
@@ -60,7 +60,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati
RF_channels_ = configuration->property(role + ".RF_channels", 1);
- if (item_type_.compare("gr_complex") == 0)
+ if (item_type_ == "gr_complex")
{
item_size_ = sizeof(gr_complex);
flexiband_source_ = gr::teleorbit::frontend::make(firmware_filename_.c_str(), gain1_, gain2_, gain3_, AGC_, usb_packet_buffer_size_, signal_file.c_str(), flag_read_file);
@@ -96,9 +96,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati
}
-FlexibandSignalSource::~FlexibandSignalSource()
-{
-}
+FlexibandSignalSource::~FlexibandSignalSource() = default;
void FlexibandSignalSource::connect(gr::top_block_sptr top_block)
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
index 54e7eeff4..ed70b5bfd 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -53,7 +53,7 @@ class FlexibandSignalSource : public GNSSBlockInterface
{
public:
FlexibandSignalSource(ConfigurationInterface* configuration,
- std::string role, unsigned int in_stream,
+ const std::string& role, unsigned int in_stream,
unsigned int out_stream, gr::msg_queue::sptr queue);
virtual ~FlexibandSignalSource();
From 30a72d5c061839b39e5c86c6b112a32210f5965c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:49:07 +0100
Subject: [PATCH 12/16] Fix headers
---
.../adapters/flexiband_signal_source.cc | 18 +++++++++++++-----
.../adapters/flexiband_signal_source.h | 13 +++++++------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
index 26d371535..213ab4b6b 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@@ -1,6 +1,8 @@
-(item_type_ == "gr_complex") /*!
- * \file raw_array_signal_source.cc
- * \brief CTTC Experimental GNSS 8 channels array signal source
+/*!
+ * \file flexiband_signal_source.cc
+ * \brief ignal Source adapter for the Teleorbit Flexiband front-end device.
+ * This adapter requires a Flexiband GNU Radio driver
+ * installed (not included with GNSS-SDR)
* \author Javier Arribas, jarribas(at)cttc.es
*
* -------------------------------------------------------------------------
@@ -36,10 +38,16 @@
#include <teleorbit/frontend.h>
- using google::LogMessage;
+using google::LogMessage;
FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configuration,
- const std::string& role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue)
+ const std::string& role,
+ unsigned int in_stream,
+ unsigned int out_stream,
+ gr::msg_queue::sptr queue) : role_(role),
+ in_stream_(in_stream),
+ out_stream_(out_stream),
+ queue_(queue)
{
std::string default_item_type = "byte";
item_type_ = configuration->property(role + ".item_type", default_item_type);
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
index ed70b5bfd..40030af6c 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -1,7 +1,8 @@
/*!
- * \file raw_array_signal_source.h
- * \brief Signal Source adapter for the Teleorbit Flexiband front-end device.
- * This adapter requires a Flexiband GNURadio driver installed (not included with GNSS-SDR)
+ * \file flexiband_signal_source.h
+ * \brief ignal Source adapter for the Teleorbit Flexiband front-end device.
+ * This adapter requires a Flexiband GNU Radio driver
+ * installed (not included with GNSS-SDR)
* \author Javier Arribas, jarribas(at)cttc.es
*
* -------------------------------------------------------------------------
@@ -30,8 +31,8 @@
*/
-#ifndef FLEXIBAND_SIGNAL_SOURCE_H_
-#define FLEXIBAND_SIGNAL_SOURCE_H_
+#ifndef GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H_
+#define GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H_
#include "gnss_block_interface.h"
#include <gnuradio/blocks/char_to_float.h>
@@ -108,4 +109,4 @@ private:
boost::shared_ptr<gr::msg_queue> queue_;
};
-#endif /*FLEXIBAND_SIGNAL_SOURCE_H_*/
+#endif // GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H_
From 13d8d19679f0badd065fa9b0094bb12f9873fbcb Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 22:02:37 +0100
Subject: [PATCH 13/16] clang-tidy fixes
---
.../signal_source/adapters/raw_array_signal_source.cc | 6 ++----
.../signal_source/adapters/raw_array_signal_source.h | 6 +++---
src/core/receiver/CMakeLists.txt | 11 +++++++++--
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
index b7f29a012..589af32c5 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
@@ -66,7 +66,7 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration
int sampling_freq_;
sampling_freq_ = configuration->property(role + ".sampling_freq", 5000000);
- if (item_type_.compare("gr_complex") == 0)
+ if (item_type_ == "gr_complex")
{
item_size_ = sizeof(gr_complex);
raw_array_source_ = gr::dbfcttc::raw_array::make(eth_device_.c_str(), channels_, snapshots_per_frame_, inter_frame_delay_, sampling_freq_);
@@ -97,9 +97,7 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration
}
-RawArraySignalSource::~RawArraySignalSource()
-{
-}
+RawArraySignalSource::~RawArraySignalSource() = default;
void RawArraySignalSource::connect(gr::top_block_sptr top_block)
diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
index 9af4df30f..321895cef 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@@ -29,8 +29,8 @@
*/
-#ifndef RAW_ARRAY_SIGNAL_SOURCE_H_
-#define RAW_ARRAY_SIGNAL_SOURCE_H_
+#ifndef GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_
+#define GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_
#include "gnss_block_interface.h"
#include <gnuradio/blocks/file_sink.h>
@@ -90,4 +90,4 @@ private:
boost::shared_ptr<gr::msg_queue> queue_;
};
-#endif /*RAW_ARRAY_SIGNAL_SOURCE_H_*/
+#endif /*GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_*/
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index b30c2295e..469960d47 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -169,19 +169,26 @@ if(OS_IS_MACOSX)
endif()
if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
- target_compile_definitions(core_receiver
+ target_link_libraries(core_receiver
PRIVATE
Gnuradio::teleorbit
)
endif()
if(ENABLE_GN3S AND GRGN3S_FOUND)
- target_compile_definitions(core_receiver
+ target_link_libraries(core_receiver
PRIVATE
Gnuradio::gn3s
)
endif()
+if(ENABLE_ARRAY AND GRDBFCTTC_FOUND)
+ target_link_libraries(core_receiver
+ PRIVATE
+ Gnuradio::dbfcttc
+ )
+endif()
+
if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE)
set_target_properties(core_receiver
From 00687408956373c673155d9c68e2499cff8e9d03 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 22:12:44 +0100
Subject: [PATCH 14/16] clang-tidy fixes
---
.../signal_source/adapters/flexiband_signal_source.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
index 213ab4b6b..216fa084c 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@@ -36,7 +36,7 @@
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/msg_queue.h>
#include <teleorbit/frontend.h>
-
+#include <utility>
using google::LogMessage;
@@ -47,7 +47,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati
gr::msg_queue::sptr queue) : role_(role),
in_stream_(in_stream),
out_stream_(out_stream),
- queue_(queue)
+ queue_(std::move(queue))
{
std::string default_item_type = "byte";
item_type_ = configuration->property(role + ".item_type", default_item_type);
From 07259159afd4ac54d3a1056b2076e5581f53a882 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:34:15 +0000
Subject: [PATCH 15/16] Apply clang-tidy checks
---
src/algorithms/libs/rtklib/rtklib_rtkpos.cc | 5 +--
.../adapters/ad9361_fpga_signal_source.cc | 2 +-
.../adapters/ad9361_fpga_signal_source.h | 2 +-
.../adapters/custom_udp_signal_source.cc | 2 +-
.../adapters/custom_udp_signal_source.h | 2 +-
.../gr_complex_ip_packet_source.cc | 32 +++++++++----------
.../gr_complex_ip_packet_source.h | 8 ++---
.../signal_source/libs/fpga_switch.cc | 12 +++----
.../signal_source/libs/fpga_switch.h | 6 ++--
9 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
index 40645f9a0..e59327680 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
@@ -57,6 +57,7 @@
#include "rtklib_pntpos.h"
#include "rtklib_ppp.h"
#include "rtklib_tides.h"
+#include <cmath>
#include <cstring>
static int resamb_WLNL(rtk_t *rtk __attribute((unused)), const obsd_t *obs __attribute((unused)), const int *sat __attribute((unused)),
@@ -2672,7 +2673,7 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
}
rtk->sol.age = static_cast<float>(timediff(rtk->sol.time, solb.time));
- if (fabs(rtk->sol.age) > TTOL_MOVEB)
+ if (std::fabs(rtk->sol.age) > TTOL_MOVEB)
{
errmsg(rtk, "time sync error for moving-base (age=%.1f)\n", rtk->sol.age);
return 0;
@@ -2692,7 +2693,7 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
{
rtk->sol.age = static_cast<float>(timediff(obs[0].time, obs[nu].time));
- if (fabs(rtk->sol.age) > opt->maxtdiff)
+ if (std::fabs(rtk->sol.age) > opt->maxtdiff)
{
errmsg(rtk, "age of differential error (age=%.1f)\n", rtk->sol.age);
outsolstat(rtk);
diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
index a9cade7c5..5d989b956 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
@@ -110,7 +110,7 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
std::string default_device_name = "/dev/uio13";
std::string device_name = configuration->property(role + ".devicename", default_device_name);
int switch_position = configuration->property(role + ".switch_position", 0);
- switch_fpga = std::make_shared<fpga_switch>(device_name);
+ switch_fpga = std::make_shared<Fpga_Switch>(device_name);
switch_fpga->set_switch_position(switch_position);
if (in_stream_ > 0)
{
diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
index 79ebeff3e..9277c4c2b 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
@@ -114,7 +114,7 @@ private:
boost::shared_ptr<gr::msg_queue> queue_;
- std::shared_ptr<fpga_switch> switch_fpga;
+ std::shared_ptr<Fpga_Switch> switch_fpga;
};
#endif /*GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_*/
diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
index 2f2e76ef3..2b4714bca 100644
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
@@ -72,7 +72,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati
// output item size is always gr_complex
item_size_ = sizeof(gr_complex);
- udp_gnss_rx_source_ = gr_complex_ip_packet_source::make(capture_device,
+ udp_gnss_rx_source_ = Gr_Complex_Ip_Packet_Source::make(capture_device,
address,
port,
payload_bytes,
diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
index bec7c3d73..18cc21c9e 100644
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
@@ -97,7 +97,7 @@ private:
bool dump_;
std::string dump_filename_;
std::vector<boost::shared_ptr<gr::block>> null_sinks_;
- gr_complex_ip_packet_source::sptr udp_gnss_rx_source_;
+ Gr_Complex_Ip_Packet_Source::sptr udp_gnss_rx_source_;
std::vector<boost::shared_ptr<gr::block>> file_sink_;
boost::shared_ptr<gr::msg_queue> queue_;
};
diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
index ba6a8ec3e..8085e9e81 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
@@ -75,8 +75,8 @@ typedef struct gr_udp_header
} gr_udp_header;
-gr_complex_ip_packet_source::sptr
-gr_complex_ip_packet_source::make(std::string src_device,
+Gr_Complex_Ip_Packet_Source::sptr
+Gr_Complex_Ip_Packet_Source::make(std::string src_device,
const std::string &origin_address,
int udp_port,
int udp_packet_size,
@@ -85,7 +85,7 @@ gr_complex_ip_packet_source::make(std::string src_device,
size_t item_size,
bool IQ_swap_)
{
- return gnuradio::get_initial_sptr(new gr_complex_ip_packet_source(std::move(src_device),
+ return gnuradio::get_initial_sptr(new Gr_Complex_Ip_Packet_Source(std::move(src_device),
origin_address,
udp_port,
udp_packet_size,
@@ -99,7 +99,7 @@ gr_complex_ip_packet_source::make(std::string src_device,
/*
* The private constructor
*/
-gr_complex_ip_packet_source::gr_complex_ip_packet_source(std::string src_device,
+Gr_Complex_Ip_Packet_Source::Gr_Complex_Ip_Packet_Source(std::string src_device,
__attribute__((unused)) const std::string &origin_address,
int udp_port,
int udp_packet_size,
@@ -151,14 +151,14 @@ gr_complex_ip_packet_source::gr_complex_ip_packet_source(std::string src_device,
// Called by gnuradio to enable drivers, etc for i/o devices.
-bool gr_complex_ip_packet_source::start()
+bool Gr_Complex_Ip_Packet_Source::start()
{
std::cout << "gr_complex_ip_packet_source START\n";
// open the ethernet device
if (open() == true)
{
// start pcap capture thread
- d_pcap_thread = new boost::thread(boost::bind(&gr_complex_ip_packet_source::my_pcap_loop_thread, this, descr));
+ d_pcap_thread = new boost::thread(boost::bind(&Gr_Complex_Ip_Packet_Source::my_pcap_loop_thread, this, descr));
return true;
}
else
@@ -169,7 +169,7 @@ bool gr_complex_ip_packet_source::start()
// Called by gnuradio to disable drivers, etc for i/o devices.
-bool gr_complex_ip_packet_source::stop()
+bool Gr_Complex_Ip_Packet_Source::stop()
{
std::cout << "gr_complex_ip_packet_source STOP\n";
if (descr != nullptr)
@@ -182,7 +182,7 @@ bool gr_complex_ip_packet_source::stop()
}
-bool gr_complex_ip_packet_source::open()
+bool Gr_Complex_Ip_Packet_Source::open()
{
char errbuf[PCAP_ERRBUF_SIZE];
boost::mutex::scoped_lock lock(d_mutex); // hold mutex for duration of this function
@@ -219,7 +219,7 @@ bool gr_complex_ip_packet_source::open()
}
-gr_complex_ip_packet_source::~gr_complex_ip_packet_source()
+Gr_Complex_Ip_Packet_Source::~Gr_Complex_Ip_Packet_Source()
{
if (d_pcap_thread != nullptr)
{
@@ -230,15 +230,15 @@ gr_complex_ip_packet_source::~gr_complex_ip_packet_source()
}
-void gr_complex_ip_packet_source::static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr,
+void Gr_Complex_Ip_Packet_Source::static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr,
const u_char *packet)
{
- auto *bridge = reinterpret_cast<gr_complex_ip_packet_source *>(args);
+ auto *bridge = reinterpret_cast<Gr_Complex_Ip_Packet_Source *>(args);
bridge->pcap_callback(args, pkthdr, packet);
}
-void gr_complex_ip_packet_source::pcap_callback(__attribute__((unused)) u_char *args, __attribute__((unused)) const struct pcap_pkthdr *pkthdr,
+void Gr_Complex_Ip_Packet_Source::pcap_callback(__attribute__((unused)) u_char *args, __attribute__((unused)) const struct pcap_pkthdr *pkthdr,
const u_char *packet)
{
boost::mutex::scoped_lock lock(d_mutex); // hold mutex for duration of this function
@@ -312,13 +312,13 @@ void gr_complex_ip_packet_source::pcap_callback(__attribute__((unused)) u_char *
}
-void gr_complex_ip_packet_source::my_pcap_loop_thread(pcap_t *pcap_handle)
+void Gr_Complex_Ip_Packet_Source::my_pcap_loop_thread(pcap_t *pcap_handle)
{
- pcap_loop(pcap_handle, -1, gr_complex_ip_packet_source::static_pcap_callback, reinterpret_cast<u_char *>(this));
+ pcap_loop(pcap_handle, -1, Gr_Complex_Ip_Packet_Source::static_pcap_callback, reinterpret_cast<u_char *>(this));
}
-void gr_complex_ip_packet_source::demux_samples(gr_vector_void_star output_items, int num_samples_readed)
+void Gr_Complex_Ip_Packet_Source::demux_samples(gr_vector_void_star output_items, int num_samples_readed)
{
int8_t real;
int8_t imag;
@@ -383,7 +383,7 @@ void gr_complex_ip_packet_source::demux_samples(gr_vector_void_star output_items
}
-int gr_complex_ip_packet_source::work(int noutput_items,
+int Gr_Complex_Ip_Packet_Source::work(int noutput_items,
__attribute__((unused)) gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
index d008e1314..8807be5bb 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
@@ -43,7 +43,7 @@
#include <string>
#include <sys/ioctl.h>
-class gr_complex_ip_packet_source : virtual public gr::sync_block
+class Gr_Complex_Ip_Packet_Source : virtual public gr::sync_block
{
private:
boost::mutex d_mutex;
@@ -82,7 +82,7 @@ private:
static void static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet);
public:
- typedef boost::shared_ptr<gr_complex_ip_packet_source> sptr;
+ typedef boost::shared_ptr<Gr_Complex_Ip_Packet_Source> sptr;
static sptr make(std::string src_device,
const std::string &origin_address,
int udp_port,
@@ -91,7 +91,7 @@ public:
const std::string &wire_sample_type,
size_t item_size,
bool IQ_swap_);
- gr_complex_ip_packet_source(std::string src_device,
+ Gr_Complex_Ip_Packet_Source(std::string src_device,
const std::string &origin_address,
int udp_port,
int udp_packet_size,
@@ -99,7 +99,7 @@ public:
const std::string &wire_sample_type,
size_t item_size,
bool IQ_swap_);
- ~gr_complex_ip_packet_source();
+ ~Gr_Complex_Ip_Packet_Source();
// Where all the action really happens
int work(int noutput_items,
diff --git a/src/algorithms/signal_source/libs/fpga_switch.cc b/src/algorithms/signal_source/libs/fpga_switch.cc
index 71fd26eba..3f1caec12 100644
--- a/src/algorithms/signal_source/libs/fpga_switch.cc
+++ b/src/algorithms/signal_source/libs/fpga_switch.cc
@@ -45,7 +45,7 @@
const size_t PAGE_SIZE = 0x10000;
const unsigned int TEST_REGISTER_TRACK_WRITEVAL = 0x55AA;
-fpga_switch::fpga_switch(const std::string &device_name)
+Fpga_Switch::Fpga_Switch(const std::string &device_name)
{
if ((d_device_descriptor = open(device_name.c_str(), O_RDWR | O_SYNC)) == -1)
{
@@ -67,7 +67,7 @@ fpga_switch::fpga_switch(const std::string &device_name)
// sanity check : check test register
unsigned writeval = TEST_REGISTER_TRACK_WRITEVAL;
unsigned readval;
- readval = fpga_switch::fpga_switch_test_register(writeval);
+ readval = Fpga_Switch::fpga_switch_test_register(writeval);
if (writeval != readval)
{
LOG(WARNING) << "Test register sanity check failed";
@@ -81,19 +81,19 @@ fpga_switch::fpga_switch(const std::string &device_name)
}
-fpga_switch::~fpga_switch()
+Fpga_Switch::~Fpga_Switch()
{
close_device();
}
-void fpga_switch::set_switch_position(int switch_position)
+void Fpga_Switch::set_switch_position(int switch_position)
{
d_map_base[0] = switch_position;
}
-unsigned fpga_switch::fpga_switch_test_register(
+unsigned Fpga_Switch::fpga_switch_test_register(
unsigned writeval)
{
unsigned readval;
@@ -106,7 +106,7 @@ unsigned fpga_switch::fpga_switch_test_register(
}
-void fpga_switch::close_device()
+void Fpga_Switch::close_device()
{
auto *aux = const_cast<unsigned *>(d_map_base);
if (munmap(static_cast<void *>(aux), PAGE_SIZE) == -1)
diff --git a/src/algorithms/signal_source/libs/fpga_switch.h b/src/algorithms/signal_source/libs/fpga_switch.h
index 2ab67dbef..f535bce7d 100644
--- a/src/algorithms/signal_source/libs/fpga_switch.h
+++ b/src/algorithms/signal_source/libs/fpga_switch.h
@@ -41,11 +41,11 @@
#define MAX_LENGTH_DEVICEIO_NAME 50
-class fpga_switch
+class Fpga_Switch
{
public:
- fpga_switch(const std::string& device_name);
- ~fpga_switch();
+ Fpga_Switch(const std::string& device_name);
+ ~Fpga_Switch();
void set_switch_position(int switch_position);
private:
From 3b039619cc6a75f32c329670a93c6cb55dff1aaa Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 23:02:16 +0100
Subject: [PATCH 16/16] Uniformize header guards
---
.../gnuradio_blocks/gr_complex_ip_packet_source.h | 6 +++---
.../gnuradio_blocks/unpack_byte_4bit_samples.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
index 8807be5bb..ee915a662 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
@@ -30,8 +30,8 @@
*/
-#ifndef INCLUDED_GR_COMPLEX_IP_PACKET_SOURCE_H
-#define INCLUDED_GR_COMPLEX_IP_PACKET_SOURCE_H
+#ifndef GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H
+#define GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H
#include <boost/thread.hpp>
#include <gnuradio/sync_block.h>
@@ -112,4 +112,4 @@ public:
bool stop();
};
-#endif /* INCLUDED_GR_COMPLEX_IP_PACKET_SOURCE_H */
+#endif /* GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H */
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
index 2ee08145e..8b9ad7454 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
@@ -30,8 +30,8 @@
* -------------------------------------------------------------------------
*/
-#ifndef GNSS_SDR_unpack_byte_4bit_samples_H
-#define GNSS_SDR_unpack_byte_4bit_samples_H
+#ifndef GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H
+#define GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H
#include <gnuradio/sync_interpolator.h>